From cf01577f4378989393b27bda01b5a3b5057426aa Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Thu, 20 Mar 2025 18:15:56 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E8=B4=B9=E7=B4=AF=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../account/service/impl/ShopUserServiceImpl.java | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopUserServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopUserServiceImpl.java index c503d734..5a7e2965 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopUserServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopUserServiceImpl.java @@ -9,6 +9,7 @@ import com.czg.account.dto.shopuser.*; import com.czg.account.entity.*; import com.czg.account.service.*; import com.czg.config.RedisCst; +import com.czg.enums.ShopUserFlowBizEnum; import com.czg.exception.ApiNotPrintException; import com.czg.order.entity.OrderDetail; import com.czg.order.entity.OrderInfo; @@ -107,10 +108,10 @@ public class ShopUserServiceImpl extends ServiceImpl i ShopUserFlow userFlow = new ShopUserFlow(); int flag; if (shopUserEditDTO.getType() == 0) { - if(shopUserEditDTO.getMoney().compareTo(userInfo.getAmount()) > 0){ + if (shopUserEditDTO.getMoney().compareTo(userInfo.getAmount()) > 0) { //如果超额退款 则退为0 flag = mapper.decrAccount(shopId, shopUserEditDTO.getId(), DateUtil.date().toLocalDateTime(), userInfo.getAmount()); - }else { + } else { flag = mapper.decrAccount(shopId, shopUserEditDTO.getId(), DateUtil.date().toLocalDateTime(), shopUserEditDTO.getMoney()); } } else { @@ -132,6 +133,13 @@ public class ShopUserServiceImpl extends ServiceImpl i userFlow.setRelationId(shopUserEditDTO.getRelationId()); userFlow.setRechargeId(shopUserEditDTO.getRechargeId()); shopUserFlowService.save(userFlow); + //次数 + if (shopUserEditDTO.getType() == 0 && shopUserEditDTO.getBizEnum().equals(ShopUserFlowBizEnum.ORDER_PAY)) { + ShopUser shopUser = new ShopUser(); + shopUser.setConsumeCount(userInfo.getConsumeCount() + 1); + shopUser.setConsumeAmount(userInfo.getConsumeAmount().add(shopUserEditDTO.getMoney())); + updateById(shopUser); + } return userFlow.getId(); } @@ -245,7 +253,6 @@ public class ShopUserServiceImpl extends ServiceImpl i } - @Override @Transactional(rollbackFor = Exception.class) public boolean join(Long shopId, Long userId, ShopUserAddDTO shopUserAddDTO) { @@ -309,7 +316,7 @@ public class ShopUserServiceImpl extends ServiceImpl i shopUser.setUserId(userId); save(shopUser); shopUser = getById(shopUser.getId()); - }else { + } else { couponNum = shopActivateCouponRecordService.count(new QueryWrapper().eq(ShopActivateCouponRecord::getShopUserId, shopUser.getId()).eq(ShopActivateCouponRecord::getStatus, 0)); } ShopUserDetailDTO shopUserDetailDTO = BeanUtil.copyProperties(shopUser, ShopUserDetailDTO.class);