From 69b0991aefcc73ee48690c6a605dfa7d8ac53972 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 08 八月 2024 19:36:41 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml | 27 ++++++
pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/card/IcCardCtrl.java | 57 ++++++++++++++
pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/card/IcCardSv.java | 88 +++++++++++++++++++++
pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientCardMapper.xml | 11 +-
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeCardOperateMapper.java | 22 +++++
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeClientCardMapper.java | 7 -
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSt/VoICCard.java | 4 +
7 files changed, 205 insertions(+), 11 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeCardOperateMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeCardOperateMapper.java
index 69f2e43..20696bf 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeCardOperateMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeCardOperateMapper.java
@@ -132,4 +132,26 @@
* @return
*/
Double getTradeAmountByCardNo(Long cardNum);
+
+
+ /**
+ * 鎸囧畾鏃堕棿娈靛唴寮�鍗℃�绘暟閲忥紙鐗╃悊鍗★級
+ * @param params
+ * @return
+ */
+ Long getOpenCountIcCardsCount(Map<String, Object> params);
+
+ /**
+ * 鎸囧畾鏃堕棿娈靛唴鎸傚け鎬绘暟閲忥紙鐗╃悊鍗★級
+ * @param params
+ * @return
+ */
+ Long getLossCountIcCardsCount(Map<String, Object> params);
+
+ /**
+ * 鎸囧畾鏃堕棿娈靛唴鍏呭�兼�绘暟閲忥紙鐗╃悊鍗★級
+ * @param params
+ * @return
+ */
+ Long getRechargeCountIcCardsCount(Map<String, Object> params);
}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeClientCardMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeClientCardMapper.java
index 8596575..84522a1 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeClientCardMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeClientCardMapper.java
@@ -185,10 +185,9 @@
void updateMoney(@Param("id")Long id , @Param("money")Double money);
/**
- * 鎸囧畾鏃堕棿娈靛唴寮�鍗℃�绘暟閲忥紙鐗╃悊鍗★級
- * @param params
+ *褰撳墠浣欓鎬婚噺锛堢墿鐞嗗崱锛�
+ * @param
* @return
*/
- Long getOpenCountIcCardsCount(Map<String, Object> params);
-
+ Double getTotalMoneyIcCards();
}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSt/VoICCard.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSt/VoICCard.java
index d11e433..982a7ca 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSt/VoICCard.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSt/VoICCard.java
@@ -18,4 +18,8 @@
*/
@JSONField(serializeUsing= ObjectWriterImplToString.class)
private Long cardId;
+ /**
+ * 浣欓鎬婚噺
+ */
+ private Double totalMoney;
}
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml
index 8baa1e8..deac89d 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml
@@ -693,4 +693,31 @@
ORDER BY ope.operate_dt DESC
LIMIT 0,1
</select>
+ <!--鎸囧畾鏃堕棿娈靛唴寮�鍗℃�绘暟閲忥紙鐗╃悊鍗★級-->
+ <select id="getOpenCountIcCardsCount" resultType="java.lang.Long">
+ SELECT
+ count(*)
+ FROM
+ `se_card_operate`
+ WHERE
+ operate_dt BETWEEN #{timeStart} AND #{timeStop} AND operate_type = 1
+ </select>
+ <!--鎸囧畾鏃堕棿娈靛唴鎸傚け鎬绘暟閲忥紙鐗╃悊鍗★級-->
+ <select id="getLossCountIcCardsCount" resultType="java.lang.Long">
+ SELECT
+ count(*)
+ FROM
+ `se_card_operate`
+ WHERE
+ operate_dt BETWEEN #{timeStart} AND #{timeStop} AND operate_type = 6
+ </select>
+ <!--鎸囧畾鏃堕棿娈靛唴鍏呭�兼�绘暟閲忥紙鐗╃悊鍗★級-->
+ <select id="getRechargeCountIcCardsCount" resultType="java.lang.Long">
+ SELECT
+ count(*)
+ FROM
+ `se_card_operate`
+ WHERE
+ operate_dt BETWEEN #{timeStart} AND #{timeStop} AND operate_type = 2
+ </select>
</mapper>
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientCardMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientCardMapper.xml
index c617340..1bdeb43 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientCardMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientCardMapper.xml
@@ -589,13 +589,12 @@
ORDER BY card.id
</select>
- <!--鎸囧畾鏃堕棿娈靛唴寮�鍗℃�绘暟閲忥紙鐗╃悊鍗★級-->
- <select id="getOpenCountIcCardsCount" resultType="java.lang.Long">
+ <!--褰撳墠浣欓鎬婚噺锛堢墿鐞嗗崱锛�-->
+ <select id="getTotalMoneyIcCards" resultType="java.lang.Double">
SELECT
- count(*)
+ IFNULL(SUM(money),0) AS totalMoney
FROM
`se_client_card`
- WHERE
- createDt BETWEEN #{timeStart} AND #{timeStop}
- </select>
+ WHERE state = 1
+ </select>
</mapper>
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/card/IcCardCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/card/IcCardCtrl.java
index 970e07f..df89ee5 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/card/IcCardCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/card/IcCardCtrl.java
@@ -45,4 +45,61 @@
return BaseResponseUtils.buildException(e.getMessage());
}
}
+
+
+ /**
+ * 鎸囧畾鏃堕棿娈靛唴鎸傚け鎬绘暟閲忥紙鐗╃悊鍗★級
+ *
+ * @param qo
+ * @return
+ */
+ @GetMapping(path = "/getLossCountIcCards")
+ @SsoAop()
+ public BaseResponse<QueryResultVo<List<VoICCard>>> getLossCountIcCards(CommonQO qo) {
+ try {
+ QueryResultVo<List<VoICCard>> res = icCardSv.getLossCountIcCards(qo);
+ return BaseResponseUtils.buildSuccess(res);
+ }catch (Exception e){
+ log.error("鑾峰彇璁板綍寮傚父", e);
+ return BaseResponseUtils.buildException(e.getMessage());
+ }
+ }
+
+
+ /**
+ * 鎸囧畾鏃堕棿娈靛唴鍏呭�兼�绘暟閲忥紙鐗╃悊鍗★級
+ *
+ * @param qo
+ * @return
+ */
+ @GetMapping(path = "/getRechargeCountIcCards")
+ @SsoAop()
+ public BaseResponse<QueryResultVo<List<VoICCard>>> getRechargeCountIcCards(CommonQO qo) {
+ try {
+ QueryResultVo<List<VoICCard>> res = icCardSv.getRechargeCountIcCards(qo);
+ return BaseResponseUtils.buildSuccess(res);
+ }catch (Exception e){
+ log.error("鑾峰彇璁板綍寮傚父", e);
+ return BaseResponseUtils.buildException(e.getMessage());
+ }
+ }
+
+
+ /**
+ * 褰撳墠浣欓鎬婚噺锛堢墿鐞嗗崱锛�
+ *
+ * @param
+ * @return
+ */
+ @GetMapping(path = "/getTotalMoneyIcCards")
+ @SsoAop()
+ public BaseResponse<Double> getTotalMoneyIcCards() {
+ try {
+ Double res = icCardSv.getTotalMoneyIcCards();
+ return BaseResponseUtils.buildSuccess(res);
+ }catch (Exception e){
+ log.error("鑾峰彇璁板綍寮傚父", e);
+ return BaseResponseUtils.buildException(e.getMessage());
+ }
+ }
}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/card/IcCardSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/card/IcCardSv.java
index 410a9cb..c712949 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/card/IcCardSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/card/IcCardSv.java
@@ -1,6 +1,7 @@
package com.dy.pipIrrStatistics.card;
import com.dy.common.webUtil.QueryResultVo;
+import com.dy.pipIrrGlobal.daoSe.SeCardOperateMapper;
import com.dy.pipIrrGlobal.daoSe.SeClientCardMapper;
import com.dy.pipIrrGlobal.voSt.VoICCard;
import com.dy.pipIrrGlobal.voSt.VoIntakeAccumulateAmount;
@@ -26,6 +27,8 @@
@Service
public class IcCardSv {
+ @Autowired
+ private SeCardOperateMapper seCardOperateMapper;
@Autowired
private SeClientCardMapper seClientCardMapper;
@@ -54,7 +57,7 @@
Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo);
- Long itemTotal = seClientCardMapper.getOpenCountIcCardsCount(params);
+ Long itemTotal = seCardOperateMapper.getOpenCountIcCardsCount(params);
QueryResultVo<List<VoICCard>> rsVo = new QueryResultVo<>() ;
rsVo.pageSize = qo.pageSize ;
@@ -64,4 +67,87 @@
return rsVo ;
}
+
+ /**
+ * 鎸囧畾鏃堕棿娈靛唴鎸傚け鎬绘暟閲忥紙鐗╃悊鍗★級
+ * @param qo
+ * @return
+ */
+ public QueryResultVo<List<VoICCard>> getLossCountIcCards(CommonQO qo) {
+
+ String timeStart = qo.getTimeStart();
+ String timeStop = qo.getTimeStop();
+
+ if (timeStart != null && timeStart != ""){
+ timeStart = timeStart + " 00:00:00";
+ }else {
+ timeStart = LocalDate.now() + " 00:00:00";
+ }
+ if (timeStop != null && timeStop != ""){
+ timeStop = timeStop + " 23:59:59";
+ }else {
+ timeStop = LocalDateTime.now().toString();
+ }
+ qo.setTimeStart(timeStart);
+ qo.setTimeStop(timeStop);
+
+
+ Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo);
+ Long itemTotal = seCardOperateMapper.getLossCountIcCardsCount(params);
+
+ QueryResultVo<List<VoICCard>> rsVo = new QueryResultVo<>() ;
+ rsVo.pageSize = qo.pageSize ;
+ rsVo.pageCurr = qo.pageCurr ;
+
+ rsVo.calculateAndSet(itemTotal, params);
+
+ return rsVo ;
+ }
+
+ /**
+ * 鎸囧畾鏃堕棿娈靛唴鍏呭�兼�绘暟閲忥紙鐗╃悊鍗★級
+ * @param qo
+ * @return
+ */
+ public QueryResultVo<List<VoICCard>> getRechargeCountIcCards(CommonQO qo) {
+
+ String timeStart = qo.getTimeStart();
+ String timeStop = qo.getTimeStop();
+
+ if (timeStart != null && timeStart != ""){
+ timeStart = timeStart + " 00:00:00";
+ }else {
+ timeStart = LocalDate.now() + " 00:00:00";
+ }
+ if (timeStop != null && timeStop != ""){
+ timeStop = timeStop + " 23:59:59";
+ }else {
+ timeStop = LocalDateTime.now().toString();
+ }
+ qo.setTimeStart(timeStart);
+ qo.setTimeStop(timeStop);
+
+
+ Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo);
+ Long itemTotal = seCardOperateMapper.getRechargeCountIcCardsCount(params);
+
+ QueryResultVo<List<VoICCard>> rsVo = new QueryResultVo<>() ;
+ rsVo.pageSize = qo.pageSize ;
+ rsVo.pageCurr = qo.pageCurr ;
+
+ rsVo.calculateAndSet(itemTotal, params);
+
+ return rsVo ;
+ }
+
+ /**
+ * 褰撳墠浣欓鎬婚噺锛堢墿鐞嗗崱锛�
+ * @param
+ * @return
+ */
+ public Double getTotalMoneyIcCards() {
+
+ Double totalMoney = seClientCardMapper.getTotalMoneyIcCards();
+ return totalMoney ;
+ }
}
--
Gitblit v1.8.0