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 @@
+
+
- 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