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

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

Browse Source
This commit is contained in:
SongZhang
2024-10-08 16:17:09 +08:00
parent 6097c45d68 3db3a5b38d
commit fa216760e9
4 changed files with 14 additions and 4 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 java.math.BigDecimal;
import java.sql.Timestamp;
import java.util.*;
@Service
@@ -521,6 +522,7 @@ public class LoginService {
TbShopUser tbShopUserSM = tbShopUserMapper.selectByUserIdAndShopId(userInfo.getId().toString(), shopId);
if (tbShopUserSM != null) {
tbShopUserSM.setIsVip(Byte.parseByte("1"));
tbShopUserSM.setJoinTime(new Timestamp(System.currentTimeMillis()));
tbShopUserSM.setTelephone(phone);
tbShopUserSM.setUpdatedAt(System.currentTimeMillis());
tbShopUserMapper.updateByPrimaryKey(tbShopUserSM);
@@ -543,6 +545,7 @@ public class LoginService {
shopUser.setTelephone(userInfo.getTelephone());
shopUser.setAmount(BigDecimal.ZERO);
shopUser.setIsVip(Byte.parseByte("1"));
shopUser.setJoinTime(new Timestamp(System.currentTimeMillis()));
shopUser.setCreditAmount(BigDecimal.ZERO);
shopUser.setConsumeAmount(BigDecimal.ZERO);
shopUser.setConsumeNumber(0);

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

@@ -453,8 +453,8 @@ public class PayService {
orderInfo.setMemberId(memberId);
orderInfo.setPayType("deposit");
orderInfo.setStatus("closed");
orderInfo.setPaidTime(System.currentTimeMillis());
orderInfo.setPayOrderNo("deposit".concat(SnowFlakeUtil.generateOrderNo()));
orderInfo.setUserId(String.valueOf(TokenUtil.getUserId()));
tbOrderInfoMapper.updateByPrimaryKeySelective(orderInfo);
//更新购物车状态
int cartCount = tbCashierCartMapper.updateStatusByOrderId(orderId, "final");
@@ -782,6 +782,7 @@ public class PayService {
orderInfo.setPayType("wx_lite");
orderInfo.setPayOrderNo(payment.getTradeNumber());
orderInfo.setPayAmount(orderInfo.getOrderAmount());
orderInfo.setPaidTime(System.currentTimeMillis());
orderInfo.setUserId(String.valueOf(TokenUtil.getUserId()));
tbOrderInfoMapper.updateByPrimaryKeySelective(orderInfo);
@@ -844,6 +845,7 @@ public class PayService {
orderInfo.setPayType("wx_lite");
orderInfo.setPayOrderNo(payment.getTradeNumber());
orderInfo.setPayAmount(orderInfo.getOrderAmount());
orderInfo.setPaidTime(System.currentTimeMillis());
orderInfo.setUserId(String.valueOf(TokenUtil.getUserId()));
tbOrderInfoMapper.updateByPrimaryKeySelective(orderInfo);
@@ -1004,6 +1006,7 @@ public class PayService {
orderInfo.setPayType("wx_lite");
orderInfo.setPayOrderNo(payOrderNO);
orderInfo.setPayAmount(orderInfo.getOrderAmount());
orderInfo.setPaidTime(System.currentTimeMillis());
tbOrderInfoMapper.updateByPrimaryKeySelective(orderInfo);
@@ -1067,6 +1070,7 @@ public class PayService {
orderInfo.setPayType("wx_lite");
orderInfo.setPayOrderNo(payOrderNO);
orderInfo.setPayAmount(orderInfo.getOrderAmount());
orderInfo.setPaidTime(System.currentTimeMillis());
tbOrderInfoMapper.updateByPrimaryKeySelective(orderInfo);
outRecordMapper.updateByOrderIdAndStatus(orderInfo.getId(), "closed");
@@ -1229,12 +1233,12 @@ public class PayService {
if (!"1".equals(tbShopUser.getIsVip().toString())) {
tbShopUser.setIsVip(Byte.parseByte("1"));
tbShopUser.setJoinTime(new Timestamp(System.currentTimeMillis()));
}
//修改客户资金
tbShopUser.setAmount(tbShopUser.getAmount().add(memberIn.getAmount()));
tbShopUser.setUpdatedAt(System.currentTimeMillis());
tbShopUser.setJoinTime(new Timestamp(System.currentTimeMillis()));
tbShopUserMapper.updateByPrimaryKeySelective(tbShopUser);
TbShopUserFlow flow = new TbShopUserFlow();
@@ -1328,12 +1332,12 @@ public class PayService {
tbShopUser.setTelephone(userInfo.getTelephone());
tbShopUser.setCode(RandomUtil.randomNumbers(8));
tbShopUser.setIsVip(Byte.parseByte("1"));
tbShopUser.setJoinTime(new Timestamp(System.currentTimeMillis()));
}
//修改客户资金
tbShopUser.setAmount(tbShopUser.getAmount().add(memberIn.getAmount()));
tbShopUser.setUpdatedAt(System.currentTimeMillis());
tbShopUser.setJoinTime(new Timestamp(System.currentTimeMillis()));
tbShopUserMapper.updateByPrimaryKeySelective(tbShopUser);
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.InputStream;
import java.math.BigDecimal;
import java.sql.Timestamp;
import java.util.*;
import java.util.concurrent.TimeUnit;
@@ -280,6 +281,7 @@ public class UserService {
tbShopUser.setTelephone(memberVo.getTelephone());
tbShopUser.setBirthDay(StringUtils.isNotBlank(memberVo.getBirthDay()) ? memberVo.getBirthDay() : null);
tbShopUser.setIsVip(Byte.parseByte("1"));
tbShopUser.setJoinTime(new Timestamp(System.currentTimeMillis()));
shopUserMapper.updateByPrimaryKeySelective(tbShopUser);
} else {
TbUserInfo tbUserInfo = userInfoMapper.selectByPrimaryKey(memberVo.getId());
@@ -304,6 +306,7 @@ public class UserService {
tbShopUser.setTelephone(memberVo.getTelephone());
tbShopUser.setAmount(BigDecimal.ZERO);
tbShopUser.setIsVip(Byte.parseByte("1"));
tbShopUser.setJoinTime(new Timestamp(System.currentTimeMillis()));
tbShopUser.setCreditAmount(BigDecimal.ZERO);
tbShopUser.setConsumeAmount(BigDecimal.ZERO);
tbShopUser.setConsumeNumber(0);

2
src/main/resources/mapper/TbActivateInRecordMapper.xml
View File

@@ -62,7 +62,7 @@
LEFT JOIN tb_product ON tb_activate_in_record.pro_id = tb_product.id
WHERE vip_user_id = #{vipUserId}
and tb_activate_in_record.shop_id = #{shopId}
and num!=0
and tb_activate_in_record.over_num!=0
group by tb_activate_in_record.pro_id
</select>