修改bug

puzhibing

2025-01-15 9a3055a717c98a27a193e566a8febda4a1dd2413

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

@@ -11,6 +11,7 @@
import com.ruoyi.account.api.vo.PaymentUserCoupon;
import com.ruoyi.account.api.vo.PaymentUserCouponVo;
import com.ruoyi.common.core.domain.R;
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.mapper.ShoppingCartMapper;
@@ -144,8 +145,31 @@
      //查询符合商品类型的商品数据
      List<ShoppingCart> list = this.list(new LambdaQueryWrapper<ShoppingCart>().eq(ShoppingCart::getAppUserId, userid)
            .in(ShoppingCart::getGoodsId, goodsIds).eq(ShoppingCart::getStatus, 1));
      //删除过期的秒杀活动商品
      List<ShoppingCart> list1 = new ArrayList<>();
      for (ShoppingCart shoppingCart : list) {
         if(shoppingCart.getType() == 2){
            GetSeckillActivityInfo info = new GetSeckillActivityInfo();
            info.setGoodsId(shoppingCart.getGoodsId());
            info.setVip(appUser.getVipId());
            GoodsSeckill data1 = seckillActivityInfoClient.getSeckillActivityInfo(info).getData();
            if(null != data1){
               SeckillActivityInfo seckillActivityInfo = seckillActivityInfoClient.getSeckillActivityInfoById(data1.getSeckillActivityInfoId()).getData();
               if(null != seckillActivityInfo && (seckillActivityInfo.getIsShelves() == 1 &&
                     seckillActivityInfo.getStartTime().isBefore(LocalDateTime.now()) && seckillActivityInfo.getEndTime().isAfter(LocalDateTime.now()))){
						
                  list1.add(shoppingCart);
                  continue;
               }
            }
            this.removeById(shoppingCart.getId());
         }else{
            list1.add(shoppingCart);
         }
      }
		
      //构建返回数据
      List<MyShoppingCartVo> page = buildDetail(appUser, shopId, list, null);
      List<MyShoppingCartVo> page = buildDetail(appUser, shopId, list1, null);
      return page;
   }

@@ -167,7 +191,7 @@
      info.setVip(appUser.getVipId());
      GoodsSeckill goodsSeckill = seckillActivityInfoClient.getSeckillActivityInfo(info).getData();
      //没有秒杀活动或者添加的普通商品则不使用秒杀活动价格
      if(null == goodsSeckill || type == 1){
      if((null == goodsSeckill || (null == goodsSeckill.getCashPayment() && null == goodsSeckill.getPointPayment())) || type == 1){
         //没有秒杀价，则判断门店特价
         GetGoodsBargainPrice goodsBargainPrice = new GetGoodsBargainPrice();
         goodsBargainPrice.setGoodsId(goodsId);
@@ -186,17 +210,17 @@
            area.setVip(appUser.getVipId());
            area.setGoodsId(goodsId);
            GoodsArea goodsArea = goodsAreaClient.getGoodsArea(area).getData();
            if(null == goodsArea){
            if(null == goodsArea || (null == goodsArea.getCashPayment() && null == goodsArea.getPointPayment())){
               //没有地区价格，则使用会员价格
               GoodsVip goodsVip = goodsVipClient.getGoodsVip(goodsId, appUser.getVipId()).getData();
               if(null == goodsVip){
               if(null == goodsVip || (null == goodsVip.getCashPayment() && null == goodsVip.getPointPayment())){
                  //没有配置价格，直接使用原始基础价格
                  return null;
               }else{
                  price.setCash(goodsVip.getSellingPrice());
                  price.setPoint(goodsVip.getIntegral());
                  price.setCashPayment(goodsVip.getCashPayment() == 1);
                  price.setPointPayment(goodsVip.getPointPayment() == 1);
                  price.setCashPayment(null != goodsVip.getCashPayment() && goodsVip.getCashPayment() == 1);
                  price.setPointPayment(null != goodsVip.getPointPayment() && goodsVip.getPointPayment() == 1);
                  price.setEarnSpendingPoints(goodsVip.getEarnSpendingPoints());
                  price.setSuperiorSubcommission(goodsVip.getSuperiorSubcommission());
                  price.setSuperiorRebatePoints(goodsVip.getSuperiorRebatePoints());
@@ -213,8 +237,8 @@
            }else{
               price.setCash(goodsArea.getSellingPrice());
               price.setPoint(goodsArea.getIntegral());
               price.setCashPayment(goodsArea.getCashPayment() == 1);
               price.setPointPayment(goodsArea.getPointPayment() == 1);
               price.setCashPayment(null !=goodsArea.getCashPayment() && goodsArea.getCashPayment() == 1);
               price.setPointPayment(null !=goodsArea.getPointPayment() && goodsArea.getPointPayment() == 1);
               price.setEarnSpendingPoints(goodsArea.getEarnSpendingPoints());
               price.setSuperiorSubcommission(goodsArea.getSuperiorSubcommission());
               price.setSuperiorRebatePoints(goodsArea.getSuperiorRebatePoints());
@@ -281,8 +305,8 @@
         if(goodsSeckill.getCashPayment() == 0 && goodsSeckill.getPointPayment() == 1){
            price.setPoint(goodsSeckill.getIntegral());
         }
         price.setCashPayment(goodsSeckill.getCashPayment() == 1);
         price.setPointPayment(goodsSeckill.getPointPayment() == 1);
         price.setCashPayment(null != goodsSeckill.getCashPayment() && goodsSeckill.getCashPayment() == 1);
         price.setPointPayment(null != goodsSeckill.getPointPayment() && goodsSeckill.getPointPayment() == 1);
         price.setEndTime(goodsSeckill.getEndTime());
         price.setEarnSpendingPoints(goodsSeckill.getEarnSpendingPoints());
         price.setSuperiorSubcommission(goodsSeckill.getSuperiorSubcommission());
@@ -306,6 +330,11 @@
   @Override
   public Long addGoods(ShoppingCart shoppingCart) {
      Long userid = tokenService.getLoginUserApplet().getUserid();
      Integer goodsSaleNum = orderService.getGoodsSaleNum(shoppingCart.getGoodsId(), null, userid);
      Goods goods = goodsClient.getGoodsById(shoppingCart.getGoodsId()).getData();
      if(null != goods.getPurchaseLimit() && -1 != goods.getPurchaseLimit() && (goodsSaleNum + shoppingCart.getNumber()) > goods.getPurchaseLimit()){
         throw new ServiceException("超出购买数量限制");
      }
      ShoppingCart one = this.getOne(new LambdaQueryWrapper<ShoppingCart>().eq(ShoppingCart::getAppUserId, userid)
            .eq(ShoppingCart::getGoodsId, shoppingCart.getGoodsId()).eq(ShoppingCart::getType, shoppingCart.getType()).eq(ShoppingCart::getStatus, 1));
      if(null != one){
@@ -328,15 +357,22 @@
    */
   @Override
   public R setGoodsNumber(SetGoodsNumber setGoodsNumber) {

      Long userid = tokenService.getLoginUserApplet().getUserid();
      ShoppingCart shoppingCart = this.getById(setGoodsNumber.getId());
      Integer goodsSaleNum = orderService.getGoodsSaleNum(shoppingCart.getGoodsId(), null, userid);
      Goods goods = goodsClient.getGoodsById(shoppingCart.getGoodsId()).getData();
      if(null != goods.getPurchaseLimit() && -1 != goods.getPurchaseLimit() && (goodsSaleNum + shoppingCart.getNumber()) > goods.getPurchaseLimit()){
         throw new ServiceException("超出购买数量限制");
      }
      if(0 >= setGoodsNumber.getNumber()){
         return R.fail("修改数量不能小于等于0");
      }
      ShoppingCart shoppingCart = this.getById(setGoodsNumber.getId());

      if(null != shoppingCart){

         Goods goods = goodsClient.getGoodsById(shoppingCart.getGoodsId()).getData();
         if(null != goods.getPurchaseLimit() && -1 != goods.getPurchaseLimit() && goods.getPurchaseLimit() < setGoodsNumber.getNumber()){
         Goods goods1 = goodsClient.getGoodsById(shoppingCart.getGoodsId()).getData();
         if(null != goods1.getPurchaseLimit() && -1 != goods1.getPurchaseLimit() && goods1.getPurchaseLimit() < setGoodsNumber.getNumber()){
            return R.fail("修改数量不能大于限购数量");
         }

@@ -395,12 +431,14 @@
         BigDecimal bigDecimal = BigDecimal.ZERO;
         for (MyShoppingCartVo myShoppingCartVo : goodsList) {
            bigDecimal = bigDecimal.add(myShoppingCartVo.getCash().multiply(new BigDecimal(myShoppingCartVo.getNumber())));
            myShoppingCartVo.setEarnSpendingPoints(myShoppingCartVo.getEarnSpendingPoints() * myShoppingCartVo.getNumber());
         }
         confirmOrderVo.setOrderMoney(bigDecimal);
      }else{
         int sum = 0;
         for (MyShoppingCartVo myShoppingCartVo : goodsList) {
            sum += (myShoppingCartVo.getPoint() * myShoppingCartVo.getNumber());
            sum += ((null != myShoppingCartVo.getPoint() ? myShoppingCartVo.getPoint() : 0) * myShoppingCartVo.getNumber());
            myShoppingCartVo.setEarnSpendingPoints((null != myShoppingCartVo.getEarnSpendingPoints() ? myShoppingCartVo.getEarnSpendingPoints() : 0) * myShoppingCartVo.getNumber());
         }
         confirmOrderVo.setOrderPoint(sum);
      }
@@ -485,23 +523,34 @@
      //满XX才打折，只有现金才能优惠
      if((confirmOrderVo.getUseSimultaneously() || (!confirmOrderVo.getUseSimultaneously() && activityAmount.equals(BigDecimal.ZERO)))
            && null != orderActivityInfo && confirmOrder.getPaymentType() == 1){
         BigDecimal zyh = BigDecimal.ZERO;
         OrderActivityInfo activityInfo1 = null;
         for (OrderActivityInfo activityInfo : orderActivityInfo) {
            if(activityInfo.getConditionAmount().compareTo(paymentMoney) <= 0){
               confirmOrderVo.setActivityName(activityInfo.getActivityName());
               //优惠后的支付金额
               BigDecimal multiply = activityInfo.getDiscount().divide(new BigDecimal(10)).multiply(paymentMoney);
               //优惠金额
               BigDecimal bigDecimal = paymentMoney.subtract(multiply).setScale(2, RoundingMode.HALF_EVEN);
               paymentMoney = multiply;
               activityAmount = activityAmount.add(bigDecimal);
               break;
               if(bigDecimal.compareTo(zyh) > 0){
                  zyh = bigDecimal;
                  activityInfo1 = activityInfo;
               }
            }
         }

         if(null != activityInfo1){
            confirmOrderVo.setActivityName(activityInfo1.getActivityName());
            paymentMoney = paymentMoney.subtract(zyh);
            activityAmount = activityAmount.add(zyh);
         }
      }
      confirmOrderVo.setDiscountAmount(activityAmount);
      int earnPoint = goodsList.stream().mapToInt(MyShoppingCartVo::getEarnSpendingPoints).sum();
      confirmOrderVo.setEarnPoint(earnPoint);
      if(null != paymentMoney && BigDecimal.ZERO.compareTo(paymentMoney) > 0){
         paymentMoney = BigDecimal.ZERO;
      }

      //支付金额，订单金额-订单优惠
      confirmOrderVo.setPayMoney(paymentMoney);
      confirmOrderVo.setResidualPoint(appUser.getAvailablePoint().intValue());
@@ -509,6 +558,7 @@
      UserAddress userAddress = userAddressClient.getDefaultUserAddress(userid).getData();
      if(null != userAddress){
         userAddress.setIdStr(userAddress.getId().toString());
         userAddress.setRecieveAddress(userAddress.getProvince() + userAddress.getCity() + userAddress.getDistrict() + userAddress.getRecieveAddress());
         confirmOrderVo.setUserAddress(userAddress);
      }
      confirmOrderVo.setPaymentType(confirmOrder.getPaymentType());
@@ -534,11 +584,11 @@
                  }
               }else{
                  //部分商品适用
                  BigDecimal goodsMoney = BigDecimal.ZERO;
                   BigDecimal goodsMoney = BigDecimal.ZERO;
                  for (MyShoppingCartVo myShoppingCartVo : goodsList) {
                     Integer goodsId = myShoppingCartVo.getGoodsId();
                     BigDecimal cash = myShoppingCartVo.getCash();
                     if(forGoodIds.contains(goodsId)){
                     if(forGoodIds.contains(String.valueOf(goodsId))){
                        goodsMoney = goodsMoney.add(cash);
                     }
                  }
@@ -686,7 +736,7 @@
         num += num1;
         ShoppingCart shoppingCart = this.getById(id);
         //判断当前数量是否已经超出限购数量（需要计算已经购买的数量）
         Integer goodsSaleNum = orderService.getGoodsSaleNum(shoppingCart.getGoodsId(), type);
         Integer goodsSaleNum = orderService.getGoodsSaleNum(shoppingCart.getGoodsId(), type, userid);
         Goods goods = goodsClient.getGoodsById(shoppingCart.getGoodsId()).getData();
         if(1 == type){
            if(null != goods.getPurchaseLimit() && -1 != goods.getPurchaseLimit() && (goodsSaleNum + num1) > goods.getPurchaseLimit()){
@@ -704,6 +754,14 @@
               }
            }
         }
			
         if(goods.getStatus() == 1){
            throw new RuntimeException(goods.getName() + "商品已被下架");
         }
         if(!goods.getCommodityAuthority().contains("-1") && !goods.getCommodityAuthority().contains(appUser.getVipId().toString())){
            throw new RuntimeException("无权限购买" + goods.getName());
         }
			
         ids.add(id);
      }

@@ -760,9 +818,6 @@
      }else{
         for (MyShoppingCartVo myShoppingCartVo : goodsList) {
            orderPoint += (myShoppingCartVo.getPoint() * myShoppingCartVo.getNumber());
         }
         if(appUser.getLavePoint().intValue() < orderPoint){
            return R.fail("账户剩余积分不足");
         }
      }
      //现金的支付金额
@@ -856,17 +911,21 @@
      OrderActivityInfo orderActivityInfo1 = null;
      if((1 == status || null == shoppingCartPayment.getUserCouponId()) &&
            null != orderActivityInfo && shoppingCartPayment.getPaymentType() != 3){
         //找出最优会的金额
         BigDecimal zyh = BigDecimal.ZERO;
         for (OrderActivityInfo activityInfo : orderActivityInfo) {
            if(activityInfo.getConditionAmount().compareTo(paymentMoney) <= 0){
               BigDecimal paymentMoney1 = activityInfo.getDiscount().divide(new BigDecimal(10)).multiply(paymentMoney);
               BigDecimal bigDecimal = paymentMoney.subtract(paymentMoney1).setScale(2, RoundingMode.HALF_EVEN);
               discount = activityInfo.getDiscount();
               paymentMoney = paymentMoney1;
               activityAmount = activityAmount.add(bigDecimal);
               orderActivityInfo1 = activityInfo;
               break;
               if(bigDecimal.compareTo(zyh) > 0){
                  zyh = bigDecimal;
                  orderActivityInfo1 = activityInfo;
               }
            }
         }

         paymentMoney = paymentMoney.subtract(zyh);
         activityAmount = activityAmount.add(zyh);
      }

      //可获得的消费积分
@@ -900,6 +959,10 @@
            }
         }
      }
      if(BigDecimal.ZERO.compareTo(paymentMoney) > 0){
         paymentMoney = BigDecimal.ZERO;
      }

      //构建订单明细
      Order order = new Order();
      order.setAppUserId(userid);
@@ -914,7 +977,7 @@
      order.setGoodName(goodName.substring(0, goodName.length() - 1));
      Goods goods = goodsClient.getGoodsById(goodsList.get(0).getGoodsId()).getData();
      order.setOrderType(goods.getType());
      order.setOrderStatus(goods.getType() == 1 ? 3 : 1);
      order.setOrderStatus(goods.getType() == 1 ? 3 : (shoppingCartPayment.getDistributionMode() == 2 ? 1 : 2));
      SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
      order.setOrderNumber("QJS" + getNumber(3) + sdf.format(new Date()));
      order.setTotalAmount(orderMoney.setScale(2, RoundingMode.HALF_EVEN));
@@ -931,11 +994,12 @@
      }
      if(3 != shoppingCartPayment.getPaymentType() && (fullReductionAmount.compareTo(BigDecimal.ZERO) > 0 ||moneyAmount.compareTo(BigDecimal.ZERO) > 0 || discountAmount.compareTo(BigDecimal.ZERO) > 0)){
         order.setCouponJson(JSON.toJSONString(couponInfoVo));
         order.setUserCouponId(shoppingCartPayment.getUserCouponId());
      }
      if(activityAmount.compareTo(BigDecimal.ZERO) > 0){
      if(null != orderActivityInfo1){
         order.setActivityJson(JSON.toJSONString(orderActivityInfo1));
      }
      if(null != shoppingCartPayment.getUserAddressId()){
      if(2 == shoppingCartPayment.getDistributionMode()){
         UserAddress address = userAddressClient.getUserAddressById(shoppingCartPayment.getUserAddressId()).getData();
         order.setExpressAmount(expressFee);
         order.setAddressJson(JSON.toJSONString(address));
@@ -946,6 +1010,7 @@
      order.setDelFlag(0);
      order.setCreateTime(LocalDateTime.now());
      order.setExpressPayMethod(shoppingCartPayment.getFreightPaymentType());
      order.setDistributionMode(shoppingCartPayment.getDistributionMode());

      if(2 == shoppingCartPayment.getPaymentType()){
         BigDecimal balance = appUser.getBalance();
@@ -955,8 +1020,8 @@
      }
      if(3 == shoppingCartPayment.getPaymentType()){
         Integer availablePoint = appUser.getAvailablePoint();
         if(availablePoint < orderPoint){
            return R.fail("账户积分不足");
         if(availablePoint.compareTo(orderPoint) < 0){
            return R.fail("账户可用积分不足");
         }
      }
      //判断运费支付是否足够
@@ -1019,21 +1084,94 @@
      //开始构建支付数据
      //现金支付
      paymentMoney = paymentMoney.add(expressFee).setScale(2, RoundingMode.HALF_EVEN);
      if(BigDecimal.ZERO.compareTo(paymentMoney) > 0){
         paymentMoney = BigDecimal.ZERO;
      }
      if(1 == shoppingCartPayment.getPaymentType()){
         //调起微信支付
         String goodsNames = goodsList.stream().map(MyShoppingCartVo::getName).collect(Collectors.joining("\n"));
         UniPayResult uniPayResult = PaymentUtil.uniPay(order.getOrderNumber(), paymentMoney.doubleValue(), order.getOrderType() == 1 ? "购买服务商品" : "购买单品商品",
               goodsNames, "", "/order/shopping-cart/shoppingCartPaymentCallback", appUser.getWxOpenid(), null);
         if(null == uniPayResult || !"100".equals(uniPayResult.getRa_Code())){
            return R.fail(null == uniPayResult ? "支付失败" : uniPayResult.getRb_CodeMsg());
         if(BigDecimal.ZERO.compareTo(paymentMoney) < 0){
            //调起微信支付
            String goodsNames = goodsList.stream().map(MyShoppingCartVo::getName).collect(Collectors.joining("\n"));
            UniPayResult uniPayResult = PaymentUtil.uniPay(order.getOrderNumber(), paymentMoney.doubleValue(), order.getOrderType() == 1 ? "购买服务商品" : "购买单品商品",
                  goodsNames, "", "/order/shopping-cart/shoppingCartPaymentCallback", appUser.getWxOpenid(), null);
            if(null == uniPayResult || !"100".equals(uniPayResult.getRa_Code())){
               return R.fail(null == uniPayResult ? "支付失败" : uniPayResult.getRb_CodeMsg());
            }
            String rc_result = uniPayResult.getRc_Result();
            JSONObject jsonObject = JSON.parseObject(rc_result);
            jsonObject.put("orderId", order.getId().toString());
            //将支付数据添加到redis队列中，便于定时任务去校验是否完成支付，没有完成支付支付，15分钟后关闭订单。
            long second = LocalDateTime.now().plusMinutes(15).toEpochSecond(ZoneOffset.UTC);
            redisTemplate.opsForZSet().add("OrderPayment", order.getOrderNumber(), second);
            return R.ok(jsonObject.toJSONString());
         }else{

            earnPoint = order.getGetPoint();
            appUser = appUserClient.getAppUserById(order.getAppUserId());
            Integer lavePoint = appUser.getLavePoint();
            paymentMoney = order.getPaymentAmount();
            //构建积分流水记录
            if(earnPoint > 0){
               PointSetting pointSetting = pointSettingClient.getPointSetting(appUser.getVipId()).getData();
               int earnPoint1 = 0;
               if(null != pointSetting && 1 == pointSetting.getBuyPointOpen()){
                  earnPoint1 = new BigDecimal(earnPoint).multiply(pointSetting.getBuyPoint().divide(new BigDecimal(100))).intValue();
               }
               appUser.setShopPoint(appUser.getShopPoint() + earnPoint);
               appUser.setLavePoint(appUser.getLavePoint() + earnPoint);
               appUser.setTotalPoint(appUser.getTotalPoint() + earnPoint);
               appUser.setAvailablePoint(appUser.getAvailablePoint() + earnPoint1);
               appUser.setTotalAvailablePoint(appUser.getTotalAvailablePoint() + earnPoint1);

               JSONObject jsonObject = new JSONObject();
               jsonObject.put("shopPoint", earnPoint);
               jsonObject.put("availablePoint", earnPoint1);
               if(null != pointSetting && 1 == pointSetting.getBuyPointGift()){
                  appUser.setTransferablePoint(appUser.getTransferablePoint() + earnPoint1);
                  jsonObject.put("transferablePoint", earnPoint1);
               }

               UserPoint userPoint = new UserPoint();
               userPoint.setType(1);
               userPoint.setHistoricalPoint(lavePoint);
               userPoint.setVariablePoint(earnPoint);
               userPoint.setBalance(appUser.getLavePoint());
               userPoint.setCreateTime(LocalDateTime.now());
               userPoint.setAppUserId(appUser.getId());
               userPoint.setObjectId(order.getId());
               userPoint.setExtention(jsonObject.toJSONString());
               userPointClient.saveUserPoint(userPoint);
            }
            appUser.setShopAmount(appUser.getShopAmount().add(paymentMoney).setScale(2, RoundingMode.HALF_EVEN));
            appUser.setLastShopTime(LocalDateTime.now());
            appUserClient.editAppUserById(appUser);
            //变更等级
            appUserClient.vipUpgrade(appUser.getId());
            //修改订支付状态
            order.setPayStatus(2);
            //自提
            if(order.getOrderType() == 1 && StringUtils.isEmpty(order.getAddressJson())){
               order.setOrderStatus(2);
            }
            orderService.updateById(order);

            //处理优惠券
            if(null != order.getUserCouponId()){
               UserCoupon userCoupon = userCouponClient.getUserCoupon(order.getUserCouponId()).getData();
               if(null != userCoupon && null == userCoupon.getUseTime()){
                  userCoupon.setStatus(2);
                  userCoupon.setUseTime(LocalDateTime.now());
                  userCouponClient.editUserCoupon(userCoupon);
               }
            }
				

            //删除购物车数据
            userid = tokenService.getLoginUserApplet().getUserid();
            List<OrderGood> list1 = orderGoodService.list(new LambdaQueryWrapper<OrderGood>().eq(OrderGood::getOrderId, order.getId()));
            List<Integer> goodsIds1 = list1.stream().map(OrderGood::getGoodsId).collect(Collectors.toList());
            this.remove(new LambdaQueryWrapper<ShoppingCart>().eq(ShoppingCart::getAppUserId, userid).in(ShoppingCart::getGoodsId, goodsIds1));

         }
         String rc_result = uniPayResult.getRc_Result();
         JSONObject jsonObject = JSON.parseObject(rc_result);
         jsonObject.put("orderId", order.getId().toString());
         //将支付数据添加到redis队列中，便于定时任务去校验是否完成支付，没有完成支付支付，15分钟后关闭订单。
         long second = LocalDateTime.now().plusMinutes(15).toEpochSecond(ZoneOffset.UTC);
         redisTemplate.opsForZSet().add("OrderPayment", order.getOrderNumber(), second);
         return R.ok(jsonObject.toJSONString());
      }
      //账户余额
      BigDecimal redPacketAmount = BigDecimal.ZERO;
@@ -1043,27 +1181,28 @@
         BigDecimal totalDistributionAmount = appUser.getTotalDistributionAmount();
         BigDecimal balance = appUser.getBalance();
         //红包金额满足支付
         if(paymentMoney.compareTo(totalRedPacketAmount) <= 0){
            totalRedPacketAmount = totalRedPacketAmount.subtract(paymentMoney);
            balance = balance.subtract(paymentMoney);
         BigDecimal paymentMoney1 = paymentMoney;
         if(paymentMoney1.compareTo(totalRedPacketAmount) <= 0){
            totalRedPacketAmount = totalRedPacketAmount.subtract(paymentMoney1);
            balance = balance.subtract(paymentMoney1);
            appUser.setTotalRedPacketAmount(totalRedPacketAmount);
            appUser.setBalance(balance);
            redPacketAmount = paymentMoney;
            redPacketAmount = paymentMoney1;
         }else{
            paymentMoney = paymentMoney.subtract(totalRedPacketAmount);
            paymentMoney1 = paymentMoney1.subtract(totalRedPacketAmount);
            redPacketAmount = totalRedPacketAmount;
            totalRedPacketAmount = BigDecimal.ZERO;
            if(paymentMoney.compareTo(totalDistributionAmount) <= 0){
               totalDistributionAmount = totalDistributionAmount.subtract(paymentMoney);
               balance = balance.subtract(paymentMoney);
            if(paymentMoney1.compareTo(totalDistributionAmount) <= 0){
               totalDistributionAmount = totalDistributionAmount.subtract(paymentMoney1);
               balance = balance.subtract(paymentMoney1);
               appUser.setTotalRedPacketAmount(totalRedPacketAmount);
               appUser.setTotalDistributionAmount(totalDistributionAmount);
               appUser.setBalance(balance);
               distributionAmount = paymentMoney;
               distributionAmount = paymentMoney1;
            }else{
               paymentMoney = paymentMoney.subtract(totalDistributionAmount);
               paymentMoney1 = paymentMoney1.subtract(totalDistributionAmount);
               totalDistributionAmount = BigDecimal.ZERO;
               balance = balance.subtract(paymentMoney);
               balance = balance.subtract(paymentMoney1);
               appUser.setTotalRedPacketAmount(totalRedPacketAmount);
               appUser.setTotalDistributionAmount(totalDistributionAmount);
               appUser.setBalance(balance);
@@ -1112,6 +1251,7 @@
         //构建余额明细变动记录
         BalanceChangeRecord balanceChangeRecord = new BalanceChangeRecord();
         balanceChangeRecord.setAppUserId(appUser.getId());
         balanceChangeRecord.setVipId(appUser.getVipId());
         balanceChangeRecord.setOrderId(order.getId());
         balanceChangeRecord.setChangeType(5);
         balanceChangeRecord.setBeforeAmount(balance.add(paymentMoney));
@@ -1128,6 +1268,15 @@
         orderService.updateById(order);
         //删除购物车数据
         this.removeBatchByIds(ids);
         //处理优惠券
         if(null != order.getUserCouponId()){
            UserCoupon userCoupon = userCouponClient.getUserCoupon(order.getUserCouponId()).getData();
            if(null != userCoupon && null == userCoupon.getUseTime()){
               userCoupon.setUseTime(LocalDateTime.now());
               userCouponClient.editUserCoupon(userCoupon);
            }
         }
			
      }
      //积分支付
      if(3 == shoppingCartPayment.getPaymentType()){
@@ -1189,27 +1338,28 @@
               BigDecimal totalRedPacketAmount = appUser.getTotalRedPacketAmount();
               BigDecimal totalDistributionAmount = appUser.getTotalDistributionAmount();
               BigDecimal balance = appUser.getBalance();
               if(expressFee.compareTo(totalRedPacketAmount) <= 0){
                  totalRedPacketAmount = totalRedPacketAmount.subtract(expressFee);
                  balance = balance.subtract(expressFee);
               BigDecimal expressFee1 = expressFee;
               if(expressFee1.compareTo(totalRedPacketAmount) <= 0){
                  totalRedPacketAmount = totalRedPacketAmount.subtract(expressFee1);
                  balance = balance.subtract(expressFee1);
                  appUser.setTotalRedPacketAmount(totalRedPacketAmount);
                  appUser.setBalance(balance);
                  redPacketAmount = expressFee;
                  redPacketAmount = expressFee1;
               }else{
                  expressFee = expressFee.subtract(totalRedPacketAmount);
                  expressFee1 = expressFee1.subtract(totalRedPacketAmount);
                  redPacketAmount = totalRedPacketAmount;
                  totalRedPacketAmount = BigDecimal.ZERO;
                  if(expressFee.compareTo(totalDistributionAmount) <= 0){
                     totalDistributionAmount = totalDistributionAmount.subtract(expressFee);
                     balance = balance.subtract(expressFee);
                  if(expressFee1.compareTo(totalDistributionAmount) <= 0){
                     totalDistributionAmount = totalDistributionAmount.subtract(expressFee1);
                     balance = balance.subtract(expressFee1);
                     appUser.setTotalRedPacketAmount(totalRedPacketAmount);
                     appUser.setTotalDistributionAmount(totalDistributionAmount);
                     appUser.setBalance(balance);
                     distributionAmount = expressFee;
                     distributionAmount = expressFee1;
                  }else{
                     expressFee = expressFee.subtract(totalDistributionAmount);
                     expressFee1 = expressFee1.subtract(totalDistributionAmount);
                     totalDistributionAmount = BigDecimal.ZERO;
                     balance = balance.subtract(expressFee);
                     balance = balance.subtract(expressFee1);
                     appUser.setTotalRedPacketAmount(totalRedPacketAmount);
                     appUser.setTotalDistributionAmount(totalDistributionAmount);
                     appUser.setBalance(balance);
@@ -1221,10 +1371,11 @@
               //构建余额明细变动记录
               BalanceChangeRecord balanceChangeRecord = new BalanceChangeRecord();
               balanceChangeRecord.setAppUserId(appUser.getId());
               balanceChangeRecord.setVipId(appUser.getVipId());
               balanceChangeRecord.setOrderId(order.getId());
               balanceChangeRecord.setChangeType(5);
               balanceChangeRecord.setBeforeAmount(balance.add(paymentMoney));
               balanceChangeRecord.setChangeAmount(paymentMoney);
               balanceChangeRecord.setBeforeAmount(balance.add(expressFee));
               balanceChangeRecord.setChangeAmount(expressFee);
               balanceChangeRecord.setAfterAmount(balance);
               balanceChangeRecord.setDelFlag(0);
               balanceChangeRecord.setCreateTime(LocalDateTime.now());
@@ -1248,6 +1399,7 @@
            //删除购物车数据
            this.removeBatchByIds(ids);
         }
			
      }

      //添加账户余额支付明细
@@ -1330,11 +1482,27 @@
         order.setOrderStatus(2);
      }
      orderService.updateById(order);

      //处理优惠券
      if(null != order.getUserCouponId()){
         UserCoupon userCoupon = userCouponClient.getUserCoupon(order.getUserCouponId()).getData();
         if(null != userCoupon && null == userCoupon.getUseTime()){
            userCoupon.setStatus(2);
            userCoupon.setUseTime(LocalDateTime.now());
            userCouponClient.editUserCoupon(userCoupon);
         }
      }

      //删除购物车数据
      Long userid = tokenService.getLoginUserApplet().getUserid();
      Long userid = order.getAppUserId();
      List<OrderGood> list = orderGoodService.list(new LambdaQueryWrapper<OrderGood>().eq(OrderGood::getOrderId, order.getId()));
      List<Integer> goodsIds = list.stream().map(OrderGood::getGoodsId).collect(Collectors.toList());
      this.remove(new LambdaQueryWrapper<ShoppingCart>().eq(ShoppingCart::getAppUserId, userid).in(ShoppingCart::getGoodsId, goodsIds));

      //商品销量增加
      for (Integer goodsId : goodsIds) {
         goodsClient.editGoodsNum(goodsId, 1);
      }
      return R.ok();
   }