diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java index 88930a79b..35f0095fa 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java @@ -283,8 +283,8 @@ public class WxMerchantController extends BaseController { if (null == wxMerchant.getId() || StringUtils.isBlank(wxMerchant.getAccount()) || StringUtils.isBlank(wxMerchant.getApiKey())) { return new ResultData(ResultData.ERROR,"参数缺失"); } - - return null; + wxMerchant.updateTenantInfo(getTenantInfo()); + return wxMerchantService.setWxMerchantAccount(wxMerchant); } @ApiOperation("查询当前租户下商户名称列表") diff --git a/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java b/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java index 13227d1b2..ac9075622 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java @@ -153,6 +153,8 @@ public interface WxMerchantService { ResultData updateMerchantTax(WxMerchant wxMerchant); ResultData updateMerchantLevel(WxMerchant wxMerchant); + + ResultData setWxMerchantAccount(WxMerchant wxMerchant); WxMerchantVo findMerchantById(TenantEntity tenantEntity,Long id); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java index 827adc5be..bcfd32784 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -85,6 +85,10 @@ public class WxMerchantServiceImpl implements WxMerchantService { @Lazy @Autowired WxProfitSharingReceiverService wxProfitSharingReceiverService; + + @Lazy + @Autowired + WxProfitPaymentReceiverService wxProfitPaymentReceiverService; @Autowired WxBillDepositMapper wxBillDepositMapper; @@ -928,6 +932,28 @@ public class WxMerchantServiceImpl implements WxMerchantService { } return new ResultData(Result.SUCCESS, "操作成功"); } + + @Override + public ResultData setWxMerchantAccount(WxMerchant wxMerchant) { + try { + WxProfitPaymentReceiver receiver = wxProfitPaymentReceiverService.findReceiver(wxMerchant, wxMerchant.getId(),EnumAppPlat.WX); + if (null == receiver ) { + receiver = new WxProfitPaymentReceiver(); + receiver.setMerchantId(wxMerchant.getId()); + receiver.setReceiverType(); + receiver.setReceiverComments("手动设置收款账号"); + receiver.setStatus(); + receiver.setPlat(EnumAppPlat.WX.getCode()); + } + receiver.setReceiverAccount(wxMerchant.getAccount()); + receiver.setApiKey(wxMerchant.getApiKey()); + wxProfitPaymentReceiverService.saveOrUpdate(receiver); + } catch (Exception e) { + logger.error("db failed: 账号操作失败, e:" + e.getMessage()); + throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); + } + return new ResultData(Result.SUCCESS, "操作成功"); + } @Override public WxMerchantVo findMerchantById(TenantEntity tenantEntity,Long id) {