From 3292a0784567d1f4ba9999a456451cfa74cfca4d Mon Sep 17 00:00:00 2001
From: perry <292303709@qq.com>
Date: Wed, 31 May 2023 00:10:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=BD=E4=BD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../recharge/vo/RechargeOrderExcelVO.java     |  8 ++--
 .../recharge/vo/RechargeOrderExportReqVO.java |  5 ++
 .../recharge/vo/RechargeOrderInfoExcelVO.java |  2 +-
 .../recharge/RechargeOrderServiceImpl.java    |  2 +-
 .../recharge/RechargeOrderInfoMapper.xml      |  2 +-
 .../mapper/recharge/RechargeOrderMapper.xml   | 46 ++++++-------------
 6 files changed, 26 insertions(+), 39 deletions(-)

diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/recharge/vo/RechargeOrderExcelVO.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/recharge/vo/RechargeOrderExcelVO.java
index ba5d9ea1a..9c549ce61 100644
--- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/recharge/vo/RechargeOrderExcelVO.java
+++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/recharge/vo/RechargeOrderExcelVO.java
@@ -37,8 +37,10 @@ public class RechargeOrderExcelVO {
     private LocalDateTime payCompleteTime;
     @ExcelProperty("订单类型")
     private String type="普通订单";
-    @ExcelProperty("订单状态")
-    private String status="已经完成";
+
+    @ExcelProperty(value = "订单状态",converter = DictConvert.class)
+    @DictFormat(DictTypeConstants.PYT_STATUS)
+    private Integer paid;
 
     @ExcelProperty("配送方式")
     private String deliveryType="快递(系统快递)(系统快递)";
@@ -86,6 +88,6 @@ public class RechargeOrderExcelVO {
     private String promoter;
 
     @ExcelProperty("组织名称")
-    private String depName;
+    private String parentOrganizationName;
 
 }
diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/recharge/vo/RechargeOrderExportReqVO.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/recharge/vo/RechargeOrderExportReqVO.java
index b0bc6caac..9183a2fde 100644
--- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/recharge/vo/RechargeOrderExportReqVO.java
+++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/recharge/vo/RechargeOrderExportReqVO.java
@@ -20,6 +20,8 @@ public class RechargeOrderExportReqVO {
 
     @Schema(description = "租户id")
     private Long tenantId;
+    @Schema(description = "商户名称")
+    private String tenantName;
 
     @Schema(description = "用户id", example = "28969")
     private Long uid;
@@ -125,4 +127,7 @@ public class RechargeOrderExportReqVO {
     @Schema(description = "第三方支付流水号")
     private String paySerialNumber;
 
+
+    private Long promoterId;
+
 }
diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/recharge/vo/RechargeOrderInfoExcelVO.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/recharge/vo/RechargeOrderInfoExcelVO.java
index 117047462..a239490e0 100644
--- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/recharge/vo/RechargeOrderInfoExcelVO.java
+++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/recharge/vo/RechargeOrderInfoExcelVO.java
@@ -25,7 +25,7 @@ public class RechargeOrderInfoExcelVO {
     private String orderNo;
 
     @ExcelProperty("商户名称")
-    private String shopName;
+    private String tenantName;
 
     @ExcelProperty("产品名称")
     private String productName;
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 d17137615..4ebd663a5 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
@@ -144,7 +144,7 @@ public class RechargeOrderServiceImpl implements RechargeOrderService {
                     if(promoterDrawVO.getMemberCommission()==null){
                         promoterDrawVO.setMemberCommission(0);
                     }
-                    promoterDrawVO.setDrawAmount(NumberUtil.mul(promoterDrawNew.getDealAmount(),NumberUtil.div(promoterDrawVO.getMemberCommission().toString(),"100"),2));
+                    promoterDrawVO.setDrawAmount(NumberUtil.mul(promoterDrawNew.getDealAmount(),NumberUtil.div(promoterDrawVO.getMemberCommission().toString(),"100",2)));
                 }else {
                     promoterDrawVO.setDealAmount(new BigDecimal(0));
                     promoterDrawVO.setTotalAmount(new BigDecimal(0));
diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/recharge/RechargeOrderInfoMapper.xml b/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/recharge/RechargeOrderInfoMapper.xml
index 70e37e6f3..728284b85 100644
--- a/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/recharge/RechargeOrderInfoMapper.xml
+++ b/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/recharge/RechargeOrderInfoMapper.xml
@@ -11,7 +11,7 @@
 
     <select id="getRechargeOrderInfoListExcel" resultType="cn.iocoder.yudao.module.shop.controller.admin.recharge.vo.RechargeOrderInfoExcelVO">
         select
-            a.id as 'orderNo',
+            a.order_id as 'orderNo',
             e.name as tenantName,
             f.product_name as 'productName',
             f.price,
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 fb2986d61..5ff09ab76 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
@@ -31,14 +31,14 @@
             <if test="data.tenantId!=null">
                 and a.tenant_id=#{data.tenantId}
             </if>
-            <if test="data.tenantId!=null">
-                and c.parent_Organization_name=#{data.parentOrganizationName}
+            <if test="data.parentOrganizationName!=null and data.parentOrganizationName!=''">
+                and c.parent_Organization_name like CONCAT('%',#{data.parentOrganizationName},'%')
             </if>
             <if test="data.mobile!=null and data.mobile!=''">
-                and d.mobile=#{data.mobile}
+                and d.mobile like CONCAT('%',#{data.mobile},'%')
             </if>
             <if test="data.nickname!=null and data.nickname!=''">
-                and d.nickname=#{data.nickname}
+                and d.nickname like CONCAT('%',#{data.nickname},'%')
             </if>
             <if test="data.createTime !=null and data.createTime.length>=1">
                 and a.create_time &gt;=#{data.createTime[0]}
@@ -49,10 +49,13 @@
         </where>
     </select>
     <select id="findPromoterDrawCount" resultType="cn.iocoder.yudao.module.shop.controller.admin.recharge.vo.PromoterDrawVO">
-        select b.promoter_id as user_id,count(case b.paid=1 when 1 then 0 end) as order_count,
-               sum(case b.paid =1 when 1 then 0 end) as deal_amount,
-               sum(case b.paid in (1,2) when 1 then 0 end) as total_amount
-                 from cy_recharge_order b
+        SELECT
+        b.promoter_id AS user_id,
+        count( CASE  b.paid = 1 WHEN  1 THEN 0 END) AS order_count,
+        sum( CASE WHEN b.paid = 1 THEN b.pay_price ELSE  0 END ) AS deal_amount,
+        sum( CASE WHEN b.paid IN ( 1, 2 ) THEN b.pay_price ELSE 0 END ) AS total_amount
+        FROM
+        cy_recharge_order b
            <where>
                <if test="promoterIds!=null and promoterIds.size()>0">
                    and b.promoter_id in
@@ -65,31 +68,7 @@
     </select>
 
 
-    <select id="findListPage" resultType="cn.iocoder.yudao.module.shop.controller.admin.recharge.vo.RechargeOrderRespVO">
-        select
-            a.id,
-            a.order_id,
-            a.pay_serial_number,
-            a.out_trade_no,
-            a.pay_time,
-            b.nickname,
-            a.real_name,
-            a.uid,
-            a.user_phone,
-            a.confirm_phone,
-            a.pay_type,
-            a.total_price,
-            a.pay_price,
-            a.paid,
-            a.refund_status,
-            d.parent_organization_name
-        from cy_recharge_order a
-        left join member_user b on a.promoter_id = b.id
-        left join system_dept d on d.id = a.dept_id
-        <include refid="baseWhere">
-        </include>
-        order by a.pay_time desc
-    </select>
+
     <select id="findListPage" resultType="cn.iocoder.yudao.module.shop.controller.admin.recharge.vo.RechargeOrderRespVO">
         select
         a.order_id,
@@ -139,6 +118,7 @@
         a.pay_time,
         a.pay_time as payCompleteTime,
         a.real_name,
+        a.paid,
         a.user_phone,
         a.confirm_phone,
         a.pay_type,