From 3ff8a544b05e713fc819023fb4a5c89f841661c3 Mon Sep 17 00:00:00 2001 From: gaoqr <13665037151@163.com> Date: Fri, 7 Nov 2025 10:24:22 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E7=AE=A1=E7=90=86=E7=AB=AF=E5=88=86?= =?UTF-8?q?=E6=9E=90=E9=A1=B5=E8=B4=A6=E6=88=B7=E8=B5=84=E9=87=91=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E6=94=B9=E4=B8=BA=E5=8F=AA=E5=B1=95=E7=A4=BA=E9=94=80?= =?UTF-8?q?=E5=94=AE=E9=A2=9D=EF=BC=9B2=E3=80=81=E7=A7=BB=E9=99=A4?= =?UTF-8?q?=E7=BB=84=E7=BB=87=E8=B5=84=E9=87=91=E7=9B=B8=E5=85=B3=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManageStatisticsController.java | 2 +- .../funds/organamount/OrganAmountDO.java | 63 ------------------- .../funds/organamount/OrganAmountMapper.java | 22 ------- .../funds/purchase/PurchaseRecordMapper.java | 10 --- .../IncomeExpenseDetailsMapper.java | 24 +++++++ .../system/dal/mysql/pay/PayOrderMapper.java | 12 ---- .../organamount/OrganAmountServiceImpl.java | 6 +- .../FundsStatisticsServiceImpl.java | 28 ++------- .../service/organ/OrganServiceImpl.java | 10 --- .../mapper/funds/amount/OrganAmountMapper.xml | 32 ---------- .../IncomeExpenseDetailsMapper.xml | 37 +++++++++++ .../mapper/funds/pay/PayOrderMapper.xml | 28 --------- .../mapper/funds/purchase/PurchaseMapper.xml | 27 ++------ 13 files changed, 75 insertions(+), 226 deletions(-) delete mode 100644 cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/funds/organamount/OrganAmountDO.java delete mode 100644 cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/funds/organamount/OrganAmountMapper.java delete mode 100644 cf-module-system/cf-module-system-biz/src/main/resources/mapper/funds/amount/OrganAmountMapper.xml diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/statistics/ManageStatisticsController.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/statistics/ManageStatisticsController.java index 9dc91d212..c44b70ee7 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/statistics/ManageStatisticsController.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/statistics/ManageStatisticsController.java @@ -77,7 +77,7 @@ public class ManageStatisticsController { } @GetMapping("/funds/tradeType/group") - @Operation(summary = "账户资金充值、软件购买统计") + @Operation(summary = "销售额统计") public CommonResult> getFunsTradeTypeGroupStatistics(@Valid OrgStatusGroupStatisticsReqVO reqVO) { return success(fundsStatisticsService.getFunsTradeTypeGroupStatistics(reqVO)); } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/funds/organamount/OrganAmountDO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/funds/organamount/OrganAmountDO.java deleted file mode 100644 index 246515955..000000000 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/funds/organamount/OrganAmountDO.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.cf.imes.module.system.dal.dataobject.funds.organamount; - - -import com.baomidou.mybatisplus.annotation.KeySequence; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.cf.imes.framework.mybatis.core.dataobject.BaseDO; -import lombok.*; - -import java.math.BigDecimal; - -@TableName("system_organization_amount") -@KeySequence("system_organization_amount_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class OrganAmountDO extends BaseDO { - - - /** - * 主键 - */ - @TableId - private Long id; - - - /** - * 组织ID - */ - private Long organId; - - - /** - * 现金金额 - */ - private BigDecimal amount; - - - /** - * 赠送金额 - */ - private BigDecimal giftAmount; - - - /** - * 货币类型 - */ - private Integer currency; - - - /** - * 货币单位 - */ - private String currencyUnit; - - /** - * 版本号 - */ - private int version; -} diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/funds/organamount/OrganAmountMapper.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/funds/organamount/OrganAmountMapper.java deleted file mode 100644 index e9ea0be67..000000000 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/funds/organamount/OrganAmountMapper.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.cf.imes.module.system.dal.mysql.funds.organamount; - -import com.cf.imes.framework.mybatis.core.mapper.BaseMapperX; -import com.cf.imes.module.system.controller.admin.funds.organamount.vo.OrganAmountGroupByCreateTimeRespVO; -import com.cf.imes.module.system.controller.admin.funds.organamount.vo.OrganFundsStatisticsReqVO; -import com.cf.imes.module.system.dal.dataobject.funds.organamount.OrganAmountDO; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -@Mapper -public interface OrganAmountMapper extends BaseMapperX { - - /** - * 查询基于创建时间的组织收支趋势 - * - * @param reqVO - * @return - */ - List selectOrganIncomeExpenseTrendGroupByCreateTime(@Param("req") OrganFundsStatisticsReqVO reqVO, @Param("organId") Long organId); -} 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 9efd348d3..e9acd1038 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 @@ -11,9 +11,7 @@ import com.cf.imes.module.system.controller.admin.funds.invoice.vo.InvoiceAmount import com.cf.imes.module.system.controller.admin.funds.organamount.vo.TotalSalesAmountRespVO; import com.cf.imes.module.system.controller.admin.funds.purchase.vo.PurchaseRecordPageReqVO; import com.cf.imes.module.system.controller.admin.funds.purchase.vo.SalesDetailsPageReqVO; -import com.cf.imes.module.system.controller.admin.statistics.vo.OrgStatusGroupStatisticsReqVO; import com.cf.imes.module.system.dal.dataobject.funds.purchase.PurchaseRecordDO; -import com.cf.imes.module.system.dal.dataobject.funds.statistics.FundsTradeTypeGroupStatisticsDO; import com.cf.imes.module.system.enums.pay.InvoiceStatusEnum; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -133,12 +131,4 @@ public interface PurchaseRecordMapper extends BaseMapperX { PurchaseRecordDO::getCreator, PurchaseRecordDO::getCreateTime, PurchaseRecordDO::getPaymentMethod) ); } - - /** - * 获取软件购买统计分组 - * - * @param reqVO - * @return - */ - List getPurchaseGroupStatistics(@Param("req") OrgStatusGroupStatisticsReqVO reqVO); } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/incomeandexpense/IncomeExpenseDetailsMapper.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/incomeandexpense/IncomeExpenseDetailsMapper.java index 7b266febe..a575c6627 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/incomeandexpense/IncomeExpenseDetailsMapper.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/incomeandexpense/IncomeExpenseDetailsMapper.java @@ -1,8 +1,16 @@ package com.cf.imes.module.system.dal.mysql.incomeandexpense; import com.cf.imes.framework.mybatis.core.mapper.BaseMapperX; +import com.cf.imes.module.system.controller.admin.funds.organamount.vo.OrganAmountGroupByCreateTimeRespVO; +import com.cf.imes.module.system.controller.admin.funds.organamount.vo.OrganFundsStatisticsReqVO; +import com.cf.imes.module.system.controller.admin.statistics.vo.OrgStatusGroupStatisticsReqVO; +import com.cf.imes.module.system.dal.dataobject.funds.statistics.FundsTradeTypeGroupStatisticsDO; import com.cf.imes.module.system.dal.dataobject.incomeandexpense.IncomeExpenseDetailsDO; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + /** * 收支明细 Mapper * @@ -11,4 +19,20 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface IncomeExpenseDetailsMapper extends BaseMapperX { + /** + * 查询基于创建时间的组织收支趋势 + * + * @param reqVO + * @return + */ + List selectOrganIncomeExpenseTrendGroupByCreateTime(@Param("req") OrganFundsStatisticsReqVO reqVO, @Param("organId") Long organId); + + + /** + * 查询基于创建时间的组织消费额趋势 + * + * @param reqVO + * @return + */ + List selectTotalSalesTrendGroupByCreateTime(@Param("req") OrgStatusGroupStatisticsReqVO reqVO); } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/pay/PayOrderMapper.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/pay/PayOrderMapper.java index 8a2c02cee..08857b2f0 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/pay/PayOrderMapper.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/pay/PayOrderMapper.java @@ -1,14 +1,10 @@ package com.cf.imes.module.system.dal.mysql.pay; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.cf.imes.module.system.controller.admin.statistics.vo.OrgStatusGroupStatisticsReqVO; -import com.cf.imes.module.system.dal.dataobject.funds.statistics.FundsTradeTypeGroupStatisticsDO; import com.cf.imes.module.system.dal.dataobject.pay.PayOrderDO; import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; import java.math.BigDecimal; -import java.util.List; /** * 支付订单 Mapper @@ -25,12 +21,4 @@ public interface PayOrderMapper extends BaseMapper { * @return */ BigDecimal getRechargeTotalAmount(); - - /** - * 获取充值统计分组 - * - * @param reqVO - * @return - */ - List getRechargeGroupStatistics(@Param("req") OrgStatusGroupStatisticsReqVO reqVO); } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/organamount/OrganAmountServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/organamount/OrganAmountServiceImpl.java index 261462ac3..8eea68484 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/organamount/OrganAmountServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/organamount/OrganAmountServiceImpl.java @@ -10,9 +10,9 @@ import com.cf.imes.module.system.controller.admin.funds.organamount.vo.OrganProd import com.cf.imes.module.system.controller.admin.funds.organamount.vo.TotalSalesAmountRespVO; import com.cf.imes.module.system.controller.admin.funds.purchase.vo.OrgEarliestPurchaseProductRespVO; import com.cf.imes.module.system.dal.dataobject.funds.purchase.PurchaseRecordDO; +import com.cf.imes.module.system.dal.mysql.incomeandexpense.IncomeExpenseDetailsMapper; import com.cf.imes.module.system.service.funds.invoice.InvoiceService; import com.cf.imes.module.system.service.funds.purchase.PurchaseService; -import com.cf.imes.module.system.dal.mysql.funds.organamount.OrganAmountMapper; import com.cf.imes.module.system.service.organ.OrganService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -43,7 +43,7 @@ public class OrganAmountServiceImpl implements OrganAmountService { @Resource - private OrganAmountMapper organAmountMapper; + private IncomeExpenseDetailsMapper incomeExpenseDetailsMapper; @Resource private OrganService organService; @@ -106,7 +106,7 @@ public class OrganAmountServiceImpl implements OrganAmountService { Map orgAmountSeriesItem = new HashMap<>(); // 查询组织收支趋势统计 - Map> organIncomeExpenseGroupByCreateTimeRespMap = organAmountMapper.selectOrganIncomeExpenseTrendGroupByCreateTime(reqVO, queryOrg ? organId : null).stream() + Map> organIncomeExpenseGroupByCreateTimeRespMap = incomeExpenseDetailsMapper.selectOrganIncomeExpenseTrendGroupByCreateTime(reqVO, queryOrg ? organId : null).stream() .sorted(Comparator.naturalOrder()) .collect(Collectors.groupingBy(OrganAmountGroupByCreateTimeRespVO::getDate, LinkedHashMap::new, Collectors.toList())); diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/statistics/FundsStatisticsServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/statistics/FundsStatisticsServiceImpl.java index 3cf1a25dc..37f27191e 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/statistics/FundsStatisticsServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/statistics/FundsStatisticsServiceImpl.java @@ -2,8 +2,7 @@ package com.cf.imes.module.system.service.funds.statistics; import com.cf.imes.module.system.controller.admin.statistics.vo.OrgStatusGroupStatisticsReqVO; import com.cf.imes.module.system.dal.dataobject.funds.statistics.FundsTradeTypeGroupStatisticsDO; -import com.cf.imes.module.system.dal.mysql.funds.purchase.PurchaseRecordMapper; -import com.cf.imes.module.system.dal.mysql.pay.PayOrderMapper; +import com.cf.imes.module.system.dal.mysql.incomeandexpense.IncomeExpenseDetailsMapper; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; @@ -30,10 +29,7 @@ import static com.cf.imes.framework.common.util.time.StatisticsChangeUtils.getDa public class FundsStatisticsServiceImpl implements FundsStatisticsService { @Resource - private PurchaseRecordMapper purchaseRecordMapper; - - @Resource - private PayOrderMapper payOrderMapper; + private IncomeExpenseDetailsMapper incomeExpenseDetailsMapper; @Override public Map getFunsTradeTypeGroupStatistics(OrgStatusGroupStatisticsReqVO reqVO) { @@ -43,29 +39,16 @@ public class FundsStatisticsServiceImpl implements FundsStatisticsService { List dateList = getDateList(reqVO); // 销售额Map - LinkedHashMap> purchaseMap = purchaseRecordMapper.getPurchaseGroupStatistics(reqVO).stream() - .sorted(Comparator.naturalOrder()) - .collect(Collectors.groupingBy(FundsTradeTypeGroupStatisticsDO::getDate, LinkedHashMap::new, Collectors.toList())); - - // 充值Map - LinkedHashMap> rechargeMap = payOrderMapper.getRechargeGroupStatistics(reqVO).stream() + LinkedHashMap> purchaseMap = incomeExpenseDetailsMapper.selectTotalSalesTrendGroupByCreateTime(reqVO).stream() .sorted(Comparator.naturalOrder()) .collect(Collectors.groupingBy(FundsTradeTypeGroupStatisticsDO::getDate, LinkedHashMap::new, Collectors.toList())); List> series = new ArrayList<>(); - Map rechargeSeriesItem = new HashMap<>(); Map purchaseSeriesItem = new HashMap<>(); - BigDecimal[] rechargeCountArr = new BigDecimal[dateList.size()]; BigDecimal[] purchaseCountArr = new BigDecimal[dateList.size()]; // 遍历时间跨度列表，匹配数量存入数组，没有补0存入数组 for (int i = 0; i < dateList.size(); i++) { String dateStr = dateList.get(i); - // 充值金额 - BigDecimal rechargeAmount = Optional.ofNullable(rechargeMap.get(dateStr)) - .map(list -> list.stream().findFirst().orElse(new FundsTradeTypeGroupStatisticsDO())) - .map(FundsTradeTypeGroupStatisticsDO::getAmount) - .orElse(BigDecimal.valueOf(0)); - rechargeCountArr[i] = rechargeAmount; // 软件购买金额 BigDecimal purchaseAmount = Optional.ofNullable(purchaseMap.get(dateStr)) @@ -74,11 +57,8 @@ public class FundsStatisticsServiceImpl implements FundsStatisticsService { .orElse(BigDecimal.valueOf(0)); purchaseCountArr[i] = purchaseAmount; } - rechargeSeriesItem.put("data", rechargeCountArr); - rechargeSeriesItem.put("name", "充值"); purchaseSeriesItem.put("data", purchaseCountArr); - purchaseSeriesItem.put("name", "软件购买"); - series.add(rechargeSeriesItem); + purchaseSeriesItem.put("name", "销售额"); series.add(purchaseSeriesItem); // x轴时间区间字符串 diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/organ/OrganServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/organ/OrganServiceImpl.java index d551fd35a..baa40a5d9 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/organ/OrganServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/organ/OrganServiceImpl.java @@ -35,7 +35,6 @@ import com.cf.imes.module.system.controller.admin.tokenconfig.vo.JwtConfig; import com.cf.imes.module.system.controller.admin.user.vo.user.UserSaveReqVO; import com.cf.imes.module.system.convert.organ.OrganConvert; import com.cf.imes.module.system.dal.dataobject.dict.DictDataDO; -import com.cf.imes.module.system.dal.dataobject.funds.organamount.OrganAmountDO; import com.cf.imes.module.system.dal.dataobject.lable.LabelDO; import com.cf.imes.module.system.dal.dataobject.machine.MachineDO; import com.cf.imes.module.system.dal.dataobject.machine.MachineLimitDO; @@ -46,7 +45,6 @@ import com.cf.imes.module.system.dal.dataobject.permission.RoleDO; import com.cf.imes.module.system.dal.dataobject.systemconfig.*; import com.cf.imes.module.system.dal.dataobject.tokenconfig.TokenConfigDO; import com.cf.imes.module.system.dal.mysql.dict.DictDataMapper; -import com.cf.imes.module.system.dal.mysql.funds.organamount.OrganAmountMapper; import com.cf.imes.module.system.dal.mysql.label.LabelMapper; import com.cf.imes.module.system.dal.mysql.machine.MachineLimitMapper; import com.cf.imes.module.system.dal.mysql.machine.MachineMapper; @@ -160,9 +158,6 @@ public class OrganServiceImpl implements OrganService { @Resource private LabelMapper labelMapper; - @Resource - private OrganAmountMapper organAmountMapper; - @Resource private PurchaseService purchaseService; @@ -242,11 +237,6 @@ public class OrganServiceImpl implements OrganService { // 复制系统配置里的相关配置 copySystemConfig(organId); - // 创建组织套餐 - organAmountMapper.insert(OrganAmountDO.builder() - .organId(organId) - .build()); - // 创建产品购买记录 List productPurchaseReqVOS = createReqVO.getProductPurchaseReqVOS(); // 根据productId去重，初次订购每个产品只能有一种订购 diff --git a/cf-module-system/cf-module-system-biz/src/main/resources/mapper/funds/amount/OrganAmountMapper.xml b/cf-module-system/cf-module-system-biz/src/main/resources/mapper/funds/amount/OrganAmountMapper.xml deleted file mode 100644 index d32a1ecaa..000000000 --- a/cf-module-system/cf-module-system-biz/src/main/resources/mapper/funds/amount/OrganAmountMapper.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - ,CONCAT(YEAR(create_time), '-', QUARTER(create_time)) as date - - - ,CONCAT(YEAR(create_time), '-', MONTH(create_time)) as date - - - ,CONCAT(YEAR(create_time), '-', MONTH(create_time), '-', WEEK(create_time, 1)) AS date - - - ,CONCAT(YEAR(create_time), '-', MONTH(create_time), '-', DAY(create_time)) as date - - - - - - - \ No newline at end of file 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 993502bde..cfd6cc881 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 @@ -1,4 +1,41 @@ + + + ,CONCAT(YEAR(create_time), '-', QUARTER(create_time)) as date + + + ,CONCAT(YEAR(create_time), '-', MONTH(create_time)) as date + + + ,CONCAT(YEAR(create_time), '-', MONTH(create_time), '-', WEEK(create_time, 1)) AS date + + + ,CONCAT(YEAR(create_time), '-', MONTH(create_time), '-', DAY(create_time)) as date + + + + + + \ 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 6634b1e72..13157a72e 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 @@ -6,32 +6,4 @@ select sum(price) from pay_order where status = '${@com.cf.imes.module.system.enums.pay.PayOrderStatusEnum@SUCCESS.status}' and deleted = false - - - - ,CONCAT(YEAR(o.notify_time), '-', QUARTER(o.notify_time)) as date - - - ,CONCAT(YEAR(o.notify_time), '-', MONTH(o.notify_time)) as date - - - ,CONCAT(YEAR(o.notify_time), '-', MONTH(o.notify_time), '-', FLOOR((DayOfMonth(o.notify_time)-1)/7)+1) AS - date - - - ,CONCAT(YEAR(o.notify_time), '-', MONTH(o.notify_time), '-', DAY(o.notify_time)) as date - - - - \ 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 562b250cf..bc97161f1 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,12 +2,7 @@ @@ -18,7 +13,7 @@ SUM( CASE WHEN is_invocing = '${@com.cf.imes.module.system.enums.pay.InvoiceStatusEnum@INVOICABLE.code}' - THEN account_balance_spent + external_spent + THEN external_spent ELSE 0 END ) AS invocable, @@ -26,7 +21,7 @@ SUM( CASE WHEN is_invocing = '${@com.cf.imes.module.system.enums.pay.InvoiceStatusEnum@PENDINGINVOICING.code}' - THEN account_balance_spent + external_spent + THEN external_spent ELSE 0 END ) AS inTheInvoice, @@ -34,7 +29,7 @@ SUM( CASE WHEN is_invocing = '${@com.cf.imes.module.system.enums.pay.InvoiceStatusEnum@INVOICINGSUCCESSFUL.code}' - THEN account_balance_spent + external_spent + THEN external_spent ELSE 0 END ) AS invoiced @@ -43,7 +38,7 @@ select - sum(total_amount - gift_money_spent) as amount + sum(total_amount) as amount from purchase_record where deleted = false and initial != true and create_time >= CURDATE() @@ -85,14 +80,4 @@ ,CONCAT(YEAR(o.create_time), '-', MONTH(o.create_time), '-', DAY(o.create_time)) as date - - \ No newline at end of file