取消撤回订单状态优化

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/order/impl/TradeOrderServiceImpl.java

@@ -635,11 +635,14 @@ public class TradeOrderServiceImpl implements TradeOrderService {
             tradeOrderDO.setOrderStatus(TradeOrderStatusEnum.UNPAID.getStatus());
             tradeOrderDO.setConfirmDate(LocalDateTime.now());
         }
-        if(oldtradeOrderDO!=null && oldtradeOrderDO.getOrderStatus()==TradeOrderStatusEnum.UNUSED.getStatus()
-            && tradeOrderDO.getOrderStatus() != TradeOrderStatusEnum.TRANSFER.getStatus()){
+        if(oldtradeOrderDO!=null && oldtradeOrderDO.getOrderStatus().equals(TradeOrderStatusEnum.UNUSED.getStatus())
+            && !tradeOrderDO.getOrderStatus().equals(TradeOrderStatusEnum.TRANSFER.getStatus())){
             tradeOrderDO.setOrderStatus(TradeOrderStatusEnum.UNUSED.getStatus());
             tradeOrderDO.setConfirmDate(LocalDateTime.now());
         }
+        if(tradeOrderDO.getOrderStatus().equals(TradeOrderStatusEnum.UNPAID.getStatus()) && tradeOrderDO.getConfirmDate()==null){
+            tradeOrderDO.setConfirmDate(LocalDateTime.now());
+        }
         OrderJzDO orderJzDO = new OrderJzDO();
         orderJzDO.setId(IdWorker.getId());
         orderJzDO.setOrderId(tradeOrderDO.getId());

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/otc/impl/OtcTradeOrderServiceImpl.java

@@ -500,15 +500,20 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
                 if(tradeOrderDO.getPayStatus()==1){
                     orderStatus = 6;
                 }
-                tradeOrderMapper.update(Wrappers.<TradeOrderDO>lambdaUpdate()
+                LocalDateTime confireDate = tradeOrderDO.getConfirmDate();
+                LambdaUpdateWrapper<TradeOrderDO> updateWrapper = Wrappers.<TradeOrderDO>lambdaUpdate()
                         .set(TradeOrderDO::getOrderStatus, orderStatus)
+                        .set(TradeOrderDO::getConfirmDate, confireDate)
                         .set(TradeOrderDO::getAuditStatus, tradeOrderDO.getAuditStatus() + 1)
                         .set(TradeOrderDO::getUpdateTime, LocalDateTime.now())
                         .set(TradeOrderDO::getDeposiStatus, 1)
                         .set(TradeOrderDO::getPayAmount, tradeOrderDO.getPayAmount().subtract(amount))
                         .set(TradeOrderDO::getFreeAmount, amount)
-                        .eq(TradeOrderDO::getId, orderId)
-                );
+                        .eq(TradeOrderDO::getId, orderId);
+                if(confireDate == null){
+                    updateWrapper.set(TradeOrderDO::getConfirmDate, LocalDateTime.now());
+                }
+                tradeOrderMapper.update(updateWrapper);
                 Map<String, Object> extMap = new HashMap<>();
                 extMap.put("result", "审核通过,审核意见："+auditAdvice);
                 TradeOrderLogUtils.setOrderInfo(orderId, tradeOrderDO.getOrderStatus(), TradeOrderStatusEnum.UNPAID.getStatus(), extMap);
@@ -1300,12 +1305,20 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
             tradeOrderAuditDO.setOrderId(tradeOrderDO.getId());
             tradeOrderAuditMapper.insert(tradeOrderAuditDO);
             //审核 不通过还原到修改前订单
-            tradeOrderMapper.update(new UpdateWrapper<TradeOrderDO>().set("order_status", TradeOrderStatusEnum.UNPAID.getStatus()).set("audit_status", 5).set("damaged_status",3).eq("id", orderId));
+
+            int oldorderStatus =  TradeOrderStatusEnum.YD.getStatus();
+            if(tradeOrderDO.getConfirmDate()!=null){
+                oldorderStatus = TradeOrderStatusEnum.UNPAID.getStatus();
+            }
+            if(tradeOrderDO.getPayStatus()!=null && tradeOrderDO.getPayStatus()==1){
+                oldorderStatus = TradeOrderStatusEnum.UNUSED.getStatus();
+            }
+            tradeOrderMapper.update(new UpdateWrapper<TradeOrderDO>().set("order_status",oldorderStatus).set("audit_status", 5).set("damaged_status",3).eq("id", orderId));
 
 
             Map<String, Object> extMap = new HashMap<>();
             extMap.put("result", "审核不通过");
-            TradeOrderLogUtils.setOrderInfo(orderId, tradeOrderDO.getOrderStatus(),TradeOrderStatusEnum.UNPAID.getStatus(), extMap);
+            TradeOrderLogUtils.setOrderInfo(orderId, tradeOrderDO.getOrderStatus(),oldorderStatus, extMap);
 
         }
         return CommonResult.success("审核成功");
@@ -2977,7 +2990,9 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
 //                    orderPolicyMapper.insertBatch(orderPolicyDOList);
                 }
             }
-            if (!CollUtil.isEmpty(createVO.getPolicyList()) &&isAudit) {
+            int oldSize = orderPolicyList==null?0:orderPolicyList.size();
+            int newSize = orderPolicyDOList==null?0:orderPolicyDOList.size();
+            if ((!CollUtil.isEmpty(createVO.getPolicyList()) &&isAudit)||oldSize!=newSize) {
                 auditType = 2;
                 desc = "政策优惠提交，订单进入二级审核";
                 TradeOrderBindDO tradeOrderBindDO = new TradeOrderBindDO();