diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/controller/TbShopShareController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/TbShopShareController.java index 40ffba36..e3d707e2 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/controller/TbShopShareController.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/TbShopShareController.java @@ -36,7 +36,6 @@ public class TbShopShareController { private TbShopShareRecordService tbShopShareRecordService; @PostMapping("byShare") - @AnonymousPostMapping @ApiOperation("分页查询") public ResponseEntity selectAllByShare(@RequestBody TbShopShareRecordQueryCriteria criteria) { return new ResponseEntity<>(tbShopShareRecordService.selectAllByShare(criteria), HttpStatus.OK); diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopInfoServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopInfoServiceImpl.java index d9ad7880..ce0e2ce1 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopInfoServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopInfoServiceImpl.java @@ -91,17 +91,17 @@ public class TbShopInfoServiceImpl implements TbShopInfoService { @Override public JSONObject binding(BindingDto bindingDto) { -// TbShopInfo tbShopInfo = tbShopInfoRepository.findById(bindingDto.getShopId()).orElseGet(null); -// TbMerchantAccount account = merchantAccountRepository.findByAccount(tbShopInfo.getAccount()); -// if (org.apache.commons.lang3.StringUtils.isBlank(bindingDto.getAccount())) { -// if (tbShopInfo != null) { -// if (org.apache.commons.lang3.StringUtils.isNotBlank(account.getBindAccount())) { -// bindingDto.setAccount(account.getBindAccount()); -// } else { -// return null; -// } -// } -// } + TbShopInfo tbShopInfo = tbShopInfoRepository.findById(bindingDto.getShopId()).orElseGet(null); + TbMerchantAccount account = merchantAccountRepository.findByAccount(tbShopInfo.getAccount()); + if (org.apache.commons.lang3.StringUtils.isBlank(bindingDto.getAccount())) { + if (tbShopInfo != null) { + if (org.apache.commons.lang3.StringUtils.isNotBlank(account.getBindAccount())) { + bindingDto.setAccount(account.getBindAccount()); + } else { + return null; + } + } + } Map param = new HashMap<>(); //超掌柜生活-用户端 param.put("account", bindingDto.getAccount()); @@ -110,11 +110,11 @@ public class TbShopInfoServiceImpl implements TbShopInfoService { JSONObject jsonObject = JSONObject.parseObject(result); if (jsonObject.getInteger("code").equals(1)) { JSONObject data = jsonObject.getJSONObject("data"); -// if (org.apache.commons.lang3.StringUtils.isNotBlank(bindingDto.getAccount())) { -// String bindAccount = data.getJSONObject("store").getString("account"); -// account.setBindAccount(bindAccount); -// merchantAccountRepository.save(account); -// } + if (org.apache.commons.lang3.StringUtils.isNotBlank(bindingDto.getAccount())) { + String bindAccount = data.getJSONObject("store").getString("account"); + account.setBindAccount(bindAccount); + merchantAccountRepository.save(account); + } return data; } else { throw new BadRequestException(jsonObject.getString("msg"));