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

sckw-common/sckw-common-core/src/main/java/com/sckw/core/web/constant/HttpStatus.java

@@ -146,7 +146,7 @@ public class HttpStatus {
     public static final String COOPERATE_CANCEL_EXISTS = "未查询到可撤销的记录";
     public static final String ADDRESS_NOT_EXISTS = "未查询到地址记录或已失效";
     public static final String CONTRACT_NOT_EXISTS = "未查询到合同或已失效";
-    public static final String Data_NOT_EXISTS = "未查询到相关数据";
+    public static final String BANNER_NOT_EXISTS = "未查询到banner数据或已失效";
 
     /**自定义提示消息*/
     public static final String PASSWD_ERROR = "密码不正确";

sckw-modules/sckw-operation/src/main/java/com/sckw/operation/controller/KwoBannerController.java

@@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @date 2023/8/28
  */
 @RestController
-@RequestMapping("/bannerOperation")
+@RequestMapping("/kwoBanner")
 public class KwoBannerController {
 
     @Autowired

sckw-modules/sckw-operation/src/main/java/com/sckw/operation/model/vo/req/BannerAddReqVo.java

@@ -62,15 +62,9 @@ public class BannerAddReqVo extends PageRequest implements Serializable {
     /**
      * 排序
      */
-    @NotNull(message = "排序不能为空")
+
     private Integer sort;
 
-    /**
-     * 显示终端：苹果设备 ios、安卓设备 android、物流管家 pc、官网 pc-portal、管理系统 pc-background、移动端网页 mobile、全部终端 terminal
-     */
-    @NotBlank(message = "显示终端不能为空")
-    @Size(max = 40, message = "显示终端超长")
-    private String clientType;
 
     /**
      * 备注
@@ -84,23 +78,5 @@ public class BannerAddReqVo extends PageRequest implements Serializable {
     @NotNull(message = "状态不能为空")
     private Integer status;
 
-    /**
-     * 创建人
-     */
-    private String createBy;
-
-    /**
-     * 创建时间
-     */
-    private String createTime;
-
-    /**
-     * 更新时间
-     */
-    private String updateBy;
-    /**
-     * 更新时间
-     */
-    private String updateTime;
 
 }

sckw-modules/sckw-operation/src/main/java/com/sckw/operation/model/vo/req/BannerQueryReqVo.java

@@ -27,11 +27,6 @@ public class BannerQueryReqVo extends PageRequest implements Serializable {
      */
     private Integer status;
 
-    /**
-     * 显示终端：苹果设备 ios、安卓设备 android、物流管家 pc、官网 pc-portal、管理系统 pc-background、移动端网页 mobile、全部终端 terminal
-     */
-    private String clientType;
-
     /**
      * 创建开始时间（时间戳）
      */
@@ -46,10 +41,6 @@ public class BannerQueryReqVo extends PageRequest implements Serializable {
     @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date endTime;
 
-    /**
-     * 显示区域（0首页,1建材市场,2求购大厅,3运需广场,4运力大厅,5金融服务,6车后服务,7绿智新能）
-     */
-    private Long district;
 
     /**
      * 主键

sckw-modules/sckw-operation/src/main/java/com/sckw/operation/service/BannerService.java

@@ -61,7 +61,7 @@ public class BannerService {
         if (CollectionUtils.isEmpty(kwoBannerList)) {
             return PageHelperUtil.getPageResult(new PageInfo<>());
         }
-        List<BannerQueryResVo> list = getAddressQueryResVo(kwoBannerList);
+        List<BannerQueryResVo> list = getBannerQueryResVo(kwoBannerList);
         return PageHelperUtil.getPageResult(new PageInfo<>(list), kwoBannerList, reqVo.getPageSize());
     }
 
@@ -82,11 +82,11 @@ public class BannerService {
                 orderByDesc(KwoBanner::getUpdateTime);
 
         if (Objects.nonNull(reqVo.getStartTime())) {
-            wrapper.ge(KwoBanner::getCreateTime, reqVo.getStartTime());
+            wrapper.ge(KwoBanner::getStartTime, reqVo.getStartTime());
         }
 
         if (Objects.nonNull(reqVo.getEndTime())) {
-            wrapper.lt(KwoBanner::getCreateTime, DateUtil.offsetDay(reqVo.getEndTime(), 1));
+            wrapper.lt(KwoBanner::getEntTime, DateUtil.offsetDay(reqVo.getEndTime(), 1));
         }
 
         if (StringUtils.isNotBlank(reqVo.getIds())) {
@@ -103,10 +103,10 @@ public class BannerService {
      * @author: sky
      * @date 2023/7/18
      */
-    private List<BannerQueryResVo> getAddressQueryResVo(List<KwoBanner> kwoBanner) {
+    private List<BannerQueryResVo> getBannerQueryResVo(List<KwoBanner> kwoBanner) {
         List<BannerQueryResVo> list = new ArrayList<>();
         List<Long> userIds = kwoBanner.stream().map(KwoBanner::getCreateBy).distinct().toList();
-        List<Integer> types = kwoBanner.stream().map(KwoBanner::getDistrict).distinct().toList();
+
         Map<Long, UserCacheResDto> userCacheResDtoMap = commonBusinessService.queryUserCacheMapByIds(userIds);
 
         kwoBanner.forEach(item -> {
@@ -122,7 +122,6 @@ public class BannerService {
                 bannerQueryResVo.setDistrictName(bannerDistrictEnum.getName(item.getDistrict()).getName());
             }
 
-            //bannerQueryResVo.statusText(StringUtils.isNotBlank(item.getStatus()) ? "已设置" : "未设置");
             list.add(bannerQueryResVo);
         });
         return list;
@@ -162,9 +161,13 @@ public class BannerService {
     public void udpateService(BannerAddReqVo reqVo) {
         KwoBanner kwobanner = kwoBannerMapper.selectById(reqVo.getId());
         if (Objects.isNull(kwobanner)) {
-            throw new SystemException(HttpStatus.QUERY_FAIL_CODE, HttpStatus.Data_NOT_EXISTS);
+            throw new SystemException(HttpStatus.QUERY_FAIL_CODE, HttpStatus.BANNER_NOT_EXISTS);
         }
         BeanUtils.copyProperties(reqVo, kwobanner);
+        Date date = new Date();
+        Long userId = LoginUserHolder.getUserId();
+        kwobanner.setUpdateTime(date);
+        kwobanner.setUpdateBy(userId);
         if (kwoBannerMapper.updateById(kwobanner) <= 0) {
             throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.UPDATE_FAIL);
         }

sckw-modules/sckw-operation/src/main/java/com/sckw/operation/service/CommonBusinessService.java

@@ -39,53 +39,4 @@ public class CommonBusinessService {
         return remoteSystemService.queryUserCacheMapByIds(userIds);
     }
 
-
-    /**
-     * @param entIds 企业id
-     * @return EntCacheResDto
-     * @desc: 查企业信息
-     * @author: czh
-     * @date: 2023/7/12
-     */
-    public Map<Long, EntCacheResDto> queryEntCacheMapByIds(List<Long> entIds) {
-        return remoteSystemService.queryEntCacheMapByIds(entIds);
-    }
-
-    /**
-     * @param keys type#value,type#value
-     * @return Map
-     * @desc: 根据id查字典
-     * @author: czh
-     * @date: 2023/7/12
-     */
-    public Map<String, SysDictResDto> queryDictMapByTypeValues(String keys) {
-        return remoteSystemService.queryDictMapByTypeValues(keys);
-    }
-
-    /**
-     * @param type 当前企业的属性
-     * @return Integer
-     * @desc: 转换成相对的属性
-     * @author: czh
-     * @date: 2023/7/11
-     */
-    public Integer changeAttribute(Integer type) {
-        if (type == CooperateTypeEnum.SUPPLIER.getCode()) {
-            return CooperateTypeEnum.PURCHASER.getCode();
-        }
-
-        if (type == CooperateTypeEnum.PURCHASER.getCode()) {
-            return CooperateTypeEnum.SUPPLIER.getCode();
-        }
-
-        if (type == CooperateTypeEnum.CONSIGN.getCode()) {
-            return CooperateTypeEnum.CARRIAGE.getCode();
-        }
-
-        if (type == CooperateTypeEnum.CARRIAGE.getCode()) {
-            return CooperateTypeEnum.CONSIGN.getCode();
-        }
-
-        return Global.NO;
-    }
 }