bug修改,

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

@@ -77,6 +77,7 @@ import java.util.stream.Collectors;
 
 import static com.yc.ship.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static com.yc.ship.framework.common.exception.util.ServiceExceptionUtil.exception0;
+import static com.yc.ship.framework.web.core.util.WebFrameworkUtils.getLoginUserId;
 import static com.yc.ship.module.product.enums.YesOrNoEnum.NO;
 import static com.yc.ship.module.trade.enums.ApiConstants.*;
 import static com.yc.ship.module.trade.enums.ErrorCodeConstants.*;
@@ -506,15 +507,29 @@ public class TradeOrderServiceImpl implements TradeOrderService {
         TradeOrderDO oldtradeOrderDO = orderCreateReqDTO.getOldtradeOrderDO();
         //订单
         TradeOrderDO tradeOrderDO = new TradeOrderDO();
-        tradeOrderDO.setSellMethod(oldtradeOrderDO.getSellMethod());
+        if(oldtradeOrderDO!=null){
+            tradeOrderDO.setSellMethod(oldtradeOrderDO.getSellMethod());
+        }else{
+            tradeOrderDO.setSellMethod(orderCreateReqDTO.getOrderProperty().getSellMethod());
+        }
         tradeOrderDO.setSourceId(orderCreateReqDTO.getOrderProperty().getSourceId());
         tradeOrderDO.setSourceName(orderCreateReqDTO.getOrderProperty().getSourceName());
         tradeOrderDO.setSellerId(orderCreateReqDTO.getOrderProperty().getSellerId());
         tradeOrderDO.setMemberId(orderCreateReqDTO.getOrderProperty().getMemberId());
-        tradeOrderDO.setStoreId(oldtradeOrderDO.getStoreId());
-        tradeOrderDO.setStoreName(oldtradeOrderDO.getStoreName());
-        tradeOrderDO.setStoreName(oldtradeOrderDO.getExternalOrderNo());
-        tradeOrderDO.setExternalOrderNo(orderCreateReqDTO.getExternalOrderNo());
+        if(oldtradeOrderDO!=null) {
+            tradeOrderDO.setStoreId(oldtradeOrderDO.getStoreId());
+            tradeOrderDO.setStoreName(oldtradeOrderDO.getStoreName());
+            tradeOrderDO.setExternalOrderNo(oldtradeOrderDO.getExternalOrderNo());
+            tradeOrderDO.setConfirmDate(oldtradeOrderDO.getConfirmDate());
+            tradeOrderDO.setCreator(oldtradeOrderDO.getCreator());
+            tradeOrderDO.setCreateTime(oldtradeOrderDO.getCreateTime());
+        }else{
+            tradeOrderDO.setStoreId(orderCreateReqDTO.getOrderProperty().getStoreId());
+            tradeOrderDO.setStoreName(orderCreateReqDTO.getOrderProperty().getStoreName());
+            tradeOrderDO.setExternalOrderNo(orderCreateReqDTO.getExternalOrderNo());
+            tradeOrderDO.setCreator(getLoginUserId()+"");
+            tradeOrderDO.setCreateTime(LocalDateTime.now());
+        }
         tradeOrderDO.setTravelDate(orderCreateReqDTO.getTravelDate());
         tradeOrderDO.setAmount(orderCreateReqDTO.getAmount());
         tradeOrderDO.setIsRead(orderCreateReqDTO.getIsRead());
@@ -533,9 +548,7 @@ public class TradeOrderServiceImpl implements TradeOrderService {
         tradeOrderDO.setLinkMobile(orderCreateReqDTO.getLinkMobile());
         tradeOrderDO.setLinkEmail(orderCreateReqDTO.getLinkEmail());
         tradeOrderDO.setDeposi(orderCreateReqDTO.getDeposi());
-        tradeOrderDO.setConfirmDate(oldtradeOrderDO.getConfirmDate());
-        tradeOrderDO.setCreator(oldtradeOrderDO.getCreator());
-        tradeOrderDO.setCreateTime(oldtradeOrderDO.getCreateTime());
+
         //设置团散类型
         if (tradeOrderDO.getVisitorType() == null) {
             if (tradeOrderDO.getSellMethod() == 7 || tradeOrderDO.getSellMethod() == 1) {