From 7fb5322563f55151015026d769941cd015049506 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=89=9B=E5=8F=89=E9=97=AA=E9=97=AA?= <18322780655@163.com>
Date: Thu, 29 Aug 2024 14:46:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BC=9A=E5=91=98=E4=BD=99?=
 =?UTF-8?q?=E9=A2=9D=E5=8F=98=E5=8A=A8=E9=80=9A=E7=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cashierservice/entity/TbShopUserFlow.java | 21 +++++++++++++++++++
 .../cashierservice/service/PayService.java    |  1 +
 .../resources/mapper/TbShopUserFlowMapper.xml |  8 ++++---
 3 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopUserFlow.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopUserFlow.java
index 730cd8f..fb8f548 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopUserFlow.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopUserFlow.java
@@ -21,6 +21,11 @@ public class TbShopUserFlow implements Serializable {
 
     private String type;
 
+
+    private String isReturn;
+
+    private String remark;
+
     private static final long serialVersionUID = 1L;
 
     public Integer getId() {
@@ -86,4 +91,20 @@ public class TbShopUserFlow implements Serializable {
     public void setType(String type) {
         this.type = type == null ? null : type.trim();
     }
+
+    public String getIsReturn() {
+        return isReturn;
+    }
+
+    public void setIsReturn(String isReturn) {
+        this.isReturn = isReturn;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
index c1b8bdb..4f3c6f2 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
@@ -1204,6 +1204,7 @@ public class PayService {
         flow.setAmount(memberIn.getAmount());
         flow.setBalance(tbShopUser.getAmount());
         flow.setCreateTime(new Date());
+        flow.setRemark(payOrderNO);
         tbShopUserFlowMapper.insert(flow);
         //会员活动
        BigDecimal awardAmount= giveActivate(tbShopUser,memberIn.getAmount(),flow.getId());
diff --git a/src/main/resources/mapper/TbShopUserFlowMapper.xml b/src/main/resources/mapper/TbShopUserFlowMapper.xml
index 013efcf..f562bb4 100644
--- a/src/main/resources/mapper/TbShopUserFlowMapper.xml
+++ b/src/main/resources/mapper/TbShopUserFlowMapper.xml
@@ -10,9 +10,11 @@
     <result column="biz_name" jdbcType="VARCHAR" property="bizName" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="type" jdbcType="VARCHAR" property="type" />
+    <result column="is_return" jdbcType="VARCHAR" property="isReturn" />
+    <result column="remark" jdbcType="VARCHAR" property="remark" />
   </resultMap>
   <sql id="Base_Column_List">
-    id, shop_user_id, amount, balance, biz_code, biz_name, create_time, type
+    id, shop_user_id, amount, balance, biz_code, biz_name, create_time, type,is_return,remark
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select 
@@ -27,10 +29,10 @@
   <insert id="insert" parameterType="com.chaozhanggui.system.cashierservice.entity.TbShopUserFlow" useGeneratedKeys="true" keyProperty="id" keyColumn="id">
     insert into tb_shop_user_flow (id, shop_user_id, amount, 
       balance, biz_code, biz_name, 
-      create_time, type)
+      create_time, type,is_return,remark)
     values (#{id,jdbcType=INTEGER}, #{shopUserId,jdbcType=INTEGER}, #{amount,jdbcType=DECIMAL}, 
       #{balance,jdbcType=DECIMAL}, #{bizCode,jdbcType=VARCHAR}, #{bizName,jdbcType=VARCHAR}, 
-      #{createTime,jdbcType=TIMESTAMP}, #{type,jdbcType=VARCHAR})
+      #{createTime,jdbcType=TIMESTAMP}, #{type,jdbcType=VARCHAR},#{isReturn,jdbcType=VARCHAR},#{remark,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.chaozhanggui.system.cashierservice.entity.TbShopUserFlow">
     insert into tb_shop_user_flow