Merge remote-tracking branch 'origin/master'

puzhibing

2025-01-11 f18a802137a7642473891f6886d44cf0c229efed

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

@@ -240,18 +240,34 @@
            area.setProvinceCode(appUser.getProvinceCode());
            area.setVip(appUser.getVipId());
            GoodsArea goodsArea = goodsAreaClient.getGoodsArea(area).getData();
            price.setEarnSpendingPoints(goodsArea.getEarnSpendingPoints());
            price.setSuperiorSubcommission(goodsArea.getSuperiorSubcommission());
            price.setSuperiorRebatePoints(goodsArea.getSuperiorRebatePoints());
            price.setSuperiorType(goodsArea.getSuperiorType());
            price.setSuperiorPriceType(goodsArea.getSuperiorPriceType());
            price.setServuceShopCharges(goodsArea.getServuceShopCharges());
            price.setServuceShopPoints(goodsArea.getServuceShopPoints());
            price.setTechnicianPoints(goodsArea.getTechnicianPoints());
            price.setBoundShopCharges(goodsArea.getBoundShopCharges());
            price.setBoundShopPoints(goodsArea.getBoundShopPoints());
            price.setBoundShopSuperiorsCharges(goodsArea.getBoundShopSuperiorsCharges());
            price.setBoundShopSuperiorsPoints(goodsArea.getBoundShopSuperiorsPoints());
            if(null != goodsArea){
               price.setEarnSpendingPoints(goodsArea.getEarnSpendingPoints());
               price.setSuperiorSubcommission(goodsArea.getSuperiorSubcommission());
               price.setSuperiorRebatePoints(goodsArea.getSuperiorRebatePoints());
               price.setSuperiorType(goodsArea.getSuperiorType());
               price.setSuperiorPriceType(goodsArea.getSuperiorPriceType());
               price.setServuceShopCharges(goodsArea.getServuceShopCharges());
               price.setServuceShopPoints(goodsArea.getServuceShopPoints());
               price.setTechnicianPoints(goodsArea.getTechnicianPoints());
               price.setBoundShopCharges(goodsArea.getBoundShopCharges());
               price.setBoundShopPoints(goodsArea.getBoundShopPoints());
               price.setBoundShopSuperiorsCharges(goodsArea.getBoundShopSuperiorsCharges());
               price.setBoundShopSuperiorsPoints(goodsArea.getBoundShopSuperiorsPoints());
            }else{
               GoodsVip goodsVip = goodsVipClient.getGoodsVip(goodsId, appUser.getVipId()).getData();
               price.setEarnSpendingPoints(goodsVip.getEarnSpendingPoints());
               price.setSuperiorSubcommission(goodsVip.getSuperiorSubcommission());
               price.setSuperiorRebatePoints(goodsVip.getSuperiorRebatePoints());
               price.setSuperiorType(goodsVip.getSuperiorType());
               price.setSuperiorPriceType(goodsVip.getSuperiorPriceType());
               price.setServuceShopCharges(goodsVip.getServuceShopCharges());
               price.setServuceShopPoints(goodsVip.getServuceShopPoints());
               price.setTechnicianPoints(goodsVip.getTechnicianPoints());
               price.setBoundShopCharges(goodsVip.getBoundShopCharges());
               price.setBoundShopPoints(goodsVip.getBoundShopPoints());
               price.setBoundShopSuperiorsCharges(goodsVip.getBoundShopSuperiorsCharges());
               price.setBoundShopSuperiorsPoints(goodsVip.getBoundShopSuperiorsPoints());
            }
         }
      }else{
         //构建价格数据
@@ -388,23 +404,112 @@
         }
         confirmOrderVo.setOrderPoint(sum);
      }
      //查询当前是否有订单活动
      OrderActivityInfo orderActivityInfo = orderActivityInfoClient.getNowOrderActivityInfo(appUser.getVipId()).getData();

      BigDecimal orderMoney = confirmOrderVo.getOrderMoney();
      BigDecimal paymentMoney = orderMoney;
      //满XX才打折，只有现金才能优惠
      if(null != orderActivityInfo && confirmOrder.getPaymentType() == 1 && orderActivityInfo.getConditionAmount().compareTo(orderMoney) <= 0){
         confirmOrderVo.setActivityName(orderActivityInfo.getActivityName());
         paymentMoney = orderActivityInfo.getDiscount().divide(new BigDecimal(10)).multiply(orderMoney);
         confirmOrderVo.setDiscountAmount(orderMoney.subtract(paymentMoney).setScale(2, RoundingMode.HALF_EVEN));
      }
      //总优惠金额
      BigDecimal activityAmount = BigDecimal.ZERO;


      BaseSetting baseSetting = baseSettingClient.getBaseSetting(4).getData();
      confirmOrderVo.setUseSimultaneously(JSON.parseObject(baseSetting.getContent()).getInteger("status") == 1);
      //减去优惠券优惠金额
      CouponInfoVo couponInfoVo = null;
      if(null != confirmOrder.getCouponId() && 2 != confirmOrder.getPaymentType()){
         couponInfoVo = userCouponClient.getCouponInfo(confirmOrder.getCouponId()).getData();
         String forGoodIds = couponInfoVo.getForGoodIds();
         String[] split = forGoodIds.split(",");
         List<String> parseArray = Arrays.asList(split);
         //全部商品
         if("-1".equals(forGoodIds)){
            //满减
            if(1 == couponInfoVo.getCouponType() && couponInfoVo.getConditionAmount().compareTo(paymentMoney) <= 0){
               paymentMoney = paymentMoney.subtract(couponInfoVo.getDiscountAmount());
               activityAmount = activityAmount.add(couponInfoVo.getDiscountAmount());
            }
            //代金券
            if(2 == couponInfoVo.getCouponType()){
               paymentMoney = paymentMoney.subtract(couponInfoVo.getMoneyAmount());
               activityAmount = activityAmount.add(couponInfoVo.getMoneyAmount());
               if(paymentMoney.compareTo(BigDecimal.ZERO) < 0){
                  paymentMoney = BigDecimal.ZERO;
               }
            }
            //折扣券
            if(3 == couponInfoVo.getCouponType()){
               BigDecimal paymentMoney1 = couponInfoVo.getDiscount().divide(new BigDecimal(10)).multiply(paymentMoney);
               BigDecimal bigDecimal = paymentMoney.subtract(paymentMoney1).setScale(2, RoundingMode.HALF_EVEN);
               paymentMoney = paymentMoney1;
               activityAmount = activityAmount.add(bigDecimal);
            }
         }else{
            //部分商品，需要计算参与优惠商品的支付金额，然后再对商品进行优惠券处理
            paymentMoney = BigDecimal.ZERO;
            BigDecimal goodsMoney = BigDecimal.ZERO;
            for (MyShoppingCartVo myShoppingCartVo : goodsList) {
               String goodsId = myShoppingCartVo.getGoodsId().toString();
               BigDecimal cash = myShoppingCartVo.getCash();
               if(parseArray.contains(goodsId)){
                  goodsMoney = goodsMoney.add(cash);
               }else{
                  paymentMoney = paymentMoney.add(cash);
               }
            }

            //满减
            if(1 == couponInfoVo.getCouponType() && couponInfoVo.getConditionAmount().compareTo(goodsMoney) <= 0){
               goodsMoney = goodsMoney.subtract(couponInfoVo.getDiscountAmount());
               activityAmount = activityAmount.add(couponInfoVo.getDiscountAmount());
            }
            //代金券
            if(2 == couponInfoVo.getCouponType()){
               goodsMoney = goodsMoney.subtract(couponInfoVo.getMoneyAmount());
               activityAmount = activityAmount.add(couponInfoVo.getMoneyAmount());
               if(goodsMoney.compareTo(BigDecimal.ZERO) < 0){
                  goodsMoney = BigDecimal.ZERO;
               }
            }
            //折扣券
            if(3 == couponInfoVo.getCouponType()){
               BigDecimal paymentMoney1 = couponInfoVo.getDiscount().divide(new BigDecimal(10)).multiply(goodsMoney);
               BigDecimal bigDecimal = goodsMoney.subtract(paymentMoney1).setScale(2, RoundingMode.HALF_EVEN);
               goodsMoney = paymentMoney1;
               activityAmount = activityAmount.add(bigDecimal);
            }
            paymentMoney = paymentMoney.add(goodsMoney);
         }
      }

      //查询当前是否有订单活动
      List<OrderActivityInfo> orderActivityInfo = orderActivityInfoClient.getNowOrderActivityInfo(appUser.getVipId()).getData();
      //满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){
               //优惠后的支付金额
               BigDecimal multiply = activityInfo.getDiscount().divide(new BigDecimal(10)).multiply(paymentMoney);
               //优惠金额
               BigDecimal bigDecimal = paymentMoney.subtract(multiply).setScale(2, RoundingMode.HALF_EVEN);
               if(bigDecimal.compareTo(zyh) > 0){
                  zyh = bigDecimal;
                  activityInfo1 = activityInfo;
               }
            }
         }

         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);
      //支付金额，订单金额-订单优惠
      confirmOrderVo.setPayMoney(paymentMoney);
      confirmOrderVo.setResidualPoint(appUser.getLavePoint().intValue());
      confirmOrderVo.setResidualPoint(appUser.getAvailablePoint().intValue());
      //获取默认收货地址
      UserAddress userAddress = userAddressClient.getDefaultUserAddress(userid).getData();
      if(null != userAddress){
@@ -582,21 +687,26 @@
      for (int i = 0; i < objects.size(); i++) {
         Long id = objects.getJSONObject(i).getLong("id");
         Integer num1 = objects.getJSONObject(i).getInteger("num");
         Integer type = objects.getJSONObject(i).getInteger("type");
         num += num1;
         ShoppingCart shoppingCart = this.getById(id);
         //判断当前数量是否已经超出限购数量（需要计算已经购买的数量）
         Integer goodsSaleNum = orderService.getGoodsSaleNum(shoppingCart.getGoodsId(), type);
         Goods goods = goodsClient.getGoodsById(shoppingCart.getGoodsId()).getData();
         if(null != goods.getPurchaseLimit() && -1 != goods.getPurchaseLimit()){
            List<Order> orders = orderService.list(new LambdaQueryWrapper<Order>().eq(Order::getAppUserId, appUser.getId()).eq(Order::getDelFlag, 0).notIn(Order::getOrderStatus, Arrays.asList(5, 6)));
            List<Long> orderIds = orders.stream().map(Order::getId).collect(Collectors.toList());
            int sum = 0;
            if(orderIds.size() > 0){
               List<OrderGood> orderGoodList = orderGoodService.list(new LambdaQueryWrapper<OrderGood>().in(OrderGood::getOrderId, orderIds)
                     .eq(OrderGood::getGoodsId, shoppingCart.getGoodsId()).eq(OrderGood::getDelFlag, 0));
               sum = orderGoodList.stream().mapToInt(OrderGood::getNum).sum();
            }
            if((num1 + sum) > goods.getPurchaseLimit()){
         if(1 == type){
            if(null != goods.getPurchaseLimit() && -1 != goods.getPurchaseLimit() && (goodsSaleNum + num1) > goods.getPurchaseLimit()){
               return R.fail(goods.getName() + "已超出购买上限");
            }
         }else{
            GetSeckillActivityInfo info = new GetSeckillActivityInfo();
            info.setGoodsId(shoppingCart.getGoodsId());
            info.setVip(appUser.getVipId());
            GoodsSeckill goodsSeckill = seckillActivityInfoClient.getSeckillActivityInfo(info).getData();
            if(null != goodsSeckill ){
               SeckillActivityInfo activityInfo = seckillActivityInfoClient.getSeckillActivityInfoById(goodsSeckill.getSeckillActivityInfoId()).getData();
               if(null != activityInfo.getMaxNum() && -1 != activityInfo.getMaxNum() && (goodsSaleNum + num1) > activityInfo.getMaxNum()){
                  return R.fail(goods.getName() + "已超出秒杀活动购买上限");
               }
            }
         }
         ids.add(id);
@@ -655,9 +765,6 @@
      }else{
         for (MyShoppingCartVo myShoppingCartVo : goodsList) {
            orderPoint += (myShoppingCartVo.getPoint() * myShoppingCartVo.getNumber());
         }
         if(appUser.getLavePoint().intValue() < orderPoint){
            return R.fail("账户剩余积分不足");
         }
      }
      //现金的支付金额
@@ -741,20 +848,32 @@
      }

      //查询当前是否有订单活动
      OrderActivityInfo orderActivityInfo = orderActivityInfoClient.getNowOrderActivityInfo(appUser.getVipId()).getData();
      List<OrderActivityInfo> orderActivityInfo = orderActivityInfoClient.getNowOrderActivityInfo(appUser.getVipId()).getData();
      BaseSetting baseSetting = baseSettingClient.getBaseSetting(4).getData();
      //系统活动设置（优惠券和活动能否同时使用）
      boolean useSimultaneously = baseSetting.getContent().equals("1");
      Integer status = JSON.parseObject(baseSetting.getContent()).getInteger("status");
      //满XX才打折，只有现金才能优惠
      //如果使用优惠券，则需要判断是否可以和同时使用，且活动满足使用条件。
      //没有使用优惠券，只需要判断是都满足使用条件
      if((useSimultaneously || null == shoppingCartPayment.getUserCouponId()) &&
            null != orderActivityInfo && shoppingCartPayment.getPaymentType() != 3 && orderActivityInfo.getConditionAmount().compareTo(paymentMoney) <= 0){
         BigDecimal paymentMoney1 = orderActivityInfo.getDiscount().divide(new BigDecimal(10)).multiply(paymentMoney);
         BigDecimal bigDecimal = paymentMoney.subtract(paymentMoney1).setScale(2, RoundingMode.HALF_EVEN);
         discount = orderActivityInfo.getDiscount();
         paymentMoney = paymentMoney1;
         activityAmount = activityAmount.add(bigDecimal);
      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);
               if(bigDecimal.compareTo(zyh) > 0){
                  zyh = bigDecimal;
                  orderActivityInfo1 = activityInfo;
               }
            }
         }

         discount = orderActivityInfo1.getDiscount();
         paymentMoney = paymentMoney.subtract(zyh);
         activityAmount = activityAmount.add(zyh);
      }

      //可获得的消费积分
@@ -820,8 +939,8 @@
      if(3 != shoppingCartPayment.getPaymentType() && (fullReductionAmount.compareTo(BigDecimal.ZERO) > 0 ||moneyAmount.compareTo(BigDecimal.ZERO) > 0 || discountAmount.compareTo(BigDecimal.ZERO) > 0)){
         order.setCouponJson(JSON.toJSONString(couponInfoVo));
      }
      if(activityAmount.compareTo(BigDecimal.ZERO) > 0){
         order.setActivityJson(JSON.toJSONString(orderActivityInfo));
      if(null != orderActivityInfo1){
         order.setActivityJson(JSON.toJSONString(orderActivityInfo1));
      }
      if(null != shoppingCartPayment.getUserAddressId()){
         UserAddress address = userAddressClient.getUserAddressById(shoppingCartPayment.getUserAddressId()).getData();
@@ -844,7 +963,7 @@
      if(3 == shoppingCartPayment.getPaymentType()){
         Integer availablePoint = appUser.getAvailablePoint();
         if(availablePoint < orderPoint){
            return R.fail("账户积分不足");
            return R.fail("账户可用积分不足");
         }
      }
      //判断运费支付是否足够
@@ -861,19 +980,23 @@
         OrderGood orderGood = new OrderGood();
         orderGood.setGoodsId(myShoppingCartVo.getGoodsId());
         orderGood.setOrderId(order.getId());
         GetSeckillActivityInfo info = new GetSeckillActivityInfo();
         info.setGoodsId(myShoppingCartVo.getGoodsId());
         info.setVip(appUser.getVipId());
         GoodsSeckill goodsSeckill = seckillActivityInfoClient.getSeckillActivityInfo(info).getData();
         if(null != goodsSeckill){
            orderGood.setSeckillJson(JSON.toJSONString(goodsSeckill));
         }
         for (int i = 0; i < objects.size(); i++) {
            Long id = objects.getJSONObject(i).getLong("id");
            if(myShoppingCartVo.getId().equals(id.toString())){
               ShoppingCart shoppingCart = this.getById(id);
               Integer num1 = objects.getJSONObject(i).getInteger("num");
               Integer type = objects.getJSONObject(i).getInteger("type");
               orderGood.setNum(num1);
               orderGood.setType(type);
               if(2 == type){
                  GetSeckillActivityInfo info = new GetSeckillActivityInfo();
                  info.setGoodsId(myShoppingCartVo.getGoodsId());
                  info.setVip(appUser.getVipId());
                  GoodsSeckill goodsSeckill = seckillActivityInfoClient.getSeckillActivityInfo(info).getData();
                  if(null != goodsSeckill){
                     orderGood.setSeckillJson(JSON.toJSONString(goodsSeckill));
                  }
               }
               Goods goods1 = goodsClient.getGoodsById(shoppingCart.getGoodsId()).getData();
               orderGood.setGoodJson(JSON.toJSONString(goods1));
               break;
@@ -893,6 +1016,10 @@
         orderGood.setBoundShopPoints(myShoppingCartVo.getBoundShopPoints());
         orderGood.setBoundShopSuperiorsCharges(myShoppingCartVo.getBoundShopSuperiorsCharges());
         orderGood.setBoundShopSuperiorsPoints(myShoppingCartVo.getBoundShopSuperiorsPoints());
         orderGood.setCashPayment(myShoppingCartVo.getCashPayment() ? 1 : 0);
         orderGood.setPointPayment(myShoppingCartVo.getPointPayment() ? 1 : 0);
         orderGood.setSellingPrice(myShoppingCartVo.getCash());
         orderGood.setIntegral(myShoppingCartVo.getPoint());
         orderGoodService.save(orderGood);
      }

@@ -923,27 +1050,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);
@@ -962,8 +1090,13 @@
            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);
            }

            if(earnPoint > 0){
@@ -975,6 +1108,7 @@
               userPoint.setCreateTime(LocalDateTime.now());
               userPoint.setAppUserId(appUser.getId());
               userPoint.setObjectId(order.getId());
               userPoint.setExtention(jsonObject.toJSONString());
               userPointClient.saveUserPoint(userPoint);
            }
         }
@@ -1009,7 +1143,7 @@
         if(expressFee.compareTo(BigDecimal.ZERO) > 0){
            if(shoppingCartPayment.getFreightPaymentType() == 1){
               //调起微信支付
               UniPayResult uniPayResult = PaymentUtil.uniPay(order.getOrderNumber() + appUser.getId(), expressFee.doubleValue(), order.getOrderType() == 1 ? "购买服务商品快递费" : "购买单品商品快递费",
               UniPayResult uniPayResult = PaymentUtil.uniPay("K" + order.getOrderNumber(), expressFee.doubleValue(), order.getOrderType() == 1 ? "购买服务商品快递费" : "购买单品商品快递费",
                     "快递费", "", "/order/shopping-cart/shoppingCartMaterialFlowPaymentCallback", appUser.getWxOpenid(), null);
               if(null == uniPayResult || !"100".equals(uniPayResult.getRa_Code())){
                  return R.fail(null == uniPayResult ? "支付失败" : uniPayResult.getRb_CodeMsg());
@@ -1019,7 +1153,7 @@
               jsonObject.put("orderId", order.getId().toString());
               //将支付数据添加到redis队列中，便于定时任务去校验是否完成支付，没有完成支付支付，15分钟后关闭订单。
               long second = LocalDateTime.now().plusMinutes(15).toEpochSecond(ZoneOffset.UTC);
               redisTemplate.opsForZSet().add("MaterialFlowPayment", order.getOrderNumber() + appUser.getId(), second);
               redisTemplate.opsForZSet().add("MaterialFlowPayment", "K" + order.getOrderNumber(), second);
               return R.ok(jsonObject.toJSONString());
            }
         }
@@ -1034,8 +1168,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();
@@ -1049,65 +1184,41 @@
         userPoint.setExtention((tra >= 0 ? orderPoint : transferablePoint) + "");
         userPointClient.saveUserPoint(userPoint);

         lavePoint = appUser.getLavePoint();
         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.setAvailablePoint(appUser.getAvailablePoint() + earnPoint1);
         appUser.setTotalAvailablePoint(appUser.getTotalAvailablePoint() + earnPoint1);
         if(null != pointSetting && 1 == pointSetting.getBuyPointGift()){
            appUser.setTransferablePoint(appUser.getTransferablePoint() + earnPoint1);
         }
         appUser.setTotalPoint(appUser.getTotalPoint() + earnPoint);
         appUser.setLastShopTime(LocalDateTime.now());
         appUserClient.editAppUserById(appUser);
         //变更等级
         appUserClient.vipUpgrade(appUser.getId());

         //构建积分流水记录
         if(earnPoint > 0){
            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());
            userPointClient.saveUserPoint(userPoint);
         }
         //积分支付不返佣

         //如果有运费，需要先扣除账户积分，再进行支付。支付成功后修改订单状态，未支付成功则回退积分，删除的订单
         if(expressFee.compareTo(BigDecimal.ZERO) > 0){
            if(shoppingCartPayment.getFreightPaymentType() == 2){
               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);
@@ -1121,8 +1232,8 @@
               balanceChangeRecord.setAppUserId(appUser.getId());
               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());
@@ -1147,6 +1258,7 @@
            this.removeBatchByIds(ids);
         }
      }

      //添加账户余额支付明细
      if(redPacketAmount.compareTo(BigDecimal.ZERO) > 0 || distributionAmount.compareTo(BigDecimal.ZERO) > 0){
         OrderBalancePayment orderBalancePayment = new OrderBalancePayment();
@@ -1181,31 +1293,39 @@
      }
      Integer earnPoint = order.getGetPoint();
      AppUser appUser = appUserClient.getAppUserById(order.getAppUserId());
      Integer lavePoint = appUser.getLavePoint();
      BigDecimal paymentMoney = order.getPaymentAmount();
      //构建积分流水记录
      if(earnPoint > 0){
         PointSetting pointSetting = pointSettingClient.getPointSetting(appUser.getVipId()).getData();
         int earnPoint1 = earnPoint;
         int earnPoint1 = 0;
         if(null != pointSetting && 1 == pointSetting.getBuyPointOpen()){
            earnPoint1 = new BigDecimal(earnPoint1).multiply(pointSetting.getBuyPoint().divide(new BigDecimal(100))).intValue();
            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);
			
         if(earnPoint > 0){
            UserPoint userPoint = new UserPoint();
            userPoint.setType(1);
            userPoint.setHistoricalPoint(appUser.getLavePoint() - earnPoint);
            userPoint.setVariablePoint(earnPoint);
            userPoint.setBalance(appUser.getLavePoint());
            userPoint.setCreateTime(LocalDateTime.now());
            userPoint.setAppUserId(appUser.getId());
            userPoint.setObjectId(order.getId());
            userPointClient.saveUserPoint(userPoint);

         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());
@@ -1236,40 +1356,46 @@
   @Override
   public R shoppingCartMaterialFlowPaymentCallback(UniPayCallbackResult uniPayCallbackResult) {
      String r2_orderNo = uniPayCallbackResult.getR2_OrderNo();
      r2_orderNo = r2_orderNo.substring(0, 23);
      r2_orderNo = r2_orderNo.substring(1);
      Order order = orderService.getOne(new LambdaQueryWrapper<Order>().eq(Order::getOrderNumber, r2_orderNo));
      if(null == order || order.getPayStatus() == 2){
         return R.ok();
      }
      Integer earnPoint = order.getGetPoint();
      Integer orderPoint = order.getPoint();
      AppUser appUser = appUserClient.getAppUserById(order.getAppUserId());

      Integer lavePoint = appUser.getLavePoint();
      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.setLavePoint(appUser.getLavePoint() - orderPoint);
      appUser.setAvailablePoint(appUser.getAvailablePoint() - orderPoint);
      //可转增积分
      Integer transferablePoint = appUser.getTransferablePoint();
      Integer tra = 0;
      if(transferablePoint > 0){
         tra = transferablePoint - orderPoint;
         appUser.setTransferablePoint(tra >= 0 ? tra : 0);
      }else{
         appUser.setTransferablePoint(appUser.getTransferablePoint() - orderPoint);
      }
      appUser.setShopPoint(appUser.getShopPoint() + earnPoint);
      appUser.setLavePoint(appUser.getLavePoint() + earnPoint);
      appUser.setAvailablePoint(appUser.getAvailablePoint() + earnPoint1);
      appUser.setTotalAvailablePoint(appUser.getTotalAvailablePoint() + earnPoint1);
      appUser.setTotalPoint(appUser.getTotalPoint() + earnPoint);
      appUser.setLastShopTime(LocalDateTime.now());
      appUserClient.editAppUserById(appUser);
      //变更等级
      appUserClient.vipUpgrade(appUser.getId());
		

      //构建积分流水记录
      UserPoint userPoint = new UserPoint();
      userPoint.setType(1);
      userPoint.setType(11);
      userPoint.setHistoricalPoint(lavePoint);
      userPoint.setVariablePoint(earnPoint);
      userPoint.setVariablePoint(orderPoint);
      userPoint.setBalance(appUser.getLavePoint());
      userPoint.setCreateTime(LocalDateTime.now());
      userPoint.setAppUserId(appUser.getId());
      userPoint.setObjectId(order.getId());
      userPoint.setExtention((tra >= 0 ? orderPoint : transferablePoint) + "");
      userPointClient.saveUserPoint(userPoint);

      //积分支付不反积分

      appUser.setLastShopTime(LocalDateTime.now());
      appUserClient.editAppUserById(appUser);
      //变更等级
      appUserClient.vipUpgrade(appUser.getId());

      //修改订支付状态
      order.setPayStatus(2);
@@ -1294,35 +1420,43 @@
   public void closeOrder() {
      //订单支付数据
      long second = LocalDateTime.now().toEpochSecond(ZoneOffset.UTC);
      Set<String> orderPayment = redisTemplate.opsForZSet().range("OrderPayment", 0, second);
      for (String code : orderPayment) {
         Order order = orderService.getOne(new LambdaQueryWrapper<Order>().eq(Order::getOrderNumber, code));
         if(null == order || order.getPayStatus() != 1){
            continue;
         }
         //开始执行关闭订单操作
         CloseOrderResult closeOrderResult = PaymentUtil.closeOrder(code);
         if((null == closeOrderResult || !closeOrderResult.getRa_Status().equals("100")) &&
               Arrays.asList("0", "4", "101", "10080000", "10080002", "10083004", "10083005").contains(closeOrderResult.getRb_Code())){
            redisTemplate.opsForZSet().add("OrderPayment", code, 0);
            log.error("关闭订单失败：{}---->{}", code, JSON.toJSONString(closeOrderResult));
      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) {
            if(null == order || order.getPayStatus() != 1){
               redisTemplate.opsForZSet().remove("OrderPayment", order.getOrderNumber());
               continue;
            }
            //开始执行关闭订单操作
            CloseOrderResult closeOrderResult = PaymentUtil.closeOrder(order.getOrderNumber());
            if((null == closeOrderResult || !closeOrderResult.getRa_Status().equals("100")) &&
                  Arrays.asList("0", "4", "101", "10080000", "10080002", "10083004", "10083005").contains(closeOrderResult.getRb_Code())){
               redisTemplate.opsForZSet().add("OrderPayment", order.getOrderNumber(), 0);
               log.error("关闭订单失败：{}---->{}", order.getOrderNumber(), JSON.toJSONString(closeOrderResult));
            }
            redisTemplate.opsForZSet().remove("OrderPayment", order.getOrderNumber());
         }
      }
      
      //快递支付
      Set<String> materialFlowPayment = redisTemplate.opsForZSet().range("MaterialFlowPayment", 0, second);
      for (String code : materialFlowPayment) {
         code = code.substring(0, 23);
         Order order = orderService.getOne(new LambdaQueryWrapper<Order>().eq(Order::getOrderNumber, code));
         if(null == order || order.getPayStatus() != 1){
            continue;
         }
         //开始执行关闭订单操作
         CloseOrderResult closeOrderResult = PaymentUtil.closeOrder(code);
         if((null == closeOrderResult || !closeOrderResult.getRa_Status().equals("100")) &&
               Arrays.asList("0", "4", "101", "10080000", "10080002", "10083004", "10083005").contains(closeOrderResult.getRb_Code())){
            redisTemplate.opsForZSet().add("MaterialFlowPayment", code, 0);
            log.error("关闭订单失败：{}---->{}", code, JSON.toJSONString(closeOrderResult));
      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));
         for (Order order : list) {
            if(null == order || order.getPayStatus() != 1){
               redisTemplate.opsForZSet().remove("MaterialFlowPayment", order.getOrderNumber());
               continue;
            }
            //开始执行关闭订单操作
            CloseOrderResult closeOrderResult = PaymentUtil.closeOrder("K" + order.getOrderNumber());
            if((null == closeOrderResult || !closeOrderResult.getRa_Status().equals("100")) &&
                  Arrays.asList("0", "4", "101", "10080000", "10080002", "10083004", "10083005").contains(closeOrderResult.getRb_Code())){
               redisTemplate.opsForZSet().add("MaterialFlowPayment", order.getOrderNumber(), 0);
               log.error("关闭订单失败：{}---->{}", order.getOrderNumber(), JSON.toJSONString(closeOrderResult));
            }
            redisTemplate.opsForZSet().remove("MaterialFlowPayment", order.getOrderNumber());
         }
      }
   }