caojiahao/dev_caojiahao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop

Browse Source
This commit is contained in:
Chopper711 2024-05-10 17:05:19 +08:00
commit 6311767320
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
consumer/src/main/java/cn/lili/event/impl/VerificationOrderExecute.java
View File

@ -42,7 +42,7 @@ public class VerificationOrderExecute implements OrderStatusChangeEvent {
.eq(Order::getSn, orderMessage.getOrderSn()));
//修改虚拟订单货物可以进行售后、投诉
orderItemService.update(new LambdaUpdateWrapper<OrderItem>().eq(OrderItem::getOrderSn, orderMessage.getOrderSn())
.set(OrderItem::getAfterSaleStatus, OrderItemAfterSaleStatusEnum.ALREADY_APPLIED)
.set(OrderItem::getAfterSaleStatus, OrderItemAfterSaleStatusEnum.NOT_APPLIED)
.set(OrderItem::getComplainStatus, OrderComplaintStatusEnum.COMPLETE));
}
}

16
framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionOrderServiceImpl.java
View File

@ -129,14 +129,14 @@ public class DistributionOrderServiceImpl extends ServiceImpl<DistributionOrderM
distributionService.addRebate(rebate, order.getDistributionId());
//如果天数写0则立即进行结算
if (distributionSetting.getCashDay().equals(0)) {
DateTime dateTime = new DateTime();
dateTime = dateTime.offsetNew(DateField.DAY_OF_MONTH, -distributionSetting.getCashDay());
//防止事务失效，采用上下文获取bean
DistributionOrderService bean = SpringContextUtil.getBean(DistributionOrderService.class);
//分销订单结算
bean.updateRebate(dateTime, DistributionOrderStatusEnum.WAIT_BILL.name());
}
// if (distributionSetting.getCashDay().equals(0)) {
// DateTime dateTime = new DateTime();
// dateTime = dateTime.offsetNew(DateField.DAY_OF_MONTH, -distributionSetting.getCashDay());
// //防止事务失效，采用上下文获取bean
// DistributionOrderService bean = SpringContextUtil.getBean(DistributionOrderService.class);
// //分销订单结算
// bean.updateRebate(dateTime, DistributionOrderStatusEnum.WAIT_BILL.name());
// }
}