Преглед на файлове

fix

release_toaliyun_real
winter преди 1 година
родител
ревизия
59507cca35
променени са 1 файла, в които са добавени 10 реда и са изтрити 12 реда
  1. +10
    -12
      mallinkBApi/src/main/java/com/iformall/controller/WxProfitSharingReceiverApplyController.java

+ 10
- 12
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);
}


Зареждане…
Отказ
Запис