|
@@ -272,6 +272,7 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
|
|
|
lqw.eq(bo.getReceivingTime() != null, OrderMain::getReceivingTime, bo.getReceivingTime());
|
|
lqw.eq(bo.getReceivingTime() != null, OrderMain::getReceivingTime, bo.getReceivingTime());
|
|
|
lqw.eq(bo.getPackageCount() != null, OrderMain::getPackageCount, bo.getPackageCount());
|
|
lqw.eq(bo.getPackageCount() != null, OrderMain::getPackageCount, bo.getPackageCount());
|
|
|
lqw.eq(bo.getSignedQuantity() != null, OrderMain::getSignedQuantity, bo.getSignedQuantity());
|
|
lqw.eq(bo.getSignedQuantity() != null, OrderMain::getSignedQuantity, bo.getSignedQuantity());
|
|
|
|
|
+ lqw.eq(bo.getAssigneeId() != null, OrderMain::getAssigneeId, bo.getAssigneeId());
|
|
|
lqw.eq(bo.getAfterSaleCompleted() != null, OrderMain::getAfterSaleCompleted, bo.getAfterSaleCompleted());
|
|
lqw.eq(bo.getAfterSaleCompleted() != null, OrderMain::getAfterSaleCompleted, bo.getAfterSaleCompleted());
|
|
|
lqw.eq(bo.getAfterSalePending() != null, OrderMain::getAfterSalePending, bo.getAfterSalePending());
|
|
lqw.eq(bo.getAfterSalePending() != null, OrderMain::getAfterSalePending, bo.getAfterSalePending());
|
|
|
lqw.eq(StringUtils.isNotBlank(bo.getPushStatus()), OrderMain::getPushStatus, bo.getPushStatus());
|
|
lqw.eq(StringUtils.isNotBlank(bo.getPushStatus()), OrderMain::getPushStatus, bo.getPushStatus());
|
|
@@ -523,7 +524,7 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
|
|
|
this.update(Wrappers.lambdaUpdate(OrderMain.class)
|
|
this.update(Wrappers.lambdaUpdate(OrderMain.class)
|
|
|
.eq(OrderMain::getId, orderId)
|
|
.eq(OrderMain::getId, orderId)
|
|
|
.set(OrderMain::getOrderStatus, 1)); // 假设 1 代表某种特定状态,需确认枚举值
|
|
.set(OrderMain::getOrderStatus, 1)); // 假设 1 代表某种特定状态,需确认枚举值
|
|
|
- }else {
|
|
|
|
|
|
|
+ } else {
|
|
|
this.update(Wrappers.lambdaUpdate(OrderMain.class)
|
|
this.update(Wrappers.lambdaUpdate(OrderMain.class)
|
|
|
.eq(OrderMain::getId, orderId)
|
|
.eq(OrderMain::getId, orderId)
|
|
|
.set(OrderMain::getCheckStatus, "1")
|
|
.set(OrderMain::getCheckStatus, "1")
|