diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCuserFloatingLayerController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCuserFloatingLayerController.java index 3f46ef31f..e5fdf77bb 100755 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCuserFloatingLayerController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCuserFloatingLayerController.java @@ -9,6 +9,8 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; + +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -28,13 +30,16 @@ public class WxCuserFloatingLayerController extends BaseController { @Autowired WxCuserFloatingLayerService wxCuserFloatingLayerService; -// @AuthIgnore + @AuthIgnore @ApiOperation("获取浮层") @GetMapping("/getFloatingLayer") @ApiImplicitParams({ @ApiImplicitParam(name = "openId", value = "openId", dataType = "String", paramType = "query", required = true), @ApiImplicitParam(name = "appId", value = "appId", dataType = "String", paramType = "query", required = true)}) public ResultData getAppIcon(String openId, String appId) { + if (StringUtils.isBlank(openId)) { + return new ResultData(Result.UNLOGIN, "用户openId不能为空", null); + } WxFloatingLayer wxFloatingLayer = wxCuserFloatingLayerService.getFloatingLayer(openId, appId); return new ResultData(Result.SUCCESS, "查询成功", wxFloatingLayer); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponPasswordServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponPasswordServiceImpl.java index cf2e9fe0c..0a5d6213d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponPasswordServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponPasswordServiceImpl.java @@ -119,7 +119,16 @@ public class WxCouponPasswordServiceImpl implements WxCouponPasswordService { } String pwd = sb.toString(); if (!pwList.stream().anyMatch(oPwd->oPwd.equals(pwd))) { - pwList.add(pwd); + //判断是否已经在数据库里面是否存在了 + WxCouponPassword pwQ1 = new WxCouponPassword(); + pwQ1.updateTenantInfo(tenantEntity); + pwQ1.setPassword(pwd); + List palist = wxCouponPasswordMapper.findList(pwQ1); + if (null != palist && palist.size() > 0 ) { + continue; + }else { + pwList.add(pwd); + } } else { continue; }