From 2be8bf27bfbe6a8ee6cfead80ebe6ff550602070 Mon Sep 17 00:00:00 2001
From: chc <1501738723@qq.com>
Date: Tue, 7 May 2024 10:51:01 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E5=94=AE=E5=90=8E=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/cn/lili/event/impl/VerificationOrderExecute.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/consumer/src/main/java/cn/lili/event/impl/VerificationOrderExecute.java b/consumer/src/main/java/cn/lili/event/impl/VerificationOrderExecute.java
index e7a3efcc..ffe818ad 100644
--- a/consumer/src/main/java/cn/lili/event/impl/VerificationOrderExecute.java
+++ b/consumer/src/main/java/cn/lili/event/impl/VerificationOrderExecute.java
@@ -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));
         }
     }

From 9d41ae3cae27da0f4821f3854f58c0771145269b Mon Sep 17 00:00:00 2001
From: chc <1501738723@qq.com>
Date: Tue, 7 May 2024 11:13:56 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=86=E9=94=80=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E7=AB=8B=E5=8D=B3=E7=BB=93=E7=AE=97=E5=8A=9F=E8=83=BD=E6=B3=A8?=
 =?UTF-8?q?=E9=87=8A=EF=BC=8C=E6=96=B0=E7=89=88=E6=9C=AC=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E5=BF=85=E9=A1=BB=E9=80=9A=E8=BF=87=E5=AE=9A=E6=97=B6=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DistributionOrderServiceImpl.java            | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionOrderServiceImpl.java b/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionOrderServiceImpl.java
index c46e47b3..f42d0961 100644
--- a/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionOrderServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionOrderServiceImpl.java
@@ -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());
+//                    }
                 }