no message

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/order/PayOrderLogic.java

@@ -877,7 +877,7 @@ public class PayOrderLogic {
         }
 
         return workerOrderService.lambdaQuery()
-                .like(!StringUtil.isEmpty(goodsType),WorkerOrder::getGoodsType,goodsType)
+                .eq(!StringUtil.isEmpty(goodsType),WorkerOrder::getGoodsType,goodsType)
                 .like(!StringUtil.isEmpty(settlementType),WorkerOrder::getSettlementType,settlementType)
                 .eq(!StringUtil.isEmpty(orderId),WorkerOrder::getOrderId,orderId)
                 .eq(!StringUtil.isEmpty(workerOrderId),WorkerOrder::getWorkerOrderId,workerOrderId)
@@ -912,7 +912,7 @@ public class PayOrderLogic {
         }
 
         return workerOrderService.lambdaQuery()
-                .like(!StringUtil.isEmpty(goodsType),WorkerOrder::getGoodsType,goodsType)
+                .eq(!StringUtil.isEmpty(goodsType),WorkerOrder::getGoodsType,goodsType)
                 .like(!StringUtil.isEmpty(settlementType),WorkerOrder::getSettlementType,settlementType)
                 .eq(!StringUtil.isEmpty(orderId),WorkerOrder::getOrderId,orderId)
                 .eq(!StringUtil.isEmpty(payStatus),WorkerOrder::getPayStatus,payStatus)
@@ -1000,7 +1000,7 @@ public class PayOrderLogic {
         OrderCount orderCount = new OrderCount();
 
         Integer yqx = workerOrderService.lambdaQuery()
-                .like(!StringUtil.isEmpty(goodsType), WorkerOrder::getGoodsType, goodsType)
+                .eq(!StringUtil.isEmpty(goodsType), WorkerOrder::getGoodsType, goodsType)
                 .like(!StringUtil.isEmpty(settlementType), WorkerOrder::getSettlementType, settlementType)
                 .eq(!StringUtil.isEmpty(orderId), WorkerOrder::getOrderId, orderId)
                 .and(item -> item
@@ -1016,7 +1016,7 @@ public class PayOrderLogic {
 
 
         Integer wzf = workerOrderService.lambdaQuery()
-                .like(!StringUtil.isEmpty(goodsType), WorkerOrder::getGoodsType, goodsType)
+                .eq(!StringUtil.isEmpty(goodsType), WorkerOrder::getGoodsType, goodsType)
                 .like(!StringUtil.isEmpty(settlementType), WorkerOrder::getSettlementType, settlementType)
                 .eq(!StringUtil.isEmpty(orderId), WorkerOrder::getOrderId, orderId)
 
@@ -1029,7 +1029,7 @@ public class PayOrderLogic {
 
 
         Integer yzf = workerOrderService.lambdaQuery()
-                .like(!StringUtil.isEmpty(goodsType), WorkerOrder::getGoodsType, goodsType)
+                .eq(!StringUtil.isEmpty(goodsType), WorkerOrder::getGoodsType, goodsType)
                 .like(!StringUtil.isEmpty(settlementType), WorkerOrder::getSettlementType, settlementType)
                 .eq(!StringUtil.isEmpty(orderId), WorkerOrder::getOrderId, orderId)
                 .eq(WorkerOrder::getRefundStatus, IsYesNoEnum.NO.getKey())
@@ -1043,7 +1043,7 @@ public class PayOrderLogic {
 
 
         Integer qb = workerOrderService.lambdaQuery()
-                .like(!StringUtil.isEmpty(goodsType), WorkerOrder::getGoodsType, goodsType)
+                .eq(!StringUtil.isEmpty(goodsType), WorkerOrder::getGoodsType, goodsType)
                 .like(!StringUtil.isEmpty(settlementType), WorkerOrder::getSettlementType, settlementType)
                 .eq(!StringUtil.isEmpty(orderId), WorkerOrder::getOrderId, orderId)
                 .and(item -> item.eq(WorkerOrder::getUserId,currentCompanyWechat.getUser().getUserId())

mall-miniapp-service/src/main/resources/mapper/workorder/OrderBaseCMapper.xml

@@ -18,8 +18,56 @@
         count(DISTINCT if(a.order_status not in ('YWG','YJS','GCSZX','YWGO','WDWG','DQD'),a.id,null)) 'WWG',
         COUNT(DISTINCT a.id) AS 'all'
         from pg_order_base a
-        left join pg_order_worker b on a.id = b.order_base_id
-        where ((b.worker_id=#{workerId} or b.worker_number=#{workerNumber}) or a.order_status = 'DQD') and
+        left join
+        (
+            SELECT b.id AS gourpbyId,b.* FROM (
+                SELECT
+                id,
+                order_base_id,
+                websit_id,
+                websit_name,
+                worker_id,
+                worker_name,
+                worker_mobile,
+                worker_number,
+                worker_idcard,
+                is_examine,
+                is_master,
+                create_time,
+                update_time,
+                create_by,
+                update_by,
+                worker_query
+                FROM
+                pg_order_worker
+                WHERE
+                    worker_id=#{workerId}
+                union all
+                SELECT
+                id,
+                order_base_id,
+                websit_id,
+                websit_name,
+                worker_id,
+                worker_name,
+                worker_mobile,
+                worker_number,
+                worker_idcard,
+                is_examine,
+                is_master,
+                create_time,
+                update_time,
+                create_by,
+                update_by,
+                worker_query
+                FROM
+                pg_order_worker
+                WHERE
+                    worker_number=#{workerNumber}
+                ) b
+                GROUP BY 1
+        ) b on a.id = b.order_base_id
+        where
         a.order_status not in ('YQX','FWQX','FL','FWZT','YCGB')
         and b.websit_id = a.websit_id
         <if test="isYb != null and isYb == true">
@@ -32,6 +80,7 @@
             and a.pg_incre_order_id = #{pgIncreOrderId}
         </if>
         and a.company_wechat_id = #{companyWechatId}
+        or a.order_status = 'DQD'
 
     </select>