submit

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/impl/TopOldOrderServiceImpl.java

@@ -229,6 +229,9 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
     @Autowired
     private IOrderInputService orderInputService;
 
+    @Autowired
+    private ISysOldOrgService iSysOldOrgService;
+
     @Value("${oldOrder.studyRecord}")
     private String ORDER_STUDY;
 
@@ -568,6 +571,16 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
         add.setStatus(1);
         add.setCreateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());
+        //运营模式
+        if (ObjectUtils.isNotNull(bo.getTenantId())){
+            SysOldOrg ordOrg = iSysOldOrgService.getOne(new LambdaQueryWrapper<SysOldOrg>()
+                    .eq(SysOldOrg::getOrgId, bo.getTenantId())
+                    .eq(SysOldOrg::getStatus, 1)
+                    .last("LIMIT 1"));
+            if (ObjectUtils.isNotNull(ordOrg)){
+                add.setOperationType(ordOrg.getOperationType());
+            }
+        }
         //佣金计算
         BigDecimal brokerage = new BigDecimal("0.0000");
         if (ObjectUtils.isNotNull(bo.getPretaxBrokerage()) && ObjectUtils.isNotNull(bo.getPretax())) {

zhongzheng-system/src/main/resources/mapper/modules/top/TopOldOrderMapper.xml

@@ -152,14 +152,16 @@
             AND vto.tenant_id = #{tenantId}
         </if>
         <if test="refundStartTime != null or refundEndTime != null">
-            AND (SELECT COUNT(*)
-            FROM top_old_order_refund tor
+            AND (
+            SELECT COUNT(*)
+            FROM
+             (SELECT order_sn,pay_check_time AS refund_time,`status` FROM top_old_order_refund  UNION ALL SELECT order_sn,refund_time,`status` AS refund_time FROM order_goods_refund ) tor
             WHERE vto.order_sn = tor.order_sn AND tor.`status` = 1
             <if test="refundStartTime != null and refundStartTime != ''">
-                AND tor.pay_check_time &gt;= #{refundStartTime}
+                AND tor.refund_time &gt;= #{refundStartTime}
             </if>
             <if test="refundEndTime != null and refundEndTime != ''">
-                AND tor.pay_check_time &lt;= #{refundEndTime}
+                AND tor.refund_time &lt;= #{refundEndTime}
             </if>
              ) > 0
         </if>
@@ -339,13 +341,13 @@
         </if>
         <if test="refundStartTime != null or refundEndTime != null">
             AND (SELECT COUNT(*)
-            FROM top_old_order_refund tor
+            FROM order_goods_refund tor
             WHERE o.order_sn = tor.order_sn AND tor.`status` = 1
             <if test="refundStartTime != null and refundStartTime != ''">
-                AND tor.pay_check_time &gt;= #{refundStartTime}
+                AND tor.refund_time &gt;= #{refundStartTime}
             </if>
             <if test="refundEndTime != null and refundEndTime != ''">
-                AND tor.pay_check_time &lt;= #{refundEndTime}
+                AND tor.refund_time &lt;= #{refundEndTime}
             </if>
             ) > 0
         </if>
@@ -709,7 +711,7 @@
         FROM
         (
             SELECT
-                SUM( too.order_received - too.order_refunded ) AS money,
+                SUM( too.order_price ) AS money,
                 too.old_customer_id AS customer_id,
                 (
                 SELECT
@@ -799,7 +801,7 @@
         SELECT
             (
             SELECT
-            SUM( too.order_received - too.order_refunded ) AS money
+            SUM( too.order_price ) AS money
             FROM
             top_old_order too
             WHERE
@@ -963,7 +965,7 @@
         SELECT
         ((
         SELECT
-        IFNULL(SUM( too.order_received - too.order_refunded ),0) AS money
+        IFNULL(SUM( too.order_price),0) AS money
         FROM
         top_old_order too
         WHERE
@@ -1164,7 +1166,7 @@
         SELECT
             1 AS orderType,
             COUNT(too.order_id) AS orderNum,
-            SUM( too.order_received - too.order_refunded ) AS money,
+            SUM( too.order_price ) AS money,
             too.old_customer_id AS customer_id,
             (
             SELECT
@@ -1263,7 +1265,7 @@
                     (
                         SELECT
                             tenant_id,
-                            SUM( order_received - order_refunded ) money2
+                            SUM( order_price ) money2
                             <if test="tenantId != null and tenantId != ''">
                                 , create_sys_user_id,any_value(create_username) as create_username
                             </if>
@@ -1339,7 +1341,7 @@
     <select id="getSingleTenantStatistics" parameterType="com.zhongzheng.modules.top.order.bo.TopOrderStatisticsBo"
             resultType="java.math.BigDecimal">
         SELECT
-        (IFNULL(SUM( vo.order_received - vo.order_refunded ),0)+(
+        (IFNULL(SUM( vo.order_price ),0)+(
         SELECT
         IFNULL(SUM(  og.goods_received ),0)
         FROM
@@ -1694,7 +1696,7 @@
             resultType="java.math.BigDecimal">
 
         SELECT
-        IFNULL(SUM( too.order_received - too.order_refunded ),0)+ (
+        IFNULL(SUM( too.order_price ),0)+ (
         SELECT
         IFNULL(SUM(  og.goods_received ),0) AS money
         FROM
@@ -1791,7 +1793,7 @@
             (
                 SELECT
                     ouu.business_name,
-                    IFNULL( SUM( oo.order_received - oo.order_refunded ), 0 ) money
+                    IFNULL( SUM( oo.order_price ), 0 ) money
                 FROM
                     (
                         SELECT
@@ -2062,7 +2064,7 @@
         (
         SELECT
         ouu.business_name,
-        IFNULL( SUM( oo.order_received - oo.order_refunded ), 0 ) money
+        IFNULL( SUM( oo.order_price ), 0 ) money
         FROM
         (
         SELECT
@@ -2167,7 +2169,7 @@
         SELECT
         tenant_id,
         1 AS order_type,
-        SUM( order_received - order_refunded ) money2,
+        SUM( order_price ) money2,
         COUNT( * ) order_num2
         <if test="tenantId != null and tenantId != ''">
             , create_sys_user_id,any_value(create_username) as create_username
@@ -2295,7 +2297,7 @@
         (
         SELECT
         ouu.business_name,
-        IFNULL( SUM( oo.order_received - oo.order_refunded ), 0 ) money,
+        IFNULL( SUM( oo.order_price ), 0 ) money,
         1 AS order_type,
         COUNT( * ) order_num
         FROM