fix: 优化代码结构

buyer-api/src/main/java/cn/lili/controller/distribution/DistributionGoodsBuyerController.java

@@ -54,22 +54,22 @@ public class DistributionGoodsBuyerController {
     @PreventDuplicateSubmissions
     @ApiOperation(value = "选择分销商品")
     @ApiImplicitParams({
-        @ApiImplicitParam(name = "distributionGoodsId", value = "分销ID", required = true, dataType = "String", paramType = "path"),
+            @ApiImplicitParam(name = "distributionGoodsId", value = "分销ID", required = true, dataType = "String", paramType = "path"),
             @ApiImplicitParam(name = "checked", value = "是否选择", required = true, dataType = "boolean", paramType = "query")
     })
     @GetMapping(value = "/checked/{distributionGoodsId}")
     public ResultMessage<Object> distributionCheckGoods(
-            @NotNull(message = "分销商品不能为空") @PathVariable("distributionGoodsId") String distributionGoodsId,Boolean checked) {
+            @NotNull(message = "分销商品不能为空") @PathVariable("distributionGoodsId") String distributionGoodsId, Boolean checked) {
-        Boolean result=false;
+        Boolean result = false;
-        if(checked){
+        if (checked) {
-            result=distributionSelectedGoodsService.add(distributionGoodsId);
+            result = distributionSelectedGoodsService.add(distributionGoodsId);
-        }else {
+        } else {
-            result=distributionSelectedGoodsService.delete(distributionGoodsId);
+            result = distributionSelectedGoodsService.delete(distributionGoodsId);
         }
         //判断操作结果
-        if(result){
+        if (result) {
             return ResultUtil.success(ResultCode.SUCCESS);
-        }else{
+        } else {
             throw new ServiceException(ResultCode.ERROR);
         }
 

consumer/src/main/java/cn/lili/event/impl/RegisteredCouponActivityExecute.java

@@ -1,8 +1,8 @@
 package cn.lili.event.impl;
 
+import cn.hutool.core.text.CharSequenceUtil;
 import cn.lili.cache.Cache;
 import cn.lili.cache.CachePrefix;
-import cn.lili.common.utils.StringUtils;
 import cn.lili.event.MemberRegisterEvent;
 import cn.lili.modules.member.entity.dos.Member;
 import cn.lili.modules.member.service.MemberService;
@@ -46,7 +46,7 @@ public class RegisteredCouponActivityExecute implements MemberRegisterEvent {
                 .build());
         //邀请人赠券
         String memberId = (String) cache.get(CachePrefix.INVITER.getPrefix() + member.getId());
-        if (StringUtils.isNotEmpty(memberId)) {
+        if (CharSequenceUtil.isNotEmpty(memberId)) {
             //邀请人
             Member inviter = memberService.getById(memberId);
             couponActivityService.trigger(CouponActivityTrigger.builder()

framework/src/main/java/cn/lili/modules/goods/entity/vos/DraftGoodsVO.java

@@ -5,6 +5,7 @@ import cn.lili.modules.goods.entity.dos.Wholesale;
 import cn.lili.modules.goods.entity.dto.GoodsParamsDTO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.util.List;
 
@@ -14,6 +15,7 @@ import java.util.List;
  * @author pikachu
  * @since 2020-02-26 23:24:13
  */
+@EqualsAndHashCode(callSuper = true)
 @Data
 public class DraftGoodsVO extends DraftGoods {
 

framework/src/main/java/cn/lili/modules/member/entity/dos/FootPrint.java

@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
 
@@ -15,6 +16,7 @@ import lombok.NoArgsConstructor;
  * @author Chopper
  * @since 2020/11/17 7:22 下午
  */
+@EqualsAndHashCode(callSuper = true)
 @Data
 @TableName("li_foot_print")
 @ApiModel(value = "浏览历史")

framework/src/main/java/cn/lili/modules/member/entity/dos/MemberEvaluation.java

@@ -1,9 +1,9 @@
 package cn.lili.modules.member.entity.dos;
 
+import cn.hutool.core.text.CharSequenceUtil;
 import cn.lili.common.enums.SwitchEnum;
 import cn.lili.common.security.sensitive.Sensitive;
 import cn.lili.common.security.sensitive.enums.SensitiveStrategy;
-import cn.lili.common.utils.StringUtils;
 import cn.lili.modules.goods.entity.dos.GoodsSku;
 import cn.lili.modules.member.entity.dto.MemberEvaluationDTO;
 import cn.lili.modules.order.order.entity.dos.Order;
@@ -131,7 +131,7 @@ public class MemberEvaluation extends BaseEntity {
         //设置订单编号
         this.orderNo = order.getSn();
         //是否包含图片
-        this.haveImage = StringUtils.isNotEmpty(memberEvaluationDTO.getImages());
+        this.haveImage = CharSequenceUtil.isNotEmpty(memberEvaluationDTO.getImages());
         //默认开启评价
         this.status = SwitchEnum.OPEN.name();
     }

framework/src/main/java/cn/lili/modules/member/service/StoreLogisticsService.java

@@ -89,5 +89,4 @@ public interface StoreLogisticsService extends IService<StoreLogistics> {
      */
     List<StoreLogisticsVO> getCloseStoreLogistics(String storeId);
 
-
 }

framework/src/main/java/cn/lili/modules/member/serviceimpl/ClerkServiceImpl.java

@@ -4,7 +4,6 @@ import cn.hutool.core.text.CharSequenceUtil;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
 import cn.lili.common.security.context.UserContext;
-import cn.lili.common.utils.BeanUtil;
 import cn.lili.common.utils.StringUtils;
 import cn.lili.common.vo.PageVO;
 import cn.lili.modules.member.entity.dos.Clerk;
@@ -20,7 +19,6 @@ import cn.lili.modules.member.service.*;
 import cn.lili.mybatis.util.PageUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -60,9 +58,8 @@ public class ClerkServiceImpl extends ServiceImpl<ClerkMapper, Clerk> implements
         clerkVOQueryWrapper.eq(StringUtils.isNotEmpty(clerkQueryDTO.getDepartmentId()), "li_clerk.department_id", clerkQueryDTO.getDepartmentId());
         clerkVOQueryWrapper.like(StringUtils.isNotEmpty(clerkQueryDTO.getClerkName()), "li_clerk.clerk_name", clerkQueryDTO.getClerkName());
         clerkVOQueryWrapper.like(StringUtils.isNotEmpty(clerkQueryDTO.getMobile()), "m.mobile", clerkQueryDTO.getMobile());
-        IPage<ClerkVO> clerkPage = this.baseMapper.selectClerkPage(PageUtil.initPage(page), clerkVOQueryWrapper);
 
-        return clerkPage;
+        return this.baseMapper.selectClerkPage(PageUtil.initPage(page), clerkVOQueryWrapper);
 
 
         /*Page<Clerk> clerkPage = page(initPage, initWrapper);

framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java

@@ -42,7 +42,6 @@ import cn.lili.modules.store.service.StoreService;
 import cn.lili.mybatis.util.PageUtil;
 import cn.lili.rocketmq.RocketmqSendCallbackBuilder;
 import cn.lili.rocketmq.tags.MemberTagsEnum;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -715,7 +714,6 @@ public class MemberServiceImpl extends ServiceImpl<MemberMapper, Member> impleme
 
     @Override
     public MemberVO getMember(String id) {
-        Member byId = this.getById(id);
         return new MemberVO(this.getById(id));
     }
 

framework/src/main/java/cn/lili/modules/member/serviceimpl/StoreLogisticsServiceImpl.java

@@ -45,7 +45,7 @@ public class StoreLogisticsServiceImpl extends ServiceImpl<StoreLogisticsMapper,
     }
 
     @Override
-    public StoreLogistics update(String logisticsId, String storeId,StoreLogisticsCustomerDTO storeLogisticsCustomerDTO) {
+    public StoreLogistics update(String logisticsId, String storeId, StoreLogisticsCustomerDTO storeLogisticsCustomerDTO) {
         LambdaQueryWrapper<StoreLogistics> lambdaQueryWrapper = Wrappers.lambdaQuery();
         lambdaQueryWrapper.eq(StoreLogistics::getLogisticsId, logisticsId);
         lambdaQueryWrapper.eq(StoreLogistics::getStoreId, storeId);
@@ -58,15 +58,15 @@ public class StoreLogisticsServiceImpl extends ServiceImpl<StoreLogisticsMapper,
     }
 
     @Override
-    public StoreLogistics getStoreLogisticsInfo( String logisticsId) {
+    public StoreLogistics getStoreLogisticsInfo(String logisticsId) {
         String storeId = Objects.requireNonNull(UserContext.getCurrentUser()).getStoreId();
-        return this.getOne(new LambdaQueryWrapper<StoreLogistics>().eq(StoreLogistics::getStoreId,storeId).eq(StoreLogistics::getLogisticsId,logisticsId));
+        return this.getOne(new LambdaQueryWrapper<StoreLogistics>().eq(StoreLogistics::getStoreId, storeId).eq(StoreLogistics::getLogisticsId, logisticsId));
     }
 
     @Override
     public List<StoreLogisticsVO> getOpenStoreLogistics(String storeId) {
         List<StoreLogisticsVO> openStoreLogistics = this.baseMapper.getOpenStoreLogistics(storeId);
-        for(StoreLogisticsVO storeLogisticsVO:openStoreLogistics){
+        for (StoreLogisticsVO storeLogisticsVO : openStoreLogistics) {
             storeLogisticsVO.setSelected("1");
         }
         return openStoreLogistics;
@@ -78,19 +78,19 @@ public class StoreLogisticsServiceImpl extends ServiceImpl<StoreLogisticsMapper,
     }
 
     @Override
-    public StoreLogistics add(String logisticsId, String storeId, StoreLogisticsCustomerDTO storeLogisticsCustomerDTO){
+    public StoreLogistics add(String logisticsId, String storeId, StoreLogisticsCustomerDTO storeLogisticsCustomerDTO) {
         //判断是否已经选择过，如果没有选择则进行添加
         LambdaQueryWrapper<StoreLogistics> lambdaQueryWrapper = Wrappers.lambdaQuery();
         lambdaQueryWrapper.eq(StoreLogistics::getLogisticsId, logisticsId);
         lambdaQueryWrapper.eq(StoreLogistics::getStoreId, storeId);
-        StoreLogistics storeLogistics=null;
+        StoreLogistics storeLogistics = null;
         if (this.getOne(lambdaQueryWrapper) == null) {
-        storeLogistics=new StoreLogistics(storeLogisticsCustomerDTO);
+            storeLogistics = new StoreLogistics(storeLogisticsCustomerDTO);
-        storeLogistics.setStoreId(storeId);
+            storeLogistics.setStoreId(storeId);
-        storeLogistics.setLogisticsId(logisticsId);
+            storeLogistics.setLogisticsId(logisticsId);
-        this.save(storeLogistics);
+            this.save(storeLogistics);
-        return storeLogistics;
+            return storeLogistics;
-    }
+        }
         return null;
     }
 

framework/src/main/java/cn/lili/modules/promotion/entity/dos/CouponActivity.java

@@ -23,6 +23,7 @@ import javax.validation.constraints.NotNull;
 @ApiModel(value = "优惠券活动实体类")
 public class CouponActivity extends BasePromotions {
 
+    private static final long serialVersionUID = 4230258450334305951L;
     /**
      * @see CouponActivityTypeEnum
      */

framework/src/main/java/cn/lili/modules/promotion/entity/vos/MemberCouponVO.java

@@ -5,6 +5,7 @@ import cn.lili.modules.promotion.entity.dos.MemberCoupon;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
 
 /**
  * MemberCouponVO
@@ -15,6 +16,7 @@ import lombok.EqualsAndHashCode;
  */
 @EqualsAndHashCode(callSuper = true)
 @Data
+@NoArgsConstructor
 public class MemberCouponVO extends MemberCoupon {
 
     private static final long serialVersionUID = -5533168813075444962L;
@@ -30,7 +32,4 @@ public class MemberCouponVO extends MemberCoupon {
         this.reason = reason;
     }
 
-    public MemberCouponVO(){
-
-    }
 }

framework/src/main/java/cn/lili/modules/promotion/service/PromotionGoodsService.java

@@ -7,7 +7,7 @@ import cn.lili.modules.goods.entity.dos.GoodsSku;
 import cn.lili.modules.goods.entity.dto.GoodsSkuDTO;
 import cn.lili.modules.promotion.entity.dos.PromotionGoods;
 import cn.lili.modules.promotion.entity.dto.search.PromotionGoodsSearchParams;
-import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.Date;
@@ -60,7 +60,7 @@ public interface PromotionGoodsService extends IService<PromotionGoods> {
      * @param pageVo       分页参数
      * @return 促销商品列表
      */
-    IPage<PromotionGoods> pageFindAll(PromotionGoodsSearchParams searchParams, PageVO pageVo);
+    Page<PromotionGoods> pageFindAll(PromotionGoodsSearchParams searchParams, PageVO pageVo);
 
     /**
      * 获取促销商品信息

framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PromotionGoodsServiceImpl.java

@@ -29,7 +29,7 @@ import cn.lili.mybatis.util.PageUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
@@ -115,7 +115,7 @@ public class PromotionGoodsServiceImpl extends ServiceImpl<PromotionGoodsMapper,
     }
 
     @Override
-    public IPage<PromotionGoods> pageFindAll(PromotionGoodsSearchParams searchParams, PageVO pageVo) {
+    public Page<PromotionGoods> pageFindAll(PromotionGoodsSearchParams searchParams, PageVO pageVo) {
         return this.page(PageUtil.initPage(pageVo), searchParams.queryWrapper());
     }