Bläddra i källkod

运营人员bugfix

chao 3 år sedan
förälder
incheckning
3ea6e8f899

+ 3 - 0
src/main/java/com/caimei365/user/controller/OperationApi.java

@@ -56,6 +56,9 @@ public class OperationApi {
     @ApiOperation("更新运营人员邀请码")
     @PostMapping("/code/update")
     public ResponseJson updateInvitationCode(OperationDto operationDto){
+        if (null == operationDto.getId()){
+            return ResponseJson.error("运营人员Id不能为空!");
+        }
         return operationService.updateInvitationCode(operationDto);
     }
 

+ 1 - 1
src/main/java/com/caimei365/user/controller/ShopApi.java

@@ -146,7 +146,7 @@ public class ShopApi {
      * 供应商-删除轮播图片
      * @param shopBannerDto { id  图片id}
      */
-    @ApiOperation("供应商-更新轮播图片(旧:/supplier/deleteShopBanner)")
+    @ApiOperation("供应商-删除轮播图片(旧:/supplier/deleteShopBanner)")
     @PostMapping("/home/images/delete")
     public ResponseJson<Void> deleteShopHomeImages(ShopBannerDto shopBannerDto) {
         if (null == shopBannerDto.getId()) {

+ 2 - 2
src/main/java/com/caimei365/user/service/impl/ClubServiceImpl.java

@@ -508,7 +508,7 @@ public class ClubServiceImpl implements ClubService {
             return ResponseJson.error("用户身份错误", null);
         }
         // 会员机构
-        boolean userFlag1 = (StringUtils.isNotBlank(club.getLinkMan()) && StringUtils.isNotBlank(user.getBindMobile()) && StringUtils.isNotBlank(club.getContractPhone()) && StringUtils.isNotBlank(club.getFax()) && StringUtils.isNotBlank(club.getProfile()) && StringUtils.isNotBlank(club.getName()) && StringUtils.isNotBlank(user.getEmail()) && StringUtils.isNotBlank(club.getShortName()) && club.getProvinceId() != 0 && club.getCityId() != 0 && club.getTownId() != 0 && StringUtils.isNotBlank(club.getAddress()) && StringUtils.isNotBlank(club.getSocialCreditCode()) && StringUtils.isNotBlank(club.getBusinessLicense()) && StringUtils.isNotBlank(club.getShopPhoto()) && null != club.getFirstClubType() && StringUtils.isNotBlank(club.getMainProduct()));
+        boolean userFlag1 = (StringUtils.isNotBlank(club.getLinkMan()) && StringUtils.isNotBlank(user.getBindMobile()) && StringUtils.isNotBlank(club.getContractPhone()) && StringUtils.isNotBlank(club.getFax()) && StringUtils.isNotBlank(club.getProfile()) && StringUtils.isNotBlank(club.getName()) && StringUtils.isNotBlank(user.getEmail()) && StringUtils.isNotBlank(club.getShortName()) && club.getProvinceId() != null && club.getProvinceId() != 0 && club.getCityId() != null && club.getCityId() != 0 && club.getTownId() != null && club.getTownId() != 0 && StringUtils.isNotBlank(club.getAddress()) && StringUtils.isNotBlank(club.getSocialCreditCode()) && StringUtils.isNotBlank(club.getBusinessLicense()) && StringUtils.isNotBlank(club.getShopPhoto()) && null != club.getFirstClubType() && StringUtils.isNotBlank(club.getMainProduct()));
         // 普通机构
         boolean userFlag2 = (StringUtils.isNotBlank(club.getLinkMan()) && StringUtils.isNotBlank(user.getBindMobile()) && StringUtils.isNotBlank(club.getContractPhone()) && StringUtils.isNotBlank(club.getFax()) && StringUtils.isNotBlank(club.getProfile()));
         boolean degreeFlag = (user.getUserIdentity() == 4 && userFlag1) || (user.getUserIdentity() == 2 && userFlag2);
@@ -526,7 +526,7 @@ public class ClubServiceImpl implements ClubService {
         // 7.今日推荐
         int floorId = 6;
         int index = 1;
-        String homeAdvertiseKey = "home_advertise_" + floorId;
+        String homeAdvertiseKey = "user_advertise_" + floorId;
         if (!redisService.exists(homeAdvertiseKey)) {
             AdvertiseVo homePageAdvertise = new AdvertiseVo();
             homePageAdvertise.setAdvertiseTypeId(1001);

+ 3 - 0
src/main/java/com/caimei365/user/service/impl/OperationServiceImpl.java

@@ -112,6 +112,9 @@ public class OperationServiceImpl implements OperationService {
     @Override
     public ResponseJson updateInvitationCode(OperationDto operationDto) {
         OperationPo operation = operationMapper.getOperationCodeInfoById(operationDto.getId());
+        if (null == operation){
+            return ResponseJson.error("运营人员数据异常!");
+        }
         int flag = 0;
         if (operation.getStatus() == 2) {
             return ResponseJson.error("该邀请码已绑定");