diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/purchase/vo/PurchaseRecordPageReqVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/purchase/vo/PurchaseRecordPageReqVO.java index 6f1f91c2f..ee45fb35b 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/purchase/vo/PurchaseRecordPageReqVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/purchase/vo/PurchaseRecordPageReqVO.java @@ -37,6 +37,9 @@ public class PurchaseRecordPageReqVO extends PageParam { @Schema(description = "购买时长") private Integer purchaseDuration; + @Schema(description = "赠送时长") + private Integer giftDuration; + @Schema(description = "购买时间", example = "[2022-07-01 01:01:01 ,2022-07-01 01:01:01]") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/funds/purchase/PurchaseRecordMapper.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/funds/purchase/PurchaseRecordMapper.java index e9acd1038..3b840086b 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/funds/purchase/PurchaseRecordMapper.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/funds/purchase/PurchaseRecordMapper.java @@ -47,6 +47,7 @@ public interface PurchaseRecordMapper extends BaseMapperX { .likeIfPresent(PurchaseRecordDO::getProductName, pageReqVO.getProductName()) .likeIfPresent(PurchaseRecordDO::getId, pageReqVO.getId()) .eqIfPresent(PurchaseRecordDO::getPurchaseDuration, pageReqVO.getPurchaseDuration()) + .eqIfPresent(PurchaseRecordDO::getGiftDuration, pageReqVO.getGiftDuration()) .betweenIfPresent(PurchaseRecordDO::getCreateTime, pageReqVO.getCreateTime()) .likeIfPresent(PurchaseRecordDO::getCreator, pageReqVO.getCreator()) .eqIfPresent(PurchaseRecordDO::getTotalAmount, pageReqVO.getProductPrice()) diff --git a/cf-module-system/cf-module-system-biz/src/main/resources/mapper/funds/incomeandexpense/IncomeExpenseDetailsMapper.xml b/cf-module-system/cf-module-system-biz/src/main/resources/mapper/funds/incomeandexpense/IncomeExpenseDetailsMapper.xml index cfd6cc881..9d904c780 100644 --- a/cf-module-system/cf-module-system-biz/src/main/resources/mapper/funds/incomeandexpense/IncomeExpenseDetailsMapper.xml +++ b/cf-module-system/cf-module-system-biz/src/main/resources/mapper/funds/incomeandexpense/IncomeExpenseDetailsMapper.xml @@ -18,7 +18,7 @@ - select sum(amount) as amount + select COALESCE(sum(amount) ,0) as amount from income_expense_details where create_time between #{req.createTime[0]} and #{req.createTime[1]} diff --git a/cf-module-system/cf-module-system-biz/src/main/resources/mapper/funds/invoice/InvoiceRecordsMapper.xml b/cf-module-system/cf-module-system-biz/src/main/resources/mapper/funds/invoice/InvoiceRecordsMapper.xml index 3d8777981..ab00f27e1 100644 --- a/cf-module-system/cf-module-system-biz/src/main/resources/mapper/funds/invoice/InvoiceRecordsMapper.xml +++ b/cf-module-system/cf-module-system-biz/src/main/resources/mapper/funds/invoice/InvoiceRecordsMapper.xml @@ -2,8 +2,9 @@ \ No newline at end of file diff --git a/cf-module-system/cf-module-system-biz/src/main/resources/mapper/funds/pay/PayOrderMapper.xml b/cf-module-system/cf-module-system-biz/src/main/resources/mapper/funds/pay/PayOrderMapper.xml index 13157a72e..977df1a96 100644 --- a/cf-module-system/cf-module-system-biz/src/main/resources/mapper/funds/pay/PayOrderMapper.xml +++ b/cf-module-system/cf-module-system-biz/src/main/resources/mapper/funds/pay/PayOrderMapper.xml @@ -3,7 +3,7 @@ \ No newline at end of file diff --git a/cf-module-system/cf-module-system-biz/src/main/resources/mapper/funds/purchase/PurchaseMapper.xml b/cf-module-system/cf-module-system-biz/src/main/resources/mapper/funds/purchase/PurchaseMapper.xml index bc97161f1..fc4ffbb08 100644 --- a/cf-module-system/cf-module-system-biz/src/main/resources/mapper/funds/purchase/PurchaseMapper.xml +++ b/cf-module-system/cf-module-system-biz/src/main/resources/mapper/funds/purchase/PurchaseMapper.xml @@ -2,7 +2,7 @@ @@ -10,35 +10,35 @@ select - sum(total_amount) as amount + COALESCE(sum(total_amount) ,0) as amount from purchase_record where deleted = false and initial != true; @@ -58,7 +58,7 @@