|
@@ -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())
|