From 69b7ed77ec0ef96f61afcf2dfba133b1d081217e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9F=A9=E9=B9=8F=E8=BE=89?= <18322780655@163.com> Date: Fri, 14 Jun 2024 15:26:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9msg=20=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E7=BB=9F=E4=B8=80=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/TbShopUserFlowMapper.java | 5 +--- .../cashierservice/entity/TbShopUserFlow.java | 10 +++++++ .../cashierservice/service/PayService.java | 8 ++++++ .../generator-mapper/generatorConfig.xml | 4 ++- .../resources/mapper/TbShopUserFlowMapper.xml | 28 +++++++++++++------ 5 files changed, 42 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbShopUserFlowMapper.java b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbShopUserFlowMapper.java index 7cf0c32..8beec03 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbShopUserFlowMapper.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbShopUserFlowMapper.java @@ -1,14 +1,10 @@ package com.chaozhanggui.system.cashierservice.dao; import com.chaozhanggui.system.cashierservice.entity.TbShopUserFlow; -import org.apache.ibatis.annotations.Mapper; -import org.springframework.stereotype.Component; import java.util.List; import java.util.Map; -@Component -@Mapper public interface TbShopUserFlowMapper { int deleteByPrimaryKey(Integer id); @@ -22,5 +18,6 @@ public interface TbShopUserFlowMapper { int updateByPrimaryKey(TbShopUserFlow record); + List> selectByMemberAccountFlow(String memberId); } \ No newline at end of file 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 d70e58c..730cd8f 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopUserFlow.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopUserFlow.java @@ -19,6 +19,8 @@ public class TbShopUserFlow implements Serializable { private Date createTime; + private String type; + private static final long serialVersionUID = 1L; public Integer getId() { @@ -76,4 +78,12 @@ public class TbShopUserFlow implements Serializable { public void setCreateTime(Date createTime) { this.createTime = createTime; } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type == null ? null : type.trim(); + } } \ 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 af29d61..caa0112 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java @@ -352,6 +352,7 @@ public class PayService { flow.setShopUserId(Integer.valueOf(user.getId())); flow.setBizCode("accountPay"); flow.setBizName("会员储值卡支付"); + flow.setType("-"); flow.setAmount(orderInfo.getOrderAmount()); flow.setBalance(user.getAmount()); flow.setCreateTime(new Date()); @@ -424,6 +425,7 @@ public class PayService { TbShopUserFlow flow = new TbShopUserFlow(); flow.setShopUserId(Integer.valueOf(user.getId())); flow.setBizCode("accountGroupPay"); + flow.setType("-"); flow.setBizName("会员储值卡支付团购卷"); flow.setAmount(orderInfo.getOrderAmount()); flow.setBalance(user.getAmount()); @@ -1039,7 +1041,9 @@ public class PayService { TbShopUserFlow flow=new TbShopUserFlow(); flow.setShopUserId(Integer.valueOf(tbShopUser.getId())); flow.setBizCode("scanMemberIn"); + flow.setBizName("会员扫码充值"); + flow.setType("+"); flow.setAmount(memberIn.getAmount()); flow.setBalance(tbShopUser.getAmount()); flow.setCreateTime(new Date()); @@ -1065,6 +1069,7 @@ public class PayService { flow.setShopUserId(Integer.valueOf(tbShopUser.getId())); flow.setBizCode("scanMemberAwardIn"); flow.setBizName("会员充值奖励"); + flow.setType("+"); flow.setAmount(amount); flow.setBalance(tbShopUser.getAmount()); flow.setCreateTime(new Date()); @@ -1119,6 +1124,8 @@ public class PayService { TbShopUserFlow flow=new TbShopUserFlow(); flow.setShopUserId(Integer.valueOf(tbShopUser.getId())); flow.setBizCode("scanMemberIn"); + flow.setType("+"); + flow.setBizName("线上充值"); flow.setAmount(memberIn.getAmount()); flow.setBalance(tbShopUser.getAmount()); @@ -1145,6 +1152,7 @@ public class PayService { flow=new TbShopUserFlow(); flow.setShopUserId(Integer.valueOf(tbShopUser.getId())); flow.setBizCode("scanMemberAwardIn"); + flow.setType("+"); flow.setBizName("充值活动奖励"); flow.setAmount(amount); flow.setBalance(tbShopUser.getAmount()); diff --git a/src/main/resources/generator-mapper/generatorConfig.xml b/src/main/resources/generator-mapper/generatorConfig.xml index 87787f8..a6c8bea 100644 --- a/src/main/resources/generator-mapper/generatorConfig.xml +++ b/src/main/resources/generator-mapper/generatorConfig.xml @@ -52,9 +52,11 @@ -
+ + \ No newline at end of file diff --git a/src/main/resources/mapper/TbShopUserFlowMapper.xml b/src/main/resources/mapper/TbShopUserFlowMapper.xml index 9c9e34a..9e02f10 100644 --- a/src/main/resources/mapper/TbShopUserFlowMapper.xml +++ b/src/main/resources/mapper/TbShopUserFlowMapper.xml @@ -9,9 +9,10 @@ + - id, shop_user_id, amount, balance, biz_code, biz_name, create_time + id, shop_user_id, amount, balance, biz_code, biz_name, create_time, type + SELECT - f.*, - u.`name` + f.*, + u.`name` FROM - tb_shop_user_flow f - LEFT JOIN tb_shop_user u ON f.shop_user_id = u.id + tb_shop_user_flow f + LEFT JOIN tb_shop_user u ON f.shop_user_id = u.id where 1=1 and u.id = #{memberId}