迭代版本：2.28

luofl

2025-03-17 e23242d09e31e1c78f7ecdbc2859c9f99a3c4171

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java

@@ -14,6 +14,7 @@
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.order.event.PayEvent;
import com.ruoyi.order.mapper.ShoppingCartMapper;
import com.ruoyi.order.model.Order;
import com.ruoyi.order.model.OrderBalancePayment;
@@ -31,6 +32,7 @@
import com.ruoyi.other.api.vo.GetGoodsShopByGoodsIds;
import com.ruoyi.other.api.vo.GetSeckillActivityInfo;
import lombok.extern.slf4j.Slf4j;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;

@@ -108,12 +110,6 @@
   private CommissionService commissionService;

   @Resource
   private VipSettingClient vipSettingClient;

   @Resource
   private UserChangeLogClient userChangeLogClient;

   @Resource
   private PointSettingClient pointSettingClient;
   
   @Resource
@@ -121,6 +117,9 @@
   
   @Resource
   private RedisTemplate redisTemplate;

   @Resource
   private ApplicationEventPublisher applicationEventPublisher;
   
   
   
@@ -1167,7 +1166,7 @@
            appUser.setLastShopTime(LocalDateTime.now());
            appUserClient.editAppUserById(appUser);
            //变更等级
            appUserClient.vipUpgrade(appUser.getId());
            applicationEventPublisher.publishEvent(new PayEvent(JSON.toJSONString(appUser)));
            //修改订支付状态
            order.setPayStatus(2);
            //自提
@@ -1272,7 +1271,7 @@
         appUser.setLastShopTime(LocalDateTime.now());
         appUserClient.editAppUserById(appUser);
         //变更等级
         appUserClient.vipUpgrade(appUser.getId());
         applicationEventPublisher.publishEvent(new PayEvent(JSON.toJSONString(appUser)));
         //构建余额明细变动记录
         BalanceChangeRecord balanceChangeRecord = new BalanceChangeRecord();
         balanceChangeRecord.setAppUserId(appUser.getId());
@@ -1355,7 +1354,7 @@
         appUser.setLastShopTime(LocalDateTime.now());
         appUserClient.editAppUserById(appUser);
         //变更等级
         appUserClient.vipUpgrade(appUser.getId());
         applicationEventPublisher.publishEvent(new PayEvent(JSON.toJSONString(appUser)));

         //积分支付不返佣

@@ -1513,13 +1512,16 @@
      appUser.setLastShopTime(LocalDateTime.now());
      appUserClient.editAppUserById(appUser);
      //变更等级
      appUserClient.vipUpgrade(appUser.getId());
      applicationEventPublisher.publishEvent(new PayEvent(JSON.toJSONString(appUser)));
      //修改订支付状态
      order.setPayStatus(2);
      //自提
      if(order.getOrderType() == 1 && StringUtils.isEmpty(order.getAddressJson())){
         order.setOrderStatus(2);
      }

      String r7TrxNo = uniPayCallbackResult.getR9_BankTrxNo();
      order.setSerialNumber(r7TrxNo);
      orderService.updateById(order);

      //处理优惠券
@@ -1597,7 +1599,7 @@
      appUser.setLastShopTime(LocalDateTime.now());
      appUserClient.editAppUserById(appUser);
      //变更等级
      appUserClient.vipUpgrade(appUser.getId());
      applicationEventPublisher.publishEvent(new PayEvent(JSON.toJSONString(appUser)));

      //修改订支付状态
      order.setPayStatus(2);