1、优化获取待支付订单逻辑

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/order/TradeOrderServiceImpl.java

@@ -6,18 +6,19 @@ import com.citu.framework.common.pojo.PageResult;
 import com.citu.module.menduner.common.util.LoginUserContext;
 import com.citu.module.menduner.system.controller.app.jobhunt.order.vo.AppTradeOrderPageReqVO;
 import com.citu.module.menduner.system.controller.app.jobhunt.order.vo.AppTradeOrderRespVO;
-import com.citu.module.menduner.system.controller.app.recruit.order.vo.*;
+import com.citu.module.menduner.system.controller.app.recruit.order.vo.AppRecruitTradeOrderPageReqVO;
+import com.citu.module.menduner.system.controller.app.recruit.order.vo.AppRecruitTradeOrderRespVO;
 import com.citu.module.menduner.system.controller.base.order.AppTradeOrderGetReqVO;
 import com.citu.module.menduner.system.controller.base.order.AppTradeOrderGetRespVO;
 import com.citu.module.menduner.system.controller.base.order.TradeOrderCreateReqVO;
 import com.citu.module.menduner.system.controller.base.order.TradeOrderPageReqVO;
 import com.citu.module.menduner.system.dal.dataobject.order.TradeOrderDO;
 import com.citu.module.menduner.system.dal.mysql.order.TradeOrderMapper;
-import com.citu.module.menduner.system.enums.user.MdeUserTypeEnum;
 import com.citu.module.menduner.system.enums.order.TradeOrderCancelTypeEnum;
 import com.citu.module.menduner.system.enums.order.TradeOrderRefundStatusEnum;
 import com.citu.module.menduner.system.enums.order.TradeOrderStatusEnum;
 import com.citu.module.menduner.system.enums.order.TradeOrderTypeEnum;
+import com.citu.module.menduner.system.enums.user.MdeUserTypeEnum;
 import com.citu.module.menduner.system.mq.producer.OrderProducer;
 import com.citu.module.pay.api.order.PayOrderApi;
 import com.citu.module.pay.api.order.dto.PayOrderBaseRespDTO;
@@ -79,7 +80,7 @@ public class TradeOrderServiceImpl implements TradeOrderService {
     }
 
     @Override
-    public Long createOrder(TradeOrderCreateReqVO createReqVO,String payKey) {
+    public Long createOrder(TradeOrderCreateReqVO createReqVO, String payKey) {
         TradeOrderTypeEnum type = TradeOrderTypeEnum.getByType(createReqVO.getType());
         // 1.1 获得商品
         // 1.2 插入 订单
@@ -351,10 +352,12 @@ public class TradeOrderServiceImpl implements TradeOrderService {
         if (null == order) {
             return null;
         }
-        PayOrderBaseRespDTO respDTO = payOrderApi.getOrder2(order.getPayOrderId()).getCheckedData();
         AppTradeOrderGetRespVO respVO = new AppTradeOrderGetRespVO();
         respVO.setOrder(order);
-        respVO.setPayOrder(respDTO);
+        if (null != order.getPayOrderId()) {
+            PayOrderBaseRespDTO respDTO = payOrderApi.getOrder2(order.getPayOrderId()).getCheckedData();
+            respVO.setPayOrder(respDTO);
+        }
 
         return respVO;
     }