禅道bug修改,下单流程优化

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

@@ -729,7 +729,7 @@ public class TradeOrderServiceImpl implements TradeOrderService {
         tradeOrderDO.setGroupNo(orderCreateReqDTO.getGroupNo());
         tradeOrderDO.setVoyageId(orderCreateReqDTO.getVoyageId());
         tradeOrderDO.setShipId(orderCreateReqDTO.getShipId());
-        tradeOrderDO.setDiscountId(orderCreateReqDTO.getShipId());
+        tradeOrderDO.setDiscountId(orderCreateReqDTO.getDicountId());
         tradeOrderDO.setCurrency(orderCreateReqDTO.getCurrency());
         //设置团散类型
         if (tradeOrderDO.getVisitorType() == null) {
@@ -747,7 +747,7 @@ public class TradeOrderServiceImpl implements TradeOrderService {
             tradeOrderDO.setOrderNo(tradeUUCodeUtils.generateOrderNo(ORDER_PREFIX));
         }
         tradeOrderDO.setOrderStatus(TradeOrderStatusEnum.INIT.getStatus());
-        if(orderCreateReqDTO.getIsYd() == 1){
+        if(orderCreateReqDTO.getIsYd()!=null && orderCreateReqDTO.getIsYd() == 1){
             tradeOrderDO.setOrderStatus(TradeOrderStatusEnum.YD.getStatus());
         }
         //订单联系人

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

@@ -2215,7 +2215,7 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
             return CommonResult.error(ORDER_STORE_NONE);
         }
         VoyageRespDTO voyage = productApi.getVoyage(createVO.getVoyageId());
-        String date = DateUtils.format(createVO.getBoardingTime(),"yyyyMMddmmss");
+        String date = DateUtils.format(new Date(),"yyyyMMddmmss");
         String orderNo = distributorDO.getCode()+"-"+voyage.getCode()+"-"+date;
         List<TradeOrderCountryReqVO> countryData = createVO.getCountryData();
         ShipTradeOrderCreateReqVO shipTradeOrderCreateReqVO = BeanUtils.toBean(createVO, ShipTradeOrderCreateReqVO.class);
@@ -2260,6 +2260,7 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
             visitor.setCredentialType(tradeVistorReqVO.getCardType());
             visitor.setYczz(tradeVistorReqVO.getYichang());
             visitor.setCqzz(tradeVistorReqVO.getChongqing());
+            visitor.setRoomId(tradeVistorReqVO.getRoomId());
             visitorList.add(visitor);
         }
         orderDetail.setVisitorList(visitorList);

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/supplier/impl/TradeSupplierCallbackServiceImpl.java

@@ -27,6 +27,7 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
+import java.util.Objects;
 
 import static com.yc.ship.module.trade.enums.ErrorCodeConstants.REFUND_AUDITING;
 
@@ -53,8 +54,10 @@ public class TradeSupplierCallbackServiceImpl implements TradeSupplierCallbackSe
     @Override
     public void afterAllOrderCreate(TradeOrderDO tradeOrderDO) {
         //更新订单状态
-        tradeOrderDO.setOrderStatus(TradeOrderStatusEnum.UNPAID.getStatus());
-        tradeOrderRepositoryService.updateOrderStatus(tradeOrderDO);
+        if(!Objects.equals(tradeOrderDO.getOrderStatus(), TradeOrderStatusEnum.YD.getStatus())) {
+            tradeOrderDO.setOrderStatus(TradeOrderStatusEnum.UNPAID.getStatus());
+            tradeOrderRepositoryService.updateOrderStatus(tradeOrderDO);
+        }
     }
 
     @Override