Merge remote-tracking branch 'origin/test' into test

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;
+    }
 }

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.*;
 
@@ -1117,6 +1118,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();
@@ -1215,6 +1217,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();