fix

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/TenantMemberController.java

@@ -97,15 +97,4 @@ public class TenantMemberController extends BaseController {
 
         return R.from(tenantMemberService.removeById(id));
     }
-
-
-    @ApiOperation(value = "新增易宝账号", notes = "机构子账户表- 传入 TenantMemberWrapper.AddYBCount")
-    @PreAuthorize("@pcs.hasPermissions('tenantMember/addYB', {'BACKEND'})")
-    @PostMapping("/addYB")
-    public HttpResponseResult addYB(@RequestBody TenantMemberWrapper.AddYBCount tenantMember) {
-
-        // 新增数据
-        return HttpResponseResult.succeed(tenantMemberService.addYB(tenantMember));
-    }
-
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/TenantMemberService.java

@@ -55,10 +55,4 @@ public interface TenantMemberService extends IService<TenantMember>  {
      */
     Boolean updateCount(TenantMemberWrapper.UpdateCount tenantMember);
 
-    /**
-     * 新增易宝账号
-     * @param tenantMember
-     * @return
-     */
-    Boolean addYB(TenantMemberWrapper.AddYBCount tenantMember);
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/TenantMemberServiceImpl.java

@@ -75,7 +75,6 @@ public class TenantMemberServiceImpl extends ServiceImpl<TenantMemberMapper, Ten
         if (tenantMembers.isEmpty()) {
             return page.setRecords(tenantMembers);
         }
-
         //设置省市中文名称
         List<Integer> areaCodeList = tenantMembers.stream().map(next -> {
             HashSet<Integer> areaCodes = new HashSet<>();
@@ -92,9 +91,9 @@ public class TenantMemberServiceImpl extends ServiceImpl<TenantMemberMapper, Ten
                     .stream().collect(Collectors.toMap(SysArea::getCode, SysArea::getName));
 
             tenantMembers.forEach(next -> {
-                next.setProvName(codeNameMap.getOrDefault(next.getProvCode(), ""));
-                next.setAreaName(codeNameMap.getOrDefault(next.getAreaCode(), ""));
-                next.setDistrictName(codeNameMap.getOrDefault(next.getDistrictCode(), ""));
+                next.setProvName(codeNameMap.getOrDefault(Integer.valueOf(next.getProvCode()), ""));
+                next.setAreaName(codeNameMap.getOrDefault(Integer.valueOf(next.getAreaCode()), ""));
+                next.setDistrictName(codeNameMap.getOrDefault(Integer.valueOf(next.getDistrictCode()), ""));
             });
         }
         return page.setRecords(tenantMembers);
@@ -148,15 +147,4 @@ public class TenantMemberServiceImpl extends ServiceImpl<TenantMemberMapper, Ten
          return false;
     }
 
-
-    /**
-     * 新增易宝账号
-     * @param tenantMember
-     * @return
-     */
-    @Override
-    public Boolean addYB(TenantMemberWrapper.AddYBCount tenantMember) {
-
-        return this.save(JSON.parseObject(tenantMember.jsonString(), TenantMember.class));
-    }
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/wrapper/TenantMemberWrapper.java

@@ -279,93 +279,18 @@ public class TenantMemberWrapper {
         @ApiModelProperty("城市名称")
         private String areaName;
 
-
-
-        public String jsonString() {
-            return JSON.toJSONString(this);
-        }
-
-        public static TenantMember from(String json) {
-            return JSON.parseObject(json, TenantMember.class);
-        }
-    }
-
-
-
-    @Data
-    @Builder
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @ApiModel(" TenantMember-机构子账户表修改银行信息")
-    public static class UpdateCount {
-        private Long id;
-
-        @ApiModelProperty("企业银行卡号")
-        private String cardNo;
-
-        @ApiModelProperty("银行编码")
-        private String bankCode;
-
-
-        public String jsonString() {
-            return JSON.toJSONString(this);
-        }
-
-        public static TenantMember from(String json) {
-            return JSON.parseObject(json, TenantMember.class);
-        }
-    }
-
-
-
-    @Data
-    @Builder
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @ApiModel(" TenantMember-机构子账户表新增易宝数据")
-    public static class AddYBCount {
-
-        @ApiModelProperty("机构ID")
-        private Long tenantId;
-
-        @ApiModelProperty("公司名称")
-        private String name;
+        @ApiModelProperty("区编号")
+        private String districtCode;
 
         @ApiModelProperty("商家类型（企业-ENTERPRISE，个体户-INDIVIDUAL）")
         private String merchantType;
 
-        @ApiModelProperty("统一社会信用码")
-        private String socialCreditCode;
-
         @ApiModelProperty("商户证件照片")
         private String licenceUrl;
 
         @ApiModelProperty("开户许可证照片")
         private String openAccountLicenceUrl;
 
-        @ApiModelProperty("省份编号")
-        private String provCode;
-
-        @ApiModelProperty("城市编号")
-        private String areaCode;
-
-        @ApiModelProperty("区编号")
-        private String districtCode;
-
-        @ApiModelProperty("公司地址")
-        private String address;
-
-        @ApiModelProperty("法人")
-        private String legalPerson;
-
-        @ApiModelProperty("法人手机号")
-        private String legalMp;
-
-        @ApiModelProperty("法人证件类型")
-        private String legalLicenceType;
-
-        @ApiModelProperty("法人身份证号")
-        private String legalCertId;
 
         @ApiModelProperty("法人证件人像面照片 请上传带有人像面的法人证件照片")
         private String legalLicenceFrontUrl;
@@ -386,15 +311,32 @@ public class TenantMemberWrapper {
         @ApiModelProperty("联系人邮箱")
         private String contactEmail;
 
+
+        public String jsonString() {
+            return JSON.toJSONString(this);
+        }
+
+        public static TenantMember from(String json) {
+            return JSON.parseObject(json, TenantMember.class);
+        }
+    }
+
+
+
+    @Data
+    @Builder
+    @NoArgsConstructor
+    @AllArgsConstructor
+    @ApiModel(" TenantMember-机构子账户表修改银行信息")
+    public static class UpdateCount {
+        private Long id;
+
         @ApiModelProperty("企业银行卡号")
         private String cardNo;
 
         @ApiModelProperty("银行编码")
         private String bankCode;
 
-        @ApiModelProperty("银行账户类型：1-对公；2-对私，如果需要自动开结算账户，本字段必填")
-        private String bankAcctType;
-
 
         public String jsonString() {
             return JSON.toJSONString(this);