分销商折扣优化和查询接口

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

@@ -69,8 +69,8 @@ public class DistributorDiscountController {
     @GetMapping("/getByTravlId")
     @Operation(summary = "获得分销商专属折扣")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    public CommonResult<DistributorDiscountRespVO> getByTravlId(@RequestParam("id") Long id) {
-        DistributorDiscountDO distributorDiscount = distributorDiscountService.getByTravlId(id);
+    public CommonResult<DistributorDiscountRespVO> getByTravlId(@RequestParam("id") Long id,@RequestParam("shipId") String shipId) {
+        DistributorDiscountDO distributorDiscount = distributorDiscountService.getByTravlId(id,shipId);
         if(distributorDiscount==null){
             return success(null);
         }

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

@@ -50,7 +50,7 @@ public class DistributorDiscountRespVO {
 
     @Schema(description = "试用游轮", example = "14940")
     @ExcelProperty("试用游轮")
-    private Long shipId;
+    private List<Long> shipId;
 
 
     @Schema(description = "备注", example = "你猜")

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

@@ -35,7 +35,7 @@ public class DistributorDiscountSaveReqVO {
     private List<Long> areaId;
 
     @Schema(description = "试用游轮", example = "14940")
-    private Long shipId;
+    private List<Long> shipId;
 
     @Schema(description = "备注", example = "你猜")
     private String remark;

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/dal/dataobject/distributorDiscount/DistributorDiscountDO.java

@@ -63,7 +63,7 @@ public class DistributorDiscountDO extends BaseDO {
     /**
      * 试用游轮
      */
-    private Long shipId;
+    private String shipId;
     /**
      * 备注
      */

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/service/distributorDiscount/DistributorDiscountService.java

@@ -43,7 +43,7 @@ public interface DistributorDiscountService {
      * @return 分销商专属折扣
      */
     DistributorDiscountDO getDistributorDiscount(Long id);
-    DistributorDiscountDO getByTravlId(Long id);
+    DistributorDiscountDO getByTravlId(Long id,String shipId);
 
     /**
      * 获得分销商专属折扣分页

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/service/distributorDiscount/DistributorDiscountServiceImpl.java

@@ -41,7 +41,13 @@ public class DistributorDiscountServiceImpl implements DistributorDiscountServic
         DistributorRespDTO distributor = otaDistributorApi.getDistributorById(createReqVO.getDistributorId());
         DistributorDiscountDO distributorDiscount = BeanUtils.toBean(createReqVO, DistributorDiscountDO.class);
         distributorDiscount.setId(IdWorker.getId(distributorDiscount));
-        distributorDiscount.setAreaId(createReqVO.getAreaId().toString()) ;
+        if(createReqVO.getAreaId()!=null) {
+            distributorDiscount.setAreaId(createReqVO.getAreaId().toString());
+        }
+        if(createReqVO.getShipId()!=null){
+            distributorDiscount.setShipId(createReqVO.getShipId().toString()) ;
+        }
+
         distributorDiscount.setDistributorName(distributor.getName()) ;
         distributorDiscountMapper.insert(distributorDiscount);
 
@@ -57,7 +63,12 @@ public class DistributorDiscountServiceImpl implements DistributorDiscountServic
         DistributorRespDTO distributor = otaDistributorApi.getDistributorById(updateReqVO.getDistributorId());
         // 更新
         DistributorDiscountDO updateObj = BeanUtils.toBean(updateReqVO, DistributorDiscountDO.class);
-        updateObj.setAreaId(updateReqVO.getAreaId().toString()) ;
+        if(updateReqVO.getAreaId()!=null) {
+            updateObj.setAreaId(updateReqVO.getAreaId().toString());
+        }
+        if(updateReqVO.getShipId()!=null) {
+            updateObj.setShipId(updateReqVO.getShipId().toString());
+        }
         updateObj.setDistributorName(distributor.getName()) ;
         distributorDiscountMapper.updateById(updateObj);
     }
@@ -82,8 +93,12 @@ public class DistributorDiscountServiceImpl implements DistributorDiscountServic
     }
 
     @Override
-    public DistributorDiscountDO getByTravlId(Long id) {
-         List<DistributorDiscountDO> distributorDiscountDOList = distributorDiscountMapper.selectList(new LambdaQueryWrapperX<DistributorDiscountDO>().eq(DistributorDiscountDO::getDistributorId, id));
+    public DistributorDiscountDO getByTravlId(Long id,String shipId) {
+         List<DistributorDiscountDO> distributorDiscountDOList = distributorDiscountMapper.selectList(
+                 new LambdaQueryWrapperX<DistributorDiscountDO>()
+                         .eq(DistributorDiscountDO::getDistributorId, id)
+                         .likeIfPresent(DistributorDiscountDO::getShipId, shipId)
+         );
         if(distributorDiscountDOList!=null && !distributorDiscountDOList.isEmpty()){
             return distributorDiscountDOList.get(0);
         }