linxk пре 3 недеља
родитељ
комит
4559e73db6

+ 2 - 0
cif-service/src/main/java/com/txz/cif/service/UserService.java

@@ -33,5 +33,7 @@ public interface UserService extends Service<User> {
      */
     Long createUser(UserAddParam param, String userName, Integer type);
 
+    void add(User user);
+
 //    boolean sendMsg(MessageParam param);
 }

+ 18 - 0
cif-service/src/main/java/com/txz/cif/service/impl/UserServiceImpl.java

@@ -176,6 +176,24 @@ public class UserServiceImpl extends AbstractService<User> implements UserServic
        return user.getId();
     }
 
+    @Override
+    public void add(User user) {
+        saveUseGeneratedKeys(user);
+        Date today = DateUtil.date();
+        String remark = "个人账户(负债类)";
+        String  aliases = "202";
+        Account account =  Account.builder().balance(BigDecimal.ZERO).beforeDayBalance(BigDecimal.ZERO)
+                .aliases(aliases).subjectType(2).beforeDayInitBalance(BigDecimal.ZERO)
+                .userId(user.getId()).bizType(1)
+                .beforeDayTime(today).createTime(today).freezeAmount(BigDecimal.ZERO).name(user.getName())
+                .remark(remark).type(1) .direction("C") .updateTime(today) .build();
+        //钱包账户
+        accountService.saveUseGeneratedKeys(account);
+        account.setId(null);
+        account.setBizType(2);
+        accountService.saveUseGeneratedKeys(account);
+    }
+
 //    @Override
 //    public boolean sendMsg(MessageParam param) {
 //        if (param == null){

+ 8 - 4
cif-service/src/main/java/com/txz/cif/web/UserApiController.java

@@ -47,6 +47,9 @@ public class UserApiController extends AbstractApiController {
     @Resource
     private AuthService authService;
 
+    @Resource
+    private SequenceService sequenceService;
+
 
     @Resource
     private RedEnvelopeService redEnvelopeService;
@@ -205,9 +208,10 @@ public class UserApiController extends AbstractApiController {
             return ResultGenerator.genFailResult(ResultCode.INTERNAL_SERVER_ERROR);
         }
         User parent = userService.findBy("invitedCode", params.getCode());
+        String userNo = sequenceService.genSerialNumber("register_rule",null);
         User user = User.builder().createTime(DateUtil.date()).invitedCode(code)
-                .name(params.getName())
-                .status((byte)1) .phoneNo(params.getPhone()).pwd(pwd2).salt(salt).build();
+                .name(params.getName()).userNo(userNo).isDelete((byte)1).createUser("sys")
+                .status((byte)1).phoneNo(params.getPhone()).pwd(pwd2).salt(salt).build();
         if (parent != null){
             user.setPid(parent.getId());
             if (parent.getPid() != null){
@@ -215,7 +219,7 @@ public class UserApiController extends AbstractApiController {
             }
         }
         user.setVipLevel(1);
-        userService.saveUseGeneratedKeys(user);
+        userService.add(user);
         user.setPwd("***");
         user.setSalt("***");
         return ResultGenerator.genSuccessResult(user);
@@ -226,7 +230,7 @@ public class UserApiController extends AbstractApiController {
             return null;
         }
         String s = RandomUtil.randomString(8);
-        User inviteCode = userService.findBy("inviteCode", s);
+        User inviteCode = userService.findBy("invitedCode", s);
         if (inviteCode == null){
             return s;
         }