订单修改优化

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/admin/order/OtcTradeOrderController.java

@@ -70,6 +70,7 @@ import java.util.Map;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
 
+import static com.yc.ship.framework.common.pojo.CommonResult.error;
 import static com.yc.ship.framework.common.pojo.CommonResult.success;
 import static com.yc.ship.framework.operatelog.core.enums.OperateTypeEnum.API;
 import static com.yc.ship.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
@@ -401,7 +402,11 @@ public class OtcTradeOrderController {
     @Operation(summary = "win-订单详情", description = "根据订单id查询订单详情")
     @PlatTenantEnv
     public CommonResult<TradeOrderRespNewVO> getOrderInfoNew(@Valid @RequestParam("id") Long id) {
-        return success(otcTradeOrderService.getOrderInfoNew(id));
+        TradeOrderRespNewVO orderInfoNew = otcTradeOrderService.getOrderInfoNew(id);
+        if(orderInfoNew == null) {
+            return error(500,"订单已修改请刷新页面后再试");
+        }
+        return success(orderInfoNew);
     }
 
     @GetMapping("/window/orderConfirmation")

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/insurance/InsuranceServiceImpl.java

@@ -336,6 +336,10 @@ public class InsuranceServiceImpl implements InsuranceService {
     @Transactional
     public void handleInsuranceQuery(BigDecimal amount, String policyNo, Long id, String status, String service) {
         InsuranceDO insuranceDO = insuranceMapper.selectById(id);
+        if(insuranceDO == null){
+            log.error("handleInsuranceQuery》insuranceDO is null{}", id);
+            return;
+        }
         insuranceDO.setPremium(amount);
         insuranceDO.setPolicyNo(policyNo);
         Integer insuranceStatus = InsuranceStatusEnum.INSURE.getValue();

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/orderjzdetail/OrderJzDetailServiceImpl.java

@@ -131,7 +131,7 @@ public class OrderJzDetailServiceImpl implements OrderJzDetailService {
 
     private String createSupplierJz(List<OrderJzDetailSaveReqVO> createReqVOList, TradeOrderDO tradeOrderDO) throws Exception {
         Long id = null;
-        String productId = "2034192879786524673";
+        String productId = "2034198456717037761";
         String method = "createOrder";
         String createOrderUrl = "http://10.3.10.50/app-api/travelhub-ops-trade/trade/ota/zshl/212/" + method;
         String userId = "67fd6a5e6a2a453a98f288b08d571234";

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

@@ -2337,6 +2337,9 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
     @Override
     public TradeOrderRespNewVO getOrderInfoNew(Long id) {
         TradeOrderDO tradeOrderDO = tradeOrderMapper.selectById(id);
+        if(tradeOrderDO == null){
+            return null;
+        }
         TradeOrderRespNewVO orderRespNewVO = BeanUtils.toBean(tradeOrderDO, TradeOrderRespNewVO.class);
         //设置房型数据
         List<TradeOrderRoomModelDO> roomModelDoList = tradeOrderRoomModelMapper.selectListByOrderId(id);