服务客户

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizservicecustomer/param/BizServiceCustomerAccountAddParam.java

@@ -30,7 +30,7 @@ public class BizServiceCustomerAccountAddParam {
 
     /** 客户id */
     @Schema(description = "客户id")
-    private String customerId;
+    private String serviceCustomerId;
 
     /** 账号 */
     @Schema(description = "账号")

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizservicecustomer/param/BizServiceCustomerAccountEditParam.java

@@ -37,7 +37,7 @@ public class BizServiceCustomerAccountEditParam {
 
     /** 客户id */
     @Schema(description = "客户id")
-    private String customerId;
+    private String serviceCustomerId;
 
     /** 账号 */
     @Schema(description = "账号")

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizservicecustomer/service/impl/BizServiceCustomerAccountServiceImpl.java

@@ -95,8 +95,8 @@ public class BizServiceCustomerAccountServiceImpl extends ServiceImpl<BizService
             throw new CommonException("服务客户账号已存在！");
         }
         BizServiceCustomerAccount bizServiceCustomerAccount = BeanUtil.toBean(bizServiceCustomerAccountAddParam, BizServiceCustomerAccount.class);
-        addUserAccount(bizServiceCustomerAccount);
         this.save(bizServiceCustomerAccount);
+        addUserAccount(bizServiceCustomerAccount);
     }
 
     @Transactional(rollbackFor = Exception.class)
@@ -147,6 +147,9 @@ public class BizServiceCustomerAccountServiceImpl extends ServiceImpl<BizService
         // 设置状态
         bizUser.setUserStatus(BizUserStatusEnum.ENABLE.getValue());
         this.bizUserMapper.insert(bizUser);
+
+        // 添加服务客户角色
+        this.sysUserApi.grantRoleType(bizUser.getId(), "服务客户");
     }
 
     @Transactional(rollbackFor = Exception.class)

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizservicecustomer/service/impl/BizServiceCustomerServiceImpl.java

@@ -117,11 +117,13 @@ public class BizServiceCustomerServiceImpl extends ServiceImpl<BizServiceCustome
         }
         BizServiceCustomer bizServiceCustomer = BeanUtil.toBean(bizServiceCustomerAddParam, BizServiceCustomer.class);
 
+        this.save(bizServiceCustomer);
+
         //查询账号是否添加过
         if(ObjectUtil.isNotEmpty(bizServiceCustomer.getPhone())){
             addUserAccount(bizServiceCustomer);
         }
-        this.save(bizServiceCustomer);
+
     }
 
     @Transactional(rollbackFor = Exception.class)
@@ -171,8 +173,8 @@ public class BizServiceCustomerServiceImpl extends ServiceImpl<BizServiceCustome
         bizUser.setUserStatus(BizUserStatusEnum.ENABLE.getValue());
         this.bizUserMapper.insert(bizUser);
 
-        // 添加供应商角色
-        this.sysUserApi.grantRoleType(bizUser.getId(), "供应商");
+        // 添加服务客户角色
+        this.sysUserApi.grantRoleType(bizUser.getId(), "服务客户");
 
         BizServiceCustomerAccount bizServiceCustomerAccount = new BizServiceCustomerAccount();
         bizServiceCustomerAccount.setServiceCustomerId(bizServiceCustomer.getId());