Browse Source

bug修改

lishiqiang 3 weeks ago
parent
commit
d21ea11f32

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

@@ -794,6 +794,8 @@ public class TradeOrderServiceImpl implements TradeOrderService {
         }else if(orderCreateReqDTO.getConfirmType()!=null && orderCreateReqDTO.getConfirmType() == 1){
             //订单需要审核
             tradeOrderDO.setOrderStatus(TradeOrderStatusEnum.TRANSFER.getStatus());
+        }else if(orderCreateReqDTO.getIsYd()!=null && orderCreateReqDTO.getIsYd() == 0){
+            tradeOrderDO.setOrderStatus(TradeOrderStatusEnum.UNPAID.getStatus());
         }
         if(tradeOrderDO.getSellMethod() == 3){
             tradeOrderDO.setOrderStatus(TradeOrderStatusEnum.YD.getStatus());

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

@@ -2345,6 +2345,9 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
             shipTradeOrderCreateReqVO.setAmount(createVO.getSummary().getOrderMoney());
             shipTradeOrderCreateReqVO.setPayAmount(createVO.getSummary().getOrderMoney());
         }
+        if(tradeOrderDO.getOrderStatus()==6){
+            shipTradeOrderCreateReqVO.setConfirmType(1);
+        }
 
         shipTradeOrderCreateReqVO.setDicountId(createVO.getSummary().getDicountId());
         if (createVO.getSummary().getRealOrderMoney() != null) {