czg_team
/
cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
wangw 2025-03-14 10:01:22 +08:00
parent 9af7a6a742 76d6659c81
commit 9b53f62442
2 changed files with 38 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopUserServiceImpl.java
View File

@ -1,5 +1,6 @@
package com.czg.service.account.service.impl;
import cn.dev33.satoken.stp.StpUtil;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.RandomUtil;
@ -9,6 +10,10 @@ import com.czg.account.entity.*;
import com.czg.account.service.*;
import com.czg.config.RedisCst;
import com.czg.exception.ApiNotPrintException;
import com.czg.order.entity.OrderDetail;
import com.czg.order.entity.OrderInfo;
import com.czg.order.service.OrderDetailService;
import com.czg.order.service.OrderInfoService;
import com.czg.resp.CzgResult;
import com.czg.sa.StpKit;
import com.czg.service.RedisService;
@ -42,6 +47,10 @@ import java.util.List;
public class ShopUserServiceImpl extends ServiceImpl<ShopUserMapper, ShopUser> implements ShopUserService {
@DubboReference
private SysParamsService sysParamsService;
@DubboReference
private OrderInfoService orderInfoService;
@DubboReference
private OrderDetailService orderDetailService;
@Resource
private ShopUserFlowService shopUserFlowService;
@ -247,10 +256,33 @@ public class ShopUserServiceImpl extends ServiceImpl<ShopUserMapper, ShopUser> i
}
@Override
@Transactional(rollbackFor = Exception.class)
public boolean join(Long shopId, Long userId, ShopUserAddDTO shopUserAddDTO) {
// 当前用户信息
UserInfo userInfo = userInfoService.getById(userId);
userInfo.setPhone(shopUserAddDTO.getPhone());
// 查询系统添加的会员
UserInfo oriInfo = userInfoService.getOne(new QueryWrapper().eq(UserInfo::getPhone, shopUserAddDTO.getPhone()));
if (oriInfo != null) {
BeanUtil.copyProperties(shopUserAddDTO, oriInfo);
if (StrUtil.isNotBlank(userInfo.getAlipayOpenId())) {
oriInfo.setAlipayOpenId(userInfo.getAlipayOpenId());
}
if (StrUtil.isNotBlank(userInfo.getWechatOpenId())) {
oriInfo.setAlipayOpenId(userInfo.getWechatOpenId());
}
// 迁移订单
orderInfoService.updateChain().eq(OrderInfo::getUserId, userInfo.getId())
.set(OrderInfo::getUserId, oriInfo.getId()).update();
// 删除多余用户信息
userInfoService.removeById(userId);
userInfo = oriInfo;
}else {
BeanUtil.copyProperties(shopUserAddDTO, userInfo);
}
userInfoService.updateById(userInfo);
ShopUser shopUser = getOne(new QueryWrapper().eq(ShopUser::getShopId, shopId).eq(ShopUser::getUserId, userId));
@ -268,8 +300,9 @@ public class ShopUserServiceImpl extends ServiceImpl<ShopUserMapper, ShopUser> i
shopUser.setJoinTime(DateUtil.date().toLocalDateTime());
shopUser.setUserId(null);
shopUser.setShopId(null);
return updateById(shopUser);
// 切换id
StpKit.USER.reLogin(shopUser.getId());
return true;
}
@Override

5
cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ConsStockFlowServiceImpl.java
View File

@ -10,7 +10,6 @@ import com.czg.exception.CzgException;
import com.czg.product.dto.ConsStockFlowDTO;
import com.czg.product.entity.ConsInfo;
import com.czg.product.entity.ConsStockFlow;
import com.czg.product.entity.ProductStockFlow;
import com.czg.product.enums.InOutItemEnum;
import com.czg.product.enums.InOutTypeEnum;
import com.czg.product.param.ConsCheckStockParam;
@ -217,9 +216,9 @@ public class ConsStockFlowServiceImpl extends ServiceImpl<ConsStockFlowMapper, C
queryWrapper.eq(ConsStockFlow::getInOutItem, param.getInOutItem());
}
if (ObjUtil.isNotNull(param.getConId())) {
queryWrapper.eq(ConsStockFlow::getProductId, param.getConId());
queryWrapper.eq(ConsStockFlow::getConId, param.getConId());
}
queryWrapper.orderBy(ProductStockFlow::getId, false);
queryWrapper.orderBy(ConsStockFlow::getId, false);
return pageAs(PageUtil.buildPage(), queryWrapper, ConsStockFlowDTO.class);
}