diff --git a/mall-account/src/main/java/com/suisung/mall/account/controller/admin/AccountController.java b/mall-account/src/main/java/com/suisung/mall/account/controller/admin/AccountController.java index 4636e6b1..246e153f 100644 --- a/mall-account/src/main/java/com/suisung/mall/account/controller/admin/AccountController.java +++ b/mall-account/src/main/java/com/suisung/mall/account/controller/admin/AccountController.java @@ -478,17 +478,15 @@ public class AccountController { } @RequestMapping(value = "/getAllBindPage", method = RequestMethod.GET) - public List getAllBindPage(@RequestParam(name = "bind_type") Integer bind_type, - @RequestParam(name = "bindTmpl") String bindTmpl, + public List getAllBindPage(@RequestParam(name = "bindTmpl") String bindTmpl, @RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { - return accountUserBindConnectService.getAllBindPage(bind_type,bindTmpl,pageNum,pageSize); + return accountUserBindConnectService.getAllBindPage(bindTmpl,pageNum,pageSize); } @RequestMapping(value = "/getAllBindCount", method = RequestMethod.GET) - public long getAllBindCount(@RequestParam(name = "bind_type") Integer bind_type, - @RequestParam(name = "bindTmpl") String bindTmpl) { - return accountUserBindConnectService.getAllBindCount(bind_type,bindTmpl); + public long getAllBindCount(@RequestParam(name = "bindTmpl") String bindTmpl) { + return accountUserBindConnectService.getAllBindCount(bindTmpl); } } diff --git a/mall-account/src/main/java/com/suisung/mall/account/service/AccountUserBindConnectService.java b/mall-account/src/main/java/com/suisung/mall/account/service/AccountUserBindConnectService.java index 96d06ee5..ebc26691 100644 --- a/mall-account/src/main/java/com/suisung/mall/account/service/AccountUserBindConnectService.java +++ b/mall-account/src/main/java/com/suisung/mall/account/service/AccountUserBindConnectService.java @@ -89,9 +89,9 @@ public interface AccountUserBindConnectService extends IBaseService getAllBindPage(Integer bind_type,String bindTmpl,Integer pageNum, Integer pageSize); + List getAllBindPage(String bindTmpl,Integer pageNum, Integer pageSize); - long getAllBindCount(Integer bind_type,String bindTmpl); + long getAllBindCount(String bindTmpl); void bindTmplId(JSONObject jsonObject); } diff --git a/mall-account/src/main/java/com/suisung/mall/account/service/impl/AccountUserBindConnectServiceImpl.java b/mall-account/src/main/java/com/suisung/mall/account/service/impl/AccountUserBindConnectServiceImpl.java index 10024cd2..45a1e1c9 100644 --- a/mall-account/src/main/java/com/suisung/mall/account/service/impl/AccountUserBindConnectServiceImpl.java +++ b/mall-account/src/main/java/com/suisung/mall/account/service/impl/AccountUserBindConnectServiceImpl.java @@ -504,10 +504,10 @@ public class AccountUserBindConnectServiceImpl extends BaseServiceImpl getAllBindPage(Integer bind_type,String bindTmpl,Integer pageNum, Integer pageSize) { + public List getAllBindPage(String bindTmpl,Integer pageNum, Integer pageSize) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.select("bind_id,bind_type,user_id,user_type"); - queryWrapper.eq("bind_type", bind_type) + queryWrapper.in("bind_type", Arrays.asList(BindCode.MOBILE,BindCode.WEIXIN_XCX)) .eq("user_type", CommonConstant.USER_TYPE_NORMAL) .eq("bind_active", CommonConstant.Enable) .eq("bind_tmpl",bindTmpl) @@ -516,9 +516,9 @@ public class AccountUserBindConnectServiceImpl extends BaseServiceImpl queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("bind_type", bind_type) + queryWrapper.eq("bind_type", Arrays.asList(BindCode.MOBILE,BindCode.WEIXIN_XCX)) .eq("user_type", CommonConstant.USER_TYPE_NORMAL) .eq("bind_active", CommonConstant.Enable) .eq("bind_tmpl",bindTmpl) diff --git a/mall-common/src/main/java/com/suisung/mall/common/feignService/AccountService.java b/mall-common/src/main/java/com/suisung/mall/common/feignService/AccountService.java index 80df3e97..f29a63ba 100644 --- a/mall-common/src/main/java/com/suisung/mall/common/feignService/AccountService.java +++ b/mall-common/src/main/java/com/suisung/mall/common/feignService/AccountService.java @@ -297,11 +297,10 @@ public interface AccountService { @GetMapping(value = "/admin/account/accountController/getAllBindPage") - List getAllBindPage(@RequestParam(name = "bind_type") Integer bind_type, - @RequestParam(name = "bindTmpl") String bindTmpl, + List getAllBindPage(@RequestParam(name = "bindTmpl") String bindTmpl, @RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize); @GetMapping(value = "/admin/account/accountController/getAllBindCount") - long getAllBindCount(@RequestParam(name = "bind_type") Integer bind_type,@RequestParam(name = "bindTmpl") String bindTmpl); + long getAllBindCount(@RequestParam(name = "bindTmpl") String bindTmpl); } diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/message/service/impl/ShopMessageTemplateServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/message/service/impl/ShopMessageTemplateServiceImpl.java index 150f1c43..e165fc95 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/message/service/impl/ShopMessageTemplateServiceImpl.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/message/service/impl/ShopMessageTemplateServiceImpl.java @@ -735,7 +735,7 @@ public class ShopMessageTemplateServiceImpl extends BaseServiceImpl> futures = new ArrayList<>(); for (int i=1;i<=pages;i++){ - List finalList=accountService.getAllBindPage(BindCode.MOBILE,CommonConstant.BIND_SUB_TMPL_SKILL,i,BATCH_SIZE); + List finalList=accountService.getAllBindPage(CommonConstant.BIND_SUB_TMPL_SKILL,i,BATCH_SIZE); int finalI = i; futures.add(executor.submit(() -> { finalList.forEach(accountUserBindConnect -> {