聚物通支付api接口

modules/Member/app/Controllers/Api/Polymer.php

+<?php
+// +----------------------------------------------------------------------
+// | SentCMS [ WE CAN DO IT JUST THINK IT ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2024 http://www.tensent.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Author: molong <molong@tensent.cn> <http://www.tensent.cn>
+// +----------------------------------------------------------------------
+namespace Modules\Member\Controllers\Api;
+
+use Illuminate\Http\Request;
+use App\Http\Controllers\BaseController;
+use Modules\Member\Services\PolymerService;
+
+class Polymer extends BaseController {
+
+	/**
+	 * @title 聚物通列表
+	 *
+	 * @param PolymerService $service
+	 * @return void
+	 */
+	public function index(Request $request, PolymerService $service){
+		try {
+			$request->mergeIfMissing([
+				'is_user' => 1
+			]);
+			$this->data['data'] = $service->getDataList($request);
+		} catch (\think\Exception $e) {
+			$this->data['code'] = 0;
+			$this->data['message'] = $e->getMessage();
+		}
+		return $this->data;
+	}
+}

modules/Member/routes/api.php

@@ -42,6 +42,10 @@ Route::name('member.')->prefix('member')->middleware(['auth.check:api'])->group(
 		Route::get('/index', 'index')->name('index');
 	});
 
+	Route::controller(Modules\Member\Controllers\Api\Polymer::class)->prefix('polymer')->name('polymer.')->group(function () {
+		Route::get('/index', 'index')->name('index');
+	});
+
 	Route::controller(Modules\Member\Controllers\Api\Collect::class)->prefix('collect')->name('collect.')->group(function () {
 		Route::get('/index', 'index')->name('index');
 		Route::post('/add', 'add')->name('add');

modules/Order/app/Controllers/Api/Order.php

@@ -62,7 +62,12 @@ class Order extends BaseController {
 	 */
 	public function add(Request $request, OrderService $service){
 		try {
-			$this->data['data'] = $service->create($request);
+			$this->data['data'] = $order = $service->create($request);
+
+			if(($order->amount - $order->polymer_money) == 0 ){
+				app(OrderService::class)->paySuccess($order->order_no);
+				$this->data['code'] =9999;
+			}
 			$this->data['message'] = '下单成功';
 		} catch (\Throwable $th) {
 			$this->data['code'] = 0;
@@ -81,7 +86,12 @@ class Order extends BaseController {
 	 */
 	public function simple(Request $request, OrderService $service){
 		try {
-			$this->data['data'] = $service->simpleCreate($request);
+			$this->data['data'] = $order = $service->simpleCreate($request);
+
+			if(($order->amount - $order->polymer_money) == 0 ){
+				app(OrderService::class)->paySuccess($order->order_no);
+				$this->data['code'] =9999;
+			}
 		} catch (\Throwable $th) {
 			$this->data['code'] = 0;
 			$this->data['message'] = $th->getMessage();

modules/Store/app/Controllers/Api/Payment.php

@@ -42,7 +42,12 @@ class Payment extends BaseController {
 				'amount.required' => '请输入金额',
 				'integral.required' => '请输入积分',
 			]);
-			$this->data['data'] = $service->create(store_id: $request->input('store_id'), amount: $request->input('amount'), integral: $request->input('integral'), polymer_money: $request->input('polymer_money'),pay_way: $request->input('pay_way'),remark: $request->input('remark'));
+			$this->data['data'] = $payment =$service->create(store_id: $request->input('store_id'), amount: $request->input('amount'), integral: $request->input('integral'), polymer_money: $request->input('polymer_money'),pay_way: $request->input('pay_way'),remark: $request->input('remark'));
+
+			if($payment->amount == 0){//聚物通支付完成
+				app(PaymentService::class)->paySuccess($payment->order_no, null);
+				$this->data['code'] =9999;
+			}
 		} catch (\Throwable $e) {
 			$this->data['code'] = 0;
 			$this->data['message']  = $e->getMessage();

modules/Store/app/Services/PaymentService.php

@@ -76,10 +76,6 @@ class PaymentService {
 		}
 
 		$payment->save();
-
-		if($pay_way == "polymer_money" && $payment->amount == 0){//聚物通支付完成
-			app(PaymentService::class)->paySuccess($payment->order_no, null);
-		}
 		return $payment;
 	}
 
@@ -114,11 +110,11 @@ class PaymentService {
 		if($payment && $payment->status == 0){
 
 			if($payment->integral > 0){//扣除积分
-				app(\Modules\Member\Services\ScoreService::class)->createScore(store_id: $item->store_id, order_id: $item->id, member_id: $order->member['uid'], type: 'pay', account_type: 'order', amount: $item->total_integral, remark: '订单支付');
+				app(\Modules\Member\Services\ScoreService::class)->createScore(store_id: $item->store_id, order_id: $item->id, member_id: $order->member['uid'], type: 'pay', account_type: 'payment', amount: $item->total_integral, remark: '订单支付');
 			}
 
 			if($payment->polymer_money > 0){//扣除聚物通资金
-				app(\Modules\Member\Services\PolymerService::class)->createPolymer(store_id: $payment->store_id, order_id: $payment->id, member_id: $payment->member['uid'], type: 'pay', account_type: 'order', amount: $payment->polymer_money, remark: '店铺支付');
+				app(\Modules\Member\Services\PolymerService::class)->createPolymer(store_id: $payment->store_id, order_id: $payment->id, member_id: $payment->member['uid'], type: 'pay', account_type: 'payment', amount: $payment->polymer_money, remark: '店铺支付');
 			}
 
 			$res = app(\Modules\Wechat\Services\PayService::class)->orderQuery($order_no);
@@ -130,6 +126,10 @@ class PaymentService {
 
 				// app(ShippingService::class)->pushShipping($order_no, $payment->member_id, '店铺内付款支付');
 				\Modules\Store\Events\PaySuccess::dispatch($payment);
+			}else if($payment->amount == 0){
+				$payment->payment_status = 1;
+				$payment->payment_time = date('Y-m-d H:i:s');
+				$payment->save();
 			}
 		}
 	}