‘linchangsheng’ преди 7 месеца
родител
ревизия
e3b6c7a79e
променени са 1 файла, в които са добавени 0 реда и са изтрити 4 реда
  1. 0 4
      mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/order/PayOrderLogic.java

+ 0 - 4
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())