修改代码

pz-common/src/main/java/com/pz/common/enums/UserType.java

@@ -35,7 +35,7 @@ public enum UserType {
     STORE_AMERCHANT_USER("store_merchant_user"),
 
     /**
-     * 商城商户
+     * 商户
      */
     AMERCHANT_USER("merchant_user");
 

pz-system/src/main/java/com/pz/system/mapper/TotalOrderMapper.java

@@ -71,5 +71,7 @@ public interface TotalOrderMapper extends BaseMapperPlus<TotalOrderMapper, Total
      * @param time
      * @return
      */
-    List<OrderColumnarVo> findOrderColumnarVoList(@Param("time") String time);
+    List<OrderColumnarVo> findOrderColumnarVoList(@Param("time") String time,@Param("emIds")List<Integer> emIdS);
+
+    List<OrderColumnarVo> findStoreOrderVoList(@Param("time")String time,@Param("emIds")List<Integer> emIdS);
 }

pz-system/src/main/java/com/pz/system/service/SysLoginService.java

@@ -287,7 +287,8 @@ public class SysLoginService {
             .select(SysUser::getUserName, SysUser::getStatus)
             .eq(SysUser::getUserName, username)
             .and(con -> {
-                con.eq(SysUser::getUserType, UserType.SYS_USER.getUserType()).or().eq(SysUser::getUserType, UserType.STORE_AMERCHANT_USER.getUserType());
+                con.eq(SysUser::getUserType, UserType.SYS_USER.getUserType()).or().eq(SysUser::getUserType, UserType.STORE_AMERCHANT_USER.getUserType())
+                    .or().eq(SysUser::getUserType, UserType.AMERCHANT_USER.getUserType());
             })
         );
         if (ObjectUtil.isNull(user)) {

pz-system/src/main/java/com/pz/system/service/impl/TotalOrderServiceImpl.java

@@ -1277,7 +1277,7 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
         for (String time : recentDates) {
             List<OrderColumnarVo> orderColumnarVoList = orderMap.get(time);
             if (orderColumnarVoList == null) {
-                orderColumnarVoList = baseMapper.findOrderColumnarVoList(time);
+                orderColumnarVoList = baseMapper.findOrderColumnarVoList(time,bo.getEmIds());
                 orderMap.put(time, orderColumnarVoList);
             }
             OrderLineVo orderLineVo = new OrderLineVo();

pz-system/src/main/resources/mapper/system/TotalOrderMapper.xml

@@ -128,9 +128,17 @@
         LEFT JOIN total_order t ON t.business_id = b.id
         AND t.`status` = 2
         AND DATE (t.create_time) = DATE (#{time})
-        <if test="bo.emIds != null and bo.emIds.size() > 0">
-            AND t.em_id IN(bo.emIds)
+        <if test="emIds != null and emIds.size() > 0">
+            AND t.em_id IN(emIds)
         </if>
         GROUP BY b.id;
     </select>
+    <select id="findStoreOrderVoList" resultType="com.pz.system.domain.vo.OrderColumnarVo">
+        SELECT '商城订单' name,DATE (#{time}) AS time,COUNT(1) num FROM total_order
+        WHERE business_id = 0 AND `status` = 2
+        AND DATE (create_time) = DATE (#{time})
+        <if test="emIds != null and emIds.size() > 0">
+            AND em_id IN(emIds)
+        </if>
+    </select>
 </mapper>