From 21790ab31dfc32524ef4701ba2fa3e562a4d1c54 Mon Sep 17 00:00:00 2001
From: perry <292303709@qq.com>
Date: Mon, 29 May 2023 09:46:14 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E5=88=86=E9=94=80=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../recharge/RechargeOrderController.java     |   1 +
 .../recharge/vo/RechargeOrderPageReqVO.java   |   6 +-
 .../app/member/MemberController.java          |  20 +++
 .../app/member/vo/PromoterMemberOrderVO.java  |  18 +++
 .../mysql/recharge/RechargeOrderMapper.java   |   5 +-
 .../recharge/RechargeOrderService.java        |   5 +
 .../recharge/RechargeOrderServiceImpl.java    |  75 ++++++++++-
 .../mapper/recharge/RechargeOrderMapper.xml   |  17 +++
 .../module/member/api/user/MemberUserApi.java |   3 +
 .../api/user/dto/AppUserInfoReqDTO.java       |  19 +++
 .../member/api/user/MemberUserApiImpl.java    |   6 +
 .../user/vo/AppUserInfoReqVO.java             |  26 +++-
 .../app/user/AppUserController.java           |   4 +-
 .../dal/mysql/user/MemberUserMapper.java      |   7 +
 .../service/promoter/PromoterService.java     |   1 +
 .../service/promoter/PromoterServiceImpl.java |   3 +
 .../service/user/MemberUserService.java       |   2 +
 .../service/user/MemberUserServiceImpl.java   |   5 +
 .../module/system/api/tenant/TenantApi.java   |   4 +
 .../system/api/tenant/dto/TenantDTO.java      | 121 ++++++++++++++++++
 .../system/api/tenant/TenantApiImpl.java      |  10 ++
 .../system/convert/tenant/TenantConvert.java  |   3 +
 22 files changed, 353 insertions(+), 8 deletions(-)
 create mode 100644 yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/app/member/vo/PromoterMemberOrderVO.java
 create mode 100644 yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/user/dto/AppUserInfoReqDTO.java
 rename yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/{app => admin}/user/vo/AppUserInfoReqVO.java (60%)
 create mode 100644 yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/tenant/dto/TenantDTO.java

diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/recharge/RechargeOrderController.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/recharge/RechargeOrderController.java
index 974b8e9ad..314963ab7 100644
--- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/recharge/RechargeOrderController.java
+++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/recharge/RechargeOrderController.java
@@ -133,6 +133,7 @@ public class RechargeOrderController {
     @PreAuthenticated
     @Operation(summary = "退款")
     @RequestMapping(value = "/memberRefund", method = RequestMethod.POST)
+    @PreAuthorize("@ss.hasPermission('shop:recharge-order:refund')")
     public CommonResult<Object> memberRefund(@Valid @RequestBody RefundRequest request, HttpServletRequest servletRequest) throws Exception {
         log.info("memberRefund会员退款===>{}", request);
         Object obj=null;
diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/recharge/vo/RechargeOrderPageReqVO.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/recharge/vo/RechargeOrderPageReqVO.java
index ccb6d0728..198f403f2 100644
--- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/recharge/vo/RechargeOrderPageReqVO.java
+++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/recharge/vo/RechargeOrderPageReqVO.java
@@ -126,6 +126,10 @@ public class RechargeOrderPageReqVO extends PageParam {
 
     @Schema(description = "第三方支付流水号")
     private String paySerialNumber;
-
+    /**
+     * 推广员id
+     */
+    @Schema(description = "推广员id")
+    private Long promoterId;
 
 }
diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/app/member/MemberController.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/app/member/MemberController.java
index cc7bca07b..a3e2f99bb 100644
--- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/app/member/MemberController.java
+++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/app/member/MemberController.java
@@ -1,10 +1,14 @@
 package cn.iocoder.yudao.module.shop.controller.app.member;
 
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.security.core.annotations.PreAuthenticated;
+import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
 import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore;
 import cn.iocoder.yudao.module.shop.controller.admin.recharge.vo.RechargeGearRespVO;
+import cn.iocoder.yudao.module.shop.controller.admin.recharge.vo.RechargeOrderPageReqVO;
 import cn.iocoder.yudao.module.shop.controller.admin.recharge.vo.RechargeOrderRespVO;
+import cn.iocoder.yudao.module.shop.controller.app.member.vo.PromoterMemberOrderVO;
 import cn.iocoder.yudao.module.shop.convert.recharge.RechargeOrderConvert;
 import cn.iocoder.yudao.module.shop.dal.dataobject.recharge.RechargeOrderDO;
 import cn.iocoder.yudao.module.shop.response.member.MemberHeadResponse;
@@ -58,6 +62,22 @@ public class MemberController {
     public CommonResult<List<RechargeOrderRespVO>> memberOrderInfo() {
         return CommonResult.success(rechargeOrderService.memberOrderInfo());
     }
+    @Operation(summary = "获取当前登录账号的推广员推广会员记录")
+    @RequestMapping(value = "/promoterOrderInfo", method = RequestMethod.GET)
+    @PreAuthenticated
+    @TenantIgnore
+    public CommonResult<PageResult<RechargeOrderRespVO>> promoterOrderInfo(RechargeOrderPageReqVO pageRespVO) {
+        pageRespVO.setPromoterId(SecurityFrameworkUtils.getLoginUserId());
+        return CommonResult.success(rechargeOrderService.promoterOrderInfo(pageRespVO));
+    }
+    @Operation(summary = "获取当前登录发展会员数量统计")
+    @RequestMapping(value = "/promoterOrderCount", method = RequestMethod.GET)
+    @PreAuthenticated
+    @TenantIgnore
+    @Parameter(name = "type", description = "时间类型1、当日2、上周3、上月4、累计", required = true)
+    public CommonResult<PromoterMemberOrderVO> promoterOrderCount(@RequestParam Integer type) {
+        return CommonResult.success(rechargeOrderService.promoterOrderCount(type,SecurityFrameworkUtils.getLoginUserId()));
+    }
     @Operation(summary = "会员头部信息")
     @RequestMapping(value = "/memberHeadInfo", method = RequestMethod.GET)
     @PreAuthenticated
diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/app/member/vo/PromoterMemberOrderVO.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/app/member/vo/PromoterMemberOrderVO.java
new file mode 100644
index 000000000..ec3367600
--- /dev/null
+++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/app/member/vo/PromoterMemberOrderVO.java
@@ -0,0 +1,18 @@
+package cn.iocoder.yudao.module.shop.controller.app.member.vo;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+@Schema(description = "会员发展数量统计")
+public class PromoterMemberOrderVO {
+    @Schema(description = "总金额")
+    private Long memberCount;
+    @Schema(description = "总金额")
+    private BigDecimal totalAmount;
+    @Schema(description = "会员提成")
+    private Integer memberCommission;
+}
diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/mysql/recharge/RechargeOrderMapper.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/mysql/recharge/RechargeOrderMapper.java
index 764bd206b..e1f7ea04b 100644
--- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/mysql/recharge/RechargeOrderMapper.java
+++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/mysql/recharge/RechargeOrderMapper.java
@@ -1,5 +1,7 @@
 package cn.iocoder.yudao.module.shop.dal.mysql.recharge;
 
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import java.util.*;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
@@ -10,6 +12,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Mapper;
 import cn.iocoder.yudao.module.shop.controller.admin.recharge.vo.*;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 
 /**
  * 订单 Mapper
@@ -57,7 +60,7 @@ public interface RechargeOrderMapper extends BaseMapperX<RechargeOrderDO> {
                 .orderByDesc(RechargeOrderDO::getId));
     }
     IPage<RechargeOrderRespVO> findListPage(IPage<RechargeOrderRespVO> page, @Param("data")  RechargeOrderPageReqVO data);
-
+    BigDecimal promoterOrderCount(@Param("startDate") LocalDateTime startDate, @Param("endDate")LocalDateTime endDate,@Param("promoterId") Long promoterId);
 
     List<RechargeOrderExcelVO> findListExcel(@Param("data")  RechargeOrderExportReqVO data);
     default List<RechargeOrderDO> selectList(RechargeOrderExportReqVO reqVO) {
diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeOrderService.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeOrderService.java
index c9c9a089f..dd6c80dd7 100644
--- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeOrderService.java
+++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeOrderService.java
@@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.shop.service.recharge;
 import java.util.*;
 import javax.validation.*;
 import cn.iocoder.yudao.module.shop.controller.admin.recharge.vo.*;
+import cn.iocoder.yudao.module.shop.controller.app.member.vo.PromoterMemberOrderVO;
 import cn.iocoder.yudao.module.shop.dal.dataobject.recharge.RechargeOrderDO;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.shop.response.member.MemberHeadResponse;
@@ -75,6 +76,10 @@ public interface RechargeOrderService {
 
     List<RechargeOrderRespVO> memberOrderInfo();
 
+    PageResult<RechargeOrderRespVO> promoterOrderInfo(RechargeOrderPageReqVO pageRespVO);
+
+    PromoterMemberOrderVO promoterOrderCount(Integer type,Long promoterId);
+
     MemberHeadResponse memberHeadInfo();
 
     List<RechargeOrderRespVO> memberOrderInfoByPhone(String phone);
diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeOrderServiceImpl.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeOrderServiceImpl.java
index d3fc5ad04..e35cb0b5f 100644
--- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeOrderServiceImpl.java
+++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeOrderServiceImpl.java
@@ -1,13 +1,19 @@
 package cn.iocoder.yudao.module.shop.service.recharge;
 
+import cn.hutool.core.date.LocalDateTimeUtil;
 import cn.iocoder.yudao.framework.security.core.LoginUser;
 import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
+import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder;
 import cn.iocoder.yudao.module.member.api.user.MemberUserApi;
+import cn.iocoder.yudao.module.member.api.user.dto.AppUserInfoReqDTO;
 import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO;
+import cn.iocoder.yudao.module.shop.controller.app.member.vo.PromoterMemberOrderVO;
 import cn.iocoder.yudao.module.shop.dal.dataobject.recharge.RechargeOrderInfoDO;
 import cn.iocoder.yudao.module.shop.dal.mysql.recharge.RechargeOrderInfoMapper;
 import cn.iocoder.yudao.module.shop.request.member.RefundRequest;
 import cn.iocoder.yudao.module.shop.response.member.MemberHeadResponse;
+import cn.iocoder.yudao.module.system.api.tenant.TenantApi;
+import cn.iocoder.yudao.module.system.api.tenant.dto.TenantDTO;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,7 +26,11 @@ import org.springframework.util.CollectionUtils;
 import org.springframework.validation.annotation.Validated;
 
 import java.math.BigDecimal;
+import java.time.DayOfWeek;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
+import java.time.temporal.TemporalAdjusters;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -51,6 +61,11 @@ public class RechargeOrderServiceImpl implements RechargeOrderService {
     private MemberUserApi userService;
     @Resource
     private PhoneRecordService phoneRecordService;
+    @Resource
+    private MemberUserApi memberUserApi;
+
+    @Resource
+    private TenantApi tenantApi;
 
     @Override
     public Long createRechargeOrder(RechargeOrderCreateReqVO createReqVO) {
@@ -125,7 +140,7 @@ public class RechargeOrderServiceImpl implements RechargeOrderService {
         LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
         Assert.notNull(loginUser, "登录失效,请重新登录!");
         List<RechargeOrderDO> orderDOS = rechargeOrderMapper.selectList(Wrappers.<RechargeOrderDO>lambdaQuery()
-                .eq(RechargeOrderDO::getUid, loginUser.getId()).eq(RechargeOrderDO::getPaid, 1));
+                .eq(RechargeOrderDO::getUid, loginUser.getId()).ne(RechargeOrderDO::getPaid, 0));
         if (!CollectionUtils.isEmpty(orderDOS)) {
             List<RechargeOrderRespVO> rechargeOrderRespVOS = RechargeOrderConvert.INSTANCE.convertList(orderDOS);
             List<String> collect1 = rechargeOrderRespVOS.stream().map(RechargeOrderBaseVO::getOrderId).collect(Collectors.toList());
@@ -153,6 +168,64 @@ public class RechargeOrderServiceImpl implements RechargeOrderService {
         return null;
     }
 
+    @Override
+    public PageResult<RechargeOrderRespVO> promoterOrderInfo(RechargeOrderPageReqVO pageReqVO) {
+        Page<RechargeOrderRespVO> page = new Page<>(pageReqVO.getPageNo(), pageReqVO.getPageSize());
+        rechargeOrderMapper.findListPage(page, pageReqVO);
+        if (!CollectionUtils.isEmpty(page.getRecords())) {
+            List<String> collect1 = page.getRecords().stream().map(RechargeOrderBaseVO::getOrderId).collect(Collectors.toList());
+            List<RechargeOrderInfoDO> infoDOS = infoMapper.selectList(Wrappers.<RechargeOrderInfoDO>lambdaQuery().in(RechargeOrderInfoDO::getOrderNo, collect1));
+            Map<String, List<RechargeOrderInfoDO>> collect = infoDOS.stream().collect(Collectors.groupingBy(RechargeOrderInfoDO::getOrderNo));
+            for (RechargeOrderRespVO orderDO : page.getRecords()) {
+                StringBuilder grade = new StringBuilder();
+                List<RechargeOrderInfoDO> infoDOS1 = collect.get(orderDO.getOrderId());
+                for (RechargeOrderInfoDO infoDO : infoDOS1) {
+                    if (infoDO.getPrice().compareTo(new BigDecimal("240")) == 0) {
+                        grade.append("套餐1,");
+                    } else if (infoDO.getPrice().compareTo(new BigDecimal("400")) == 0) {
+                        grade.append("套餐2,");
+                    } else if (infoDO.getPrice().compareTo(new BigDecimal("640")) == 0) {
+                        grade.append("套餐3");
+                    }
+                }
+                orderDO.setGrade(grade.toString());
+                DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+                orderDO.setStringCreateTime(orderDO.getCreateTime().format(formatter));
+            }
+
+            return new PageResult<>(page.getRecords(), page.getTotal());
+        }
+        return null;
+    }
+
+    @Override
+    public PromoterMemberOrderVO promoterOrderCount(Integer type,Long promoterId) {
+        PromoterMemberOrderVO promoterMemberOrderVO = new PromoterMemberOrderVO();
+        AppUserInfoReqDTO appUserInfoReqDTO = new AppUserInfoReqDTO();
+        appUserInfoReqDTO.setPromoterId(promoterId);
+        if(type==1){
+            appUserInfoReqDTO.setStartTime(LocalDateTimeUtil.beginOfDay(LocalDateTime.now()));
+            appUserInfoReqDTO.setEndTime(LocalDateTimeUtil.endOfDay(LocalDateTime.now()));
+        }else if (type == 2){
+            LocalDateTime todayOfLastWeek = LocalDateTime.now();
+            LocalDateTime monday = todayOfLastWeek.with(TemporalAdjusters.previous(DayOfWeek.SUNDAY)).plusDays(1);
+            LocalDateTime sunday = todayOfLastWeek.with(TemporalAdjusters.next(DayOfWeek.MONDAY)).minusDays(1);
+            appUserInfoReqDTO.setStartTime(LocalDateTimeUtil.beginOfDay(monday));
+            appUserInfoReqDTO.setEndTime(LocalDateTimeUtil.endOfDay(sunday));
+        } else if (type == 3) {
+            LocalDateTime lastMonth = LocalDateTime.now().minusMonths(1); // 当前月份减1
+            LocalDateTime firstDay = lastMonth.with(TemporalAdjusters.firstDayOfMonth()); // 获取当前月的第一天
+            LocalDateTime lastDay = lastMonth.with(TemporalAdjusters.lastDayOfMonth()); // 获取当前月的最后一天
+            appUserInfoReqDTO.setStartTime(LocalDateTimeUtil.beginOfDay(firstDay));
+            appUserInfoReqDTO.setEndTime(LocalDateTimeUtil.endOfDay(lastDay));
+        }
+        promoterMemberOrderVO.setTotalAmount(rechargeOrderMapper.promoterOrderCount(appUserInfoReqDTO.getStartTime(),appUserInfoReqDTO.getEndTime(),promoterId));
+        promoterMemberOrderVO.setMemberCount(memberUserApi.promoterOrderCount(appUserInfoReqDTO));
+        TenantDTO tenantDTO = tenantApi.getTenant(TenantContextHolder.getTenantId());
+        promoterMemberOrderVO.setMemberCommission(tenantDTO.getMemberCommission());
+        return promoterMemberOrderVO;
+    }
+
     @Override
     public MemberHeadResponse memberHeadInfo() {
         MemberHeadResponse response = new MemberHeadResponse();
diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/recharge/RechargeOrderMapper.xml b/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/recharge/RechargeOrderMapper.xml
index 840d91eeb..251b272c5 100644
--- a/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/recharge/RechargeOrderMapper.xml
+++ b/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/recharge/RechargeOrderMapper.xml
@@ -57,6 +57,19 @@
         <include refid="baseWhere">
         </include>
     </select>
+    <select id="promoterOrderCount" resultType="java.math.BigDecimal">
+        select sum(pay_price) from cy_recharge_order
+        <where>
+            paid=1 and promoter_id=#{promoterId}
+            <if test="startDate!=null">
+                and pay_time&gt;=#{startDate}
+            </if>
+            <if test="endDate!=null">
+                and pay_time&lt;=#{endDate}
+            </if>
+        </where>
+    </select>
+
     <select id="findListExcel" resultType="cn.iocoder.yudao.module.shop.controller.admin.recharge.vo.RechargeOrderExcelVO">
         select
         a.id,
@@ -113,6 +126,10 @@
             <if test="data.payTime !=null ">
                 and a.pay_time &lt;=#{data.payTime[1]}
             </if>
+            <if test="data.promoterId !=null ">
+                and a.promoter_id =#{data.promoterId}
+            </if>
+
         </where>
     </sql>
 </mapper>
diff --git a/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/user/MemberUserApi.java b/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/user/MemberUserApi.java
index 62faaf15c..7ef6ae9e8 100644
--- a/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/user/MemberUserApi.java
+++ b/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/user/MemberUserApi.java
@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.member.api.user;
 
+import cn.iocoder.yudao.module.member.api.user.dto.AppUserInfoReqDTO;
 import cn.iocoder.yudao.module.member.api.user.dto.MemberUserBillDTO;
 import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO;
 import cn.iocoder.yudao.module.member.api.user.dto.PromoterDTO;
@@ -83,4 +84,6 @@ public interface MemberUserApi {
     void saveMemberUser(String phone,Long promoterId);
 
     PromoterDTO getPromoterDOByUserId(Long userId);
+
+    Long promoterOrderCount(AppUserInfoReqDTO reqVO);
 }
diff --git a/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/user/dto/AppUserInfoReqDTO.java b/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/user/dto/AppUserInfoReqDTO.java
new file mode 100644
index 000000000..1b339e366
--- /dev/null
+++ b/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/user/dto/AppUserInfoReqDTO.java
@@ -0,0 +1,19 @@
+package cn.iocoder.yudao.module.member.api.user.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDateTime;
+import java.util.Date;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class AppUserInfoReqDTO {
+
+
+    private Long promoterId;
+    private LocalDateTime startTime;
+    private LocalDateTime endTime;
+}
diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/api/user/MemberUserApiImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/api/user/MemberUserApiImpl.java
index 17603857a..3ce20dd0b 100644
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/api/user/MemberUserApiImpl.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/api/user/MemberUserApiImpl.java
@@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.member.api.user;
 import cn.iocoder.yudao.framework.common.exception.ServiceException;
 import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
 import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore;
+import cn.iocoder.yudao.module.member.api.user.dto.AppUserInfoReqDTO;
 import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO;
 import cn.iocoder.yudao.module.member.api.user.dto.PromoterDTO;
 import cn.iocoder.yudao.module.member.controller.app.auth.vo.AppAuthSmsLoginReqVO;
@@ -147,4 +148,9 @@ public class MemberUserApiImpl implements MemberUserApi {
         }
         return user;
     }
+
+    @Override
+    public Long promoterOrderCount(AppUserInfoReqDTO reqDTO) {
+        return userService.promoterOrderCount(reqDTO);
+    }
 }
diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/user/vo/AppUserInfoReqVO.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/AppUserInfoReqVO.java
similarity index 60%
rename from yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/user/vo/AppUserInfoReqVO.java
rename to yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/AppUserInfoReqVO.java
index a56a62092..860ec5deb 100644
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/user/vo/AppUserInfoReqVO.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/AppUserInfoReqVO.java
@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.member.controller.app.user.vo;
+package cn.iocoder.yudao.module.member.controller.admin.user.vo;
 
 import cn.hutool.core.date.DatePattern;
 import cn.iocoder.yudao.module.system.enums.common.SexEnum;
@@ -24,8 +24,30 @@ public class AppUserInfoReqVO {
     @Schema(description = "用户昵称", required = true, example = "芋艿")
     @NotEmpty(message = "用户昵称不能为空")
     private String nickname;
-
+    /**
+     * 真实姓名
+     */
+    private String realName;
     @Schema(description = "用户头像", required = true, example = "/infra/file/get/35a12e57-4297-4faa-bf7d-7ed2f211c952")
     private String avatar;
+    /**
+     * 用户性别
+     * <p>
+     * 枚举类 {@link SexEnum}
+     */
+    private Integer sex;
+    @Schema(description = "用户手机号", required = true, example = "15601691300")
+    private String mobile;
 
+    /**
+     * 地址
+     */
+    @NotEmpty(message = "用户昵称不能为空")
+    private String userAddress;
+
+    /**
+     * 生日
+     */
+    @JsonFormat(pattern = DatePattern.NORM_DATE_PATTERN)
+    private Date userBirthday;
 }
diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/user/AppUserController.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/user/AppUserController.java
index e06dc7d6f..2bee3be55 100644
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/user/AppUserController.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/user/AppUserController.java
@@ -1,13 +1,11 @@
 package cn.iocoder.yudao.module.member.controller.app.user;
 
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.date.LocalDateTimeUtil;
 import cn.iocoder.yudao.framework.common.enums.UserTypeEnum;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.security.core.annotations.PreAuthenticated;
 import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore;
 import cn.iocoder.yudao.module.member.controller.admin.promoter.vo.PromoterRespVO;
-import cn.iocoder.yudao.module.member.controller.app.user.vo.AppUserInfoReqVO;
+import cn.iocoder.yudao.module.member.controller.admin.user.vo.AppUserInfoReqVO;
 import cn.iocoder.yudao.module.member.controller.app.user.vo.AppUserInfoRespVO;
 import cn.iocoder.yudao.module.member.controller.app.user.vo.AppUserUpdateMobileReqVO;
 import cn.iocoder.yudao.module.member.controller.app.user.vo.UserSpreadBannerVO;
diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/user/MemberUserMapper.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/user/MemberUserMapper.java
index 13f88ff4a..1c67a85b2 100644
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/user/MemberUserMapper.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/user/MemberUserMapper.java
@@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.member.dal.mysql.user;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.member.api.user.dto.AppUserInfoReqDTO;
 import cn.iocoder.yudao.module.member.controller.admin.user.dto.AdminUserQueryDTO;
 import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO;
 import org.apache.ibatis.annotations.Mapper;
@@ -33,4 +34,10 @@ public interface MemberUserMapper extends BaseMapperX<MemberUserDO> {
                 .eqIfPresent(MemberUserDO::getTenantId,reqVO.getTenantId())
                 .orderByDesc(MemberUserDO::getId));
     }
+    default Long promoterOrderCount(AppUserInfoReqDTO reqVO){
+        return selectCount(new LambdaQueryWrapperX<MemberUserDO>()
+                .geIfPresent(MemberUserDO::getCreateTime,reqVO.getStartTime())
+                .leIfPresent(MemberUserDO::getCreateTime,reqVO.getEndTime())
+                .eqIfPresent(MemberUserDO::getPromoterId, reqVO.getPromoterId()));
+    }
 }
diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/promoter/PromoterService.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/promoter/PromoterService.java
index 843bcfb62..02465551e 100644
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/promoter/PromoterService.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/promoter/PromoterService.java
@@ -88,4 +88,5 @@ public interface PromoterService {
      */
     PromoterImportRespVO importUserList(List<PromoterImportExcelVO> importUsers, boolean isUpdateSupport);
     PromoterDO getPromoterDOByUserId(Long userId);
+
 }
diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/promoter/PromoterServiceImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/promoter/PromoterServiceImpl.java
index 3ca6f47ee..a3aef67ad 100644
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/promoter/PromoterServiceImpl.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/promoter/PromoterServiceImpl.java
@@ -224,6 +224,9 @@ public class PromoterServiceImpl implements PromoterService {
         return respVO;
     }
 
+
+
+
     @Override
     public PromoterDO getPromoterDOByUserId(Long userId) {
         return promoterMapper.selectOne(Wrappers.<PromoterDO>lambdaQuery().eq(PromoterDO::getUserId, userId).last("LIMIT 1"));
diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserService.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserService.java
index f54817e37..ea5b052f0 100644
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserService.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserService.java
@@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.member.service.user;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.validation.Mobile;
+import cn.iocoder.yudao.module.member.api.user.dto.AppUserInfoReqDTO;
 import cn.iocoder.yudao.module.member.controller.admin.user.dto.AdminUserQueryDTO;
 import cn.iocoder.yudao.module.member.controller.app.user.vo.AppUserUpdateMobileReqVO;
 import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO;
@@ -137,4 +138,5 @@ public interface MemberUserService {
     void saveMemberUser(String phone);
 
 
+    Long promoterOrderCount(AppUserInfoReqDTO reqVO);
 }
diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java
index df8bb4bff..966f7dbd2 100644
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java
@@ -7,6 +7,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore;
 import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder;
 import cn.iocoder.yudao.module.infra.api.file.FileApi;
+import cn.iocoder.yudao.module.member.api.user.dto.AppUserInfoReqDTO;
 import cn.iocoder.yudao.module.member.controller.admin.user.dto.AdminUserQueryDTO;
 import cn.iocoder.yudao.module.member.controller.app.user.vo.AppUserUpdateMobileReqVO;
 import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO;
@@ -255,5 +256,9 @@ public class MemberUserServiceImpl implements MemberUserService {
         }
         return user;
     }
+    @Override
+    public Long promoterOrderCount(AppUserInfoReqDTO reqVO) {
 
+        return memberUserMapper.promoterOrderCount(reqVO);
+    }
 }
diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/tenant/TenantApi.java b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/tenant/TenantApi.java
index 1fad83ed6..a108b7300 100644
--- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/tenant/TenantApi.java
+++ b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/tenant/TenantApi.java
@@ -1,5 +1,7 @@
 package cn.iocoder.yudao.module.system.api.tenant;
 
+import cn.iocoder.yudao.module.system.api.tenant.dto.TenantDTO;
+
 import java.util.List;
 
 /**
@@ -23,4 +25,6 @@ public interface TenantApi {
      */
     void validateTenant(Long id);
 
+    TenantDTO getTenant(Long id);
+
 }
diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/tenant/dto/TenantDTO.java b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/tenant/dto/TenantDTO.java
new file mode 100644
index 000000000..c8fcfe36d
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/tenant/dto/TenantDTO.java
@@ -0,0 +1,121 @@
+package cn.iocoder.yudao.module.system.api.tenant.dto;
+
+import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
+import lombok.*;
+
+import java.time.LocalDateTime;
+
+/**
+ * 租户 DO
+ *
+ * @author 芋道源码
+ */
+@Data
+@ToString(callSuper = true)
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class TenantDTO{
+
+    /**
+     * 套餐编号 - 系统
+     */
+    public static final Long PACKAGE_ID_SYSTEM = 0L;
+
+    /**
+     * 租户编号，自增
+     */
+    private Long id;
+    /**
+     * 租户名，唯一
+     */
+    private String name;
+    /**
+     * 联系人的用户编号
+     *
+     * 关联 {@link AdminUserDO#getId()}
+     */
+    private Long contactUserId;
+    /**
+     * 联系人
+     */
+    private String contactName;
+    /**
+     * 联系手机
+     */
+    private String contactMobile;
+    /**
+     * 租户状态
+     *
+     * 枚举 {@link CommonStatusEnum}
+     */
+    private Integer status;
+    /**
+     * 绑定域名
+     *
+     * TODO 芋艿：目前是预留字段，未来会支持根据域名，自动查询到对应的租户。等等
+     */
+    private String domain;
+    /**
+     * 租户套餐编号
+     *
+     *
+     * 特殊逻辑：系统内置租户，不使用套餐，暂时使用 {@link #PACKAGE_ID_SYSTEM} 标识
+     */
+    private Long packageId;
+    /**
+     * 过期时间
+     */
+    private LocalDateTime expireTime;
+    /**
+     * 账号数量
+     */
+    private Integer accountCount;
+
+    /**
+     * 简介
+     */
+    private String introduction;
+
+    /**
+     * 服务电话
+     */
+    private String serviceMobile;
+
+    /**
+     * 服务时间
+     */
+    private String serviceTime;
+
+    /**
+     * 销售负责人
+     */
+    private String saleContactName;
+
+    /**
+     * 销售负责人联系电话
+     */
+    private String saleContactMobile;
+
+    /**
+     * 微信客服地址
+     */
+    private String wxKfUrl;
+    /**
+     * 通知公告
+     */
+    private String notice;
+    /**
+     * 商品提成
+     */
+    private Integer goodsCommission;
+    /**
+     * 会员充值提成
+     */
+    private Integer memberCommission;
+    /**
+     * logo
+     */
+    private String logo;
+
+}
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/tenant/TenantApiImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/tenant/TenantApiImpl.java
index 25ea260c5..a241fccd3 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/tenant/TenantApiImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/tenant/TenantApiImpl.java
@@ -1,5 +1,8 @@
 package cn.iocoder.yudao.module.system.api.tenant;
 
+import cn.iocoder.yudao.module.system.api.tenant.dto.TenantDTO;
+import cn.iocoder.yudao.module.system.convert.tenant.TenantConvert;
+import cn.iocoder.yudao.module.system.dal.dataobject.tenant.TenantDO;
 import cn.iocoder.yudao.module.system.service.tenant.TenantService;
 import org.springframework.stereotype.Service;
 
@@ -27,4 +30,11 @@ public class TenantApiImpl implements TenantApi {
         tenantService.validTenant(id);
     }
 
+
+    @Override
+    public TenantDTO getTenant(Long id) {
+        TenantDO tenantDO = tenantService.getTenant(id);
+        TenantDTO tenantDTO = TenantConvert.INSTANCE.convertDTO(tenantDO);
+        return tenantDTO;
+    }
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/tenant/TenantConvert.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/tenant/TenantConvert.java
index d40e481d8..31ecdea93 100755
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/tenant/TenantConvert.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/tenant/TenantConvert.java
@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.system.convert.tenant;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.system.api.tenant.dto.TenantDTO;
 import cn.iocoder.yudao.module.system.controller.admin.tenant.vo.tenant.TenantCreateReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.tenant.vo.tenant.TenantExcelVO;
 import cn.iocoder.yudao.module.system.controller.admin.tenant.vo.tenant.TenantRespVO;
@@ -28,6 +29,8 @@ public interface TenantConvert {
 
     TenantRespVO convert(TenantDO bean);
 
+    TenantDTO convertDTO(TenantDO bean);
+
     List<TenantRespVO> convertList(List<TenantDO> list);
 
     PageResult<TenantRespVO> convertPage(PageResult<TenantDO> page);

From b979f770975350e547f8ac7fd6dbee6cefc4cdca Mon Sep 17 00:00:00 2001
From: TianYu <332368756@qq.com>
Date: Mon, 29 May 2023 09:51:19 +0800
Subject: [PATCH 2/6] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yudao-ui-app/App.vue                       | 1 -
 yudao-ui-app/libs/pay.js                   | 4 ++--
 yudao-ui-app/pages/goods_cashier/index.vue | 1 -
 yudao-ui-app/pages/index/index.vue         | 2 +-
 yudao-ui-app/utils/request.js              | 1 -
 5 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/yudao-ui-app/App.vue b/yudao-ui-app/App.vue
index 8d3bbc918..3985d9038 100644
--- a/yudao-ui-app/App.vue
+++ b/yudao-ui-app/App.vue
@@ -219,7 +219,6 @@
       // 获取推广员ID
       setSpreadId() {
         const spreadId = this.$route.query.spreadId || ''
-        console.log('spreadId', spreadId)
         if (spreadId) {
           this.$store.commit("SET_SPREADID", spreadId);
         }
diff --git a/yudao-ui-app/libs/pay.js b/yudao-ui-app/libs/pay.js
index 1f09568a4..0fcc8b728 100644
--- a/yudao-ui-app/libs/pay.js
+++ b/yudao-ui-app/libs/pay.js
@@ -42,9 +42,9 @@ const unityPay = (options) => {
   }
   _options.payInfo.openid = openId
   if (_options.payType === 'WXPAY') {
-    _options.payInfo.payChannel = '微信支付'
+    _options.payInfo.payChannel = 'public'
   } else if (_options.payType === 'ALIPAY') {
-    _options.payInfo.payChannel = '支付宝'
+    _options.payInfo.payChannel = 'appAliPay'
   }
   uni.showLoading({
     title: '支付中',
diff --git a/yudao-ui-app/pages/goods_cashier/index.vue b/yudao-ui-app/pages/goods_cashier/index.vue
index edfed8233..554554211 100644
--- a/yudao-ui-app/pages/goods_cashier/index.vue
+++ b/yudao-ui-app/pages/goods_cashier/index.vue
@@ -198,7 +198,6 @@
           payType: that.paytype,
           createOrderFun: wechatOrderPay,
           payResultHandle: (res) => {
-            console.log(res)
             return {
               jsapiResult: res.jsapiConfig,
               body: res.body
diff --git a/yudao-ui-app/pages/index/index.vue b/yudao-ui-app/pages/index/index.vue
index 18246ba30..1e66621ad 100644
--- a/yudao-ui-app/pages/index/index.vue
+++ b/yudao-ui-app/pages/index/index.vue
@@ -208,7 +208,7 @@
 				followHid: true,
 				followCode: false,
 				logoUrl: "",
-				bannerList: {},
+				bannerList: [],
 				imgUrls: [],
 				itemNew: [],
 				menus: [],
diff --git a/yudao-ui-app/utils/request.js b/yudao-ui-app/utils/request.js
index dcd6a5386..152718363 100644
--- a/yudao-ui-app/utils/request.js
+++ b/yudao-ui-app/utils/request.js
@@ -26,7 +26,6 @@ function baseRequest(url, method, data, {
 	if (!noAuth) {
 		//登录过期自动登录
 		if (!store.state.app.token && !checkLogin()) {
-      console.log(store.state.app.token,checkLogin(),123123)
 			toLogin();
 			return Promise.reject({
 				msg: '未登录'

From bd53fae597ed407b98172d2254d8103f14e248a3 Mon Sep 17 00:00:00 2001
From: Jruome <2559028966@qq.com>
Date: Mon, 29 May 2023 10:19:13 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=AB=AF=20=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E8=B7=AF=E7=94=B1=E6=A0=87=E8=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yudao-ui-admin/src/router/index.js            | 24 +++++++++----------
 .../freightSet/creatTemplates.vue             |  2 +-
 .../views/deliverGoods/freightSet/index.vue   |  6 ++---
 .../src/views/mall/product/property/index.vue |  8 +++----
 .../src/views/mall/trade/afterSale/index.vue  |  2 +-
 .../src/views/member/promoter/index.vue       |  4 ++--
 .../src/views/member/user/index.vue           |  2 +-
 .../src/views/shop/phoneRecord/index.vue      |  2 +-
 .../src/views/shop/rechargeGear/index.vue     |  2 +-
 .../src/views/shop/rechargeOrder/index.vue    |  8 +++----
 10 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/yudao-ui-admin/src/router/index.js b/yudao-ui-admin/src/router/index.js
index af9c8d102..05a23465c 100644
--- a/yudao-ui-admin/src/router/index.js
+++ b/yudao-ui-admin/src/router/index.js
@@ -64,18 +64,18 @@ export const constantRoutes = [
     component: (resolve) => require(['@/views/error/401'], resolve),
     hidden: true
   },
-  {
-    path: '',
-    component: Layout,
-    redirect: 'index',
-    children: [{
-        path: 'index',
-        component: (resolve) => require(['@/views/index'], resolve),
-        name: '首页',
-        meta: {title: '首页', icon: 'dashboard', affix: true}
-      }
-    ]
-  },
+  // {
+  //   path: '',
+  //   component: Layout,
+  //   redirect: 'index',
+  //   children: [{
+  //       path: 'index',
+  //       component: (resolve) => require(['@/views/index'], resolve),
+  //       name: '首页',
+  //       meta: {title: '首页', icon: 'dashboard', affix: true}
+  //     }
+  //   ]
+  // },
   {
     path: '/user',
     component: Layout,
diff --git a/yudao-ui-admin/src/views/deliverGoods/freightSet/creatTemplates.vue b/yudao-ui-admin/src/views/deliverGoods/freightSet/creatTemplates.vue
index 9a1761ef2..7b6dcf338 100644
--- a/yudao-ui-admin/src/views/deliverGoods/freightSet/creatTemplates.vue
+++ b/yudao-ui-admin/src/views/deliverGoods/freightSet/creatTemplates.vue
@@ -158,7 +158,7 @@
     </el-form>
     <span slot="footer" class="dialog-footer">
       <el-button @click="onClose('ruleForm')">取 消</el-button>
-      <el-button type="primary"  :loading="loading" @click="onsubmit('ruleForm')" v-hasPermi="['deliverGoods:freightSet:update']">确 定</el-button>
+      <el-button type="primary"  :loading="loading" @click="onsubmit('ruleForm')">确 定</el-button>
     </span>
   </el-dialog>
 </template>
diff --git a/yudao-ui-admin/src/views/deliverGoods/freightSet/index.vue b/yudao-ui-admin/src/views/deliverGoods/freightSet/index.vue
index 49b94e9aa..2c14b42a6 100644
--- a/yudao-ui-admin/src/views/deliverGoods/freightSet/index.vue
+++ b/yudao-ui-admin/src/views/deliverGoods/freightSet/index.vue
@@ -11,7 +11,7 @@
             </el-form-item>
           </el-form>
         </div>
-        <el-button type="primary" size="mini" @click="handleSubmit()" v-hasPermi="['deliverGoods:freightSet:create']">添加运费模板</el-button>
+        <el-button type="primary" size="mini" @click="handleSubmit()" v-hasPermi="['admin:shipping:templates:save']">添加运费模板</el-button>
       </div>
       <el-table
         v-loading="loading"
@@ -70,8 +70,8 @@
           label="操作"
         >
           <template slot-scope="scope">
-            <el-button type="text" size="small" @click="bindEdit(scope.row)" v-hasPermi="['deliverGoods:freightSet:update']">修改</el-button>
-            <el-button type="text" size="small" @click="bindDelete(scope.row)" v-hasPermi="['deliverGoods:freightSet:delete']">删除</el-button>
+            <el-button type="text" size="small" @click="bindEdit(scope.row)" v-hasPermi="['admin:shipping:templates:update']">修改</el-button>
+            <el-button type="text" size="small" @click="bindDelete(scope.row)" v-hasPermi="['admin:shipping:templates:delete']">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
diff --git a/yudao-ui-admin/src/views/mall/product/property/index.vue b/yudao-ui-admin/src/views/mall/product/property/index.vue
index 2f1a42af7..8169f14d6 100644
--- a/yudao-ui-admin/src/views/mall/product/property/index.vue
+++ b/yudao-ui-admin/src/views/mall/product/property/index.vue
@@ -12,8 +12,8 @@
           </el-form>
         </div>
         <div class="acea-row">
-          <el-button size="small" type="primary" @click="add" v-hasPermi="['product:property:create']">添加商品规格</el-button>
-          <el-button size="small" @click="handleDeleteAll" v-hasPermi="['product:property:delete']">批量删除</el-button>
+          <el-button size="small" type="primary" @click="add" v-hasPermi="['admin:product:rule:save']">添加商品规格</el-button>
+          <el-button size="small" @click="handleDeleteAll" v-hasPermi="['admin:product:rule:delete']">批量删除</el-button>
         </div>
       </div>
       <el-table
@@ -57,8 +57,8 @@
         </el-table-column>
         <el-table-column label="操作" min-width="120" align="center">
           <template slot-scope="scope">
-            <el-button type="text" size="small" @click="onEdit(scope.row)" class="mr10" v-hasPermi="['product:property:update']">编辑</el-button>
-            <el-button type="text" size="small" @click="handleDelete(scope.row.id, scope.$index)" v-hasPermi="['product:property:delete']">删除</el-button>
+            <el-button type="text" size="small" @click="onEdit(scope.row)" class="mr10" v-hasPermi="['admin:product:rule:update']">编辑</el-button>
+            <el-button type="text" size="small" @click="handleDelete(scope.row.id, scope.$index)" v-hasPermi="['admin:product:rule:delete']">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
diff --git a/yudao-ui-admin/src/views/mall/trade/afterSale/index.vue b/yudao-ui-admin/src/views/mall/trade/afterSale/index.vue
index 271ecd269..c4447b861 100644
--- a/yudao-ui-admin/src/views/mall/trade/afterSale/index.vue
+++ b/yudao-ui-admin/src/views/mall/trade/afterSale/index.vue
@@ -37,7 +37,7 @@
                         :picker-options="datePickerOptions" :default-time="['00:00:00', '23:59:59']" />
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery" v-hasPermi="['trade:after-sale:query']">搜索</el-button>
         <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
diff --git a/yudao-ui-admin/src/views/member/promoter/index.vue b/yudao-ui-admin/src/views/member/promoter/index.vue
index 333d1e5f1..403cc91e9 100644
--- a/yudao-ui-admin/src/views/member/promoter/index.vue
+++ b/yudao-ui-admin/src/views/member/promoter/index.vue
@@ -21,7 +21,7 @@
         <el-input v-model="queryParams.mobile" placeholder="请输入" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery" v-hasPermi="['member:promoter:query']">搜索</el-button>
         <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
@@ -35,7 +35,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button type="info" icon="el-icon-upload2" size="mini" @click="handleImport"
-                   v-hasPermi="['system:user:import']">导入
+                   v-hasPermi="['member:promoter:export']">导入
         </el-button>
       </el-col>
             <el-col :span="1.5">
diff --git a/yudao-ui-admin/src/views/member/user/index.vue b/yudao-ui-admin/src/views/member/user/index.vue
index 771c43762..a25b53587 100644
--- a/yudao-ui-admin/src/views/member/user/index.vue
+++ b/yudao-ui-admin/src/views/member/user/index.vue
@@ -17,7 +17,7 @@
       </el-form-item>
 
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery" v-hasPermi="['member:user:query']">搜索</el-button>
         <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
diff --git a/yudao-ui-admin/src/views/shop/phoneRecord/index.vue b/yudao-ui-admin/src/views/shop/phoneRecord/index.vue
index 9a708d5d3..3200c199e 100644
--- a/yudao-ui-admin/src/views/shop/phoneRecord/index.vue
+++ b/yudao-ui-admin/src/views/shop/phoneRecord/index.vue
@@ -9,7 +9,7 @@
       </el-form-item>
 
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery" v-hasPermi="['shop:phone-record:query']">搜索</el-button>
         <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
diff --git a/yudao-ui-admin/src/views/shop/rechargeGear/index.vue b/yudao-ui-admin/src/views/shop/rechargeGear/index.vue
index 37f70a36c..1e2691128 100644
--- a/yudao-ui-admin/src/views/shop/rechargeGear/index.vue
+++ b/yudao-ui-admin/src/views/shop/rechargeGear/index.vue
@@ -7,7 +7,7 @@
         <el-input v-model="queryParams.name" placeholder="请输入档位名称" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery"  v-hasPermi="['shop:recharge-gear:query']">搜索</el-button>
         <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
diff --git a/yudao-ui-admin/src/views/shop/rechargeOrder/index.vue b/yudao-ui-admin/src/views/shop/rechargeOrder/index.vue
index 76df141a8..601f66e57 100644
--- a/yudao-ui-admin/src/views/shop/rechargeOrder/index.vue
+++ b/yudao-ui-admin/src/views/shop/rechargeOrder/index.vue
@@ -28,7 +28,7 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery" v-hasPermi="['shop:recharge-order:query']">搜索</el-button>
         <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
@@ -90,12 +90,12 @@
         <template v-slot="scope">
           <template v-if="scope.row.refundStatus === 1">
             <el-button size="mini" type="text" icon="el-icon-delete" @click="handleRefund(scope.row, 1)"
-                       v-hasPermi="['shop:recharge-order:delete']">同意退款</el-button>
+                       v-hasPermi="['shop:recharge-order:refund']">同意退款</el-button>
             <el-button size="mini" type="text" icon="el-icon-delete" @click="handleRefund(scope.row, 2)"
-                       v-hasPermi="['shop:recharge-order:delete']">拒绝退款</el-button>
+                       v-hasPermi="['shop:recharge-order:refund']">拒绝退款</el-button>
           </template>
           <el-button v-if="scope.row.refundStatus !== 2 && scope.row.refundStatus !== 3 && scope.row.paid==1" size="mini" type="text" icon="el-icon-edit" @click="handleRefund(scope.row, 3)"
-                     v-hasPermi="['shop:recharge-order:update']">发起退款</el-button>
+                     v-hasPermi="['shop:recharge-order:refund']">发起退款</el-button>
         </template>
       </el-table-column>
     </el-table>

From e79abc1405b30e7a6b8e825b399e499a4cb2a810 Mon Sep 17 00:00:00 2001
From: perry <292303709@qq.com>
Date: Mon, 29 May 2023 12:54:00 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E5=88=86=E9=94=80=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../shop/controller/app/member/MemberController.java     | 9 +++------
 .../shop/service/recharge/RechargeOrderServiceImpl.java  | 5 +++--
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/app/member/MemberController.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/app/member/MemberController.java
index a3e2f99bb..8343e7c22 100644
--- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/app/member/MemberController.java
+++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/app/member/MemberController.java
@@ -20,10 +20,7 @@ import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -63,10 +60,10 @@ public class MemberController {
         return CommonResult.success(rechargeOrderService.memberOrderInfo());
     }
     @Operation(summary = "获取当前登录账号的推广员推广会员记录")
-    @RequestMapping(value = "/promoterOrderInfo", method = RequestMethod.GET)
+    @RequestMapping(value = "/promoterOrderInfo", method = RequestMethod.POST)
     @PreAuthenticated
     @TenantIgnore
-    public CommonResult<PageResult<RechargeOrderRespVO>> promoterOrderInfo(RechargeOrderPageReqVO pageRespVO) {
+    public CommonResult<PageResult<RechargeOrderRespVO>> promoterOrderInfo(@RequestBody RechargeOrderPageReqVO pageRespVO) {
         pageRespVO.setPromoterId(SecurityFrameworkUtils.getLoginUserId());
         return CommonResult.success(rechargeOrderService.promoterOrderInfo(pageRespVO));
     }
diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeOrderServiceImpl.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeOrderServiceImpl.java
index e35cb0b5f..1be0c09eb 100644
--- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeOrderServiceImpl.java
+++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeOrderServiceImpl.java
@@ -207,7 +207,7 @@ public class RechargeOrderServiceImpl implements RechargeOrderService {
             appUserInfoReqDTO.setStartTime(LocalDateTimeUtil.beginOfDay(LocalDateTime.now()));
             appUserInfoReqDTO.setEndTime(LocalDateTimeUtil.endOfDay(LocalDateTime.now()));
         }else if (type == 2){
-            LocalDateTime todayOfLastWeek = LocalDateTime.now();
+            LocalDateTime todayOfLastWeek = LocalDateTime.now().minusDays(7);
             LocalDateTime monday = todayOfLastWeek.with(TemporalAdjusters.previous(DayOfWeek.SUNDAY)).plusDays(1);
             LocalDateTime sunday = todayOfLastWeek.with(TemporalAdjusters.next(DayOfWeek.MONDAY)).minusDays(1);
             appUserInfoReqDTO.setStartTime(LocalDateTimeUtil.beginOfDay(monday));
@@ -219,7 +219,8 @@ public class RechargeOrderServiceImpl implements RechargeOrderService {
             appUserInfoReqDTO.setStartTime(LocalDateTimeUtil.beginOfDay(firstDay));
             appUserInfoReqDTO.setEndTime(LocalDateTimeUtil.endOfDay(lastDay));
         }
-        promoterMemberOrderVO.setTotalAmount(rechargeOrderMapper.promoterOrderCount(appUserInfoReqDTO.getStartTime(),appUserInfoReqDTO.getEndTime(),promoterId));
+        BigDecimal totalAmount =rechargeOrderMapper.promoterOrderCount(appUserInfoReqDTO.getStartTime(),appUserInfoReqDTO.getEndTime(),promoterId);
+        promoterMemberOrderVO.setTotalAmount(totalAmount);
         promoterMemberOrderVO.setMemberCount(memberUserApi.promoterOrderCount(appUserInfoReqDTO));
         TenantDTO tenantDTO = tenantApi.getTenant(TenantContextHolder.getTenantId());
         promoterMemberOrderVO.setMemberCommission(tenantDTO.getMemberCommission());

From 478c21b7fb843cd66d908fc8e674f7c2e5655dca Mon Sep 17 00:00:00 2001
From: perry <292303709@qq.com>
Date: Mon, 29 May 2023 12:54:51 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E5=88=86=E9=94=80=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yudao-server/src/main/resources/application-local.yaml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/yudao-server/src/main/resources/application-local.yaml b/yudao-server/src/main/resources/application-local.yaml
index ff034d196..b1b9f03ab 100644
--- a/yudao-server/src/main/resources/application-local.yaml
+++ b/yudao-server/src/main/resources/application-local.yaml
@@ -71,7 +71,9 @@ spring:
     password: 20221122@dev # 密码，建议生产环境开启
 
 --- #################### 定时任务相关配置 ####################
-
+mybatis-plus:
+  configuration:
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
 # Quartz 配置项，对应 QuartzProperties 配置类
 spring:
   quartz:

From eab653230d539640ab60dd7aa10dca4e50766f72 Mon Sep 17 00:00:00 2001
From: TianYu <332368756@qq.com>
Date: Mon, 29 May 2023 14:43:03 +0800
Subject: [PATCH 6/6] =?UTF-8?q?feat:=20=E8=AE=A2=E5=8D=95=E4=B8=8B?=
 =?UTF-8?q?=E5=8D=95=E6=94=AF=E4=BB=98=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yudao-ui-app/pages/goods_cashier/index.vue    | 70 +++++++++++++++----
 .../pages/users/order_confirm/index.vue       |  4 +-
 2 files changed, 57 insertions(+), 17 deletions(-)

diff --git a/yudao-ui-app/pages/goods_cashier/index.vue b/yudao-ui-app/pages/goods_cashier/index.vue
index 554554211..700177b74 100644
--- a/yudao-ui-app/pages/goods_cashier/index.vue
+++ b/yudao-ui-app/pages/goods_cashier/index.vue
@@ -8,8 +8,8 @@
       </view>
       <view class="count-down">
         支付剩余时间
-        <countDown :is-day="false" :is-show-hour='false' :tip-text="''" :day-text="''" :hour-text="''" :minute-text="' : '"
-          :second-text="' '" :datatime="invalidTime"></countDown>
+        <countDown :is-day="false" :is-show-hour='false' :tip-text="''" :day-text="''" :hour-text="''"
+          :minute-text="' : '" :second-text="' '" :datatime="invalidTime"></countDown>
       </view>
     </view>
     <view class="payment">
@@ -33,15 +33,15 @@
     </view>
     <view class="btn">
       <view class="button acea-row row-center-wrapper pay-button" @click='goPay'>确认支付</view>
-      <view class="wait-pay" @click="waitPay">暂不支付</view>
+      <view class="wait-pay" @click="cancelPayModalShow = true">暂不支付</view>
     </view>
     <view v-show="false" v-html="formContent"></view>
     <u-modal :show="cancelPayModalShow" width="519rpx">
       <view class="modal-wrap">
         <view class="count-down">
           支付剩余时间
-          <countDown :is-day="false" :is-show-hour='false' :tip-text="''" :day-text="''" :hour-text="''" :minute-text="' : '"
-            :second-text="' '" :datatime="invalidTime"></countDown>
+          <countDown :is-day="false" :is-show-hour='false' :tip-text="''" :day-text="''" :hour-text="''"
+            :minute-text="' : '" :second-text="' '" :datatime="invalidTime"></countDown>
         </view>
         <view class="model-content">确认要放弃付款吗？</view>
       </view>
@@ -53,7 +53,7 @@
       </view>
     </u-modal>
     <!-- 支付宝支付链接复制组件 -->
-    <alipay-link-copy :show.sync="alipayShow" :alipayLink="alipayLink"/>
+    <alipay-link-copy :show.sync="alipayShow" :alipayLink="alipayLink" @confirm="onConfirm" />
   </view>
 </template>
 
@@ -76,9 +76,11 @@
     data() {
       return {
         cancelPayModalShow: false,
+        backPayModalShow: true,
         alipayShow: false,
         alipayLink: '',
         checked: false,
+        isClickGiveUpBtn: true,
         //支付方式
         cartArr: [{
             "name": '微信支付',
@@ -95,6 +97,7 @@
             payStatus: 1,
           }
         ],
+        paytype: 'WXPAY',
         orderId: 0,
         active: 0,
         payPrice: 10.00,
@@ -113,7 +116,8 @@
     },
     onShow() {
       let options = wx.getEnterOptionsSync();
-      console.log(options)
+      window.history.pushState(null, null, document.url)
+      window.addEventListener('popstate', this.backShowPayModal)
       /*
       if (options.scene == '1038' && options.referrerInfo.appId == 'wxef277996acc166c3' && this.initIn) {
         // 代表从收银台小程序返回
@@ -153,10 +157,25 @@
         }
       }*/
     },
+    onHide() {
+      window.removeEventListener('popstate', this.backShowPayModal)
+    },
+    onUnload() {
+      window.removeEventListener('popstate', this.backShowPayModal)
+    },
     methods: {
+      backShowPayModal() {
+        this.isClickGiveUpBtn = false
+        this.cancelPayModalShow = this.backPayModalShow
+      },
       onGiveUpPay() {
+        if (this.isClickGiveUpBtn) {
+          window.history.back()
+        }
         this.cancelPayModalShow = false
-        // uni.navigateBack()
+        uni.navigateBack({
+          delta: 1
+        })
       },
       getCashierOrder() {
         uni.showLoading({
@@ -164,6 +183,7 @@
         });
         getOrderDetail(this.orderId).then(res => {
           const orderInfo = res.data
+          this.invalidTime = new Date(res.data.endTime).getTime()
           this.payPrice = parseFloat(orderInfo.proTotalPrice).toFixed(2)
           this.payPriceShow = parseFloat(orderInfo.proTotalPrice).toFixed(2)
         }).catch(err => {
@@ -176,12 +196,28 @@
         this.active = index;
         this.paytype = paytype;
       },
-      waitPay() {
-        this.cancelPayModalShow = true
-        // uni.reLaunch({
-        //   url: '/pages/goods/order_pay_status/index?order_id=' + this.orderId + '&msg=取消支付&type=3' +
-        //     '&status=2&totalPrice=' + this.payPriceShow
-        // })
+      onConfirm() {
+        let that = this
+        uni.showModal({
+          title: '提示',
+          content: '您是否已支付？',
+          cancelText: '未支付',
+          confirmText: '已支付',
+          success: function(res) {
+            if (res.confirm) {
+              // 如果是支付成功跳转到订单列表，触发popstate事件时，不需要弹出支付确认框
+              that.backPayModalShow = false
+              window.history.back()
+              setTimeout(()=>{
+                uni.redirectTo({
+                  url: '/pages/users/order_list/index'
+                })
+              }, 200)
+            } else if (res.cancel) {
+
+            }
+          }
+        });
       },
       goPay() {
         let that = this;
@@ -205,6 +241,9 @@
           },
           wxPaySuccess: () => {
             // window.location.reload()
+            uni.redirectTo({
+              url: '/pages/users/order_list/index'
+            })
           },
           aliPaySuccess: (link) => {
             that.alipayLink = link
@@ -224,6 +263,7 @@
     .count-down .time {
       margin-left: 10rpx;
     }
+
     .modal-btn-wrap {
       display: flex;
       justify-content: space-between;
@@ -251,7 +291,7 @@
       width: 100%;
       text-align: center;
 
-      .count-down{
+      .count-down {
         display: flex;
         justify-content: center;
         font-size: 32rpx;
diff --git a/yudao-ui-app/pages/users/order_confirm/index.vue b/yudao-ui-app/pages/users/order_confirm/index.vue
index e4d9af6a2..61c17acd1 100644
--- a/yudao-ui-app/pages/users/order_confirm/index.vue
+++ b/yudao-ui-app/pages/users/order_confirm/index.vue
@@ -293,7 +293,7 @@
 				preOrderNo: '' //预下单订单号
 			};
 		},
-		computed: mapGetters(['isLogin', 'systemPlatform', 'productType']),
+		computed: mapGetters(['isLogin', 'systemPlatform', 'productType', 'tenantId']),
 		watch: {
 			isLogin: {
 				handler: function(newV, oldV) {
@@ -628,7 +628,7 @@
 			},
 			getOrderPay: function(orderNo, message) {
 				let that = this;
-				uni.navigateTo({
+				uni.redirectTo({
 					url: '/pages/goods_cashier/index?order_id=' + orderNo
 				})
 				// wechatOrderPay({