Merge branch 'develop' of ssh://8.134.10.79:222/Leadfyy.co/hainan into develop

MySQL_change.sql

@@ -278,4 +278,7 @@ ALTER TABLE `suppliers`
 ALTER TABLE `suppliers`
 	CHANGE COLUMN `public_type` `publish_type` VARCHAR(255) NOT NULL DEFAULT '[]' COMMENT '允许发布产品的模板' COLLATE 'utf8_general_ci' AFTER `rate`;
 
+# 15:19 2021/9/9
+ALTER TABLE `orders`
+	ADD COLUMN `pay_user_id` INT NOT NULL DEFAULT 0 COMMENT '支付用户的user_id（跳转到外部小程序支付时用到）' AFTER `agent_cloud_price`;
 

app/Http/Controllers/Api/OrderController.php

@@ -220,12 +220,14 @@ class OrderController extends Controller
 		if ($formData['pay_type'] == PayType::OFFLINE) { //线下支付
 			return $this->success(['id' => $order_id], '操作成功，请及时联系客服付款');
 		} else { //在线支付或定金支付
-			$config = $this->payConfig($order, $price);
+			/*$config = $this->payConfig($order, $price);
 			if (!empty($config['paySign'])) {
 				return $this->success($config);
 			} else {
 				return $this->error($config['err_code_des'] ?? join(',', $config));
-			}
+			}*/
+			// TODO 跳转支付专用
+			return $this->success(['id' => $order->id, 'jump' => true, 'jump_appid' => 'wxb35ef055a4dd8ad4']);
 		}
 	}
 
@@ -307,10 +309,6 @@ class OrderController extends Controller
 		$ap->final_price = $this->calc($ap->price, $formData['num'], $formData['pay_type'], $ap);
 		$ap->num = $formData['num'];
 
-		//是否跳转到外部小程序支付（分账测试）
-		$ap->jump = true;
-		$ap->jump_appid = 'wxb35ef055a4dd8ad4';
-
 		return $this->success($ap);
 	}
 

app/Http/Controllers/Api/SharePayController.php

@@ -32,13 +32,18 @@ class SharePayController extends Controller
 		}
 
 		//用户openid
-		$openid = User::query()->where('id', $this->user_id)->value('openid'); //此处要用where，value()用find有BUG
+		$user_info = User::query()->where('id', $this->user_id)->first(['agent_id', 'openid']); //此处要用where，value()用find有BUG
+		$openid = $user_info['openid'];
+		$this->agent_id = $user_info['agent_id'];
 
 		$order = Order::query()->whereIn('status', [Status::UNPAID, Status::PAY_EARNEST])->find($order_id);
 		if (!$order) {
 			return $this->error('订单不存在或已支付');
 		}
 
+		$order->pay_user_id = $this->user_id;
+		$order->save();
+
 		$config = config('wechat.payment.default');
 		$config = array_merge($config, [
 			'app_id' => 'wxb35ef055a4dd8ad4',
@@ -55,6 +60,7 @@ class SharePayController extends Controller
 				'notify_url' => route('wxpay_notify', ['agent_id' => $this->agent_id]), // 支付结果通知网址，如果不设置则会使用配置里的默认地址
 				'trade_type' => 'JSAPI',
 				'openid' => $openid,
+				'attach' => $this->user_id, //保存支付用户的user_id
 //				'profit_sharing' => 'Y', //Y分账，N不分账，默认不分账,Y大写
 			]);
 		} catch (InvalidArgumentException | InvalidConfigException | GuzzleException $e) {