代码优化

alien-entity/src/main/java/shop/alien/entity/store/vo/StoreInfoVo.java

@@ -100,7 +100,7 @@ public class StoreInfoVo extends StoreInfo {
     @ApiModelProperty(value = "营业执照图片地址")
     private List<String> businessLicenseAddress;
 
-    @ApiModelProperty(value = "营业执照图片地址")
+    @ApiModelProperty(value = "合同图片地址")
     private List<String> contractImageList;
 
     @ApiModelProperty(value = "续签合同图片地址")

alien-store/src/main/java/shop/alien/store/service/impl/StoreInfoServiceImpl.java

@@ -320,12 +320,13 @@ public class StoreInfoServiceImpl extends ServiceImpl<StoreInfoMapper, StoreInfo
         }
         // 获取当前时间
         LocalDate nowDay = LocalDate.now();
+        //经营许可证到期状态筛选 0 查询食品经营许可证已到期
         if(CommonConstant.FOOD_LICENCE_EXPIRE_STATUS.equals(foodLicenceWhetherExpiredStatus)){
             queryWrapper.lt("a.food_licence_expiration_time",nowDay);
-        } else if(CommonConstant.FOOD_LICENCE_ABOUT_TO_EXPIRE_STATUS.equals(foodLicenceWhetherExpiredStatus)){
+        } else if(CommonConstant.FOOD_LICENCE_ABOUT_TO_EXPIRE_STATUS.equals(foodLicenceWhetherExpiredStatus)){//经营许可证筛选状态 1 查询食品经营许可证即将到期 距离到期时间30天内
             queryWrapper.lt("a.food_licence_expiration_time",nowDay.plusDays(31))
                     .ge("a.food_licence_expiration_time",nowDay);
-        }else if(CommonConstant.FOOD_LICENCE_NOT_EXPIRED_STATUS.equals(foodLicenceWhetherExpiredStatus)){
+        }else if(CommonConstant.FOOD_LICENCE_NOT_EXPIRED_STATUS.equals(foodLicenceWhetherExpiredStatus)){//经营许可证筛选状态 2 查询食品经营许可证未到期 距离到期时间大于30天以上
             queryWrapper.gt("a.food_licence_expiration_time",nowDay.plusDays(31));
         }
         IPage<StoreInfoVo> storeInfoVoPage = storeInfoMapper.getStoreInfoVoPage(iPage, queryWrapper);
@@ -394,7 +395,7 @@ public class StoreInfoServiceImpl extends ServiceImpl<StoreInfoMapper, StoreInfo
                     long daysToExpire = ChronoUnit.DAYS.between(nowLocal, expDate);
                     record.setDaysToExpire(daysToExpire);
                 }
-                // 处理经营许可证到期时间回显状态
+                // 处理经营许可证到期时间回显状态 根据经营许可证筛选状态筛选
                 Date foodDate = record.getFoodLicenceExpirationTime();
                 if(foodDate != null){
                     // 获取当前时间
@@ -983,13 +984,13 @@ public class StoreInfoServiceImpl extends ServiceImpl<StoreInfoMapper, StoreInfo
         for (StoreImg storeImg : storeImgs) {
             storeImgPaths.add(storeImg.getImgUrl());
         }
+        result.setBusinessLicenseAddress(storeImgPaths);
         //存入合同图片地址
         List<StoreImg> storeContractImageImgs = storeImgMapper.selectList(new LambdaQueryWrapper<StoreImg>().eq(StoreImg::getStoreId, storeId).eq(StoreImg::getImgType, 15));
         List<String> storeContractImagePathImgs = new ArrayList<>();
         for (StoreImg storeImg : storeContractImageImgs) {
             storeContractImagePathImgs.add(storeImg.getImgUrl());
         }
-        result.setBusinessLicenseAddress(storeImgPaths);
         result.setContractImageList(storeContractImagePathImgs);
         //存入续签合同地址
         List<StoreImg> renewContractImgs = storeImgMapper.selectList(new LambdaQueryWrapper<StoreImg>().eq(StoreImg::getStoreId, storeId).eq(StoreImg::getImgType, 22));