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