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

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

@@ -1004,8 +1004,6 @@ public class PayOrderLogic {
                 .like(!StringUtil.isEmpty(goodsType), WorkerOrder::getGoodsType, goodsType)
                 .like(!StringUtil.isEmpty(settlementType), WorkerOrder::getSettlementType, settlementType)
                 .eq(!StringUtil.isEmpty(orderId), WorkerOrder::getOrderId, orderId)
-                .eq(!StringUtil.isEmpty(currentCompanyWechat.getUserId()), WorkerOrder::getUserId, currentCompanyWechat.getUserId())
-
                 .and(item -> item
                         .eq(WorkerOrder::getPayStatus,"CANCEL")
 
@@ -1022,7 +1020,6 @@ public class PayOrderLogic {
                 .like(!StringUtil.isEmpty(goodsType), WorkerOrder::getGoodsType, goodsType)
                 .like(!StringUtil.isEmpty(settlementType), WorkerOrder::getSettlementType, settlementType)
                 .eq(!StringUtil.isEmpty(orderId), WorkerOrder::getOrderId, orderId)
-                .eq(!StringUtil.isEmpty(currentCompanyWechat.getUserId()), WorkerOrder::getUserId, currentCompanyWechat.getUserId())
 
                 .eq( WorkerOrder::getPayStatus, "WAIT")
                 .and(item -> item.eq(WorkerOrder::getUserId,currentCompanyWechat.getUser().getUserId())
@@ -1036,7 +1033,6 @@ public class PayOrderLogic {
                 .like(!StringUtil.isEmpty(goodsType), WorkerOrder::getGoodsType, goodsType)
                 .like(!StringUtil.isEmpty(settlementType), WorkerOrder::getSettlementType, settlementType)
                 .eq(!StringUtil.isEmpty(orderId), WorkerOrder::getOrderId, orderId)
-                .eq(!StringUtil.isEmpty(currentCompanyWechat.getUserId()), WorkerOrder::getUserId, currentCompanyWechat.getUserId())
                 .eq(WorkerOrder::getRefundStatus, IsYesNoEnum.NO.getKey())
 
                 .eq( WorkerOrder::getPayStatus, PayStatusEnum.PAID.getKey())

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/workorder/OrderBaseLogic.java

@@ -192,19 +192,11 @@ public class OrderBaseLogic {
         if(!StringUtils.equals(currentCompanyWechat.getUser().getType(),UserTypeEnum.WORKER.getKey())){
             return new Page<>(pageNum,pageSize);
         }
-        List<String> orderBaseIdvs = pgOrderWorkerService.lambdaQuery()
+        List<String> orderBaseIds = pgOrderWorkerService.lambdaQuery()
                     .and(item -> item.eq(PgOrderWorker::getWorkerNumber, currentCompanyWechat.getUser().getWorkerNumber()).or()
                     .eq(PgOrderWorker::getWorkerId,currentCompanyWechat.getUserId()))
                     .list().stream().map(PgOrderWorker::getOrderBaseId).distinct().collect(Collectors.toList());
 
-        List<String> orderBaseIds = pgOrderBaseService.lambdaQuery()
-                .eq(PgOrderBase::getCompanyWechatId,currentCompanyWechat.getCompanyWechatId())
-                .in(PgOrderBase::getId,orderBaseIdvs)
-                .notIn(PgOrderBase::getOrderStatus,OrderBaseStatusEnum.YQX.getKey(),OrderBaseStatusEnum.FWZT.getKey(),OrderBaseStatusEnum.FL.getKey(),
-                        OrderBaseStatusEnum.YCGB.getKey() ,OrderBaseStatusEnum.FWQX.getKey()
-                ).select(PgOrderBase::getId)
-                .list().stream().map(PgOrderBase::getId).distinct().collect(Collectors.toList());
-
         if(byDay != null){
             if(byDay == 1) {
                 startTime = DateUtil.formatDateTime(DateUtil.beginOfDay(new Date()));

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

@@ -15,8 +15,7 @@
             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 a.order_status not in ('YQX','FWQX','FL','FWZT','YCGB'))
-    ) and a.order_status not in ('YQX','FWQX','FL','FWZT','YCGB')
+    where ((b.worker_id=#{workerId} or b.worker_number=#{workerNumber}) or a.order_status = 'DQD') and a.order_status not in ('YQX','FWQX','FL','FWZT','YCGB')
     <if test="isYb != null and isYb == true">
         and a.pg_incre_order_id != ''
     </if>