java/qijisheng.git

			@@ -22,10 +22,7 @@
			import com.ruoyi.order.model.OrderBalancePayment;
			import com.ruoyi.order.model.OrderGood;
			import com.ruoyi.order.model.RefundPass;
			import com.ruoyi.order.service.CommissionService;
			import com.ruoyi.order.service.OrderBalancePaymentService;
			import com.ruoyi.order.service.OrderService;
			import com.ruoyi.order.service.RefundPassService;
			import com.ruoyi.order.service.*;
			import com.ruoyi.order.util.ExpressDeliveryUtil;
			import com.ruoyi.order.util.payment.PaymentUtil;
			import com.ruoyi.order.util.payment.model.RefundCallbackResult;
			@@ -102,6 +99,9 @@
			private TechnicianSubscribeClient technicianSubscribeClient;
			@Resource
			private ShopBalanceStatementClient shopBalanceStatementClient;

			@Resource
			private OrderGoodService orderGoodService;



			@@ -484,7 +484,6 @@
			userPoint.setObjectId(order.getId());
			userPointClient.saveUserPoint(userPoint);
			appUserClient.editAppUserById(appUser);

			}
			if(3 == payMethod){
			//开始运费退款，积分支付，运费是单独进行支付的，所以需要单独退款
			@@ -655,9 +654,6 @@
			userPoint.setAppUserId(order.getAppUserId());
			userPoint.setObjectId(order.getId());
			userPointClient.saveUserPoint(userPoint);

			order.setRefundStatus(2);
			order.setRefundTime(LocalDateTime.now());
			return R.ok();
			}

			@@ -722,7 +718,7 @@
			orderInfo.setUserName(appUser.getName());
			orderInfo.setPhone(appUser.getPhone());
			}
			orderInfo.setOrderType(order.getOrderType() == 1 ? "服务" : (StringUtils.isNotEmpty(order.getExpressJson()) ? "单品-快递配送" : "单品-自提"));
			orderInfo.setOrderType(order.getOrderType() == 1 ? "服务" : (StringUtils.isNotEmpty(order.getAddressJson()) ? "单品-快递配送" : "单品-上门自提"));
			Shop shop = shopClient.getShopById(order.getShopId()).getData();
			if(null != shop){
			orderInfo.setShopName(shop.getName());