Merge remote-tracking branch 'origin/main' into main

ship-module-marketing/ship-module-marketing-biz/src/main/java/com/yc/ship/module/marketing/service/policy/PolicyServiceImpl.java

@@ -1,7 +1,6 @@
 package com.yc.ship.module.marketing.service.policy;
 
 import com.yc.ship.framework.common.util.collection.CollectionUtils;
-import com.yc.ship.framework.ip.core.utils.AreaUtils;
 import com.yc.ship.module.marketing.dal.dataobject.policydetail.PolicyDetailDO;
 import com.yc.ship.module.marketing.dal.mysql.policydetail.PolicyDetailMapper;
 import com.yc.ship.module.product.dal.dataobject.voyage.VoyageDO;
@@ -61,19 +60,15 @@ public class PolicyServiceImpl implements PolicyService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void updatePolicy(PolicySaveReqVO updateReqVO) {
-//        throw exception0(500, "暂不支持修改");
         // 更新
         PolicyDO updateObj = BeanUtils.toBean(updateReqVO, PolicyDO.class);
         policyMapper.updateById(updateObj);
-//        handlePolicyDetail(updateObj.getId(), updateReqVO);
     }
 
     @Override
     public void deletePolicy(Long id) {
         throw exception0(500, "暂不支持删除，请关闭使用状态");
         // 删除
-//        policyMapper.deleteById(id);
-//        policyDetailMapper.deleteByPolicyId(id);
     }
 
     private void handlePolicyDetail(Long policyId, PolicySaveReqVO reqVO) {
@@ -83,7 +78,7 @@ public class PolicyServiceImpl implements PolicyService {
         List<Long> areaIds = reqVO.getAreaIds();
         BigDecimal discountNum = reqVO.getDiscountNum();
         List<PolicyDetailDO> policyDetailDOList = new ArrayList<>();
-        voyageIds.stream().forEach(voyageId -> {
+        voyageIds.forEach(voyageId -> {
             PolicyDetailDO policyDetailDO = new PolicyDetailDO();
             policyDetailDO.setShipId(reqVO.getShipId());
             policyDetailDO.setPolicyId(policyId);
@@ -93,7 +88,7 @@ public class PolicyServiceImpl implements PolicyService {
             policyDetailDO.setSurplusNum(discountNum);
             policyDetailDOList.add(policyDetailDO);
         });
-        if(policyDetailDOList.size() > 0) {
+        if(!policyDetailDOList.isEmpty()) {
             policyDetailMapper.insertBatch(policyDetailDOList);
         }
     }
@@ -135,11 +130,11 @@ public class PolicyServiceImpl implements PolicyService {
         List<PolicyDO> policyList = policyMapper.selectList(policyIds);
         List<PolicyDO> result = policyList.stream().filter(policyDO -> {
             LocalDateTime boardingTime = voyage.getBoardingTime();
-            return boardingTime.plusDays(policyDO.getEarlyDays() * -1L).compareTo(LocalDateTime.now()) > 0;
+            return boardingTime.plusDays(policyDO.getEarlyDays() * -1L).isAfter(LocalDateTime.now());
         }).collect(Collectors.toList());
         List<PolicyRespVO> policyRespVOS = BeanUtils.toBean(result, PolicyRespVO.class);
         Map<Long, PolicyDetailDO> policyDetailDOMap = CollectionUtils.convertMap(filterPolicyDetails, PolicyDetailDO::getPolicyId);
-        policyRespVOS.stream().forEach(policyRespVO -> {
+        policyRespVOS.forEach(policyRespVO -> {
             PolicyDetailDO policyDetailDO = policyDetailDOMap.get(policyRespVO.getId());
             if(policyDetailDO != null) {
                 policyRespVO.setAreaIds(policyDetailDO.getAreaIds());
@@ -161,11 +156,11 @@ public class PolicyServiceImpl implements PolicyService {
         List<PolicyDO> policyList = policyMapper.selectList(policyIds);
         List<PolicyDO> result = policyList.stream().filter(policyDO -> {
             LocalDateTime boardingTime = voyage.getBoardingTime();
-            return boardingTime.plusDays(policyDO.getEarlyDays() * -1L).compareTo(LocalDateTime.now()) > 0;
+            return boardingTime.plusDays(policyDO.getEarlyDays() * -1L).isAfter(LocalDateTime.now());
         }).collect(Collectors.toList());
         List<PolicyRespVO> policyRespVOS = BeanUtils.toBean(result, PolicyRespVO.class);
         Map<Long, PolicyDetailDO> policyDetailDOMap = CollectionUtils.convertMap(policyDetails, PolicyDetailDO::getPolicyId);
-        policyRespVOS.stream().forEach(policyRespVO -> {
+        policyRespVOS.forEach(policyRespVO -> {
             PolicyDetailDO policyDetailDO = policyDetailDOMap.get(policyRespVO.getId());
             if(policyDetailDO != null) {
                 policyRespVO.setAreaIds(policyDetailDO.getAreaIds());

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/controller/admin/distributorDiscount/DistributorDiscountController.java

@@ -4,10 +4,9 @@ import com.yc.ship.framework.apilog.core.annotation.ApiAccessLog;
 import com.yc.ship.framework.common.pojo.CommonResult;
 import com.yc.ship.framework.common.pojo.PageParam;
 import com.yc.ship.framework.common.pojo.PageResult;
+import com.yc.ship.framework.common.util.collection.CollectionUtils;
 import com.yc.ship.framework.common.util.object.BeanUtils;
 import com.yc.ship.framework.excel.core.util.ExcelUtils;
-import com.yc.ship.framework.ip.core.Area;
-import com.yc.ship.framework.ip.core.utils.AreaUtils;
 import com.yc.ship.module.product.controller.admin.distributorDiscount.vo.DistributorDiscountCountryRespVO;
 import com.yc.ship.module.product.controller.admin.distributorDiscount.vo.DistributorDiscountPageReqVO;
 import com.yc.ship.module.product.controller.admin.distributorDiscount.vo.DistributorDiscountRespVO;
@@ -29,7 +28,6 @@ import java.io.IOException;
 import java.util.List;
 
 import static com.yc.ship.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
-import static com.yc.ship.framework.common.pojo.CommonResult.error;
 import static com.yc.ship.framework.common.pojo.CommonResult.success;
 
 @Tag(name = "管理后台 - 分销商专属折扣")
@@ -85,9 +83,12 @@ public class DistributorDiscountController {
         }
         DistributorDiscountRespVO bean = BeanUtils.toBean(distributorDiscount, DistributorDiscountRespVO.class);
         List<Long> areaId = bean.getAreaId();
+        if(CollectionUtils.isAnyEmpty(areaId)) {
+            return success(null);
+        }
         List<AreaCountryDTO> areaCountry = areaApi.getAreaCountryListByAreaIds(areaId);
         List<DistributorDiscountCountryRespVO> result = BeanUtils.toBean(areaCountry, DistributorDiscountCountryRespVO.class);
-        result.stream().forEach(item->{
+        result.forEach(item->{
             item.setId(distributorDiscount.getId());
             item.setDiscountNum(distributorDiscount.getDiscountNum());
         });

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

@@ -323,9 +323,7 @@ public class InsuranceServiceImpl implements InsuranceService {
         }
         insuranceDO.setInsuranceStatus(insuranceStatus);
         insuranceMapper.updateById(insuranceDO);
-        TradeOrderDO tradeOrderDO = tradeOrderMapper.selectById(orderId);
-        tradeOrderDO.setIsInsure(insuranceStatus);
-        tradeOrderMapper.updateById(tradeOrderDO);
+        tradeOrderMapper.update(new LambdaUpdateWrapper<TradeOrderDO>().set(TradeOrderDO::getIsInsure, insuranceStatus).eq(TradeOrderDO::getOrderNo, insuranceDO.getInsuranceNo()));
     }
 
     @Override

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

@@ -2341,11 +2341,15 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
         //设置游轮航次信息
         VoyageDO voyageDO = voyageService.getVoyage(tradeOrderDO.getVoyageId());
         orderRespNewVO.setVoyage(BeanUtils.toBean(voyageDO, VoyageRespVO.class));
-        ResourceRouteDO resourceRouteDO = resourceRouteMapper.selectById(voyageDO.getRouteId());
-        orderRespNewVO.setResourceRouteDO(resourceRouteDO);
+        if(voyageDO != null) {
+            ResourceRouteDO resourceRouteDO = resourceRouteMapper.selectById(voyageDO.getRouteId());
+            orderRespNewVO.setResourceRouteDO(resourceRouteDO);
+        }
         //设置游轮名称
         ResourceShipDO ship = shipService.getShip(tradeOrderDO.getShipId());
-        orderRespNewVO.setShipName(ship.getName());
+        if(ship != null) {
+            orderRespNewVO.setShipName(ship.getName());
+        }
         OrderJzDO orderJzDO = orderJzMapper.selectOne(OrderJzDO::getOrderId, orderRespNewVO.getId());
         orderRespNewVO.setOrderJz(orderJzDO);
         return orderRespNewVO;
@@ -2760,7 +2764,7 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
     }
 
     /**
-     * 导出游客名单列表-计调
+     * 导出游客名单列表-代理商
      *
      * 功能说明：
      * 1. 查询订单基础信息（船名、航期、航向）

ship-module-trade/ship-module-trade-biz/src/main/resources/mapper/order/TradeVisitorMapper.xml

@@ -331,6 +331,9 @@
         <if test="vo.otaId != null and vo.otaId != ''">
             AND tor.source_id = #{vo.otaId}
         </if>
+        <if test="vo.distributorId != null and vo.distributorId != ''">
+            AND tor.source_id = #{vo.distributorId}
+        </if>
         <if test="vo.otaCateId != null and vo.otaCateId != ''">
             AND od.ota_category_id = #{vo.otaCateId}
         </if>