yansen преди 4 години
родител
ревизия
92e71b5b55

+ 17
- 1
src/main/java/com/huiju/estateagents/center/taUser/service/impl/TaUserServiceImpl.java Целия файл

@@ -19,6 +19,8 @@ import com.huiju.estateagents.common.StringUtils;
19 19
 import com.huiju.estateagents.common.WxUtils;
20 20
 import com.huiju.estateagents.entity.*;
21 21
 import com.huiju.estateagents.mapper.*;
22
+import com.huiju.estateagents.miniPackage.entity.TaUserPackages;
23
+import com.huiju.estateagents.miniPackage.mapper.TaUserPackagesMapper;
22 24
 import com.huiju.estateagents.service.*;
23 25
 import org.apache.commons.collections.CollectionUtils;
24 26
 import org.springframework.beans.factory.annotation.Autowired;
@@ -95,6 +97,9 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
95 97
     @Autowired
96 98
     private TaChannelProxyMapper taChannelProxyMapper;
97 99
 
100
+    @Autowired
101
+    private TaUserPackagesMapper taUserPackagesMapper;
102
+
98 103
     @Autowired
99 104
     private WxUtils wxUtils;
100 105
 
@@ -691,7 +696,7 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
691 696
         cities.add(signUpEntity.getCity().toString());
692 697
 
693 698
         TaUser taUser = new TaUser();
694
-        taUser.setUserName(signUpEntity.getCompany());
699
+        taUser.setUserName(signUpEntity.getPhone());
695 700
         taUser.setPhone(signUpEntity.getPhone());
696 701
         taUser.setLoginPassword(signUpEntity.getPassword());
697 702
         taUser.setStatus(CommConstant.STATUS_NORMAL);
@@ -709,6 +714,17 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
709 714
         taUser = newUserAndOrg(taUser, taChannelProxy.getChannelId());
710 715
 
711 716
         // 试用账户给一个虚拟的套餐
717
+        TaUserPackages packages = new TaUserPackages();
718
+        packages.setOrgId(taUser.getOrgId());
719
+        packages.setUserId(taUser.getUserId());
720
+        packages.setPackId(CommConstant.SYS_VIRTUAL_PACKAGE_ID);     // 虚拟ID
721
+        packages.setCreateDate(taUser.getCreateDate());
722
+        packages.setStartDate(taUser.getCreateDate());
723
+        packages.setEndDate(taUser.getExpDate());
724
+        packages.setRuleId(CommConstant.SYS_ROLE_TRIAL);  // 内置试用角色
725
+        packages.setStatus(CommConstant.STATUS_NORMAL);
726
+
727
+        taUserPackagesMapper.insert(packages);
712 728
 
713 729
         return taUser;
714 730
     }

+ 12
- 0
src/main/java/com/huiju/estateagents/common/CommConstant.java Целия файл

@@ -1,5 +1,7 @@
1 1
 package com.huiju.estateagents.common;
2 2
 
3
+import io.swagger.models.auth.In;
4
+
3 5
 public class CommConstant {
4 6
     public final static String ALIOSS_DEFAULT_UPLOAD = "/miniapp/upload/images/";
5 7
 
@@ -911,4 +913,14 @@ public class CommConstant {
911 913
      * 需要替换财务联系人类型
912 914
      */
913 915
     public static final String CONCAT_TYPE_FINANCE = "finance,|,finance|finance";
916
+
917
+    /**
918
+     * 内置虚拟套餐 ID
919
+     */
920
+    public static final Integer SYS_VIRTUAL_PACKAGE_ID = -1;
921
+
922
+    /**
923
+     * 内置试用人员角色
924
+     */
925
+    public static final Integer SYS_ROLE_TRIAL = -1;
914 926
 }