Merge remote-tracking branch 'origin/dev' into dev

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

@@ -3607,11 +3607,15 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                 TopOrderStatisticsTwoVo twoVo = new TopOrderStatisticsTwoVo();
                 twoVo.setTime(day);
                 twoVo.setTimeStr(DateUtils.timestampToDateFormat(day,"yyyy-MM-dd"));
+                if(voList.size()>0){
+                    twoVo.setCreateUsername(voList.get(0).getCreateUsername());
+                }
                 if (voList.stream().anyMatch(x -> DateUtils.getScheduleTimeStrZeroTime(x.getTimeStr(), "yyyy-MM-dd").equals(day))){
                     TopOrderStatisticsTwoVo statisticsTwoVo = voList.stream()
                             .filter(x -> DateUtils.getScheduleTimeStrZeroTime(x.getTimeStr(), "yyyy-MM-dd").equals(day)).findFirst().get();
                     twoVo.setMoney(statisticsTwoVo.getMoney());
                     twoVo.setOrderNum(statisticsTwoVo.getOrderNum());
+                    twoVo.setCreateUsername(statisticsTwoVo.getCreateUsername());
                 }
                 vos.add(twoVo);
             }
@@ -3628,6 +3632,9 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                 TopOrderStatisticsTwoVo twoVo = new TopOrderStatisticsTwoVo();
                 twoVo.setTime(time);
                 twoVo.setTimeStr(DateUtils.timestampToDateFormat(time,"yyyy-MM-dd"));
+                if(voList2.size()>0){
+                    twoVo.setCreateUsername(voList2.get(0).getCreateUsername());
+                }
                 if (voList2.stream().anyMatch(x ->
                         DateUtils.getScheduleTimeZeroTime(x.getOrderTime()) >= time
                                 && DateUtils.getScheduleTimeZeroTime(x.getOrderTime()) <= weekTime.get(time))){
@@ -3637,6 +3644,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                                             && DateUtils.getScheduleTimeZeroTime(x.getOrderTime()) <= weekTime.get(time)).findFirst().get();
                     twoVo.setMoney(statisticsTwoVo.getMoney());
                     twoVo.setOrderNum(statisticsTwoVo.getOrderNum());
+                    twoVo.setCreateUsername(statisticsTwoVo.getCreateUsername());
                 }
                 vos.add(twoVo);
             }
@@ -3653,6 +3661,9 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                 TopOrderStatisticsTwoVo twoVo = new TopOrderStatisticsTwoVo();
                 twoVo.setTime(time);
                 twoVo.setTimeStr(DateUtils.timestampToDateFormat(time,"yyyy-MM"));
+                if(voList3.size()>0){
+                    twoVo.setCreateUsername(voList3.get(0).getCreateUsername());
+                }
                 if (voList3.stream().anyMatch(x ->
                         DateUtils.getScheduleTimeZeroTime(x.getOrderTime()) >= time
                                 && DateUtils.getScheduleTimeZeroTime(x.getOrderTime()) <= monthTime.get(time))){
@@ -3662,6 +3673,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                                             && DateUtils.getScheduleTimeZeroTime(x.getOrderTime()) <= monthTime.get(time)).findFirst().get();
                     twoVo.setMoney(statisticsTwoVo.getMoney());
                     twoVo.setOrderNum(statisticsTwoVo.getOrderNum());
+                    twoVo.setCreateUsername(statisticsTwoVo.getCreateUsername());
                 }
                 vos.add(twoVo);
             }
@@ -3712,6 +3724,9 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                 TopOrderStatisticsTwoVo twoVo = new TopOrderStatisticsTwoVo();
                 twoVo.setTime(day);
                 twoVo.setTimeStr(DateUtils.timestampToDateFormat(day,"yyyy-MM-dd"));
+                if(voList.size()>0){
+                    twoVo.setCreateUsername(voList.get(0).getCreateUsername());
+                }
                 if (voList.stream().anyMatch(x -> DateUtils.getScheduleTimeStrZeroTime(x.getTimeStr(), "yyyy-MM-dd").equals(day))){
                     TopOrderStatisticsTwoVo statisticsTwoVo = voList.stream()
                             .filter(x -> DateUtils.getScheduleTimeStrZeroTime(x.getTimeStr(), "yyyy-MM-dd").equals(day)).findFirst().get();
@@ -3733,6 +3748,9 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                 TopOrderStatisticsTwoVo twoVo = new TopOrderStatisticsTwoVo();
                 twoVo.setTime(time);
                 twoVo.setTimeStr(DateUtils.timestampToDateFormat(time,"yyyy-MM-dd"));
+                if(voList2.size()>0){
+                    twoVo.setCreateUsername(voList2.get(0).getCreateUsername());
+                }
                 if (voList2.stream().anyMatch(x ->
                         DateUtils.getScheduleTimeZeroTime(x.getOrderTime()) >= time
                                 && DateUtils.getScheduleTimeZeroTime(x.getOrderTime()) <= weekTime.get(time))){
@@ -3742,7 +3760,9 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                                             && DateUtils.getScheduleTimeZeroTime(x.getOrderTime()) <= weekTime.get(time)).findFirst().get();
                     twoVo.setMoney(statisticsTwoVo.getMoney());
                     twoVo.setOrderNum(statisticsTwoVo.getOrderNum());
+
                 }
+
                 vos.add(twoVo);
             }
             viewVo.setWeekView(vos);
@@ -3758,6 +3778,9 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                 TopOrderStatisticsTwoVo twoVo = new TopOrderStatisticsTwoVo();
                 twoVo.setTime(time);
                 twoVo.setTimeStr(DateUtils.timestampToDateFormat(time,"yyyy-MM"));
+                if(voList3.size()>0){
+                    twoVo.setCreateUsername(voList3.get(0).getCreateUsername());
+                }
                 if (voList3.stream().anyMatch(x ->
                         DateUtils.getScheduleTimeZeroTime(x.getOrderTime()) >= time
                                 && DateUtils.getScheduleTimeZeroTime(x.getOrderTime()) <= monthTime.get(time))){
@@ -3767,6 +3790,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                                             && DateUtils.getScheduleTimeZeroTime(x.getOrderTime()) <= monthTime.get(time)).findFirst().get();
                     twoVo.setMoney(statisticsTwoVo.getMoney());
                     twoVo.setOrderNum(statisticsTwoVo.getOrderNum());
+                    twoVo.setCreateUsername(statisticsTwoVo.getCreateUsername());
                 }
                 vos.add(twoVo);
             }

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

@@ -1858,7 +1858,7 @@
             , create_sys_user_id,any_value(create_username) as create_username
         </if>
         FROM
-        top_old_order
+        top_old_order too
         WHERE
         1 = 1
         AND `status` = 1
@@ -1876,6 +1876,26 @@
         <if test="customerId != null and customerId != ''">
             AND old_customer_id  = #{customerId}
         </if>
+        <if test="createSysUserId != null and createSysUserId != ''">
+            AND too.create_sys_user_id = #{createSysUserId}
+        </if>
+        <if test="businessName != null and businessName != ''">
+            AND (
+            SELECT
+            count(*)
+            FROM
+            (
+            SELECT
+            `otg`.`order_sn` AS `order_sn`,
+            concat( substr( `otg`.`business_full_name`, 5, 4 ), '-', `otg`.`business_name` ) AS `business_name`
+            FROM
+            `top_old_order_goods` `otg`
+            ) ouu
+            WHERE
+            ouu.order_sn = too.order_sn
+            AND ouu.business_name = #{businessName}
+            ) >0
+        </if>
         AND tenant_id IS NOT NULL
         GROUP BY
         tenant_id
@@ -1894,6 +1914,12 @@
         FROM
         `order` o
         LEFT JOIN `order_goods` `og` ON o.order_sn = og.order_sn
+        <if test="businessName != null and businessName != ''">
+            LEFT JOIN `goods` `g` ON g.goods_id = og.goods_id
+            LEFT JOIN `course_education_type` `cet` ON `g`.`education_type_id` = `cet`.`id`
+            LEFT JOIN `course_project_type` `cpt` ON `g`.`education_type_id` = `cpt`.`id`
+            LEFT JOIN `course_business` `cb` ON  `g`.`business_id` = `cb`.`id`
+        </if>
         WHERE
         o.`status` = 1
         AND o.order_status = 1
@@ -1913,6 +1939,29 @@
         <if test="customerId != null and customerId != ''">
             AND o.old_customer_id  = #{customerId}
         </if>
+        <if test="createSysUserId != null and createSysUserId != ''">
+            AND 1=0
+        </if>
+        <if test="businessName != null and businessName != ''">
+            AND (
+            SELECT
+            count(*)
+            FROM
+            (
+            SELECT
+            concat( `cet`.`education_name`, '-', `cb`.`business_name`, `cpt`.`project_name` ) AS `business_name`,
+            g.goods_id
+            FROM
+            `goods` `g`
+            LEFT JOIN `course_education_type` `cet` ON `g`.`education_type_id` = `cet`.`id`
+            LEFT JOIN `course_project_type` `cpt` ON `g`.`education_type_id` = `cpt`.`id`
+            LEFT JOIN `course_business` `cb` ON `g`.`business_id` = `cb`.`id`
+            ) oug
+            WHERE
+            oug.goods_id = og.goods_id
+            AND oug.business_name = #{businessName}
+            )>0
+        </if>
         AND o.tenant_id IS NOT NULL
         AND og.pay_status != 1
         GROUP BY