用户修改银行卡问题修复

src/main/java/com/szwl/controller/TAdminController.java

@@ -71,6 +71,12 @@ public class TAdminController {
     @Audit(type = AuditEnum.INSERT,content = "#loginUser.name + '添加账号'")
     public ResponseModel<?> addLoginUser(@RequestBody @Valid AddLoginUserParam param) {
 //    public ResponseModel<?> addLoginUser(@RequestBody  AddLoginUserParam param) {
+        if(StringUtils.isEmpty(param.getEquipmentIds())){
+            return R.fail(ResponseCodesEnum.A0001,"机器不能为空");
+        }
+        if(param.getRoleList().size()<1){
+            return R.fail(ResponseCodesEnum.A0001,"角色不能为空");
+        }
         //获取当前操作人员
         UserDetailBO loginUser = tokenManager.getLoginUserDetails();
         // 保存用户实体
@@ -271,7 +277,7 @@ public class TAdminController {
     }
     @ApiOperation(value = "获取所有子账号信息")
     @GetMapping("/getChildDrenAdminList")
-    public ResponseModel<?> getChildDrenAdminList(String adminId,String userName,String name) {
+    public ResponseModel<?> getChildDrenAdminList(String adminId,String userName,String name,String isUse) {
         List<AddLoginUserParam> returnList = new ArrayList<>();
         LambdaQueryWrapper<TAdmin> query = Wrappers.lambdaQuery();
         query.eq(TAdmin::getParentId,adminId);

src/main/java/com/szwl/controller/TJoinpayMchController.java

@@ -105,10 +105,56 @@ public class TJoinpayMchController {
         tJoinpayMch.setCreateDate(new Date());
         tJoinpayMch.setModifyDate(new Date());
         if(list.size()>0&&StringUtils.isNotEmpty(list.get(0).getAltMchNo())){
-            //已有，属于第二次提交信息，需要审核
+            //已有，属于第二次提交信息，
             TJoinpayMch mch = list.get(0);
-            ResponseModel<?> checkMch = createCheckMch(mch, tJoinpayMch);
-            return checkMch;
+            //取消审核步骤
+//            ResponseModel<?> checkMch = createCheckMch(mch, tJoinpayMch);
+            //提交并修改
+            if(!mch.getApproveStatus().equals("审核通过")){
+                if (!StringUtils.isEmpty(tJoinpayMch.getLegalPerson())) {
+                    mch.setLegalPerson(tJoinpayMch.getLegalPerson());
+                }
+                if (tJoinpayMch.getIdCardNo()!=null) {
+                    mch.setIdCardNo(tJoinpayMch.getIdCardNo());
+                }
+                if (!StringUtils.isEmpty(tJoinpayMch.getLicenseNo())) {
+                    mch.setLicenseNo(tJoinpayMch.getLicenseNo());
+                }
+            }
+
+            if (!StringUtils.isEmpty(tJoinpayMch.getBankAccountName())) {
+                mch.setBankAccountName(tJoinpayMch.getBankAccountName());
+            }
+            if (!StringUtils.isEmpty(tJoinpayMch.getBankAccountNo())) {
+                mch.setBankAccountNo(tJoinpayMch.getBankAccountNo());
+            }
+            if (!StringUtils.isEmpty(tJoinpayMch.getBankChannelNo())) {
+                mch.setBankChannelNo(tJoinpayMch.getBankChannelNo());
+            }
+            if (!StringUtils.isEmpty(tJoinpayMch.getBusiContactName())) {
+                mch.setBusiContactName(tJoinpayMch.getBusiContactName());
+            }
+            if (!StringUtils.isEmpty(tJoinpayMch.getBusiContactMobileNo())) {
+                mch.setBusiContactMobileNo(tJoinpayMch.getBusiContactMobileNo());
+            }
+            if (!StringUtils.isEmpty(tJoinpayMch.getPhoneNo())) {
+                mch.setPhoneNo(tJoinpayMch.getPhoneNo());
+            }
+
+            if(mch.getSettMode()!=null){
+                mch.setSettMode(tJoinpayMch.getSettMode());
+            }
+            if(mch.getRiskDay()!=null){
+                mch.setRiskDay(tJoinpayMch.getRiskDay());
+            }
+            if (tJoinpayMch.getSettDateType()!=null) {
+                mch.setSettDateType(tJoinpayMch.getSettDateType());
+            }
+            String s = tJoinpayMchService.updateMch(mch);
+            if(s.equals("ok")){
+                tJoinpayMchService.updateById(mch);
+            }
+            return  R.ok(s);
         }else {
             //没有，直接保存
             tJoinpayMch.setStep("0");

src/main/java/com/szwl/service/impl/TJoinpayMchServiceImpl.java

@@ -66,6 +66,7 @@ public class TJoinpayMchServiceImpl extends ServiceImpl<TJoinpayMchMapper, TJoin
 
 //        String alt_mch_name = "test1_" + adminId  + "@mianhuatang.com";
 //        String alt_mch_name = mch.getLegal_person();
+
         String alt_mch_name = mch.getBankAccountName();
         mch.setAltMchName(alt_mch_name);
         mch.setAltMchShortName("");
@@ -220,19 +221,25 @@ public class TJoinpayMchServiceImpl extends ServiceImpl<TJoinpayMchMapper, TJoin
         String aes_key2 = getRandomString(16);
 
         requestData.put("alt_mch_no", mch.getAltMchNo());
+        if(!mch.getApproveStatus().equals("审核通过")){
+            requestData.put("legal_person", mch.getLegalPerson());
+            requestData.put("id_card_no",  mch.getIdCardNo());
 
+        }
 //        requestData.put("legal_person", AESUtil.encrypt(legal_person, aes_key1 ,  aes_key2 ));
-        requestData.put("legal_person", mch.getLegalPerson());
+//        requestData.put("legal_person", mch.getLegalPerson());
 //        requestData.put("id_card_no",  AESUtil.encrypt(id_card_no, aes_key1 , aes_key2 ));
-        requestData.put("id_card_no",  mch.getIdCardNo());
+//        requestData.put("id_card_no",  mch.getIdCardNo());
 
         if(JoinpayConstant.alt_merchant_type2== mch.getAltMerchantType() || JoinpayConstant.alt_merchant_type3== mch.getAltMerchantType()){
             // 企业用对公账户
             requestData.put("bank_account_type",  JoinpayConstant.bank_account_type4);
             mch.setBankAccountType(JoinpayConstant.bank_account_type4);
             String alt_mch_name = mch.getBankAccountName();
-            requestData.put("alt_mch_name", alt_mch_name);
-            requestData.put("license_no",  mch.getLicenseNo());
+            if(!mch.getApproveStatus().equals("审核通过")){
+                requestData.put("alt_mch_name", alt_mch_name);
+                requestData.put("license_no",  mch.getLicenseNo());
+            }
 //            requestData.put("alt_mch_name", AESUtil.encrypt(alt_mch_name, aes_key1 ,  aes_key2 ));/**/
 
         }else if(JoinpayConstant.alt_merchant_type1== mch.getAltMerchantType()){