禅道bug修改

ship-module-otc/ship-module-otc-biz/src/main/java/com/yc/ship/module/otc/controller/admin/otclevel/vo/OtcLevelRespVO.java

@@ -5,6 +5,7 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.List;
 
@@ -23,7 +24,7 @@ public class OtcLevelRespVO {
 
     @Schema(description = "折扣率 80 90 ...", example = "20887")
     @ExcelProperty("折扣率 80 90 ...")
-    private Integer discount;
+    private BigDecimal discount;
 
     @Schema(description = "政策描述", example = "随便")
     @ExcelProperty("政策描述")

ship-module-otc/ship-module-otc-biz/src/main/java/com/yc/ship/module/otc/controller/admin/otclevel/vo/OtcLevelSaveReqVO.java

@@ -3,6 +3,7 @@ package com.yc.ship.module.otc.controller.admin.otclevel.vo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 @Schema(description = "管理后台 - 旅行社等级管理新增/修改 Request VO")
@@ -16,7 +17,7 @@ public class OtcLevelSaveReqVO {
     private String levelName;
 
     @Schema(description = "折扣率 80 90 ...", example = "20887")
-    private Integer discount;
+    private BigDecimal discount;
 
     @Schema(description = "政策描述", example = "随便")
     private String remark;

ship-module-otc/ship-module-otc-biz/src/main/java/com/yc/ship/module/otc/controller/admin/store/StoreController.java

@@ -275,11 +275,12 @@ public class StoreController {
     @Parameter(name = "id", description = "编号", required = true)
     @Operation(summary = "删除门店账号关联")
     @PreAuthorize("@ss.hasPermission('otc:store:delete')")
-    public CommonResult<Boolean> deleteStoreUser(@RequestParam("id") Long id) {
-        storeService.deleteStoreUser(id);
+    public CommonResult<Boolean> deleteStoreUser(@RequestParam("id") Long id,@RequestParam("storeId") Long storeId) {
+        storeService.deleteStoreUserByUserId(id,storeId);
         return success(true);
     }
 
+
     @GetMapping("/store-user/get")
     @Operation(summary = "获得门店账号关联")
     @Parameter(name = "id", description = "编号", required = true)

ship-module-otc/ship-module-otc-biz/src/main/java/com/yc/ship/module/otc/dal/dataobject/otclevel/OtcLevelDO.java

@@ -3,6 +3,8 @@ package com.yc.ship.module.otc.dal.dataobject.otclevel;
 import com.yc.ship.framework.mybatis.core.dataobject.BaseDO;
 import com.yc.ship.framework.tenant.core.db.TenantBaseDO;
 import lombok.*;
+
+import java.math.BigDecimal;
 import java.util.*;
 import com.baomidou.mybatisplus.annotation.*;
 
@@ -33,7 +35,7 @@ public class OtcLevelDO extends BaseDO {
     /**
      * 折扣率 80 90 ...
      */
-    private Integer discount;
+    private BigDecimal discount;
     /**
      * 政策描述
      */

ship-module-otc/ship-module-otc-biz/src/main/java/com/yc/ship/module/otc/dal/mysql/otclevel/OtcLevelMapper.java

@@ -16,11 +16,18 @@ import org.apache.ibatis.annotations.Mapper;
 public interface OtcLevelMapper extends BaseMapperX<OtcLevelDO> {
 
     default PageResult<OtcLevelDO> selectPage(OtcLevelPageReqVO reqVO) {
-        return selectPage(reqVO, new LambdaQueryWrapperX<OtcLevelDO>()
-                .likeIfPresent(OtcLevelDO::getLevelName, reqVO.getLevelName())
-                .eqIfPresent(OtcLevelDO::getHotelRoomType, reqVO.getHotelRoomType())
-                .betweenIfPresent(OtcLevelDO::getCreateTime, reqVO.getCreateTime())
-                .orderByDesc(OtcLevelDO::getId));
+        if(reqVO.getHotelRoomType()!=null) {
+            return selectPage(reqVO, new LambdaQueryWrapperX<OtcLevelDO>()
+                    .likeIfPresent(OtcLevelDO::getLevelName, reqVO.getLevelName())
+                    .likeIfPresent(OtcLevelDO::getHotelRoomType, reqVO.getHotelRoomType() + "")
+                    .betweenIfPresent(OtcLevelDO::getCreateTime, reqVO.getCreateTime())
+                    .orderByDesc(OtcLevelDO::getId));
+        }else {
+            return selectPage(reqVO, new LambdaQueryWrapperX<OtcLevelDO>()
+                    .likeIfPresent(OtcLevelDO::getLevelName, reqVO.getLevelName())
+                    .betweenIfPresent(OtcLevelDO::getCreateTime, reqVO.getCreateTime())
+                    .orderByDesc(OtcLevelDO::getId));
+        }
     }
 
 }

ship-module-otc/ship-module-otc-biz/src/main/java/com/yc/ship/module/otc/dal/mysql/store/StoreUserMapper.java

@@ -27,6 +27,12 @@ public interface StoreUserMapper extends BaseMapperX<StoreUserDO> {
         return delete(StoreUserDO::getStoreId, storeId);
     }
 
+    default int deleteStoreUserByUserId(Long userId,Long storeId) {
+        return delete(new LambdaQueryWrapperX<StoreUserDO>()
+                .eq(StoreUserDO::getUserId, userId)
+                .eq(StoreUserDO::getStoreId, storeId));
+    }
+
     default StoreUserDO selectStoreUser(Long userId, Long storeId) {
         return selectOne(StoreUserDO::getUserId, userId, StoreUserDO::getStoreId, storeId);
     }

ship-module-otc/ship-module-otc-biz/src/main/java/com/yc/ship/module/otc/service/store/StoreService.java

@@ -174,6 +174,7 @@ public interface StoreService {
      * @param id 编号
      */
     void deleteStoreUser(Long id);
+    void deleteStoreUserByUserId(Long userId,Long storeId);
 
     /**
      * 获得门店账号关联

ship-module-otc/ship-module-otc-biz/src/main/java/com/yc/ship/module/otc/service/store/StoreServiceImpl.java

@@ -401,6 +401,12 @@ public class StoreServiceImpl implements StoreService {
         storeUserMapper.deleteById(id);
     }
 
+    @Override
+    public void deleteStoreUserByUserId(Long userId, Long storeId) {
+        storeUserMapper.deleteStoreUserByUserId(userId, storeId);
+        adminUserApi.updateUserStore(userId, null);
+    }
+
     @Override
     public List<StoreUserDO> getStoreUser(Long storeId) {
         return storeUserMapper.selectList(StoreUserDO::getStoreId, storeId);

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

@@ -7,6 +7,7 @@ import com.yc.ship.framework.excel.core.convert.DictConvert;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.List;
 
@@ -40,9 +41,7 @@ public class DistributorDiscountRespVO {
     private LocalDateTime endTime;
 
     @Schema(description = "折扣比例")
-    @ExcelProperty(value = "折扣比例", converter = DictConvert.class)
-    @DictFormat("regional_division") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中
-    private Long discountNum;
+    private BigDecimal discountNum;
 
     @Schema(description = "适用区域", example = "22671")
     @ExcelProperty("适用区域")

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

@@ -3,6 +3,7 @@ package com.yc.ship.module.product.controller.admin.distributorDiscount.vo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.List;
 
@@ -29,7 +30,7 @@ public class DistributorDiscountSaveReqVO {
     private LocalDateTime endTime;
 
     @Schema(description = "折扣比例")
-    private Long discountNum;
+    private BigDecimal discountNum;
 
     @Schema(description = "适用区域", example = "22671")
     private List<Long> areaId;

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

@@ -7,6 +7,7 @@ import com.yc.ship.framework.mybatis.core.dataobject.BaseDO;
 import com.yc.ship.framework.tenant.core.db.TenantBaseDO;
 import lombok.*;
 
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.List;
 
@@ -55,7 +56,7 @@ public class DistributorDiscountDO extends BaseDO {
      *
      * 枚举 {@link }
      */
-    private Long discountNum;
+    private BigDecimal discountNum;
     /**
      * 适用区域
      */