java/qijisheng.git

			@@ -20,6 +20,7 @@
			import com.ruoyi.order.model.Order;
			import com.ruoyi.order.model.OrderGood;
			import com.ruoyi.order.model.ShoppingCart;
			import com.ruoyi.order.service.CommissionService;
			import com.ruoyi.order.service.OrderGoodService;
			import com.ruoyi.order.service.OrderService;
			import com.ruoyi.order.service.ShoppingCartService;
			@@ -97,6 +98,9 @@

			@Resource
			private BalanceChangeRecordClient balanceChangeRecordClient;

			@Resource
			private CommissionService commissionService;



			@@ -341,11 +345,14 @@
			return R.fail("修改数量不能小于等于0");
			}
			ShoppingCart shoppingCart = this.getById(setGoodsNumber.getId());
			Goods goods = goodsClient.getGoodsById(shoppingCart.getGoodsId()).getData();
			if(null != goods.getPurchaseLimit() && -1 != goods.getPurchaseLimit() && goods.getPurchaseLimit() < setGoodsNumber.getNumber()){
			return R.fail("修改数量不能大于限购数量");
			}

			if(null != shoppingCart){

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

			shoppingCart.setNumber(setGoodsNumber.getNumber());
			this.updateById(shoppingCart);
			}
			@@ -397,7 +404,7 @@
			confirmOrderVo.setDiscountAmount(orderMoney.subtract(paymentMoney).setScale(2, RoundingMode.HALF_EVEN));
			}
			BaseSetting baseSetting = baseSettingClient.getBaseSetting(4).getData();
			confirmOrderVo.setUseSimultaneously(baseSetting.getContent().equals("1") ? true : false);
			confirmOrderVo.setUseSimultaneously(baseSetting.getContent().equals("1"));
			int earnPoint = goodsList.stream().mapToInt(MyShoppingCartVo::getEarnSpendingPoints).sum();
			confirmOrderVo.setEarnPoint(earnPoint);
			//支付金额，订单金额-订单优惠
			@@ -813,6 +820,7 @@
			order.setShopId(shoppingCartPayment.getShopId());
			order.setDelFlag(0);
			order.setCreateTime(LocalDateTime.now());
			order.setExpressPayMethod(shoppingCartPayment.getFreightPaymentType());

			if(2 == shoppingCartPayment.getPaymentType()){
			BigDecimal balance = appUser.getBalance();