From b44eb4208d92a7817ed01526671fd8ff7686a175 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期一, 25 十二月 2023 15:31:59 +0800
Subject: [PATCH] 2023-12-25 朱宝民 挂失、注销、解锁、冲正重构，4个记录查询改为参数传递
---
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/loss/LossCtrl.java | 16 +
pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeLossMapper.xml | 48 +++---
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/loss/QueryVo.java | 11
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/unlock/QueryVo.java | 8
pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeUnlockMapper.xml | 52 +++---
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/reversal/QueryVo.java | 6
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeUnlock.java | 10
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/unlock/UnlockSv.java | 9
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeCancelMapper.java | 4
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cancel/CancelCtrl.java | 12
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/loss/LossSv.java | 21 ++
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/unlock/UnlockCtrl.java | 16 +
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeReversal.java | 10
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/reversal/ReversalSv.java | 9
pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeReversalMapper.xml | 65 ++++----
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeUnlockMapper.java | 5
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeReversalMapper.java | 5
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeLossMapper.java | 4
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/recharge/RechargeSv.java | 21 ++
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeCancel.java | 10
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/recharge/QueryVo.java | 14 +
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/recharge/RechargeCtrl.java | 5
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/reversal/ReversalCtrl.java | 16 +
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeLoss.java | 16 +-
pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCancelMapper.xml | 52 +++---
25 files changed, 234 insertions(+), 211 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeCancelMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeCancelMapper.java
index 27b77f4..b057bbb 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeCancelMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeCancelMapper.java
@@ -10,8 +10,8 @@
/**
* @author ZhuBaoMin
- * @date 2023/12/20 14:48
- * @LastEditTime 2023/12/20 14:48
+ * @date 2023-12-25 14:32
+ * @LastEditTime 2023-12-25 14:32
* @Description
*/
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeLossMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeLossMapper.java
index 790880d..dbf3e71 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeLossMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeLossMapper.java
@@ -10,8 +10,8 @@
/**
* @author ZhuBaoMin
- * @date 2023/12/19 15:08
- * @LastEditTime 2023/12/19 15:08
+ * @date 2023-12-25 13:52
+ * @LastEditTime 2023-12-25 13:52
* @Description
*/
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeReversalMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeReversalMapper.java
index 98d2574..211b0c4 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeReversalMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeReversalMapper.java
@@ -10,11 +10,10 @@
/**
* @author ZhuBaoMin
- * @date 2023/12/20 16:52
- * @LastEditTime 2023/12/20 16:52
+ * @date 2023-12-25 15:13
+ * @LastEditTime 2023-12-25 15:13
* @Description
*/
-
@Mapper
public interface SeReversalMapper extends BaseMapper<SeReversal> {
int deleteByPrimaryKey(Long id);
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeUnlockMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeUnlockMapper.java
index 2c0088b..c155198 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeUnlockMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeUnlockMapper.java
@@ -10,11 +10,10 @@
/**
* @author ZhuBaoMin
- * @date 2023/12/20 16:05
- * @LastEditTime 2023/12/20 16:05
+ * @date 2023-12-25 14:51
+ * @LastEditTime 2023-12-25 14:51
* @Description
*/
-
@Mapper
public interface SeUnlockMapper extends BaseMapper<SeUnlock> {
int deleteByPrimaryKey(Long id);
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeCancel.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeCancel.java
index f96a0f0..34aa9d7 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeCancel.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeCancel.java
@@ -7,7 +7,7 @@
import com.baomidou.mybatisplus.annotation.TableName;
import com.dy.common.po.BaseEntity;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Positive;
import lombok.*;
import org.hibernate.validator.constraints.Length;
@@ -47,15 +47,15 @@
* 姘村崱缂栧彿
*/
@Schema(description = "姘村崱缂栧彿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- @NotBlank(message = "姘村崱缂栧彿涓嶈兘涓虹┖")
- private String cardnum;
+ @NotNull(message = "姘村崱缂栧彿涓嶈兘涓虹┖")
+ private Long cardid;
/**
* 鍐滄埛缂栧彿
*/
@Schema(description = "鍐滄埛缂栧彿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- @NotBlank(message = "鍐滄埛缂栧彿涓嶈兘涓虹┖")
- private String clientnum;
+ @NotNull(message = "鍐滄埛缂栧彿涓嶈兘涓虹┖")
+ private Long clientid;
/**
* 閫�娆鹃噾棰�
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeLoss.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeLoss.java
index 7938329..2dd1125 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeLoss.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeLoss.java
@@ -7,7 +7,7 @@
import com.baomidou.mybatisplus.annotation.TableName;
import com.dy.common.po.BaseEntity;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Positive;
import lombok.*;
import org.hibernate.validator.constraints.Length;
@@ -16,15 +16,14 @@
/**
* @author ZhuBaoMin
- * @date 2023/12/9 8:55
- * @LastEditTime 2023/12/19 15:14
+ * @date 2023-12-25 13:52
+ * @LastEditTime 2023-12-25 13:52
* @Description
*/
/**
* 姘村崱鎸傚け琛�
*/
-
@TableName(value="se_loss", autoResultMap = true)
@Data
@Builder
@@ -32,6 +31,7 @@
@NoArgsConstructor
@AllArgsConstructor
@Schema(name = "鎸傚け瀹炰綋")
+
public class SeLoss implements BaseEntity {
public static final long serialVersionUID = 20231191728001L;
/**
@@ -47,15 +47,15 @@
* 姘村崱缂栧彿
*/
@Schema(description = "姘村崱缂栧彿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- @NotBlank(message = "姘村崱缂栧彿涓嶈兘涓虹┖")
- private String cardnum;
+ @NotNull(message = "姘村崱缂栧彿涓嶈兘涓虹┖")
+ private Long cardid;
/**
* 鍐滄埛缂栧彿
*/
@Schema(description = "鍐滄埛缂栧彿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- @NotBlank(message = "鍐滄埛缂栧彿涓嶈兘涓虹┖")
- private String clientnum;
+ @NotNull(message = "鍐滄埛缂栧彿涓嶈兘涓虹┖")
+ private Long clientid;
/**
* 浣欓
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeReversal.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeReversal.java
index 4c6d281..8a82772 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeReversal.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeReversal.java
@@ -7,7 +7,7 @@
import com.baomidou.mybatisplus.annotation.TableName;
import com.dy.common.po.BaseEntity;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Positive;
import lombok.*;
import org.hibernate.validator.constraints.Length;
@@ -48,15 +48,15 @@
* 姘村崱缂栧彿
*/
@Schema(description = "姘村崱缂栧彿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- @NotBlank(message = "姘村崱缂栧彿涓嶈兘涓虹┖")
- private String cardnum;
+ @NotNull(message = "姘村崱缂栧彿涓嶈兘涓虹┖")
+ private Long cardid;
/**
* 鍐滄埛缂栧彿
*/
@Schema(description = "鍐滄埛缂栧彿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- @NotBlank(message = "鍐滄埛缂栧彿涓嶈兘涓虹┖")
- private String clientnum;
+ @NotNull(message = "鍐滄埛缂栧彿涓嶈兘涓虹┖")
+ private Long clientid;
/**
* 鍗＄墖浣欓
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeUnlock.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeUnlock.java
index c2428f1..0fd30e2 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeUnlock.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeUnlock.java
@@ -7,7 +7,7 @@
import com.baomidou.mybatisplus.annotation.TableName;
import com.dy.common.po.BaseEntity;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Positive;
import lombok.*;
import org.hibernate.validator.constraints.Length;
@@ -48,15 +48,15 @@
* 姘村崱缂栧彿
*/
@Schema(description = "姘村崱缂栧彿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- @NotBlank(message = "姘村崱缂栧彿涓嶈兘涓虹┖")
- private String cardnum;
+ @NotNull(message = "姘村崱缂栧彿涓嶈兘涓虹┖")
+ private Long cardid;
/**
* 鍐滄埛缂栧彿
*/
@Schema(description = "鍐滄埛缂栧彿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- @NotBlank(message = "鍐滄埛缂栧彿涓嶈兘涓虹┖")
- private String clientnum;
+ @NotNull(message = "鍐滄埛缂栧彿涓嶈兘涓虹┖")
+ private Long clientid;
/**
* 鍓╀綑閲戦
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCancelMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCancelMapper.xml
index 2bbefd7..2644c82 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCancelMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCancelMapper.xml
@@ -5,8 +5,8 @@
<!--@mbg.generated-->
<!--@Table se_cancel-->
<id column="id" jdbcType="BIGINT" property="id" />
- <result column="cardNum" jdbcType="VARCHAR" property="cardnum" />
- <result column="clientNum" jdbcType="VARCHAR" property="clientnum" />
+ <result column="cardId" jdbcType="BIGINT" property="cardid" />
+ <result column="clientId" jdbcType="BIGINT" property="clientid" />
<result column="refund" jdbcType="FLOAT" property="refund" />
<result column="refundType" jdbcType="TINYINT" property="refundtype" />
<result column="remarks" jdbcType="VARCHAR" property="remarks" />
@@ -15,7 +15,7 @@
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
- id, cardNum, clientNum, refund, refundType, remarks, `operator`, operateDt
+ id, cardId, clientId, refund, refundType, remarks, `operator`, operateDt
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
<!--@mbg.generated-->
@@ -32,10 +32,10 @@
<insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pipIrrGlobal.pojoSe.SeCancel">
<!--@mbg.generated-->
- insert into se_cancel (id, cardNum, clientNum, refund,
+ insert into se_cancel (id, cardId, clientId, refund,
refundType, remarks, `operator`,
operateDt)
- values (#{id,jdbcType=BIGINT}, #{cardnum,jdbcType=VARCHAR}, #{clientnum,jdbcType=VARCHAR}, #{refund,jdbcType=FLOAT},
+ values (#{id,jdbcType=BIGINT}, #{cardid,jdbcType=BIGINT}, #{clientid,jdbcType=BIGINT}, #{refund,jdbcType=FLOAT},
#{refundtype,jdbcType=TINYINT}, #{remarks,jdbcType=VARCHAR}, #{operator,jdbcType=BIGINT},
#{operatedt,jdbcType=TIMESTAMP})
</insert>
@@ -44,11 +44,11 @@
<!--@mbg.generated-->
insert into se_cancel
<trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="cardnum != null">
- cardNum,
+ <if test="cardid != null">
+ cardId,
</if>
- <if test="clientnum != null">
- clientNum,
+ <if test="clientid != null">
+ clientId,
</if>
<if test="refund != null">
refund,
@@ -67,11 +67,11 @@
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
- <if test="cardnum != null">
- #{cardnum,jdbcType=VARCHAR},
+ <if test="cardid != null">
+ #{cardid,jdbcType=BIGINT},
</if>
- <if test="clientnum != null">
- #{clientnum,jdbcType=VARCHAR},
+ <if test="clientid != null">
+ #{clientid,jdbcType=BIGINT},
</if>
<if test="refund != null">
#{refund,jdbcType=FLOAT},
@@ -94,11 +94,11 @@
<!--@mbg.generated-->
update se_cancel
<set>
- <if test="cardnum != null">
- cardNum = #{cardnum,jdbcType=VARCHAR},
+ <if test="cardid != null">
+ cardId = #{cardid,jdbcType=BIGINT},
</if>
- <if test="clientnum != null">
- clientNum = #{clientnum,jdbcType=VARCHAR},
+ <if test="clientid != null">
+ clientId = #{clientid,jdbcType=BIGINT},
</if>
<if test="refund != null">
refund = #{refund,jdbcType=FLOAT},
@@ -121,8 +121,8 @@
<update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoSe.SeCancel">
<!--@mbg.generated-->
update se_cancel
- set cardNum = #{cardnum,jdbcType=VARCHAR},
- clientNum = #{clientnum,jdbcType=VARCHAR},
+ set cardId = #{cardid,jdbcType=BIGINT},
+ clientId = #{clientid,jdbcType=BIGINT},
refund = #{refund,jdbcType=FLOAT},
refundType = #{refundtype,jdbcType=TINYINT},
remarks = #{remarks,jdbcType=VARCHAR},
@@ -136,9 +136,9 @@
SELECT
COUNT(*) AS recordCount
FROM se_cancel can
- INNER JOIN se_client_card card ON can.cardNum = card.cardNum
- INNER JOIN ba_client cli ON can.clientNum = cli.num
- , (SELECT @i:=0) AS itable
+ INNER JOIN se_client_card card ON can.cardId = card.id
+ INNER JOIN se_client cli ON can.clientId = cli.id
+ , (SELECT @i:=0) AS itable
<where>
<if test = "clientName != null and clientName !=''">
AND cli.name like CONCAT('%',#{clientName},'%')
@@ -159,18 +159,18 @@
SELECT
(@i:=@i+1) AS id,
cli.`name` AS clientName,
- cli.num AS clientNum,
+ cli.clientNum,
card.cardNum,
can.refund,
(CASE
- WHEN can.refundType = 1 THEN "鐜伴噾"
+ WHEN can.refundType = 1 THEN "鐜伴噾"
END) AS refundTypeName,
can.refundType,
(SELECT `name` FROM ba_user WHERE id = can.operator) AS operator,
can.operateDt
FROM se_cancel can
- INNER JOIN se_client_card card ON can.cardNum = card.cardNum
- INNER JOIN ba_client cli ON can.clientNum = cli.num
+ INNER JOIN se_client_card card ON can.cardId = card.id
+ INNER JOIN se_client cli ON can.clientId = cli.id
, (SELECT @i:=0) AS itable
<where>
<if test = "clientName != null and clientName !=''">
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeLossMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeLossMapper.xml
index 15d62b2..fe12f52 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeLossMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeLossMapper.xml
@@ -5,8 +5,8 @@
<!--@mbg.generated-->
<!--@Table se_loss-->
<id column="id" jdbcType="BIGINT" property="id" />
- <result column="cardNum" jdbcType="VARCHAR" property="cardnum" />
- <result column="clientNum" jdbcType="VARCHAR" property="clientnum" />
+ <result column="cardId" jdbcType="BIGINT" property="cardid" />
+ <result column="clientId" jdbcType="BIGINT" property="clientid" />
<result column="money" jdbcType="FLOAT" property="money" />
<result column="refund" jdbcType="FLOAT" property="refund" />
<result column="remarks" jdbcType="VARCHAR" property="remarks" />
@@ -15,7 +15,7 @@
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
- id, cardNum, clientNum, money, refund, remarks, `operator`, operateDt
+ id, cardId, clientId, money, refund, remarks, `operator`, operateDt
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
<!--@mbg.generated-->
@@ -32,10 +32,10 @@
<insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pipIrrGlobal.pojoSe.SeLoss">
<!--@mbg.generated-->
- insert into se_loss (id, cardNum, clientNum, money,
+ insert into se_loss (id, cardId, clientId, money,
refund, remarks, `operator`,
operateDt)
- values (#{id,jdbcType=BIGINT}, #{cardnum,jdbcType=VARCHAR}, #{clientnum,jdbcType=VARCHAR}, #{money,jdbcType=FLOAT},
+ values (#{id,jdbcType=BIGINT}, #{cardid,jdbcType=BIGINT}, #{clientid,jdbcType=BIGINT}, #{money,jdbcType=FLOAT},
#{refund,jdbcType=FLOAT}, #{remarks,jdbcType=VARCHAR}, #{operator,jdbcType=BIGINT},
#{operatedt,jdbcType=TIMESTAMP})
</insert>
@@ -44,11 +44,11 @@
<!--@mbg.generated-->
insert into se_loss
<trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="cardnum != null">
- cardNum,
+ <if test="cardid != null">
+ cardId,
</if>
- <if test="clientnum != null">
- clientNum,
+ <if test="clientid != null">
+ clientId,
</if>
<if test="money != null">
money,
@@ -67,11 +67,11 @@
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
- <if test="cardnum != null">
- #{cardnum,jdbcType=VARCHAR},
+ <if test="cardid != null">
+ #{cardid,jdbcType=BIGINT},
</if>
- <if test="clientnum != null">
- #{clientnum,jdbcType=VARCHAR},
+ <if test="clientid != null">
+ #{clientid,jdbcType=BIGINT},
</if>
<if test="money != null">
#{money,jdbcType=FLOAT},
@@ -94,11 +94,11 @@
<!--@mbg.generated-->
update se_loss
<set>
- <if test="cardnum != null">
- cardNum = #{cardnum,jdbcType=VARCHAR},
+ <if test="cardid != null">
+ cardId = #{cardid,jdbcType=BIGINT},
</if>
- <if test="clientnum != null">
- clientNum = #{clientnum,jdbcType=VARCHAR},
+ <if test="clientid != null">
+ clientId = #{clientid,jdbcType=BIGINT},
</if>
<if test="money != null">
money = #{money,jdbcType=FLOAT},
@@ -121,8 +121,8 @@
<update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoSe.SeLoss">
<!--@mbg.generated-->
update se_loss
- set cardNum = #{cardnum,jdbcType=VARCHAR},
- clientNum = #{clientnum,jdbcType=VARCHAR},
+ set cardId = #{cardid,jdbcType=BIGINT},
+ clientId = #{clientid,jdbcType=BIGINT},
money = #{money,jdbcType=FLOAT},
refund = #{refund,jdbcType=FLOAT},
remarks = #{remarks,jdbcType=VARCHAR},
@@ -136,8 +136,8 @@
SELECT
COUNT(*) AS recordCount
FROM se_loss loss
- INNER JOIN se_client_card card ON loss.cardNum = card.cardNum
- INNER JOIN ba_client cli ON loss.clientNum = cli.num
+ INNER JOIN se_client_card card ON loss.cardId = card.id
+ INNER JOIN se_client cli ON loss.clientId = cli.id
, (SELECT @i:=0) AS itable
<where>
<if test = "clientName != null and clientName !=''">
@@ -159,14 +159,14 @@
SELECT
(@i:=@i+1) AS id,
cli.`name` AS clientName,
- cli.num AS clientNum,
+ cli.clientNum,
card.cardNum,
loss.money,
(SELECT `name` FROM ba_user WHERE id = loss.operator) AS operator,
loss.operateDt
FROM se_loss loss
- INNER JOIN se_client_card card ON loss.cardNum = card.cardNum
- INNER JOIN ba_client cli ON loss.clientNum = cli.num
+ INNER JOIN se_client_card card ON loss.cardId = card.id
+ INNER JOIN se_client cli ON loss.clientId = cli.id
, (SELECT @i:=0) AS itable
<where>
<if test = "clientName != null and clientName !=''">
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeReversalMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeReversalMapper.xml
index 03884b2..07d97ac 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeReversalMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeReversalMapper.xml
@@ -5,8 +5,8 @@
<!--@mbg.generated-->
<!--@Table se_reversal-->
<id column="id" jdbcType="BIGINT" property="id" />
- <result column="cardNum" jdbcType="VARCHAR" property="cardnum" />
- <result column="clientNum" jdbcType="VARCHAR" property="clientnum" />
+ <result column="cardId" jdbcType="BIGINT" property="cardid" />
+ <result column="clientId" jdbcType="BIGINT" property="clientid" />
<result column="cardBalance" jdbcType="FLOAT" property="cardbalance" />
<result column="systemBalance" jdbcType="FLOAT" property="systembalance" />
<result column="remarks" jdbcType="VARCHAR" property="remarks" />
@@ -15,7 +15,7 @@
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
- id, cardNum, clientNum, cardBalance, systemBalance, remarks, `operator`, operateDt
+ id, cardId, clientId, cardBalance, systemBalance, remarks, `operator`, operateDt
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
<!--@mbg.generated-->
@@ -32,10 +32,10 @@
<insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pipIrrGlobal.pojoSe.SeReversal">
<!--@mbg.generated-->
- insert into se_reversal (id, cardNum, clientNum, cardBalance,
+ insert into se_reversal (id, cardId, clientId, cardBalance,
systemBalance, remarks, `operator`,
operateDt)
- values (#{id,jdbcType=BIGINT}, #{cardnum,jdbcType=VARCHAR}, #{clientnum,jdbcType=VARCHAR}, #{cardbalance,jdbcType=FLOAT},
+ values (#{id,jdbcType=BIGINT}, #{cardid,jdbcType=BIGINT}, #{clientid,jdbcType=BIGINT}, #{cardbalance,jdbcType=FLOAT},
#{systembalance,jdbcType=FLOAT}, #{remarks,jdbcType=VARCHAR}, #{operator,jdbcType=BIGINT},
#{operatedt,jdbcType=TIMESTAMP})
</insert>
@@ -44,11 +44,11 @@
<!--@mbg.generated-->
insert into se_reversal
<trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="cardnum != null">
- cardNum,
+ <if test="cardid != null">
+ cardId,
</if>
- <if test="clientnum != null">
- clientNum,
+ <if test="clientid != null">
+ clientId,
</if>
<if test="cardbalance != null">
cardBalance,
@@ -67,11 +67,11 @@
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
- <if test="cardnum != null">
- #{cardnum,jdbcType=VARCHAR},
+ <if test="cardid != null">
+ #{cardid,jdbcType=BIGINT},
</if>
- <if test="clientnum != null">
- #{clientnum,jdbcType=VARCHAR},
+ <if test="clientid != null">
+ #{clientid,jdbcType=BIGINT},
</if>
<if test="cardbalance != null">
#{cardbalance,jdbcType=FLOAT},
@@ -94,11 +94,11 @@
<!--@mbg.generated-->
update se_reversal
<set>
- <if test="cardnum != null">
- cardNum = #{cardnum,jdbcType=VARCHAR},
+ <if test="cardid != null">
+ cardId = #{cardid,jdbcType=BIGINT},
</if>
- <if test="clientnum != null">
- clientNum = #{clientnum,jdbcType=VARCHAR},
+ <if test="clientid != null">
+ clientId = #{clientid,jdbcType=BIGINT},
</if>
<if test="cardbalance != null">
cardBalance = #{cardbalance,jdbcType=FLOAT},
@@ -121,8 +121,8 @@
<update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoSe.SeReversal">
<!--@mbg.generated-->
update se_reversal
- set cardNum = #{cardnum,jdbcType=VARCHAR},
- clientNum = #{clientnum,jdbcType=VARCHAR},
+ set cardId = #{cardid,jdbcType=BIGINT},
+ clientId = #{clientid,jdbcType=BIGINT},
cardBalance = #{cardbalance,jdbcType=FLOAT},
systemBalance = #{systembalance,jdbcType=FLOAT},
remarks = #{remarks,jdbcType=VARCHAR},
@@ -130,15 +130,14 @@
operateDt = #{operatedt,jdbcType=TIMESTAMP}
where id = #{id,jdbcType=BIGINT}
</update>
-
<!--鏍规嵁鎸囧畾鐨勬潯浠惰幏鍙栧啿姝ｈ褰曟暟-->
<select id="getRecordCount" parameterType="java.util.Map" resultType="java.lang.Long">
SELECT
COUNT(*) AS recordCount
FROM se_reversal rev
- INNER JOIN se_client_card card ON rev.cardNum = card.cardNum
- INNER JOIN ba_client cli ON rev.clientNum = cli.num
- , (SELECT @i:=0) AS itable
+ INNER JOIN se_client_card card ON rev.cardId = card.id
+ INNER JOIN se_client cli ON rev.clientId = cli.id
+ , (SELECT @i:=0) AS itable
<where>
<if test = "clientName != null and clientName !=''">
AND cli.name like CONCAT('%',#{clientName},'%')
@@ -157,17 +156,17 @@
<!--鏍规嵁鎸囧畾鐨勬潯浠惰幏鍙栧啿姝ｈ褰�-->
<select id="getReversals" resultType="com.dy.pipIrrGlobal.voSe.VoReversal">
SELECT
- (@i:=@i+1) AS id,
- cli.`name` AS clientName,
- cli.num AS clientNum,
- card.cardNum,
- rev.cardBalance,
- (SELECT `name` FROM ba_user WHERE id = rev.operator) AS operator,
- rev.operateDt
+ (@i:=@i+1) AS id,
+ cli.`name` AS clientName,
+ cli.clientNum,
+ card.cardNum,
+ rev.cardBalance,
+ (SELECT `name` FROM ba_user WHERE id = rev.operator) AS operator,
+ rev.operateDt
FROM se_reversal rev
- INNER JOIN se_client_card card ON rev.cardNum = card.cardNum
- INNER JOIN ba_client cli ON rev.clientNum = cli.num
- , (SELECT @i:=0) AS itable
+ INNER JOIN se_client_card card ON rev.cardId = card.id
+ INNER JOIN se_client cli ON rev.clientId = cli.id
+ , (SELECT @i:=0) AS itable
<where>
<if test = "clientName != null and clientName !=''">
AND cli.name like CONCAT('%',#{clientName},'%')
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeUnlockMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeUnlockMapper.xml
index 329661f..50c0143 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeUnlockMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeUnlockMapper.xml
@@ -5,8 +5,8 @@
<!--@mbg.generated-->
<!--@Table se_unlock-->
<id column="id" jdbcType="BIGINT" property="id" />
- <result column="cardNum" jdbcType="VARCHAR" property="cardnum" />
- <result column="clientNum" jdbcType="VARCHAR" property="clientnum" />
+ <result column="cardId" jdbcType="BIGINT" property="cardid" />
+ <result column="clientId" jdbcType="BIGINT" property="clientid" />
<result column="money" jdbcType="FLOAT" property="money" />
<result column="remarks" jdbcType="VARCHAR" property="remarks" />
<result column="operator" jdbcType="BIGINT" property="operator" />
@@ -14,7 +14,7 @@
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
- id, cardNum, clientNum, money, remarks, `operator`, operateDt
+ id, cardId, clientId, money, remarks, `operator`, operateDt
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
<!--@mbg.generated-->
@@ -31,10 +31,10 @@
<insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pipIrrGlobal.pojoSe.SeUnlock">
<!--@mbg.generated-->
- insert into se_unlock (id, cardNum, clientNum, money,
+ insert into se_unlock (id, cardId, clientId, money,
remarks, `operator`, operateDt
)
- values (#{id,jdbcType=BIGINT}, #{cardnum,jdbcType=VARCHAR}, #{clientnum,jdbcType=VARCHAR}, #{money,jdbcType=FLOAT},
+ values (#{id,jdbcType=BIGINT}, #{cardid,jdbcType=BIGINT}, #{clientid,jdbcType=BIGINT}, #{money,jdbcType=FLOAT},
#{remarks,jdbcType=VARCHAR}, #{operator,jdbcType=BIGINT}, #{operatedt,jdbcType=TIMESTAMP}
)
</insert>
@@ -43,11 +43,11 @@
<!--@mbg.generated-->
insert into se_unlock
<trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="cardnum != null">
- cardNum,
+ <if test="cardid != null">
+ cardId,
</if>
- <if test="clientnum != null">
- clientNum,
+ <if test="clientid != null">
+ clientId,
</if>
<if test="money != null">
money,
@@ -63,11 +63,11 @@
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
- <if test="cardnum != null">
- #{cardnum,jdbcType=VARCHAR},
+ <if test="cardid != null">
+ #{cardid,jdbcType=BIGINT},
</if>
- <if test="clientnum != null">
- #{clientnum,jdbcType=VARCHAR},
+ <if test="clientid != null">
+ #{clientid,jdbcType=BIGINT},
</if>
<if test="money != null">
#{money,jdbcType=FLOAT},
@@ -87,11 +87,11 @@
<!--@mbg.generated-->
update se_unlock
<set>
- <if test="cardnum != null">
- cardNum = #{cardnum,jdbcType=VARCHAR},
+ <if test="cardid != null">
+ cardId = #{cardid,jdbcType=BIGINT},
</if>
- <if test="clientnum != null">
- clientNum = #{clientnum,jdbcType=VARCHAR},
+ <if test="clientid != null">
+ clientId = #{clientid,jdbcType=BIGINT},
</if>
<if test="money != null">
money = #{money,jdbcType=FLOAT},
@@ -111,8 +111,8 @@
<update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoSe.SeUnlock">
<!--@mbg.generated-->
update se_unlock
- set cardNum = #{cardnum,jdbcType=VARCHAR},
- clientNum = #{clientnum,jdbcType=VARCHAR},
+ set cardId = #{cardid,jdbcType=BIGINT},
+ clientId = #{clientid,jdbcType=BIGINT},
money = #{money,jdbcType=FLOAT},
remarks = #{remarks,jdbcType=VARCHAR},
`operator` = #{operator,jdbcType=BIGINT},
@@ -125,9 +125,9 @@
SELECT
COUNT(*) AS recordCount
FROM se_unlock unl
- INNER JOIN se_client_card card ON unl.cardNum = card.cardNum
- INNER JOIN ba_client cli ON unl.clientNum = cli.num
- , (SELECT @i:=0) AS itable
+ INNER JOIN se_client_card card ON unl.cardId = card.id
+ INNER JOIN se_client cli ON unl.clientId = cli.id
+ , (SELECT @i:=0) AS itable
<where>
<if test = "clientName != null and clientName !=''">
AND cli.name like CONCAT('%',#{clientName},'%')
@@ -148,15 +148,15 @@
SELECT
(@i:=@i+1) AS id,
cli.`name` AS clientName,
- cli.num AS clientNum,
+ cli.clientNum,
card.cardNum,
unl.money,
(SELECT `name` FROM ba_user WHERE id = unl.operator) AS operator,
unl.operateDt
FROM se_unlock unl
- INNER JOIN se_client_card card ON unl.cardNum = card.cardNum
- INNER JOIN ba_client cli ON unl.clientNum = cli.num
- , (SELECT @i:=0) AS itable
+ INNER JOIN se_client_card card ON unl.cardId = card.id
+ INNER JOIN se_client cli ON unl.clientId = cli.id
+ , (SELECT @i:=0) AS itable
<where>
<if test = "clientName != null and clientName !=''">
AND cli.name like CONCAT('%',#{clientName},'%')
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cancel/CancelCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cancel/CancelCtrl.java
index 726052e..7edd28a 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cancel/CancelCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cancel/CancelCtrl.java
@@ -86,8 +86,8 @@
/**
* cardId 姘村崱缂栧彿锛堥潪浼犲叆鍙傛暟锛岀敱cardAddr鍙嶆煡锛屼慨鏀瑰啘鎴峰崱浣跨敤锛�
+ * clientId 鍐滄埛缂栧彿锛堥潪浼犲叆鍙傛暟锛岀敱cardNum鍙嶆煡锛�
* cardNum 姘村崱缂栧彿
- * clientNum 鍐滄埛缂栧彿锛堥潪浼犲叆鍙傛暟锛岀敱cardNum鍙嶆煡锛屾坊鍔犳敞閿�浣跨敤锛�
* refund 閫�娆鹃噾棰�
* refundType 閫�娆炬柟寮�
* remarks 澶囨敞
@@ -96,7 +96,7 @@
*/
Long cardId = 0L;
String cardNum = po.getCardNum();
- String clientNum = "";
+ Long clientId = 0L;
Float refund = po.getRefund();
Byte refundType = po.getRefundType();
String remarks = po.getRemarks();
@@ -111,7 +111,7 @@
return BaseResponseUtils.buildFail(SellResultCode.CARD_NUMBER_MISTAKE.getMessage());
}
cardId = Long.parseLong(map.get("cardId").toString());
- clientNum = map.get("clientNum").toString();
+ clientId = Long.parseLong(map.get("clientId").toString());
/**
* 淇敼鍐滄埛鍗′俊鎭細
@@ -131,8 +131,10 @@
* 娣诲姞鎸傚け璁板綍
*/
SeCancel seCancel = new SeCancel();
- seCancel.setCardnum(cardNum);
- seCancel.setClientnum(clientNum);
+ //seCancel.setCardnum(cardNum);
+ //seCancel.setClientnum(clientNum);
+ seCancel.setCardid(cardId);
+ seCancel.setClientid(clientId);
seCancel.setRefund(refund);
seCancel.setRefundtype(refundType);
seCancel.setRemarks(remarks);
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/loss/LossCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/loss/LossCtrl.java
index 3e51765..ab59e5b 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/loss/LossCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/loss/LossCtrl.java
@@ -53,9 +53,9 @@
schema = @Schema(implementation = VoLoss.class))}
)
})
- @GetMapping(path = "/getLosses", consumes = MediaType.APPLICATION_JSON_VALUE)
+ @GetMapping(path = "/getLosses")
@SsoAop()
- public BaseResponse<QueryResultVo<List<VoLoss>>> getLosses(@RequestBody @Parameter(description = "鏌ヨform琛ㄥ崟json鏁版嵁", required = true) QueryVo vo){
+ public BaseResponse<QueryResultVo<List<VoLoss>>> getLosses(QueryVo vo){
try {
QueryResultVo<List<VoLoss>> res = lossSv.getLosses(vo);
return BaseResponseUtils.buildSuccess(res);
@@ -84,8 +84,8 @@
/**
* cardId 姘村崱缂栧彿锛堥潪浼犲叆鍙傛暟锛岀敱cardNum鍙嶆煡锛�
+ * clientId 鍐滄埛缂栧彿锛堥潪浼犲叆鍙傛暟锛岀敱cardNum鍙嶆煡锛�
* cardNum 姘村崱缂栧彿
- * clientNum 鍐滄埛缂栧彿锛堥潪浼犲叆鍙傛暟锛岀敱cardNum鍙嶆煡锛屾坊鍔犳寕澶变娇鐢級
* money 浣欓
* refund 閫�娆鹃噾棰�
* remarks 澶囨敞
@@ -94,7 +94,7 @@
*/
Long cardId = 0L;
String cardNum = po.getCardNum();
- String clientNum = "";
+ Long clientId = 0L;
Float money = po.getMoney();
Float refund = po.getRefund();
String remarks = po.getRemarks();
@@ -109,7 +109,7 @@
return BaseResponseUtils.buildFail(SellResultCode.CARD_NUMBER_MISTAKE.getMessage());
}
cardId = Long.parseLong(map.get("cardId").toString());
- clientNum = map.get("clientNum").toString();
+ clientId = Long.parseLong(map.get("clientId").toString());
/**
* 淇敼鍐滄埛鍗′俊鎭細
@@ -129,8 +129,10 @@
* 娣诲姞鎸傚け璁板綍
*/
SeLoss seLoss = new SeLoss();
- seLoss.setCardnum(cardNum);
- seLoss.setClientnum(clientNum);
+ //seLoss.setCardnum(cardNum);
+ //seLoss.setClientnum(clientNum);
+ seLoss.setCardid(cardId);
+ seLoss.setClientid(clientId);
seLoss.setMoney(money);
seLoss.setRefund(refund);
seLoss.setRemarks(remarks);
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/loss/LossSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/loss/LossSv.java
index 4d0f386..2d951ad 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/loss/LossSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/loss/LossSv.java
@@ -9,7 +9,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.List;
import java.util.Map;
@@ -31,15 +30,27 @@
//瀹屽杽鏌ヨ鎸傚け璁板綍鐨勮捣姝㈡椂闂�
DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd");
- LocalDateTime lossTimeStart = queryVo.lossTimeStart;
- LocalDateTime lossTimeStop = queryVo.lossTimeStop;
+ //LocalDateTime lossTimeStart = queryVo.lossTimeStart;
+ //LocalDateTime lossTimeStop = queryVo.lossTimeStop;
+ //if(lossTimeStart != null) {
+ // lossTimeStart = LocalDateTime.parse(df.format(lossTimeStart) + " 00:00:00", DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+ // queryVo.setLossTimeStart(lossTimeStart);
+ //}
+ //
+ //if(lossTimeStop != null) {
+ // lossTimeStop = LocalDateTime.parse(df.format(lossTimeStop) + " 23:59:59", DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+ // queryVo.setLossTimeStop(lossTimeStop);
+ //}
+
+ String lossTimeStart = queryVo.lossTimeStart;
+ String lossTimeStop = queryVo.lossTimeStop;
if(lossTimeStart != null) {
- lossTimeStart = LocalDateTime.parse(df.format(lossTimeStart) + " 00:00:00", DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+ lossTimeStart = lossTimeStart + " 00:00:00";
queryVo.setLossTimeStart(lossTimeStart);
}
if(lossTimeStop != null) {
- lossTimeStop = LocalDateTime.parse(df.format(lossTimeStop) + " 23:59:59", DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+ lossTimeStop = lossTimeStop + " 23:59:59";
queryVo.setLossTimeStop(lossTimeStop);
}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/loss/QueryVo.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/loss/QueryVo.java
index 6b2c9f7..8d5250f 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/loss/QueryVo.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/loss/QueryVo.java
@@ -4,8 +4,6 @@
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
-import java.time.LocalDateTime;
-
/**
* @author ZhuBaoMin
* @date 2023/12/6 9:43
@@ -24,12 +22,13 @@
@Schema(description = "鍐滄埛濮撳悕")
public String clientName;
- @Schema(description = "IC鍗″彿")
- public String cardAddr;
+ @Schema(description = "姘村崱ID")
+ //public String cardAddr;
+ public Long cardNum;
@Schema(description = "鎸傚け鏃堕棿_寮�濮�")
- public LocalDateTime lossTimeStart;
+ public String lossTimeStart;
@Schema(description = "鎸傚け鏃堕棿_缁撴潫")
- public LocalDateTime lossTimeStop;
+ public String lossTimeStop;
}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/recharge/QueryVo.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/recharge/QueryVo.java
index 99ba48c..5ec74a7 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/recharge/QueryVo.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/recharge/QueryVo.java
@@ -4,8 +4,6 @@
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
-import java.time.LocalDateTime;
-
/**
* @author ZhuBaoMin
* @date 2023/12/4 17:20
@@ -33,11 +31,15 @@
@Schema(description = "浠樻鏂瑰紡")
public Integer paymentId;
+ //@Schema(description = "鍏呭�兼椂闂確寮�濮�")
+ //public LocalDateTime rechargeTimeStart;
+ //
+ //@Schema(description = "鍏呭�兼椂闂確缁撴潫")
+ //public LocalDateTime rechargeTimeStop;
+
@Schema(description = "鍏呭�兼椂闂確寮�濮�")
- //public DateTime rechargeTimeStart;
- public LocalDateTime rechargeTimeStart;
+ public String rechargeTimeStart;
@Schema(description = "鍏呭�兼椂闂確缁撴潫")
- //public DateTime rechargeTimeStop;
- public LocalDateTime rechargeTimeStop;
+ public String rechargeTimeStop;
}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/recharge/RechargeCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/recharge/RechargeCtrl.java
index ac8c55a..7268f34 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/recharge/RechargeCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/recharge/RechargeCtrl.java
@@ -47,9 +47,10 @@
schema = @Schema(implementation = VoRecharge.class))}
)
})
- @GetMapping(path = "/getRecharges", consumes = MediaType.APPLICATION_JSON_VALUE)
+ //@GetMapping(path = "/getRecharges", consumes = MediaType.APPLICATION_JSON_VALUE)
+ @GetMapping(path = "/getRecharges")
@SsoAop()
- public BaseResponse<QueryResultVo<List<VoRecharge>>> get(@RequestBody @Parameter(description = "鏌ヨform琛ㄥ崟json鏁版嵁", required = true) QueryVo vo){
+ public BaseResponse<QueryResultVo<List<VoRecharge>>> get(QueryVo vo){
try {
QueryResultVo<List<VoRecharge>> res = rechargeSv.getRecharges(vo);
return BaseResponseUtils.buildSuccess(res);
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/recharge/RechargeSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/recharge/RechargeSv.java
index 769284d..d30e913 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/recharge/RechargeSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/recharge/RechargeSv.java
@@ -11,7 +11,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.List;
import java.util.Map;
@@ -36,15 +35,27 @@
//瀹屽杽鏌ヨ鍏呭�艰褰曠殑璧锋鏃堕棿
DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd");
- LocalDateTime rechargeTimeStart = queryVo.rechargeTimeStart;
- LocalDateTime rechargeTimeStop = queryVo.rechargeTimeStop;
+ //LocalDateTime rechargeTimeStart = queryVo.rechargeTimeStart;
+ //LocalDateTime rechargeTimeStop = queryVo.rechargeTimeStop;
+ //if(rechargeTimeStart != null) {
+ // rechargeTimeStart = LocalDateTime.parse(df.format(rechargeTimeStart) + " 00:00:00", DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+ // queryVo.setRechargeTimeStart(rechargeTimeStart);
+ //}
+ //
+ //if(rechargeTimeStop != null) {
+ // rechargeTimeStop = LocalDateTime.parse(df.format(rechargeTimeStop) + " 23:59:59", DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+ // queryVo.setRechargeTimeStop(rechargeTimeStop);
+ //}
+
+ String rechargeTimeStart = queryVo.rechargeTimeStart;
+ String rechargeTimeStop = queryVo.rechargeTimeStop;
if(rechargeTimeStart != null) {
- rechargeTimeStart = LocalDateTime.parse(df.format(rechargeTimeStart) + " 00:00:00", DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+ rechargeTimeStart = rechargeTimeStart + " 00:00:00";
queryVo.setRechargeTimeStart(rechargeTimeStart);
}
if(rechargeTimeStop != null) {
- rechargeTimeStop = LocalDateTime.parse(df.format(rechargeTimeStop) + " 23:59:59", DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+ rechargeTimeStop = rechargeTimeStop + " 23:59:59";
queryVo.setRechargeTimeStop(rechargeTimeStop);
}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/reversal/QueryVo.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/reversal/QueryVo.java
index 9f026eb..852534e 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/reversal/QueryVo.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/reversal/QueryVo.java
@@ -4,8 +4,6 @@
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
-import java.time.LocalDateTime;
-
/**
* @author ZhuBaoMin
* @date 2023/12/6 15:57
@@ -29,8 +27,8 @@
@Schema(description = "鍐叉鏃堕棿_寮�濮�")
- public LocalDateTime reversalTimeStart;
+ public String reversalTimeStart;
@Schema(description = "鍐叉鏃堕棿_缁撴潫")
- public LocalDateTime reversalTimeStop;
+ public String reversalTimeStop;
}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/reversal/ReversalCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/reversal/ReversalCtrl.java
index 9322334..7b783f6 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/reversal/ReversalCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/reversal/ReversalCtrl.java
@@ -53,9 +53,9 @@
schema = @Schema(implementation = VoReversal.class))}
)
})
- @GetMapping(path = "/getReversals", consumes = MediaType.APPLICATION_JSON_VALUE)
+ @GetMapping(path = "/getReversals")
@SsoAop()
- public BaseResponse<QueryResultVo<List<VoReversal>>> getReversals(@RequestBody @Parameter(description = "鏌ヨform琛ㄥ崟json鏁版嵁", required = true) QueryVo vo){
+ public BaseResponse<QueryResultVo<List<VoReversal>>> getReversals(QueryVo vo){
try {
QueryResultVo<List<VoReversal>> res = reversalSv.getReversals(vo);
return BaseResponseUtils.buildSuccess(res);
@@ -84,8 +84,8 @@
/**
* cardId 姘村崱缂栧彿锛堥潪浼犲叆鍙傛暟锛岀敱cardAddr鍙嶆煡锛屼慨鏀瑰啘鎴峰崱浣跨敤锛�
+ * clientId 鍐滄埛缂栧彿锛堥潪浼犲叆鍙傛暟锛岀敱cardNum鍙嶆煡锛�
* cardNum 姘村崱鍦板潃
- * clientNum 鍐滄埛缂栧彿锛堥潪浼犲叆鍙傛暟锛岀敱cardNum鍙嶆煡锛屾坊鍔犲啿姝ｄ娇鐢級
* cardBalance 鍗＄墖浣欓
* systemBalance 绯荤粺浣欓
* remarks 澶囨敞
@@ -94,7 +94,7 @@
*/
Long cardId = 0L;
String cardNum = po.getCardNum();
- String clientNum = "";
+ Long clientId = 0L;
Float cardBalance = po.getCardBalance();
Float systemBalance = po.getSystemBalance();
String remarks = po.getRemarks();
@@ -109,7 +109,7 @@
return BaseResponseUtils.buildFail(SellResultCode.CARD_NUMBER_MISTAKE.getMessage());
}
cardId = Long.parseLong(map.get("cardId").toString());
- clientNum = map.get("clientNum").toString();
+ clientId = Long.parseLong(map.get("clientId").toString());
/**
* 淇敼鍐滄埛鍗′俊鎭細
@@ -129,8 +129,10 @@
* 娣诲姞鍐叉璁板綍
*/
SeReversal reversal = new SeReversal();
- reversal.setCardnum(cardNum);
- reversal.setClientnum(clientNum);
+ //reversal.setCardnum(cardNum);
+ //reversal.setClientnum(clientNum);
+ reversal.setCardid(cardId);
+ reversal.setClientid(clientId);
reversal.setCardbalance(cardBalance);
reversal.setSystembalance(systemBalance);
reversal.setRemarks(remarks);
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/reversal/ReversalSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/reversal/ReversalSv.java
index 42d00be..1b3e8b1 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/reversal/ReversalSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/reversal/ReversalSv.java
@@ -9,7 +9,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.List;
import java.util.Map;
@@ -31,15 +30,15 @@
//瀹屽杽鏌ヨ娉ㄩ攢璁板綍鐨勮捣姝㈡椂闂�
DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd");
- LocalDateTime reversalTimeStart = queryVo.reversalTimeStart;
- LocalDateTime reversalTimeStop = queryVo.reversalTimeStop;
+ String reversalTimeStart = queryVo.reversalTimeStart;
+ String reversalTimeStop = queryVo.reversalTimeStop;
if(reversalTimeStart != null) {
- reversalTimeStart = LocalDateTime.parse(df.format(reversalTimeStart) + " 00:00:00", DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+ reversalTimeStart = reversalTimeStart + " 00:00:00";
queryVo.setReversalTimeStart (reversalTimeStart);
}
if(reversalTimeStop != null) {
- reversalTimeStop = LocalDateTime.parse(df.format(reversalTimeStop) + " 23:59:59", DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+ reversalTimeStop = reversalTimeStop + " 23:59:59";
queryVo.setReversalTimeStop(reversalTimeStop);
}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/unlock/QueryVo.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/unlock/QueryVo.java
index ab9ffce..6c8e9c7 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/unlock/QueryVo.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/unlock/QueryVo.java
@@ -4,8 +4,6 @@
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
-import java.time.LocalDateTime;
-
/**
* @author ZhuBaoMin
* @date 2023/12/6 15:00
@@ -25,12 +23,12 @@
public String clientName;
@Schema(description = "IC鍗″彿")
- public String cardAddr;
+ public Long cardNum;
@Schema(description = "瑙ｉ攣鏃堕棿_寮�濮�")
- public LocalDateTime unlocklTimeStart;
+ public String unlocklTimeStart;
@Schema(description = "瑙ｉ攣鏃堕棿_缁撴潫")
- public LocalDateTime unlockTimeStop;
+ public String unlockTimeStop;
}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/unlock/UnlockCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/unlock/UnlockCtrl.java
index a9242eb..1a8b80a 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/unlock/UnlockCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/unlock/UnlockCtrl.java
@@ -54,9 +54,9 @@
schema = @Schema(implementation = VoUnlock.class))}
)
})
- @GetMapping(path = "/getUnlocks", consumes = MediaType.APPLICATION_JSON_VALUE)
+ @GetMapping(path = "/getUnlocks")
@SsoAop()
- public BaseResponse<QueryResultVo<List<VoUnlock>>> getUnlocks(@RequestBody @Parameter(description = "鏌ヨform琛ㄥ崟json鏁版嵁", required = true) QueryVo vo){
+ public BaseResponse<QueryResultVo<List<VoUnlock>>> getUnlocks(QueryVo vo){
try {
QueryResultVo<List<VoUnlock>> res = unlockSv.getUnlocks(vo);
return BaseResponseUtils.buildSuccess(res);
@@ -86,8 +86,8 @@
/**
* cardId 姘村崱缂栧彿锛堥潪浼犲叆鍙傛暟锛岀敱cardAddr鍙嶆煡锛屼慨鏀瑰啘鎴峰崱浣跨敤锛�
+ * clientId 鍐滄埛缂栧彿锛堥潪浼犲叆鍙傛暟锛岀敱cardNum鍙嶆煡锛�
* cardNum 姘村崱鍦板潃
- * clientNum 鍐滄埛缂栧彿锛堥潪浼犲叆鍙傛暟锛岀敱cardNum鍙嶆煡锛屾坊鍔犺В閿佷娇鐢級
* money 浣欓
* remarks 澶囨敞
* operator 鎿嶄綔浜虹紪鍙�
@@ -95,7 +95,7 @@
*/
Long cardId = 0L;
String cardNum = po.getCardNum();
- String clientNum = "";
+ Long clientId = 0L;
Float money = po.getMoney();
String remarks = po.getRemarks();
Long operator = po.getOperator();
@@ -109,7 +109,7 @@
return BaseResponseUtils.buildFail(SellResultCode.CARD_NUMBER_MISTAKE.getMessage());
}
cardId = Long.parseLong(map.get("cardId").toString());
- clientNum = map.get("clientNum").toString();
+ clientId = Long.parseLong(map.get("clientId").toString());
/**
* 淇敼鍐滄埛鍗′俊鎭細
@@ -129,8 +129,10 @@
* 娣诲姞瑙ｉ攣璁板綍
*/
SeUnlock seUnlock = new SeUnlock();
- seUnlock.setCardnum(cardNum);
- seUnlock.setClientnum(clientNum);
+ //seUnlock.setCardnum(cardNum);
+ //seUnlock.setClientnum(clientNum);
+ seUnlock.setCardid(cardId);
+ seUnlock.setClientid(clientId);
seUnlock.setMoney(money);
seUnlock.setRemarks(remarks);
seUnlock.setOperator(operator);
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/unlock/UnlockSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/unlock/UnlockSv.java
index 85d1754..21a3824 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/unlock/UnlockSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/unlock/UnlockSv.java
@@ -9,7 +9,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.List;
import java.util.Map;
@@ -31,15 +30,15 @@
//瀹屽杽鏌ヨ娉ㄩ攢璁板綍鐨勮捣姝㈡椂闂�
DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd");
- LocalDateTime unlocklTimeStart = queryVo.unlocklTimeStart;
- LocalDateTime unlockTimeStop = queryVo.unlockTimeStop;
+ String unlocklTimeStart = queryVo.unlocklTimeStart;
+ String unlockTimeStop = queryVo.unlockTimeStop;
if(unlocklTimeStart != null) {
- unlocklTimeStart = LocalDateTime.parse(df.format(unlocklTimeStart) + " 00:00:00", DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+ unlocklTimeStart = unlocklTimeStart + " 00:00:00";
queryVo.setUnlocklTimeStart(unlocklTimeStart);
}
if(unlockTimeStop != null) {
- unlockTimeStop = LocalDateTime.parse(df.format(unlockTimeStop) + " 23:59:59", DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+ unlockTimeStop = unlockTimeStop + " 23:59:59";
queryVo.setUnlockTimeStop(unlockTimeStop);
}
--
Gitblit v1.8.0