From 4ca7bd3844958b23c47864388b644fe9b76e69ef Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期六, 21 九月 2024 10:52:25 +0800
Subject: [PATCH] 2024-09-21 朱宝民 获取充值记录接口，返回值增加居委会名称
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml | 2 +
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/resources/application.yml | 1
pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intakeController/IntakeControllerCtrl.java | 18 ++++-----
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoRecharge.java | 63 ++++++++++++++++++++++++++-----
pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml | 2
5 files changed, 65 insertions(+), 21 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoRecharge.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoRecharge.java
index 3d9b309..4242361 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoRecharge.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoRecharge.java
@@ -4,7 +4,7 @@
import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
import com.dy.common.po.BaseEntity;
import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.v3.oas.annotations.media.Schema;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -18,26 +18,50 @@
*/
@Data
-@Schema(title = "鍏呭�艰褰曡鍥惧璞�")
+@JsonPropertyOrder({ "opeId", "cardId", "clientName", "phone", "idCard", "clientNum", "villageName", "address", "money", "cardNum", "cardCost", "amount", "gift", "refundAmount", "afterRecharge", "paymentName", "price", "opr"})
public class VoRecharge implements BaseEntity {
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 202409211025001L;
+ /**
+ * 鎿嶄綔ID
+ */
@JSONField(serializeUsing= ObjectWriterImplToString.class)
private Long opeId;
+ /**
+ * 姘村崱ID
+ */
@JSONField(serializeUsing= ObjectWriterImplToString.class)
private Long cardId;
- @Schema(title = "鍐滄埛濮撳悕")
+ /**
+ * 鍐滄埛濮撳悕
+ */
private String clientName;
+ /**
+ * 鎵嬫満鍙�
+ */
private String phone;
+ /**
+ * 韬唤璇佸彿
+ */
private String idCard;
- @Schema(title = "鍐滄埛缂栧彿")
+ /**
+ * 鍐滄埛缂栧彿
+ */
private String clientNum;
+ /**
+ * 鏉戝浼氬悕绉�
+ */
+ private String villageName;
+
+ /**
+ * 灞呬綇鍦板潃
+ */
private String address;
/**
@@ -45,9 +69,15 @@
*/
private Float money;
+ /**
+ * 姘村崱缂栧彿
+ */
@JSONField(serializeUsing= ObjectWriterImplToString.class)
private Long cardNum;
+ /**
+ * 璐崱璐圭敤
+ */
private Integer cardCost;
/**
@@ -60,7 +90,9 @@
*/
private Float gift;
- @Schema(title = "杩斿洖閲戦")
+ /**
+ * 杩旇繕閲戦
+ */
private Float refundAmount;
/**
@@ -68,19 +100,30 @@
*/
private Float afterRecharge;
- @Schema(title = "鏀粯鏂瑰紡")
+ /**
+ * 鏀粯鏂瑰紡
+ */
private String paymentName;
- @Schema(title = "姘翠环")
+ /**
+ * 姘翠环
+ */
private Float price;
- @Schema(title = "鎿嶄綔浜�")
+ /**
+ * 鎿嶄綔浜�
+ */
private String opr;
+ /**
+ * 鎿嶄綔绫诲瀷
+ */
private String operateType;
+ /**
+ * 鎿嶄綔鏃堕棿
+ */
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- @Schema(title = "鎿嶄綔鏃堕棿")
private Date operateDt;
}
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml b/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
index dd73239..610b648 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
@@ -72,7 +72,7 @@
pipIrr:
global:
dev: false #鏄惁寮�鍙戦樁娈碉紝true鎴杅alse
- dsName: test #寮�鍙戦樁娈碉紝璁剧疆涓存椂鐨勬暟鎹簱鍚嶇О
+ dsName: ym #寮�鍙戦樁娈碉紝璁剧疆涓存椂鐨勬暟鎹簱鍚嶇О
mw:
webPort: 8070
actutorPort: 9070
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 3b35dfd..a57b2ad 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml
@@ -272,6 +272,7 @@
cli.phone,
cli.idCard,
cli.clientNum,
+ dis.name AS villageName,
cli.address,
card.money,
cardNum,
@@ -292,6 +293,7 @@
FROM se_card_operate ope
INNER JOIN se_client_card card ON ope.card_id = card.id
INNER JOIN se_client cli ON ope.client_id = cli.id
+ LEFT JOIN ba_district dis ON dis.id = cli.villageId
INNER JOIN ba_user us ON ope.operator = us.id
Left JOIN se_payment_method pay ON ope.payment_id = pay.id
<where>
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/resources/application.yml b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/resources/application.yml
index adc3762..addc58c 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/resources/application.yml
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/resources/application.yml
@@ -4,6 +4,7 @@
user:
defaultTrueRandomFalsePassword: true #true:閲囩敤榛樿瀵嗙爜锛宖alse:绯荤粺浜х敓闅忔満瀵嗙爜
defaultPassword: "abc_123"
+# defaultPassword: "admin"
#actutor鐨剋eb绔彛
management:
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intakeController/IntakeControllerCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intakeController/IntakeControllerCtrl.java
index 8bc4a6b..7fbc6bf 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intakeController/IntakeControllerCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intakeController/IntakeControllerCtrl.java
@@ -1,7 +1,6 @@
package com.dy.pipIrrProject.intakeController;
-import cn.hutool.core.date.DateTime;
import com.dy.common.aop.SsoAop;
import com.dy.common.webUtil.BaseResponse;
import com.dy.common.webUtil.BaseResponseUtils;
@@ -284,16 +283,15 @@
@GetMapping(path = "/getTrampControllers")
@SsoAop()
public BaseResponse<QueryResultVo<List<PrControllerTramp>>> getTrampControllers(TrampControllerQueryVo vo) {
-
try {
- QueryResultVo<List<PrControllerTramp>> res = intakeControllerSv.getTrampControllers(vo);
- if (res.itemTotal != null && res.itemTotal > 0) {
- return BaseResponseUtils.buildSuccess(res);
- } else {
- //璇锋眰鎴愬姛浣嗘暟鎹负绌�
- return BaseResponseUtils.buildSuccess(res);
- }
- //return BaseResponseUtils.buildSuccess(res);
+ //QueryResultVo<List<PrControllerTramp>> res = intakeControllerSv.getTrampControllers(vo);
+ //if (res.itemTotal != null && res.itemTotal > 0) {
+ // return BaseResponseUtils.buildSuccess(res);
+ //} else {
+ // //璇锋眰鎴愬姛浣嗘暟鎹负绌�
+ // return BaseResponseUtils.buildSuccess(res);
+ //}
+ return BaseResponseUtils.buildSuccess(intakeControllerSv.getTrampControllers(vo));
} catch (Exception e) {
log.error("鑾峰彇娴佹氮鎺у埗鍣ㄨ褰曞紓甯�", e);
return BaseResponseUtils.buildException(e.getMessage());
--
Gitblit v1.8.0