置换订单收集

modules/Order/app/Services/RefundService.php

@@ -88,7 +88,8 @@ class RefundService {
 		$refund->member_id = auth('api')->user()['uid'];
 		$refund->status = 0;
 		$refund->refund_no = str_replace('-', '', Str::orderedUuid());
-		$refund->amount = $item->total_price;
+		$refund->amount = $item->total_price-$item->total_integral;
+//		$refund->amount = $item->total_price;
 
 		if($refund->save()){
 			$item->status = 4;

modules/Wechat/app/Services/PayService.php

@@ -40,7 +40,7 @@ class PayService {
 				$description = "订单支付";
 				break;
 		}
-
+		$data->amount = $data->amount-$data->integral;
 		$payData = [
 			'mchid' => $config['mch_id'],
 			'appid' => $config['app_id'],