Merge branch 'main' of http://git.wisesoft.net.cn/lishiqiang/ship-ota-server

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/service/voyagestockdistribute/VoyageStockDistributeNewServiceImpl.java

@@ -264,12 +264,13 @@ public class VoyageStockDistributeNewServiceImpl implements VoyageStockDistribut
         List<VoyageStockDistributeNewRespVO> list = new ArrayList<>();
         // 获取所有库存
         List<VoyageStockDetailDO> stockDetailDOList = voyageStockDetailService.getListByVoyageId(reqVO.getVoyageId());
-        List<VoyageStockDetailDO> stockDetailDOList1 = stockDetailDOList.stream().filter(item -> item.getCanSellNum().compareTo(BigDecimal.ZERO) > 0).collect(Collectors.toList());
+        //该处注释，按要求库存为0的也要放出来
+//        List<VoyageStockDetailDO> stockDetailDOList1 = stockDetailDOList.stream().filter(item -> item.getCanSellNum().compareTo(BigDecimal.ZERO) > 0).collect(Collectors.toList());
         //减去已分配的库存，剩下的就是共享库存
         List<VoyageStockDistributeNewDO> distributeNewList = voyageStockDistributeNewMapper.selectListByVoyageId(reqVO.getVoyageId(), reqVO.getType());
         Map<String, BigDecimal> distributeNewMap = CollectionUtils.convertMap(distributeNewList, item -> item.getRoomModelId() + "_" + item.getFloor(), item -> item.getNum());
 
-        stockDetailDOList1.forEach(item -> {
+        stockDetailDOList.forEach(item -> {
             BigDecimal bigDecimal = distributeNewMap.get(item.getRoomModelId() + "_" + item.getFloor());
             if (bigDecimal == null) {
                 bigDecimal = BigDecimal.ZERO;

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/job/InsuranceJob.java

@@ -0,0 +1,27 @@
+package com.yc.ship.module.trade.job;
+
+import com.yc.ship.framework.quartz.core.handler.JobHandler;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+/**
+ * 保险购买定时任务
+ * 1. 查询需要购买保险的订单，只有确认状态并且开航前一天才可购买保险
+ */
+@Component
+@Slf4j
+public class InsuranceJob implements JobHandler {
+    /**
+     * 执行定时任务
+     * 1.该定时任务会每天去查询开航前一天的航次，
+     * 2.根据航次去查询确认状态的订单，
+     * 3.购买保险
+     * @param param 传入的参数（当前未使用）
+     * @return 固定返回字符串"成功"
+     * @throws Exception 任务异常
+     */
+    @Override
+    public String execute(String param) {
+        return "success";
+    }
+}

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

@@ -1979,6 +1979,7 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
         orderData.put("linkMan", orderConfirmation.getLinkMan());
         orderData.put("linkMobile", orderConfirmation.getLinkMobile());
         orderData.put("amount", orderConfirmation.getAmount());
+        orderData.put("remark", orderConfirmation.getRemark());
 
         VoyageRespVO voyage = orderConfirmation.getVoyage();
         //此处改为订单号最后的序号，如CJXLY-20260526-YC-13订单，登船序号应为13
@@ -1990,11 +1991,12 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
         orderData.put("startTime", DateUtil.format(Date.from(voyage.getStartTime().atZone(ZoneOffset.ofHours(8)).toInstant()), "yyyy-MM-dd HH:mm"));
         orderData.put("leaveTime", DateUtil.format(Date.from(voyage.getLeaveTime().atZone(ZoneOffset.ofHours(8)).toInstant()), "yyyy-MM-dd HH:mm"));
 
-        String resourceRoute = "宜昌-重庆";
-        String resourceRouteEn = "Yichang-Chongqing";
-        if (voyage.getRouteResp() != null && voyage.getRouteResp().getDirection() != null && voyage.getRouteResp().getDirection() != 1) {
-            resourceRoute = "重庆-宜昌";
-            resourceRouteEn = "Chongqing-Yichang";
+        ResourceRouteDO resourceRouteDO = orderConfirmation.getResourceRouteDO();
+        String resourceRoute = "重庆-宜昌";
+        String resourceRouteEn = "Chongqing-Yichang";
+        if (resourceRouteDO != null && resourceRouteDO.getDirection() != null && resourceRouteDO.getDirection() == 1) {
+            resourceRoute = "宜昌-重庆";
+            resourceRouteEn = "Yichang-Chongqing";
         }
         orderData.put("resourceRoute", resourceRoute);
         orderData.put("resourceRouteEn", resourceRouteEn);