From e532174124ad3de9ecd96c16990681538dfd1af7 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Wed, 25 Sep 2024 16:46:55 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BC=9A=E5=91=98?=
 =?UTF-8?q?=E5=A1=AB=E5=85=85=E5=8A=A0=E5=85=A5=E4=BC=9A=E5=91=98=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cashierservice/entity/TbShopUser.java       | 11 ++++++++++-
 .../cashierservice/service/PayService.java      |  3 +++
 src/main/resources/mapper/TbShopUserMapper.xml  | 17 ++++++++++++++---
 3 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopUser.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopUser.java
index 13243bf..e4d6a24 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopUser.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopUser.java
@@ -4,6 +4,7 @@ import org.springframework.data.annotation.Transient;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.sql.Timestamp;
 
 public class TbShopUser implements Serializable {
     private String id;
@@ -73,7 +74,7 @@ public class TbShopUser implements Serializable {
     @Transient
     private String isUser;
 
-
+    private Timestamp joinTime;
 
 
 
@@ -352,4 +353,12 @@ public class TbShopUser implements Serializable {
     public void setAddress(String address) {
         this.address = address;
     }
+
+    public Timestamp getJoinTime() {
+        return joinTime;
+    }
+
+    public void setJoinTime(Timestamp joinTime) {
+        this.joinTime = joinTime;
+    }
 }
\ 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 3e832ae..7e4f1fc 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
@@ -41,6 +41,7 @@ import org.springframework.web.client.RestTemplate;
 import javax.annotation.Resource;
 import java.io.IOException;
 import java.math.BigDecimal;
+import java.sql.Timestamp;
 import java.time.LocalDateTime;
 import java.util.*;
 
@@ -1119,6 +1120,7 @@ public class PayService {
         //修改客户资金
         tbShopUser.setAmount(tbShopUser.getAmount().add(memberIn.getAmount()));
         tbShopUser.setUpdatedAt(System.currentTimeMillis());
+        tbShopUser.setJoinTime(new Timestamp(System.currentTimeMillis()));
         tbShopUserMapper.updateByPrimaryKeySelective(tbShopUser);
 
         TbShopUserFlow flow = new TbShopUserFlow();
@@ -1217,6 +1219,7 @@ public class PayService {
         //修改客户资金
         tbShopUser.setAmount(tbShopUser.getAmount().add(memberIn.getAmount()));
         tbShopUser.setUpdatedAt(System.currentTimeMillis());
+        tbShopUser.setJoinTime(new Timestamp(System.currentTimeMillis()));
         tbShopUserMapper.updateByPrimaryKeySelective(tbShopUser);
 
         TbShopUserFlow flow = new TbShopUserFlow();
diff --git a/src/main/resources/mapper/TbShopUserMapper.xml b/src/main/resources/mapper/TbShopUserMapper.xml
index c3cc4c9..11a4618 100644
--- a/src/main/resources/mapper/TbShopUserMapper.xml
+++ b/src/main/resources/mapper/TbShopUserMapper.xml
@@ -31,12 +31,13 @@
     <result column="created_at" jdbcType="BIGINT" property="createdAt" />
     <result column="updated_at" jdbcType="BIGINT" property="updatedAt" />
     <result column="mini_open_id" jdbcType="VARCHAR" property="miniOpenId" />
+    <result column="join_time" jdbcType="VARCHAR" property="joinTime" />
   </resultMap>
   <sql id="Base_Column_List">
     id, amount, credit_amount, consume_amount, consume_number, level_consume, status, 
     merchant_id, shop_id, user_id, parent_id, parent_level, name, head_img, sex, birth_day, 
     telephone, is_vip, code, is_attention, attention_at, is_shareholder, level, distribute_type, 
-    sort, created_at, updated_at, mini_open_id,dynamic_code
+    sort, created_at, updated_at, mini_open_id,dynamic_code,join_time
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
     select 
@@ -74,7 +75,7 @@
       code, is_attention, attention_at, 
       is_shareholder, level, distribute_type, 
       sort, created_at, updated_at, 
-      mini_open_id)
+      mini_open_id,join_time)
     values (#{id,jdbcType=VARCHAR}, #{amount,jdbcType=DECIMAL}, #{creditAmount,jdbcType=DECIMAL}, 
       #{consumeAmount,jdbcType=DECIMAL}, #{consumeNumber,jdbcType=INTEGER}, #{levelConsume,jdbcType=DECIMAL}, 
       #{status,jdbcType=TINYINT}, #{merchantId,jdbcType=VARCHAR}, #{shopId,jdbcType=VARCHAR}, 
@@ -84,7 +85,7 @@
       #{code,jdbcType=VARCHAR}, #{isAttention,jdbcType=TINYINT}, #{attentionAt,jdbcType=INTEGER}, 
       #{isShareholder,jdbcType=TINYINT}, #{level,jdbcType=TINYINT}, #{distributeType,jdbcType=VARCHAR}, 
       #{sort,jdbcType=INTEGER}, #{createdAt,jdbcType=BIGINT}, #{updatedAt,jdbcType=BIGINT}, 
-      #{miniOpenId,jdbcType=VARCHAR})
+      #{miniOpenId,jdbcType=VARCHAR},#{joinTime,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="com.chaozhanggui.system.cashierservice.entity.TbShopUser">
     insert into tb_shop_user
@@ -173,6 +174,9 @@
       <if test="miniOpenId != null">
         mini_open_id,
       </if>
+      <if test="joinTime != null">
+        join_time,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -259,6 +263,9 @@
       <if test="miniOpenId != null">
         #{miniOpenId,jdbcType=VARCHAR},
       </if>
+      <if test="joinTime != null">
+        #{joinTime,jdbcType=TIMESTAMP},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.chaozhanggui.system.cashierservice.entity.TbShopUser">
@@ -354,6 +361,9 @@
       <if test="miniOpenId != null">
         mini_open_id = #{miniOpenId,jdbcType=VARCHAR},
       </if>
+      <if test="joinTime != null">
+        join_time = #{joinTime,jdbcType=TIMESTAMP},
+      </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -385,6 +395,7 @@
       sort = #{sort,jdbcType=INTEGER},
       created_at = #{createdAt,jdbcType=BIGINT},
       updated_at = #{updatedAt,jdbcType=BIGINT},
+        join_time = #{joinTime,jdbcType=TIMESTAMP},
       mini_open_id = #{miniOpenId,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>

From e17e2e5d60d8a992d5bca2271d13deb331805b5a Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Wed, 25 Sep 2024 17:59:01 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BC=9A=E5=91=98?=
 =?UTF-8?q?=E5=A1=AB=E5=85=85=E5=8A=A0=E5=85=A5=E4=BC=9A=E5=91=98=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=20userInfo=E5=A2=9E=E5=8A=A0=20=E5=82=A8=E5=80=BC?=
 =?UTF-8?q?=E5=92=8C=E4=BC=98=E6=83=A0=E5=8D=B7=E6=95=B0=20=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dao/TbActivateInRecordMapper.java         |  3 +++
 .../cashierservice/dao/TbShopUserMapper.java  |  3 +++
 .../cashierservice/entity/TbUserInfo.java     | 22 ++++++++++++++++++-
 .../cashierservice/service/LoginService.java  |  6 +++++
 .../mapper/TbActivateInRecordMapper.xml       |  9 ++++++++
 .../resources/mapper/TbShopUserMapper.xml     |  4 ++++
 6 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbActivateInRecordMapper.java b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbActivateInRecordMapper.java
index df4b1d5..dfbf581 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbActivateInRecordMapper.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbActivateInRecordMapper.java
@@ -37,6 +37,9 @@ public interface TbActivateInRecordMapper {
     int queryByVipIdAndShopIdAndProId(@Param("vipUserId") Integer vipUserId, @Param("shopId") Integer shopId,@Param("productId") Integer productId);
     List<TbActivateInRecord> queryAllByVipIdAndShopIdAndProId(@Param("vipUserId") Integer vipUserId, @Param("shopId") Integer shopId,@Param("productId") Integer productId);
 
+    int countCouponNum(@Param("userId") Integer userId);
+
+
     /**
      * 新增数据
      *
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbShopUserMapper.java b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbShopUserMapper.java
index a87fe71..78baab9 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbShopUserMapper.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbShopUserMapper.java
@@ -7,6 +7,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Component;
 
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
@@ -32,6 +33,8 @@ public interface TbShopUserMapper {
     TbShopUser selectByPhoneAndShopId(@Param("phone") String phone,@Param("shopId") String shopId);
     TbShopUser selectPCByPhoneAndShopId(@Param("phone") String phone,@Param("shopId") String shopId);
     List<TbShopUser> selectAllByUserId(@Param("userId") String userId);
+    List<TbShopUser> selectVipByUserId(@Param("userId") Integer userId);
+    BigDecimal countAmount(@Param("userId") Integer userId);
 
 
     List<ShopUserListVo> selectByUserId(@Param("userId") String userId, @Param("shopId") String shopId);
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbUserInfo.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbUserInfo.java
index e449864..6bb7f5a 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbUserInfo.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbUserInfo.java
@@ -101,7 +101,11 @@ public class TbUserInfo implements Serializable {
 
     private String pwd;
 
-    private String custPhone="400-6666-389";
+    private String custPhone = "400-6666-389";
+    //优惠卷数量
+    private Integer couponAll = 0;
+    //储值数量
+    private BigDecimal balanceAll = BigDecimal.ZERO;
 
 
     public String getAvatar() {
@@ -505,4 +509,20 @@ public class TbUserInfo implements Serializable {
     public void setPwd(String pwd) {
         this.pwd = pwd;
     }
+
+    public Integer getCouponAll() {
+        return couponAll;
+    }
+
+    public void setCouponAll(Integer couponAll) {
+        this.couponAll = couponAll;
+    }
+
+    public BigDecimal getBalanceAll() {
+        return balanceAll;
+    }
+
+    public void setBalanceAll(BigDecimal balanceAll) {
+        this.balanceAll = balanceAll;
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/LoginService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/LoginService.java
index bf59077..86b6a1b 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/LoginService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/LoginService.java
@@ -37,6 +37,9 @@ public class LoginService {
     @Autowired
     private TbShopUserMapper tbShopUserMapper;
 
+    @Autowired
+    private TbActivateInRecordMapper inRecordMapper;
+
     @Autowired
     private TbShopTableMapper tbShopTableMapper;
 
@@ -460,6 +463,9 @@ public class LoginService {
         if (tbUserInfo == null) {
             return Result.success(CodeEnum.ENCRYPT, new ArrayList());
         }
+        tbUserInfo.setBalanceAll(tbShopUserMapper.countAmount(userId));
+        tbUserInfo.setCouponAll(inRecordMapper.countCouponNum(userId));
+
         return Result.success(CodeEnum.ENCRYPT, tbUserInfo);
     }
 
diff --git a/src/main/resources/mapper/TbActivateInRecordMapper.xml b/src/main/resources/mapper/TbActivateInRecordMapper.xml
index 6d9ad84..8e47129 100644
--- a/src/main/resources/mapper/TbActivateInRecordMapper.xml
+++ b/src/main/resources/mapper/TbActivateInRecordMapper.xml
@@ -28,6 +28,15 @@
         where id = #{id}
     </select>
 
+    <!--查询剩余商品优惠卷数量-->
+    <select id="countCouponNum" resultType="INTEGER">
+        SELECT
+            sum(over_num)
+        FROM
+            tb_activate_in_record record
+                INNER JOIN tb_shop_user vip ON record.vip_user_id = vip.id AND vip.user_id = #{userId}
+    </select>
+
     <select id="queryByVipIdAndShopId" resultType="com.chaozhanggui.system.cashierservice.entity.TbProduct">
         SELECT
             tb_product.*, sum(tb_activate_in_record.over_num) as limitNumber
diff --git a/src/main/resources/mapper/TbShopUserMapper.xml b/src/main/resources/mapper/TbShopUserMapper.xml
index 11a4618..affea0c 100644
--- a/src/main/resources/mapper/TbShopUserMapper.xml
+++ b/src/main/resources/mapper/TbShopUserMapper.xml
@@ -429,6 +429,10 @@
     select * from tb_shop_user where user_id=#{userId} and is_vip = 1
   </select>
 
+  <select id="countAmount" resultType="BigDecimal">
+    select sum(amount) from tb_shop_user where user_id=#{userId} and is_vip = 1
+  </select>
+
     <select id="selectByOpenId" resultType="com.chaozhanggui.system.cashierservice.entity.TbShopUser">
       select * from tb_shop_user where mini_open_id = #{openId}
     </select>