Browse Source

init: init project step4: biz code support

shc 1 year ago
parent
commit
06aad1be9d

+ 2 - 2
hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/vo/SysDeptRechargeRecordForDeptVO.java

@@ -49,7 +49,7 @@ public class SysDeptRechargeRecordForDeptVO implements Serializable {
     /**
      * 充值/消耗积分
      */
-    private Integer changeScore;
+    private Long changeScore;
 
     /**
      * 操作类型
@@ -59,7 +59,7 @@ public class SysDeptRechargeRecordForDeptVO implements Serializable {
     /**
      * 充值/消耗后积分余额
      */
-    private Integer currentScore;
+    private Long currentScore;
 
     /**
      * 关联对象(相对于当前登录企业的另一方)

+ 2 - 2
hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/vo/SysDeptRechargeRecordVO.java

@@ -50,7 +50,7 @@ public class SysDeptRechargeRecordVO implements Serializable {
     /**
      * 充值/消耗积分
      */
-    private Integer changeScore;
+    private Long changeScore;
 
     /**
      * 充值金额(元)
@@ -65,7 +65,7 @@ public class SysDeptRechargeRecordVO implements Serializable {
     /**
      * 充值/消耗后积分余额
      */
-    private Integer currentScore;
+    private Long currentScore;
 
     /**
      * 充值后积分余额(元)

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

@@ -93,7 +93,7 @@ public class SysDeptRechargeController {
     /**
      * 分页查询(平台财务)
      *
-     * @param page 分页参数
+     * @param page   分页参数
      * @param toPage 条件参数
      * @return 分页结果
      */
@@ -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()));
-            long usedScore = usedRecords.stream().mapToLong(SysDeptRechargeRecord::getChangeScore).sum();
+            long usedScore = usedRecords.stream().mapToLong(SysDeptRechargeRecord::getChangeScore).filter(score -> score < 0).sum();
             result.put("usedScore", Math.abs(usedScore));
 
             // 可开票记录