Browse Source

Merge branch 'feat-20230628-packagerecharge' into temp-pre

李学松 2 years ago
parent
commit
1d294a6bb9

+ 1 - 1
db/v2.0/230628.sql

@@ -29,7 +29,7 @@ create table sys_dept_recharge_record
     relation_dept_id int                                      null comment '关联组织机构ID(关联操作对象)',
     change_score     int                                      not null comment '充值积分',
     change_amount    decimal(10, 2) default 0.00              not null comment '充值金额(元)',
-    type             char(15)                                 not null comment '操作类型',
+    type             char(20)                                 not null comment '操作类型',
     current_score    int                                      not null comment '充值后积分余额',
     current_balance  decimal(10, 2) default 0.00              not null comment '充值后积分余额(元)',
     package_id       int                                      null comment '积分包id',

+ 6 - 0
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/recharge/service/impl/SysDeptInvoiceServiceImpl.java

@@ -47,6 +47,7 @@ import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -367,6 +368,11 @@ public class SysDeptInvoiceServiceImpl extends ServiceImpl<SysDeptInvoiceMapper,
         SysDeptInvoiceRequest.ToScorePackagePage toScorePackagePage = new SysDeptInvoiceRequest.ToScorePackagePage();
         toScorePackagePage.setInvoiceStatus(InvoiceStatus.NOT_APPLY);
 
+        if (CollUtil.isEmpty(queryDeptIds)) {
+            return Collections.emptyList();
+        }
+        // TODO 企业包已完成/个人包结算成功 则可开票
+
         return deptInvoiceRelationMapper.listInvoiceScorePacakgeRelation(toScorePackagePage, queryDeptIds);
     }