定价状态判断修改

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

@@ -528,6 +528,16 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
                 if(confireDate == null){
                     updateWrapper.set(TradeOrderDO::getConfirmDate, LocalDateTime.now());
                 }
+                if(tradeOrderDO.getDeposi().compareTo(BigDecimal.ZERO) != 0){
+                    if(tradeOrderDO.getDeposiStatus()==null){
+                        updateWrapper.set(TradeOrderDO::getDeposiStatus, 1);
+                    }else if(tradeOrderDO.getDeposiPayTime()!=null && tradeOrderDO.getDeposiStatus()!=2){
+                        updateWrapper.set(TradeOrderDO::getDeposiStatus, 2);
+                    }else if(tradeOrderDO.getDeposiStatus()==0){
+                        updateWrapper.set(TradeOrderDO::getDeposiStatus, 1);
+                    }
+                }
+
                 tradeOrderMapper.update(updateWrapper);
                 String str ="";
                 if(tradeOrderDO.getPayAmount().compareTo(newPayAmount)!=0){
@@ -543,12 +553,21 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
                 TradeOrderLogUtils.setOrderInfo(orderId, tradeOrderDO.getOrderStatus(), TradeOrderStatusEnum.UNPAID.getStatus(), extMap);
             } else {
                 AuditUserDO auditUserDO = auditUserMapper.selectOne(new QueryWrapper<AuditUserDO>().eq("type", tradeOrderDO.getAuditType()).eq("audit_status", tradeOrderDO.getAuditStatus() + 1).last("limit 1"));
-                tradeOrderMapper.update(Wrappers.<TradeOrderDO>lambdaUpdate()
+                LambdaUpdateWrapper<TradeOrderDO> updateWrapper = Wrappers.<TradeOrderDO>lambdaUpdate()
                         .set(TradeOrderDO::getAuditStatus, tradeOrderDO.getAuditStatus() + 1)
                         .set(TradeOrderDO::getUpdateTime, LocalDateTime.now())
                         .set(TradeOrderDO::getAuditUser, auditUserDO.getAuditUser())
-                        .eq(TradeOrderDO::getId, orderId)
-                );
+                        .eq(TradeOrderDO::getId, orderId);
+                if(tradeOrderDO.getDeposi().compareTo(BigDecimal.ZERO) != 0){
+                    if(tradeOrderDO.getDeposiStatus()==null){
+                        updateWrapper.set(TradeOrderDO::getDeposiStatus, 1);
+                    }else if(tradeOrderDO.getDeposiPayTime()!=null && tradeOrderDO.getDeposiStatus()!=2){
+                        updateWrapper.set(TradeOrderDO::getDeposiStatus, 2);
+                    }else if(tradeOrderDO.getDeposiStatus()==0){
+                        updateWrapper.set(TradeOrderDO::getDeposiStatus, 1);
+                    }
+                }
+                tradeOrderMapper.update(updateWrapper);
                 Map<String, Object> extMap = new HashMap<>();
                 extMap.put("result", "审核通过(审核意见："+auditAdvice+")，等待下一级审核");
                 TradeOrderLogUtils.setOrderInfo(orderId, tradeOrderDO.getOrderStatus(), tradeOrderDO.getOrderStatus(), extMap);
@@ -645,12 +664,21 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
                     orderStatus = 6;
                 }
                 //针对第一次提交就进入审核的情况下，如果审核拒绝 订单状态直接修改为留位状态
-                tradeOrderMapper.update(Wrappers.<TradeOrderDO>lambdaUpdate()
+                LambdaUpdateWrapper<TradeOrderDO> updateWrapper = Wrappers.<TradeOrderDO>lambdaUpdate()
                         .set(TradeOrderDO::getAuditStatus, 0)
                         .set(TradeOrderDO::getOrderStatus, orderStatus)
                         .set(TradeOrderDO::getUpdateTime, LocalDateTime.now())
-                        .eq(TradeOrderDO::getId, orderId)
-                );
+                        .eq(TradeOrderDO::getId, orderId);
+                if(tradeOrderDO.getDeposi().compareTo(BigDecimal.ZERO) != 0){
+                    if(tradeOrderDO.getDeposiStatus()==null){
+                        updateWrapper.set(TradeOrderDO::getDeposiStatus, 1);
+                    }else if(tradeOrderDO.getDeposiPayTime()!=null && tradeOrderDO.getDeposiStatus()!=2){
+                        updateWrapper.set(TradeOrderDO::getDeposiStatus, 2);
+                    }else if(tradeOrderDO.getDeposiStatus()==0){
+                        updateWrapper.set(TradeOrderDO::getDeposiStatus, 1);
+                    }
+                }
+                tradeOrderMapper.update(updateWrapper);
                 Map<String, Object> extMap = new HashMap<>();
                 extMap.put("result", "审核不通过，审核意见:"+auditAdvice);
                 TradeOrderLogUtils.setOrderInfo(orderId, tradeOrderDO.getOrderStatus(), TradeOrderStatusEnum.YD.getStatus(), extMap);