init: init project step4: biz code support

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/SysDeptRechargeController.java

@@ -136,7 +136,7 @@ public class SysDeptRechargeController {
                 .eq(SysDeptRecharge::getDeptId, deptId)
                 .eq(SysDeptRecharge::getDelFlag, DelEnum.NOT_DEL.getVal()));
 
-        Map<String, Integer> result = new HashMap<>(4);
+        Map<String, Object> result = new HashMap<>(4);
         if (deptRecharge == null) {
             result.put("score", 0);
             result.put("usedScore", 0);
@@ -149,7 +149,7 @@ public class SysDeptRechargeController {
             List<SysDeptRechargeRecord> usedRecords = deptRechargeRecordService.list(Wrappers.<SysDeptRechargeRecord>lambdaQuery()
                     .eq(SysDeptRechargeRecord::getDeptId, deptId)
                     .eq(SysDeptRechargeRecord::getDelFlag, DelEnum.NOT_DEL.getVal()));
-            int usedScore = usedRecords.stream().mapToInt(SysDeptRechargeRecord::getChangeScore).sum();
+            long usedScore = usedRecords.stream().mapToLong(SysDeptRechargeRecord::getChangeScore).sum();
             result.put("usedScore", Math.abs(usedScore));
 
             // 可开票记录

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmScorePackageController.java

@@ -1544,7 +1544,7 @@ public class WmScorePackageController {
                 // 设置planId
                 SysPlanPkg one = planPkgService.getOne(Wrappers.<SysPlanPkg>lambdaQuery().eq(SysPlanPkg::getPkgId, wmScorePackage.getId()));
 
-                if (one != null){
+                if (one != null) {
                     wmScorePackage.setPlanId(one.getPlanId());
                 }
 
@@ -1830,7 +1830,7 @@ public class WmScorePackageController {
                 log.error("未配置积分充值信息");
                 throw new BizException("积分余额：0，积分不足");
             }
-            int limitScore = deptRecharge.getScore() + deptRecharge.getOverdrawScore();
+            long limitScore = deptRecharge.getScore() + deptRecharge.getOverdrawScore();
             if (wmScorePackage.getScore() > limitScore) {
                 log.error("已分配积分不足，发包积分={}，剩余积分={}，透支额度={}", wmScorePackage.getScore(), deptRecharge.getScore(), limitScore);
                 throw new BizException(String.format("积分余额：%s，积分不足", deptRecharge.getScore()));
@@ -2047,7 +2047,7 @@ public class WmScorePackageController {
 
         if (!relatedScoreId) {
             // 更新积分充值信息
-            int currentScore = deptRecharge.getScore() - wmScorePackage.getScore();
+            long currentScore = deptRecharge.getScore() - (long) wmScorePackage.getScore();
             int updateRecharge = sysDeptRechargeMapper.update(null, Wrappers.<SysDeptRecharge>lambdaUpdate()
                     .eq(SysDeptRecharge::getId, deptRecharge.getId())
                     .eq(SysDeptRecharge::getVersion, deptRecharge.getVersion())
@@ -2062,12 +2062,12 @@ public class WmScorePackageController {
             // 更新积分充值记录
             SysDeptRechargeRecord rechargeRecord = new SysDeptRechargeRecord();
             rechargeRecord.setDeptId(deptId);
-            rechargeRecord.setChangeScore(-wmScorePackage.getScore());
+            rechargeRecord.setChangeScore((long) -wmScorePackage.getScore());
             rechargeRecord.setRechargeId(deptRecharge.getId());
             rechargeRecord.setPackageId(wmScorePackage.getId());
             rechargeRecord.setPackageType(RechargeRecordPackageType.TO_ENTERPRISE);
             rechargeRecord.setType(RechargeRecordType.SEND_PACKAGE_DEPT);
-            rechargeRecord.setCurrentScore(currentScore);
+            rechargeRecord.setCurrentScore((long) currentScore);
             rechargeRecord.setCreateUser(userId);
             rechargeRecord.setCreateTime(now);
             sysDeptRechargeRecordMapper.insert(rechargeRecord);
@@ -2537,7 +2537,7 @@ public class WmScorePackageController {
             wmScoreTaskTypeService.deleteByScoreId(wmScorePackage.getId());
             //todo
             //wmScoreTaskTypeService.batchInsertType(wmScoreTaskTypess);
-                    wmScoreTaskTypeService.saveBatch(wmScoreTaskTypess);
+            wmScoreTaskTypeService.saveBatch(wmScoreTaskTypess);
         }
 
         // 查询原积分包值
@@ -2572,9 +2572,9 @@ public class WmScorePackageController {
                 throw new RuntimeException("积分余额：0。积分不足");
             }
 
-            int currentScore = deptRecharge.getScore() + changeScore;
+            long currentScore = deptRecharge.getScore() + (long) changeScore;
 
-            int limitScore = deptRecharge.getScore() + deptRecharge.getOverdrawScore();
+            long limitScore = deptRecharge.getScore() + deptRecharge.getOverdrawScore();
             if (changeScore < 0 && Math.abs(changeScore) > limitScore) {
                 log.warn("已分配积分不足，修改积分={}，剩余积分={}，透支额度={}",
                         changeScore, deptRecharge.getScore(), deptRecharge.getOverdrawScore());
@@ -2597,7 +2597,7 @@ public class WmScorePackageController {
             // 更新积分充值记录
             SysDeptRechargeRecord newRechargeRecord = new SysDeptRechargeRecord();
             newRechargeRecord.setRechargeId(deptRecharge.getId());
-            newRechargeRecord.setChangeScore(changeScore);
+            newRechargeRecord.setChangeScore((long) changeScore);
             newRechargeRecord.setCurrentScore(currentScore);
             newRechargeRecord.setType(RechargeRecordType.RECOVERY);
             newRechargeRecord.setDeptId(deptRecharge.getDeptId());

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmScorePackageServiceImpl.java

@@ -762,7 +762,7 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
                 log.warn("未配置积分充值信息");
                 throw new RuntimeException("积分余额：0。积分不足");
             }
-            int limitScore = deptRecharge.getScore() + deptRecharge.getOverdrawScore();
+            long limitScore = deptRecharge.getScore() + deptRecharge.getOverdrawScore();
             if (wmScorePackage.getScore() > limitScore) {
                 log.warn("已分配积分不足，发包积分={}，剩余积分={}，透支额度={}",
                         wmScorePackage.getScore(), deptRecharge.getScore(), limitScore);
@@ -1006,7 +1006,7 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
         }
 
         if (!relatedScoreId) {
-            int currentScore = deptRecharge.getScore() - wmScorePackage.getScore();
+            long currentScore = deptRecharge.getScore() - wmScorePackage.getScore();
             // 更新积分充值信息
             int updateRecharge = sysDeptRechargeMapper.update(null, Wrappers.<SysDeptRecharge>lambdaUpdate()
                     .eq(SysDeptRecharge::getId, deptRecharge.getId())
@@ -1022,7 +1022,7 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
             // 更新积分充值记录
             SysDeptRechargeRecord rechargeRecord = new SysDeptRechargeRecord();
             rechargeRecord.setDeptId(currentUser.getDeptId());
-            rechargeRecord.setChangeScore(-wmScorePackage.getScore());
+            rechargeRecord.setChangeScore((long) (-wmScorePackage.getScore()));
             rechargeRecord.setRechargeId(deptRecharge.getId());
             rechargeRecord.setPackageType(RechargeRecordPackageType.TO_PERSON);
             rechargeRecord.setPackageId(wmScorePackage.getId());
@@ -1389,7 +1389,7 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
         if (rechargeRecord != null) {
             log.info("终止积分包，更新积分配置信息");
             SysDeptRecharge deptRecharge = sysDeptRechargeMapper.selectById(rechargeRecord.getRechargeId());
-            int currentScore = deptRecharge.getScore() + recoveryScore;
+            long currentScore = deptRecharge.getScore() + recoveryScore;
             // 更新企业配置的积分信息
             int update = sysDeptRechargeMapper.update(null, Wrappers.<SysDeptRecharge>lambdaUpdate()
                     .eq(SysDeptRecharge::getId, rechargeRecord.getRechargeId())
@@ -1404,7 +1404,7 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
             // 新增积分记录
             SysDeptRechargeRecord newRechargeRecord = new SysDeptRechargeRecord();
             newRechargeRecord.setRechargeId(deptRecharge.getId());
-            newRechargeRecord.setChangeScore(recoveryScore);
+            newRechargeRecord.setChangeScore((long) recoveryScore);
             newRechargeRecord.setCurrentScore(currentScore);
             newRechargeRecord.setType(RechargeRecordType.RECOVERY);
             newRechargeRecord.setDeptId(deptRecharge.getDeptId());
@@ -1419,7 +1419,7 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
                 log.info("终止积分包，更新积分配置信息（历史积分包处理）");
                 SysDeptRecharge deptRecharge = sysDeptRechargeMapper.selectOne(Wrappers.<SysDeptRecharge>lambdaQuery()
                         .eq(SysDeptRecharge::getDeptId, deptId));
-                int currentScore = deptRecharge.getScore() + recoveryScore;
+                long currentScore = deptRecharge.getScore() + recoveryScore;
                 // 更新企业配置的积分信息
                 int update = sysDeptRechargeMapper.update(null, Wrappers.<SysDeptRecharge>lambdaUpdate()
                         .eq(SysDeptRecharge::getId, deptRecharge.getId())
@@ -1434,7 +1434,7 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
                 // 新增积分记录
                 SysDeptRechargeRecord newRechargeRecord = new SysDeptRechargeRecord();
                 newRechargeRecord.setRechargeId(deptRecharge.getId());
-                newRechargeRecord.setChangeScore(recoveryScore);
+                newRechargeRecord.setChangeScore((long) recoveryScore);
                 newRechargeRecord.setCurrentScore(currentScore);
                 newRechargeRecord.setType(RechargeRecordType.RECOVERY);
                 newRechargeRecord.setDeptId(deptRecharge.getDeptId());
@@ -1836,9 +1836,9 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
                 throw new RuntimeException("积分余额：0。积分不足");
             }
 
-            int currentScore = deptRecharge.getScore() + changeScore;
+            long currentScore = deptRecharge.getScore() + changeScore;
 
-            int limitScore = deptRecharge.getScore() + deptRecharge.getOverdrawScore();
+            long limitScore = deptRecharge.getScore() + deptRecharge.getOverdrawScore();
             if (changeScore < 0 && Math.abs(changeScore) > limitScore) {
                 log.warn("已分配积分不足，修改积分={}，剩余积分={}，透支额度={}",
                         changeScore, deptRecharge.getScore(), deptRecharge.getOverdrawScore());
@@ -1861,7 +1861,7 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
             // 新增积分记录
             SysDeptRechargeRecord newRechargeRecord = new SysDeptRechargeRecord();
             newRechargeRecord.setRechargeId(deptRecharge.getId());
-            newRechargeRecord.setChangeScore(changeScore);
+            newRechargeRecord.setChangeScore((long) changeScore);
             newRechargeRecord.setCurrentScore(currentScore);
             newRechargeRecord.setType(RechargeRecordType.RECOVERY);
             newRechargeRecord.setDeptId(deptRecharge.getDeptId());
@@ -3685,7 +3685,7 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
         SysDeptRechargeRecord rechargeRecord = sysDeptRechargeRecordMapper.selectOne(Wrappers.<SysDeptRechargeRecord>lambdaQuery()
                 .eq(SysDeptRechargeRecord::getPackageId, packageId)
                 .in(SysDeptRechargeRecord::getType, RechargeRecordType.SEND_PACKAGE_DEPT, RechargeRecordType.SEND_PACKAGE_PERSONAL));
-        int currentScore = deptRecharge.getScore() + recoveryScore;
+        long currentScore = deptRecharge.getScore() + recoveryScore;
         // 更新企业配置的积分信息
         log.info("终止积分包，更新积分余额信息:deptId={},score={},changeScore={}", deptId, currentScore, recoveryScore);
         int update = sysDeptRechargeMapper.update(null, Wrappers.<SysDeptRecharge>lambdaUpdate()
@@ -3701,8 +3701,8 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
         // 新增积分记录
         SysDeptRechargeRecord newRechargeRecord = new SysDeptRechargeRecord();
         newRechargeRecord.setRechargeId(deptRecharge.getId());
-        newRechargeRecord.setChangeScore(recoveryScore);
-        newRechargeRecord.setCurrentScore(currentScore);
+        newRechargeRecord.setChangeScore((long) recoveryScore);
+        newRechargeRecord.setCurrentScore((long) currentScore);
         newRechargeRecord.setType(RechargeRecordType.RECOVERY);
         newRechargeRecord.setDeptId(deptRecharge.getDeptId());
         if (rechargeRecord != null) {