fix some bug

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

@@ -72,9 +72,8 @@ public class UserApiController extends AbstractApiController {
     
     @Resource
     private OperatingConfigDubboServiceClient configDubboServiceClient;
-
-
-
+    
+    
     @GetMapping("/getEnum")
     @ApiOperation(value = "获取枚举(1业务类型 2充值状态 3提现状态 4收益状态 5收益业务类型)", httpMethod = "GET")
     public Result<List<EnumBo>> getEnum(@RequestParam Integer id) {
@@ -161,6 +160,10 @@ public class UserApiController extends AbstractApiController {
             } else {
                 user = operators.get(0);
             }
+            // 禁止登录
+            if (user.getHasLogin() != 1) {
+                return ResultGenerator.genFailResult(ResultCode.USER_STATUS_IS_ERROR);
+            }
             String pwd2 = SecureUtil.md5(loginPara.getPwd() + user.getSalt());
             log.info("用户：" + loginPara.getAccount() + "登录密码：" + loginPara.getPwd() + "加密后：" + pwd2);
             if (StrUtil.equals(user.getPwd().toUpperCase(), pwd2.toUpperCase())) {
@@ -351,14 +354,14 @@ public class UserApiController extends AbstractApiController {
                 user.setPpid(puser.getPid());
             }
             // 直推红包
-
-            try{
-
+            
+            try {
+                
                 com.txz.operating.result.Result<ConfigDTO> openRedEnvelopeRate = configDubboServiceClient.getConfigByCode("invited_amount");
-                log.info("operatingConfigDubboServiceClient.getConfigByCode openRedEnvelopeRate:"+ JSONObject.toJSONString(openRedEnvelopeRate));
+                log.info("operatingConfigDubboServiceClient.getConfigByCode openRedEnvelopeRate:" + JSONObject.toJSONString(openRedEnvelopeRate));
                 String amountStr = openRedEnvelopeRate.getData().getValueInfo();
-                BigDecimal amount = new BigDecimal(amountStr).setScale(2,RoundingMode.DOWN);
-
+                BigDecimal amount = new BigDecimal(amountStr).setScale(2, RoundingMode.DOWN);
+                
                 // 直推红包
                 com.txz.cif.dto.Result result1 = redEnvelopeService.addRedEnvelope(RedEnvelopeParam.builder()
                         .amount(amount).bizType(BizTypeEnum.PROMOTION_COMMISSION.getKey())
@@ -366,8 +369,8 @@ public class UserApiController extends AbstractApiController {
                         .transTime(DateUtil.date())
                         .build());
                 // }
-            }catch (Exception e){
-                log.error("直推红包新增异常",e);
+            } catch (Exception e) {
+                log.error("直推红包新增异常", e);
             }
         }
         if (StrUtil.isBlank(user.getHeadPic())) {

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

@@ -80,10 +80,11 @@ public class WithdrawRecordApiController {
     
     @Resource
     private OperatingConfigDubboServiceClient operatingConfigDubboServiceClient;
-
-
+    
+    
     @Resource
     private NoticeDubboServiceClient noticeDubboServiceClient;
+    
     @PostMapping("/add")
     @ApiOperation(value = "新增提现订单", httpMethod = "POST")
     public Result add(@RequestBody WithdrawParam param, @RequestHeader(value = X_CLIENT_TOKEN, required = false) String token) {
@@ -102,6 +103,9 @@ public class WithdrawRecordApiController {
             Claims claims = result.getRight();
             Long userId = Long.valueOf(claims.get("userId").toString());
             User user = userService.findById(userId);
+            if (user.getHasWithdraw() != 1) {
+                return ResultGenerator.genFailResult(ResultCode.USER_STATUS_IS_ERROR);
+            }
             if (user == null) {
                 return ResultGenerator.genFailResult(ResultCode.USER_IS_NULL);
             }
@@ -279,7 +283,7 @@ public class WithdrawRecordApiController {
                 withdrawRecordService.success(record, DateUtil.parse(dto.getDatetime(), "yyyyMMddHHmmss"));
                 if (record.getAccountType() == 1) {
                     ne = NoticeEnum.MONEY_WITHDRAWAL_WALLET_SUCCESS;
-                } else  if (record.getAccountType() == 2) {
+                } else if (record.getAccountType() == 2) {
                     ne = NoticeEnum.MONEY_WITHDRAWAL_ACCOUNT_SUCCESS;
                 }
             } else {
@@ -303,8 +307,8 @@ public class WithdrawRecordApiController {
                 
             }
             try {
-                noticeDubboServiceClient.addMoneyNotice(ne,record.getUserId());
-            }catch (Exception e) {
+                noticeDubboServiceClient.addMoneyNotice(ne, record.getUserId());
+            } catch (Exception e) {
                 log.error("新增提现回调消息失败", e);
             }
             return "OK";