java/qijisheng.git

			@@ -532,7 +532,7 @@
			confirmOrderVo.setDiscountAmount(activityAmount);
			int earnPoint = goodsList.stream().mapToInt(MyShoppingCartVo::getEarnSpendingPoints).sum();
			confirmOrderVo.setEarnPoint(earnPoint);
			if(BigDecimal.ZERO.compareTo(paymentMoney) > 0){
			if(null != paymentMoney && BigDecimal.ZERO.compareTo(paymentMoney) > 0){
			paymentMoney = BigDecimal.ZERO;
			}

			@@ -543,6 +543,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());
			@@ -994,6 +995,7 @@
			order.setDelFlag(0);
			order.setCreateTime(LocalDateTime.now());
			order.setExpressPayMethod(shoppingCartPayment.getFreightPaymentType());
			order.setDistributionMode(shoppingCartPayment.getDistributionMode());

			if(2 == shoppingCartPayment.getPaymentType()){
			BigDecimal balance = appUser.getBalance();
			@@ -1238,6 +1240,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));
			@@ -1361,6 +1364,7 @@
			//构建余额明细变动记录
			BalanceChangeRecord balanceChangeRecord = new BalanceChangeRecord();
			balanceChangeRecord.setAppUserId(appUser.getId());
			balanceChangeRecord.setVipId(appUser.getVipId());
			balanceChangeRecord.setOrderId(order.getId());
			balanceChangeRecord.setChangeType(5);
			balanceChangeRecord.setBeforeAmount(balance.add(expressFee));
			@@ -1495,7 +1499,7 @@
			}

			//删除购物车数据
			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));