diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxProfitSharingReceiverApplyController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxProfitSharingReceiverApplyController.java index 7ef746165..162657ec4 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxProfitSharingReceiverApplyController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxProfitSharingReceiverApplyController.java @@ -69,17 +69,6 @@ public class WxProfitSharingReceiverApplyController extends BaseController { // return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(), "平台不合法"); // } - //检查结算账户 - if (StringUtils.isNotBlank(receiverAdd.getAccountInfo())) { - JSONObject ao = JSON.parseObject(receiverAdd.getAccountInfo()); - boolean needBankBranch = ao.getBoolean("need_bank_branch"); - String bankBranchId = ao.getString("bank_branch_id"); - String bankName = ao.getString("bank_name"); - if (needBankBranch && (StringUtils.isBlank(bankBranchId) || StringUtils.isBlank(bankName)) ) { - return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(), "未选取到支行,请确认开户行是否选择正确!"); - } - } - if(receiverAdd.getId() != null){ WxProfitSharingReceiverApply receiverApply = wxProfitSharingReceiverApplyService.selectById(receiverAdd.getId()); if(receiverApply == null){ @@ -109,7 +98,16 @@ public class WxProfitSharingReceiverApplyController extends BaseController { } } - + //检查结算账户 + if (StringUtils.isNotBlank(receiverAdd.getAccountInfo())) { + JSONObject ao = JSON.parseObject(receiverAdd.getAccountInfo()); + boolean needBankBranch = ao.getBoolean("need_bank_branch"); + String bankBranchId = ao.getString("bank_branch_id"); + String bankName = ao.getString("bank_name"); + if (needBankBranch && (StringUtils.isBlank(bankBranchId) && StringUtils.isBlank(bankName)) ) { + return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(), "未选取到支行,请确认开户行是否选择正确!"); + } + } return wxProfitSharingReceiverApplyService.saveOrUpdate(receiverAdd); }