czg_team/wx-cashier-service
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ww' into test

Browse Source
This commit is contained in:
wangw
2024-10-08 15:41:08 +08:00
parent ae9c4b3e84 0f000cd0e0
commit 3a9b453532
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/chaozhanggui/system/cashierservice/service/LoginService.java
View File

@@ -24,6 +24,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.sql.Timestamp;
import java.util.*; import java.util.*;
@Service @Service
@@ -521,6 +522,7 @@ public class LoginService {
TbShopUser tbShopUserSM = tbShopUserMapper.selectByUserIdAndShopId(userInfo.getId().toString(), shopId); TbShopUser tbShopUserSM = tbShopUserMapper.selectByUserIdAndShopId(userInfo.getId().toString(), shopId);
if (tbShopUserSM != null) { if (tbShopUserSM != null) {
tbShopUserSM.setIsVip(Byte.parseByte("1")); tbShopUserSM.setIsVip(Byte.parseByte("1"));
tbShopUserSM.setJoinTime(new Timestamp(System.currentTimeMillis()));
tbShopUserSM.setTelephone(phone); tbShopUserSM.setTelephone(phone);
tbShopUserSM.setUpdatedAt(System.currentTimeMillis()); tbShopUserSM.setUpdatedAt(System.currentTimeMillis());
tbShopUserMapper.updateByPrimaryKey(tbShopUserSM); tbShopUserMapper.updateByPrimaryKey(tbShopUserSM);
@@ -543,6 +545,7 @@ public class LoginService {
shopUser.setTelephone(userInfo.getTelephone()); shopUser.setTelephone(userInfo.getTelephone());
shopUser.setAmount(BigDecimal.ZERO); shopUser.setAmount(BigDecimal.ZERO);
shopUser.setIsVip(Byte.parseByte("1")); shopUser.setIsVip(Byte.parseByte("1"));
shopUser.setJoinTime(new Timestamp(System.currentTimeMillis()));
shopUser.setCreditAmount(BigDecimal.ZERO); shopUser.setCreditAmount(BigDecimal.ZERO);
shopUser.setConsumeAmount(BigDecimal.ZERO); shopUser.setConsumeAmount(BigDecimal.ZERO);
shopUser.setConsumeNumber(0); shopUser.setConsumeNumber(0);

4
src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
View File

@@ -1231,12 +1231,12 @@ public class PayService {
if (!"1".equals(tbShopUser.getIsVip().toString())) { if (!"1".equals(tbShopUser.getIsVip().toString())) {
tbShopUser.setIsVip(Byte.parseByte("1")); tbShopUser.setIsVip(Byte.parseByte("1"));
tbShopUser.setJoinTime(new Timestamp(System.currentTimeMillis()));
} }
//修改客户资金 //修改客户资金
tbShopUser.setAmount(tbShopUser.getAmount().add(memberIn.getAmount())); tbShopUser.setAmount(tbShopUser.getAmount().add(memberIn.getAmount()));
tbShopUser.setUpdatedAt(System.currentTimeMillis()); tbShopUser.setUpdatedAt(System.currentTimeMillis());
tbShopUser.setJoinTime(new Timestamp(System.currentTimeMillis()));
tbShopUserMapper.updateByPrimaryKeySelective(tbShopUser); tbShopUserMapper.updateByPrimaryKeySelective(tbShopUser);
TbShopUserFlow flow = new TbShopUserFlow(); TbShopUserFlow flow = new TbShopUserFlow();
@@ -1330,12 +1330,12 @@ public class PayService {
tbShopUser.setTelephone(userInfo.getTelephone()); tbShopUser.setTelephone(userInfo.getTelephone());
tbShopUser.setCode(RandomUtil.randomNumbers(8)); tbShopUser.setCode(RandomUtil.randomNumbers(8));
tbShopUser.setIsVip(Byte.parseByte("1")); tbShopUser.setIsVip(Byte.parseByte("1"));
tbShopUser.setJoinTime(new Timestamp(System.currentTimeMillis()));
} }
//修改客户资金 //修改客户资金
tbShopUser.setAmount(tbShopUser.getAmount().add(memberIn.getAmount())); tbShopUser.setAmount(tbShopUser.getAmount().add(memberIn.getAmount()));
tbShopUser.setUpdatedAt(System.currentTimeMillis()); tbShopUser.setUpdatedAt(System.currentTimeMillis());
tbShopUser.setJoinTime(new Timestamp(System.currentTimeMillis()));
tbShopUserMapper.updateByPrimaryKeySelective(tbShopUser); tbShopUserMapper.updateByPrimaryKeySelective(tbShopUser);
TbShopUserFlow flow = new TbShopUserFlow(); TbShopUserFlow flow = new TbShopUserFlow();

3
src/main/java/com/chaozhanggui/system/cashierservice/service/UserService.java
View File

@@ -34,6 +34,7 @@ import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.InputStream; import java.io.InputStream;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.sql.Timestamp;
import java.util.*; import java.util.*;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
@@ -280,6 +281,7 @@ public class UserService {
tbShopUser.setTelephone(memberVo.getTelephone()); tbShopUser.setTelephone(memberVo.getTelephone());
tbShopUser.setBirthDay(StringUtils.isNotBlank(memberVo.getBirthDay()) ? memberVo.getBirthDay() : null); tbShopUser.setBirthDay(StringUtils.isNotBlank(memberVo.getBirthDay()) ? memberVo.getBirthDay() : null);
tbShopUser.setIsVip(Byte.parseByte("1")); tbShopUser.setIsVip(Byte.parseByte("1"));
tbShopUser.setJoinTime(new Timestamp(System.currentTimeMillis()));
shopUserMapper.updateByPrimaryKeySelective(tbShopUser); shopUserMapper.updateByPrimaryKeySelective(tbShopUser);
} else { } else {
TbUserInfo tbUserInfo = userInfoMapper.selectByPrimaryKey(memberVo.getId()); TbUserInfo tbUserInfo = userInfoMapper.selectByPrimaryKey(memberVo.getId());
@@ -304,6 +306,7 @@ public class UserService {
tbShopUser.setTelephone(memberVo.getTelephone()); tbShopUser.setTelephone(memberVo.getTelephone());
tbShopUser.setAmount(BigDecimal.ZERO); tbShopUser.setAmount(BigDecimal.ZERO);
tbShopUser.setIsVip(Byte.parseByte("1")); tbShopUser.setIsVip(Byte.parseByte("1"));
tbShopUser.setJoinTime(new Timestamp(System.currentTimeMillis()));
tbShopUser.setCreditAmount(BigDecimal.ZERO); tbShopUser.setCreditAmount(BigDecimal.ZERO);
tbShopUser.setConsumeAmount(BigDecimal.ZERO); tbShopUser.setConsumeAmount(BigDecimal.ZERO);
tbShopUser.setConsumeNumber(0); tbShopUser.setConsumeNumber(0);