无关风月
2025-01-11 ec73339e08669dc5a0d4ff93e6640f51473c08cd
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java
@@ -502,7 +502,7 @@
      confirmOrderVo.setEarnPoint(earnPoint);
      //支付金额,订单金额-订单优惠
      confirmOrderVo.setPayMoney(paymentMoney);
      confirmOrderVo.setResidualPoint(appUser.getLavePoint().intValue());
      confirmOrderVo.setResidualPoint(appUser.getAvailablePoint().intValue());
      //获取默认收货地址
      UserAddress userAddress = userAddressClient.getDefaultUserAddress(userid).getData();
      if(null != userAddress){
@@ -1148,8 +1148,9 @@
         if(transferablePoint > 0){
            tra = transferablePoint - orderPoint;
            appUser.setTransferablePoint(tra >= 0 ? tra : 0);
         }else{
            appUser.setTransferablePoint(appUser.getTransferablePoint() - orderPoint);
         }
         appUser.setTransferablePoint(appUser.getTransferablePoint() - orderPoint);
         //构建积分流水记录
         UserPoint userPoint = new UserPoint();
@@ -1408,7 +1409,7 @@
   public void closeOrder() {
      //订单支付数据
      long second = LocalDateTime.now().toEpochSecond(ZoneOffset.UTC);
      Set<String> orderPayment = redisTemplate.opsForZSet().range("OrderPayment", 0, second);
      Set<String> orderPayment = redisTemplate.opsForZSet().rangeByScore("OrderPayment", 0, second);
      if(orderPayment.size() > 0){
         List<Order> list = orderService.list(new LambdaQueryWrapper<Order>().in(Order::getOrderNumber, orderPayment));
         for (Order order : list) {
@@ -1428,7 +1429,7 @@
      }
      
      //快递支付
      Set<String> materialFlowPayment = redisTemplate.opsForZSet().range("MaterialFlowPayment", 0, second);
      Set<String> materialFlowPayment = redisTemplate.opsForZSet().rangeByScore("MaterialFlowPayment", 0, second);
      if(materialFlowPayment.size() > 0){
         materialFlowPayment.forEach(s->s.substring(1));
         List<Order> list = orderService.list(new LambdaQueryWrapper<Order>().in(Order::getOrderNumber, materialFlowPayment));