java/qijisheng.git

			@@ -157,9 +157,8 @@
			// 收货地址
			String addressJson = order.getAddressJson();
			UserAddress userAddress = new UserAddress();
			if (StringUtils.isNotEmpty(addressJson)){
			if (2 == order.getDistributionMode()){
			userAddress = JSONObject.parseObject(addressJson, UserAddress.class);

			}
			// 优惠券
			String couponJson = order.getCouponJson();
			@@ -449,6 +448,7 @@
			BalanceChangeRecord balanceChangeRecord = new BalanceChangeRecord();
			balanceChangeRecord.setOrderId(order.getId());
			balanceChangeRecord.setAppUserId(order.getAppUserId());
			balanceChangeRecord.setVipId(appUser.getVipId());
			balanceChangeRecord.setChangeType(6);
			balanceChangeRecord.setBeforeAmount(balance);
			balanceChangeRecord.setChangeAmount(paymentAmount);
			@@ -529,6 +529,7 @@
			BalanceChangeRecord balanceChangeRecord = new BalanceChangeRecord();
			balanceChangeRecord.setOrderId(order.getId());
			balanceChangeRecord.setAppUserId(order.getAppUserId());
			balanceChangeRecord.setVipId(appUser.getVipId());
			balanceChangeRecord.setChangeType(6);
			balanceChangeRecord.setBeforeAmount(balance);
			balanceChangeRecord.setChangeAmount(expressAmount);
			@@ -757,18 +758,13 @@
			orderInfo.setExpressAmount(order.getExpressAmount());
			orderInfo.setPaymentAmount(order.getPaymentAmount());
			orderInfo.setGetPoint(order.getGetPoint());
			if(StringUtils.isNotEmpty(order.getAddressJson())){
			if(2 == order.getDistributionMode()){
			UserAddress userAddress = JSON.parseObject(order.getAddressJson(), UserAddress.class);
			orderInfo.setRecipient(userAddress.getRecieveName() + "-" + userAddress.getRecievePhone());
			userAddress.setRecieveAddress(userAddress.getProvince() + userAddress.getCity() + userAddress.getDistrict() + userAddress.getRecieveAddress());
			orderInfo.setAddress(userAddress.getRecieveAddress());
			}
			if(StringUtils.isNotEmpty(order.getExpressJson()) && !"NULL".equals(order.getExpressJson())){
			JSONObject jsonObject = JSON.parseObject(order.getExpressJson());
			String com = jsonObject.getString("com");
			String num = jsonObject.getString("num");
			QueryKD100Vo queryKD100Vo = ExpressDeliveryUtil.kd100QueryTrack(com, num);
			orderInfo.setExpress(queryKD100Vo);
			MapTrackKD100Vo mapTrackKD100Vo = JSON.parseObject(order.getExpressResult(), MapTrackKD100Vo.class);
			orderInfo.setExpress(mapTrackKD100Vo);
			}
			List<OrderGood> orderGoods = orderGoodMapper.selectList(new LambdaQueryWrapper<OrderGood>().eq(OrderGood::getOrderId, orderId).eq(OrderGood::getDelFlag, 0));
			int sum = orderGoods.stream().mapToInt(OrderGood::getNum).sum();