阿里巴巴代码规范检测整改

jeepay-service/src/main/java/com/jeequan/jeepay/service/impl/MchInfoService.java

@@ -74,7 +74,9 @@ public class MchInfoService extends ServiceImpl<MchInfoMapper, MchInfo> {
 
         // 插入商户基本信息
         boolean saveResult = save(mchInfo);
-        if (!saveResult) throw new BizException(ApiCodeEnum.SYS_OPERATION_FAIL_CREATE);
+        if (!saveResult) {
+            throw new BizException(ApiCodeEnum.SYS_OPERATION_FAIL_CREATE);
+        }
 
         // 插入用户信息
         SysUser sysUser = new SysUser();
@@ -98,14 +100,18 @@ public class MchInfoService extends ServiceImpl<MchInfoMapper, MchInfo> {
         mchApp.setCreatedBy(sysUser.getRealname());
         mchApp.setCreatedUid(sysUser.getSysUserId());
         saveResult = mchAppService.save(mchApp);
-        if (!saveResult) throw new BizException(ApiCodeEnum.SYS_OPERATION_FAIL_CREATE);
+        if (!saveResult) {
+            throw new BizException(ApiCodeEnum.SYS_OPERATION_FAIL_CREATE);
+        }
 
         // 存入商户默认用户ID
         MchInfo updateRecord = new MchInfo();
         updateRecord.setMchNo(mchInfo.getMchNo());
         updateRecord.setInitUserId(sysUser.getSysUserId());
         saveResult = updateById(updateRecord);
-        if (!saveResult) throw new BizException(ApiCodeEnum.SYS_OPERATION_FAIL_CREATE);
+        if (!saveResult) {
+            throw new BizException(ApiCodeEnum.SYS_OPERATION_FAIL_CREATE);
+        }
 
     }
 
@@ -115,11 +121,15 @@ public class MchInfoService extends ServiceImpl<MchInfoMapper, MchInfo> {
         try {
             // 0.当前商户是否存在
             MchInfo mchInfo = getById(mchNo);
-            if (mchInfo == null) throw new BizException("该商户不存在");
+            if (mchInfo == null) {
+                throw new BizException("该商户不存在");
+            }
 
             // 1.查看当前商户是否存在交易数据
             int payCount = payOrderService.count(PayOrder.gw().eq(PayOrder::getMchNo, mchNo));
-            if (payCount > 0) throw new BizException("该商户已存在交易数据，不可删除");
+            if (payCount > 0) {
+                throw new BizException("该商户已存在交易数据，不可删除");
+            }
 
             // 2.删除当前商户配置的支付通道
             mchPayPassageService.remove(MchPayPassage.gw().eq(MchPayPassage::getMchNo, mchNo));
@@ -158,7 +168,9 @@ public class MchInfoService extends ServiceImpl<MchInfoMapper, MchInfo> {
 
             // 7.删除当前商户
             boolean removeMchInfo = removeById(mchNo);
-            if (!removeMchInfo) throw new BizException("删除当前商户失败");
+            if (!removeMchInfo) {
+                throw new BizException("删除当前商户失败");
+            }
             return userIdList;
         }catch (Exception e) {
             throw new BizException(e.getMessage());

jeepay-service/src/main/java/com/jeequan/jeepay/service/impl/MchPayPassageService.java

@@ -54,7 +54,9 @@ public class MchPayPassageService extends ServiceImpl<MchPayPassageMapper, MchPa
         params.put("infoType", infoType);
         params.put("mchType", mchType);
         List<JSONObject> list = baseMapper.selectAvailablePayInterfaceList(params);
-        if (CollectionUtils.isEmpty(list)) return null;
+        if (CollectionUtils.isEmpty(list)) {
+            return null;
+        }
 
         // 添加通道状态
         for (JSONObject object : list) {

jeepay-service/src/main/java/com/jeequan/jeepay/service/impl/PayOrderService.java

@@ -127,21 +127,41 @@ public class PayOrderService extends ServiceImpl<PayOrderMapper, PayOrder> {
 
     public Map payCount(String mchNo, Byte state, Byte refundState, String dayStart, String dayEnd) {
         Map param = new HashMap<>();
-        if (state != null) param.put("state", state);
-        if (refundState != null) param.put("refundState", refundState);
-        if (StrUtil.isNotBlank(mchNo)) param.put("mchNo", mchNo);
-        if (StrUtil.isNotBlank(dayStart)) param.put("createTimeStart", dayStart);
-        if (StrUtil.isNotBlank(dayEnd)) param.put("createTimeEnd", dayEnd);
+        if (state != null) {
+            param.put("state", state);
+        }
+        if (refundState != null) {
+            param.put("refundState", refundState);
+        }
+        if (StrUtil.isNotBlank(mchNo)) {
+            param.put("mchNo", mchNo);
+        }
+        if (StrUtil.isNotBlank(dayStart)) {
+            param.put("createTimeStart", dayStart);
+        }
+        if (StrUtil.isNotBlank(dayEnd)) {
+            param.put("createTimeEnd", dayEnd);
+        }
         return payOrderMapper.payCount(param);
     }
 
     public List<Map> payTypeCount(String mchNo, Byte state, Byte refundState, String dayStart, String dayEnd) {
         Map param = new HashMap<>();
-        if (state != null) param.put("state", state);
-        if (refundState != null) param.put("refundState", refundState);
-        if (StrUtil.isNotBlank(mchNo)) param.put("mchNo", mchNo);
-        if (StrUtil.isNotBlank(dayStart)) param.put("createTimeStart", dayStart);
-        if (StrUtil.isNotBlank(dayEnd)) param.put("createTimeEnd", dayEnd);
+        if (state != null) {
+            param.put("state", state);
+        }
+        if (refundState != null) {
+            param.put("refundState", refundState);
+        }
+        if (StrUtil.isNotBlank(mchNo)) {
+            param.put("mchNo", mchNo);
+        }
+        if (StrUtil.isNotBlank(dayStart)) {
+            param.put("createTimeStart", dayStart);
+        }
+        if (StrUtil.isNotBlank(dayEnd)) {
+            param.put("createTimeEnd", dayEnd);
+        }
         return payOrderMapper.payTypeCount(param);
     }
 
@@ -183,12 +203,16 @@ public class PayOrderService extends ServiceImpl<PayOrderMapper, PayOrder> {
             String dayEnd = DateUtil.endOfDay(date).toString(DatePattern.NORM_DATETIME_MINUTE_PATTERN);
             // 每日交易金额查询
             dayAmount = payCount(mchNo, PayOrder.STATE_SUCCESS, null, dayStart, dayEnd);
-            if (dayAmount != null) payAmount = new BigDecimal(dayAmount.get("payAmount").toString());
+            if (dayAmount != null) {
+                payAmount = new BigDecimal(dayAmount.get("payAmount").toString());
+            }
             if (i == 0) {
                 todayAmount = dayAmount.get("payAmount").toString();
                 todayPayCount = dayAmount.get("payCount").toString();
             }
-            if (i == 1) yesterdayAmount = dayAmount.get("payAmount").toString();
+            if (i == 1) {
+                yesterdayAmount = dayAmount.get("payAmount").toString();
+            }
             payWeek = payWeek.add(payAmount);
             array.add(payAmount);
         }
@@ -234,7 +258,9 @@ public class PayOrderService extends ServiceImpl<PayOrderMapper, PayOrder> {
             createdEnd = DateUtil.formatDate(today) + " 23:59:59";
         }
 
-        if (StrUtil.isNotBlank(mchNo)) param.put("mchNo", mchNo);
+        if (StrUtil.isNotBlank(mchNo)) {
+            param.put("mchNo", mchNo);
+        }
         param.put("createTimeStart", createdStart);
         param.put("createTimeEnd", createdEnd);
         // 查询收款的记录

jeepay-service/src/main/java/com/jeequan/jeepay/service/impl/SysConfigService.java

@@ -53,6 +53,7 @@ public class SysConfigService extends ServiceImpl<SysConfigMapper, SysConfig> im
     }
 
     /** 获取实际的数据 **/
+    @Override
     public DBApplicationConfig getDBApplicationConfig() {
 
         if(APPLICATION_CONFIG.getRight() == null ){
@@ -80,7 +81,9 @@ public class SysConfigService extends ServiceImpl<SysConfigMapper, SysConfig> im
             sysConfig.setConfigKey(k);
             sysConfig.setConfigVal(updateMap.get(k));
             boolean update = sysConfigService.saveOrUpdate(sysConfig);
-            if (update) count ++;
+            if (update) {
+                count ++;
+            }
         }
         return count;
     }

jeepay-service/src/main/java/com/jeequan/jeepay/service/impl/SysUserService.java

@@ -57,10 +57,18 @@ public class SysUserService extends ServiceImpl<SysUserMapper, SysUser> {
 //        if(roleIdList.isEmpty()) throw new BizException("请选择角色信息！");
 
         // 判断数据来源
-        if( StringUtils.isEmpty(sysUser.getLoginUsername()) ) throw new BizException("登录用户名不能为空！");
-        if( StringUtils.isEmpty(sysUser.getRealname()) )throw new BizException("姓名不能为空！");
-        if( StringUtils.isEmpty(sysUser.getTelphone()) ) throw new BizException("手机号不能为空！");
-        if(sysUser.getSex() == null ) throw new BizException("性别不能为空！");
+        if( StringUtils.isEmpty(sysUser.getLoginUsername()) ) {
+            throw new BizException("登录用户名不能为空！");
+        }
+        if( StringUtils.isEmpty(sysUser.getRealname()) ) {
+            throw new BizException("姓名不能为空！");
+        }
+        if( StringUtils.isEmpty(sysUser.getTelphone()) ) {
+            throw new BizException("手机号不能为空！");
+        }
+        if(sysUser.getSex() == null ) {
+            throw new BizException("性别不能为空！");
+        }
 
         //登录用户名不可重复
         if( count(SysUser.gw().eq(SysUser::getSysType, sysType).eq(SysUser::getLoginUsername, sysUser.getLoginUsername())) > 0 ){
@@ -105,7 +113,9 @@ public class SysUserService extends ServiceImpl<SysUserMapper, SysUser> {
         Long sysUserId = sysUser.getSysUserId();
         SysUser dbRecord = getById(sysUserId);
 
-        if (dbRecord == null) throw new BizException("该用户不存在");
+        if (dbRecord == null) {
+            throw new BizException("该用户不存在");
+        }
 
         //修改了手机号， 需要修改auth表信息
         if(!dbRecord.getTelphone().equals(sysUser.getTelphone())){