From f1c648e7ac1b4c437e7f0c9a69130cb443ca46fd Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 26 六月 2025 09:55:28 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-web/pipIrr-web-terminal/src/main/java/com/dy/pipIrrTerminal/general/GeneralSv.java | 148 +++++++++++++++++++++++++++++
pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeGeneralMapper.xml | 6
pipIrr-platform/pipIrr-web/pipIrr-web-terminal/src/main/java/com/dy/pipIrrTerminal/general/qo/QoSummary.java | 40 ++++++++
pipIrr-platform/pipIrr-web/pipIrr-web-terminal/src/main/java/com/dy/pipIrrTerminal/general/GeneralCtrl.java | 53 ++++++++++
pipIrr-platform/pipIrr-web/pipIrr-web-terminal/src/main/java/com/dy/pipIrrTerminal/card/CardCtrl.java | 7 +
pipIrr-platform/pipIrr-web/pipIrr-web-terminal/src/main/java/com/dy/pipIrrTerminal/card/dto/DtoRecharge.java | 1
6 files changed, 250 insertions(+), 5 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeGeneralMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeGeneralMapper.xml
index fbed989..2fc3c00 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeGeneralMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeGeneralMapper.xml
@@ -293,8 +293,8 @@
WHEN ope.operate_type = 2 THEN '鍏呭��'
WHEN ope.operate_type = 3 THEN '閿�鍗�'
WHEN ope.operate_type = 4 THEN '琛ュ崱'
- WHEN ope.operate_type = 5 THEN '杩旇繕'
- WHEN ope.operate_type = 10 THEN '鍙嶅啓'
+ WHEN ope.operate_type = 5 THEN '琛ユ墸'
+<!-- WHEN ope.operate_type = 6 THEN '杩旇繕'-->
END AS operateType,
Date(ope.operate_dt) AS tradeDate,
COUNT(*) AS count,
@@ -305,7 +305,7 @@
FROM se_card_operate ope
INNER JOIN ba_user us ON us.id = ope.operator
<where>
- AND ope.operate_type IN(1,2,3,4,5,10)
+ AND ope.operate_type IN(1,2,3,4,5)
AND ope.operate_valid = 2
<if test = "cashierId != null and cashierId > 0">
AND us.id = #{cashierId}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-terminal/src/main/java/com/dy/pipIrrTerminal/card/CardCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-terminal/src/main/java/com/dy/pipIrrTerminal/card/CardCtrl.java
index ea8f0f8..8a4e1b4 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-terminal/src/main/java/com/dy/pipIrrTerminal/card/CardCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-terminal/src/main/java/com/dy/pipIrrTerminal/card/CardCtrl.java
@@ -54,7 +54,10 @@
return BaseResponseUtils
.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
-
+ // 妫�鏌ュ崱鐗囧湴鍧�鏄惁宸插瓨鍦�
+ if (cardSv.isCardAddrExists(po.getCardAddr())) {
+ return BaseResponseUtils.buildErrorMsg("璇ュ崱鐗囧湴鍧�宸插瓨鍦紝璇蜂娇鐢ㄥ叾浠栧崱");
+ }
Map map_result = cardSv.activeOrReissueTermCard(po);
if (map_result.get("success").equals(false)) {
return BaseResponseUtils.buildErrorMsg(map_result.get("msg").toString());
@@ -379,7 +382,7 @@
// 妫�鏌ュ崱鐗囧湴鍧�鏄惁宸插瓨鍦�
if (cardSv.isCardAddrExists(dto.getCardAddr())) {
- return BaseResponseUtils.buildErrorMsg("璇ュ崱鐗囧湴鍧�宸插瓨鍦紝璇蜂娇鐢ㄥ叾浠栧湴鍧�");
+ return BaseResponseUtils.buildErrorMsg("璇ュ崱鐗囧湴鍧�宸插瓨鍦紝璇蜂娇鐢ㄥ叾浠栧崱");
}
Map<String, Object> result = cardSv.createManagementCard(dto);
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-terminal/src/main/java/com/dy/pipIrrTerminal/card/dto/DtoRecharge.java b/pipIrr-platform/pipIrr-web/pipIrr-web-terminal/src/main/java/com/dy/pipIrrTerminal/card/dto/DtoRecharge.java
index 1ff7254..02d6922 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-terminal/src/main/java/com/dy/pipIrrTerminal/card/dto/DtoRecharge.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-terminal/src/main/java/com/dy/pipIrrTerminal/card/dto/DtoRecharge.java
@@ -52,6 +52,7 @@
/**
* 浠樻鏂瑰紡缂栧彿
*/
+ @NotNull(message = "浠樻鏂瑰紡涓嶈兘涓虹┖")
private Long paymentId;
/**
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-terminal/src/main/java/com/dy/pipIrrTerminal/general/GeneralCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-terminal/src/main/java/com/dy/pipIrrTerminal/general/GeneralCtrl.java
new file mode 100644
index 0000000..dd4fea4
--- /dev/null
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-terminal/src/main/java/com/dy/pipIrrTerminal/general/GeneralCtrl.java
@@ -0,0 +1,53 @@
+package com.dy.pipIrrTerminal.general;
+
+import com.dy.common.aop.SsoAop;
+import com.dy.common.webUtil.BaseResponse;
+import com.dy.common.webUtil.BaseResponseUtils;
+import com.dy.pipIrrTerminal.general.qo.QoSummary;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * @author ZhuBaoMin
+ * @date 2025-06-25 11:25
+ * @LastEditTime 2025-06-25 11:25
+ * @Description
+ */
+
+@Slf4j
+@RestController
+@RequestMapping(path="general")
+@RequiredArgsConstructor
+public class GeneralCtrl {
+ private final GeneralSv generalSv;
+
+ /**
+ * 鍏呭�兼満鐢ㄨ幏鍙栦氦鏄撶粺璁¤褰�
+ * @param vo
+ * @param bindingResult
+ * @return
+ */
+ @GetMapping(path = "getSummaries")
+ @SsoAop()
+ public BaseResponse<Map> getSummaries(@Valid QoSummary vo, BindingResult bindingResult){
+ if(bindingResult != null && bindingResult.hasErrors()){
+ return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
+ }
+ try {
+ Map res = generalSv.getSummaries(vo);
+ return BaseResponseUtils.buildSuccess(res);
+ } catch (Exception e) {
+ log.error("鏌ヨ浜ゆ槗姹囨�昏褰曞紓甯�", e);
+ return BaseResponseUtils.buildException(e.getMessage()) ;
+ }
+ }
+}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-terminal/src/main/java/com/dy/pipIrrTerminal/general/GeneralSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-terminal/src/main/java/com/dy/pipIrrTerminal/general/GeneralSv.java
new file mode 100644
index 0000000..47919d7
--- /dev/null
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-terminal/src/main/java/com/dy/pipIrrTerminal/general/GeneralSv.java
@@ -0,0 +1,148 @@
+package com.dy.pipIrrTerminal.general;
+
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
+import com.dy.pipIrrGlobal.daoSe.SeGeneralMapper;
+import com.dy.pipIrrGlobal.daoSe.SePaymentMethodMapper;
+import com.dy.pipIrrGlobal.pojoSe.SePaymentMethod;
+import com.dy.pipIrrGlobal.voSe.VoTransactionStatistics;
+import com.dy.pipIrrTerminal.general.qo.QoSummary;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.dubbo.common.utils.PojoUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.text.DecimalFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+/**
+ * @author ZhuBaoMin
+ * @date 2025-06-25 11:22
+ * @LastEditTime 2025-06-25 11:22
+ * @Description
+ */
+
+@Slf4j
+@Service
+public class GeneralSv {
+ @Autowired
+ private SeGeneralMapper seGeneralMapper;
+
+ @Autowired
+ private SePaymentMethodMapper sePaymentMethodMapper;
+
+ /**
+ * 鍏呭�兼満鐢ㄨ幏鍙栦氦鏄撶粺璁¤褰�
+ * @param vo
+ * @return
+ * @throws ParseException
+ */
+ public Map getSummaries(QoSummary vo) throws ParseException {
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+
+ Integer pageSize = vo.getPageSize();
+ Integer pageCurr = vo.getPageCurr();
+ // 璧峰绱㈠紩浣嶇疆
+ Integer startIndex = (pageCurr - 1) * pageSize;
+
+ // 鑾峰彇鍚勬敮浠樻柟寮廔D
+ Long paymentId_cash = 0L;
+ Long paymentId_pos = 0L;
+ Long paymentId_transfer = 0L;
+ List<SePaymentMethod> list_payment = sePaymentMethodMapper.getPaymentMethods();
+ for (int i = 0; i < list_payment.size(); i++) {
+ SePaymentMethod paymentMethod = list_payment.get(i);
+ if(paymentMethod.getName().equals("鐜伴噾")) {
+ paymentId_cash = paymentMethod.getId();
+ }
+ if(paymentMethod.getName().equals("POS鏈�")) {
+ paymentId_pos = paymentMethod.getId();
+ }
+ if(paymentMethod.getName().equals("閾惰杞处")) {
+ paymentId_transfer = paymentMethod.getId();
+ }
+ }
+
+ // 鎺ユ敹浼犲叆鍙傛暟锛氫氦鏄撹捣姝㈡棩鏈熴�佹敹閾跺憳ID
+ JSONArray array_paymentSums = new JSONArray();
+ Date timeStart = dateFormat.parse(vo.getTimeStart());
+ Date timeStop = dateFormat.parse(vo.getTimeStop());
+ Long cashierId = vo.cashierId;
+
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(timeStart);
+ while (calendar.getTime().before(timeStop) || calendar.getTime().equals(timeStop)) {
+ String tradeDate = dateFormat.format(calendar.getTime()) ;
+ Float receivedCash = Optional.ofNullable(seGeneralMapper.getPaymentSums(tradeDate, cashierId, paymentId_cash)).orElse(0f);
+ Float receivedPos = Optional.ofNullable(seGeneralMapper.getPaymentSums(tradeDate, cashierId,paymentId_pos)).orElse(0f);
+ Float receivedTransfer = Optional.ofNullable(seGeneralMapper.getPaymentSums(tradeDate, cashierId, paymentId_transfer)).orElse(0f);
+
+ JSONObject job = new JSONObject();
+ job.put("tradeDate", tradeDate);
+ job.put("receivedCash", receivedCash);
+ job.put("receivedPos", receivedPos);
+ job.put("receivedTransfer", receivedTransfer);
+ array_paymentSums.add(job);
+ calendar.add(Calendar.DAY_OF_MONTH, 1);
+ }
+
+ // 鐢熸垚鏌ヨ鍙傛暟
+ Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(vo) ;
+
+ /**
+ * 鏍规嵁鏀堕摱鍛樼紪鍙枫�佷氦鏄撴棩鏈熸煡璇㈡眹鎬昏褰�
+ * 閬嶅巻姹囨�昏褰曟煡璇㈢粨鏋滐紝璁＄畻绗旀暟鍚堣銆佸疄鏀堕噾棰濆悎璁°�佽禒閫侀噾棰濆悎璁°�佽繑杩橀噾棰濆悎璁�
+ */
+ List<VoTransactionStatistics> list = Optional.ofNullable(seGeneralMapper.getSummaries(params)).orElse(new ArrayList<>());
+ if(list.size() == 0) {
+ return new HashMap();
+ }
+
+ Integer totalCount = 0;
+ Float totalReceived = 0f;
+ Float totalGift = 0f;
+ Float totalRefund = 0f;
+ JSONArray array= JSONArray.parseArray(JSON.toJSONString(list));
+ for(int i = 0; i < array.size(); i++) {
+ JSONObject job_summary = array.getJSONObject(i);
+ totalCount = totalCount + Optional.ofNullable(job_summary.getInteger("count")).orElse(0);
+ totalReceived = totalReceived + Optional.ofNullable(job_summary.getFloat("received")).orElse(0f);
+ totalGift = totalGift + Optional.ofNullable(job_summary.getFloat("gift")).orElse(0f);
+ totalRefund = totalRefund + Optional.ofNullable(job_summary.getFloat("refundAmount")).orElse(0f);
+ }
+
+ Map map_result = new HashMap();
+ map_result.put("totalCount", totalCount);
+ map_result.put("totalReceived", totalReceived);
+ map_result.put("totalGift", totalGift);
+ map_result.put("totalRefund", totalRefund);
+
+ // 鍒嗛〉鏍煎紡缁勮璁板綍鍒楄〃
+ Map map_record = new HashMap();
+ map_record.put("itemTotal", list.size());
+ map_record.put("pageCurr", pageCurr);
+ map_record.put("pageSize", pageSize);
+ map_record.put("pageTotal", (int)Math.ceil((double)list.size() / pageSize));
+ JSONArray array_record = (JSONArray) JSON.toJSON(list);
+ JSONArray array_record_page = (JSONArray)JSON.toJSON(array_record.subList(startIndex, Math.min(startIndex + pageSize, array_record.size())));
+ map_record.put("list", array_record_page);
+
+ // 鍒嗛〉鏍煎紡缁勮鏀粯鏂瑰紡鍒楄〃
+ Map map_paymentSums = new HashMap();
+ map_paymentSums.put("itemTotal", array_paymentSums.size());
+ map_paymentSums.put("pageCurr", pageCurr);
+ map_paymentSums.put("pageSize", pageSize);
+ map_paymentSums.put("pageTotal", (int)Math.ceil((double)array_paymentSums.size() / pageSize));
+ JSONArray array_paymentSums_page = (JSONArray) JSON.toJSON(array_paymentSums.subList(startIndex, Math.min(startIndex + pageSize, array_paymentSums.size())));
+ map_paymentSums.put("list", array_paymentSums_page);
+
+
+ map_result.put("records", map_record);
+ map_result.put("paymentSums", map_paymentSums);
+
+ return map_result;
+ }
+}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-terminal/src/main/java/com/dy/pipIrrTerminal/general/qo/QoSummary.java b/pipIrr-platform/pipIrr-web/pipIrr-web-terminal/src/main/java/com/dy/pipIrrTerminal/general/qo/QoSummary.java
new file mode 100644
index 0000000..cf4087b
--- /dev/null
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-terminal/src/main/java/com/dy/pipIrrTerminal/general/qo/QoSummary.java
@@ -0,0 +1,40 @@
+package com.dy.pipIrrTerminal.general.qo;
+
+import com.dy.common.webUtil.QueryConditionVo;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.*;
+
+/**
+ * @author ZhuBaoMin
+ * @date 2025-06-25 13:53
+ * @LastEditTime 2025-06-25 13:53
+ * @Description 鍏呭�兼満鐢ㄤ氦鏄撴眹鎬绘煡璇㈠璞�
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ToString(callSuper = true)
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class QoSummary extends QueryConditionVo {
+ /**
+ * 鏌ヨ璧峰鏃ユ湡
+ */
+ @NotBlank(message = "鏌ヨ璧峰鏃ユ湡涓嶈兘涓虹┖")
+ public String timeStart;
+
+ /**
+ * 鏌ヨ鎴鏃ユ湡
+ */
+ @NotBlank(message = "鏌ヨ鎴鏃ユ湡涓嶈兘涓虹┖")
+ public String timeStop;
+
+ /**
+ * 鏀堕摱鍛業D
+ */
+ @NotNull(message = "鏀堕摱鍛樹笉鑳戒负绌�")
+ public Long cashierId;
+}
--
Gitblit v1.8.0