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

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) {
@@ -351,14 +350,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 +365,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())) {