Merge branch 'master' of http://124.220.229.80:9093/root/cif

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

@@ -2,10 +2,10 @@ package com.txz.cif.web;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.RandomUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.crypto.SecureUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.txz.cif.configurer.LocalUtil;
@@ -17,7 +17,6 @@ import com.txz.cif.enums.RedEnvelopeStatusEnum;
 import com.txz.cif.enums.WithdrawStatusEnum;
 import com.txz.cif.model.ConfigMember;
 import com.txz.cif.model.User;
-import com.txz.cif.param.OrderParam;
 import com.txz.cif.service.ConfigMemberService;
 import com.txz.cif.service.RedEnvelopeService;
 import com.txz.cif.service.SequenceService;
@@ -27,7 +26,10 @@ import com.txz.cif.util.UserNoUtil;
 import com.txz.cif.web.bo.EnumBo;
 import com.txz.cif.web.bo.UserBo;
 import com.txz.cif.web.bo.UserInfoBO;
-import com.txz.cif.web.para.*;
+import com.txz.cif.web.para.LoginAccountParameters;
+import com.txz.cif.web.para.MyUserParam;
+import com.txz.cif.web.para.RegisterAccountParameters;
+import com.txz.cif.web.para.UserInfoForm;
 import com.txz.operating.dto.ConfigDTO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -40,7 +42,6 @@ import tk.mybatis.mapper.entity.Example;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
-import java.math.RoundingMode;
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -311,7 +312,8 @@ public class UserApiController extends AbstractApiController {
         }
         Condition condition = new Condition(User.class);
         condition.createCriteria().andEqualTo("phoneNo", params.getPhone())
-                    .orEqualTo("name", params.getName());;
+                .orEqualTo("name", params.getName());
+        ;
         List<User> users = userService.findByCondition(condition);
         if (CollUtil.isNotEmpty(users)) {
             return ResultGenerator.genFailResult(ResultCode.USER_IS_EXIST);
@@ -350,18 +352,21 @@ public class UserApiController extends AbstractApiController {
             // if (parent != null) {
             user.setPid(ShareCodeUtils.codeToId(params.getCode()));
             User puser = userService.findById(ShareCodeUtils.codeToId(params.getCode()));
+            if (ObjectUtil.isEmpty(puser)) {
+                throw new ServiceException(ResultCode.USER_IS_NULL);
+            }
             if (puser.getPid() != null) {
                 user.setPpid(puser.getPid());
             }
-
+            
             //  更新VIP等级
             Condition c = new Condition(User.class);
             Example.Criteria criteria = c.createCriteria();
             criteria.andEqualTo("pid", puser.getId());
             Integer kidsNum = userService.countByCondition(c);
             ConfigMember nextLevel = configMemberService.findBy("level", puser.getVipLevel() + 1);
-            if (nextLevel != null){
-                if (nextLevel.getInvitedNo().compareTo(kidsNum+1)<= 0){
+            if (nextLevel != null) {
+                if (nextLevel.getInvitedNo().compareTo(kidsNum + 1) <= 0) {
                     userService.update(User.builder().id(puser.getId()).vipLevel(nextLevel.getLevel()).build());
                 }
             }

cif-service/src/main/java/com/txz/cif/web/mng/appcontroller/PaymentMethodAppController.java

@@ -150,7 +150,7 @@ public class PaymentMethodAppController {
             List<PaymentMethod> paymentMethodList = paymentMethodService.findAll();
             if (!CollectionUtils.isEmpty(paymentMethodList)) {
                 Byte status = 1;
-                paymentMethodListBO = paymentMethodList.stream().filter(a -> status.equals(a.getIsValid())).map(a -> {
+                paymentMethodListBO = paymentMethodList.stream().filter(a -> status.equals(a.getIsValid()) && status.equals(a.getStatus())).map(a -> {
                             return BeanUtil.toBean(a, PaymentMethodBO.class);
                 }).collect(Collectors.toList());
             }