Explorar o código

shopro接口注释

lizhen_gitee hai 3 meses
pai
achega
9ca0f32458

+ 8 - 3
addons/shopro/controller/Pay.php

@@ -32,8 +32,8 @@ class Pay extends Common
         $order_sn = $this->request->post('order_sn');
         $payment = $this->request->post('payment');
         $openid = $this->request->post('openid', '');
-        $money = $this->request->post('money', 0);
-        $money = $money > 0 ? $money : 0;
+        /*$money = $this->request->post('money', 0);
+        $money = $money > 0 ? $money : 0;*/
         $platform = $this->request->post('platform');
 
         list($order, $order_type) = $this->getOrderInstance($order_sn);
@@ -62,6 +62,7 @@ class Pay extends Common
         // pay 实例
         $payOper = new PayOper();
 
+        $money = false;
         if ($money && $order_type == 'order') {
             // 余额混合支付
             $order = Db::transaction(function () use ($payOper, $order, $order_type, $money) {
@@ -117,7 +118,7 @@ class Pay extends Common
             $this->success('订单支付成功', $order);
         }
 
-        // 微信支付宝(第三方)付款
+        // 微信支付宝(第三方)付款, 在这里执行了addPay
         $payModel = $payOper->{$payment}($order, $order->remain_pay_fee, $order_type);
 
         $order_data = [
@@ -155,6 +156,10 @@ class Pay extends Common
             $order_data['subject'] = '商城订单支付';
         }
 
+        //加这个主要是因为退款时,找不到值
+        $order->platform = $platform;
+        $order->save();
+
         //下单
         $params = [
             'type'         => $payment,

+ 5 - 4
addons/shopro/controller/order/Order.php

@@ -163,7 +163,7 @@ class Order extends Common
 
 
 
-    // 取消订单
+    // 取消订单,未支付的才可以
     public function cancel()
     {
         $user = auth_user();
@@ -188,8 +188,8 @@ class Order extends Common
     }
 
 
-    // 订单申请全额退款
-    public function applyRefund() 
+    // 订单申请全额退款,支付的且未发货的才可以
+    public function applyRefund()
     {
         $user = auth_user();
         $id = $this->request->param('id');
@@ -208,7 +208,8 @@ class Order extends Common
 
         $order = OrderModel::with(['items', 'invoice'])->find($id);
         $order = $order->setOrderItemStatusByOrder($order);     // 这里订单转 数组了
-        $this->success('申请成功', $order);
+//        $this->success('申请成功', $order);
+        $this->success('申请成功');
     }
 
     // 确认收货(货到付款的确认收货在后台)

+ 1 - 1
addons/shopro/job/OrderPaid.php

@@ -55,7 +55,7 @@ class OrderPaid extends BaseJob
                     
                     // 触发订单支付完成事件
                     $data = ['order' => $order, 'user' => $user];
-                    \think\Hook::listen('order_paid_after', $data);
+                    \think\Hook::listen('order_paid_after', $data);//orderPaidAfter
                 });
             }
 

+ 1 - 1
addons/shopro/library/pay/provider/Alipay.php

@@ -35,7 +35,7 @@ class Alipay extends Base
         } 
 
         $method = $this->getMethod('alipay');
-        $result = Pay::alipay()->$method($order);
+        $result = Pay::alipay()->$method($order);//Pay::alipay()->app($order);
 
         return $result;
     }

+ 3 - 0
addons/shopro/listener/Order.php

@@ -185,6 +185,7 @@ class Order
         $orderDispatch = new OrderDispatch(['order_id' => $order->id]);
         $orderDispatch->checkDispatchAndSend();
 
+        //新订单通知
         $this->newOrderNotify($order, $user);
     }
 
@@ -199,6 +200,7 @@ class Order
         $order = $params['order'];
         $user = $params['user'];
 
+        //新订单通知
         $this->newOrderNotify($order, $user);
     }
 
@@ -276,6 +278,7 @@ class Order
             ]);
         }
 
+        //找到有权限处理退款的一个管理员,给他发消息提醒
         $admins = collection(Admin::select())->filter(function ($admin) {
             return $admin->hasAccess($admin, [      // 订单详情权限,订单拒绝全额退款,全额退款
                 'shopro/order/order/detail',

+ 1 - 0
addons/shopro/service/StockSale.php

@@ -199,6 +199,7 @@ class StockSale
                 $this->checkStockWarning($skuPrice);
             }
 
+            //活动规格|积分商城规格
             if ($item->item_goods_sku_price_id) {
                 if ($order['type'] == 'score') {
                     // 积分商城商品,扣除积分规格库存

+ 1 - 1
addons/shopro/service/order/OrderOper.php

@@ -101,7 +101,7 @@ class OrderOper
 
         Action::add($order, null, $user, $type, $this->getOperText($type) . '申请全额退款');
 
-        // 订单申请全额退款
+        // 订单申请全额退款  orderApplyRefundAfter
         $data = ['order' => $order, 'user' => $user];
         \think\Hook::listen('order_apply_refund_after', $data);
 

+ 6 - 3
addons/shopro/service/order/OrderRefund.php

@@ -91,20 +91,23 @@ class OrderRefund
 
             // 订单商品退款后
             $eventData = ['order' => $this->order, 'item' => $item];
-            \think\Hook::listen('order_item_refund_after', $eventData);
+            \think\Hook::listen('order_item_refund_after', $eventData);//orderItemRefundAfter ,就只是更新一下退款时间
         }
         
-        // 退回已支付的所有金额(积分,余额等)
+        // 退回已支付的所有金额(积分,余额,在线支付原路返回等)
         $this->refundAllPays($data);
 
         // 订单商品退款后
+        //1 将开票申请取消,
+        //2 扣除退款金额的累计消费金额,
+        //3 通知用户
         $eventData = [
             'order' => $this->order, 
             'items' => $items, 
             'refund_type' => $data['refund_type'] ?? $this->default_refund_type,
             'refund_method' => 'full_refund'
         ];
-        \think\Hook::listen('order_refund_after', $eventData);
+        \think\Hook::listen('order_refund_after', $eventData);//orderRefundAfter
     }
 
 

+ 1 - 0
addons/shopro/service/pay/PayOper.php

@@ -255,6 +255,7 @@ class PayOper
                     // 在控制器执行后续内容,这里不再处理
                     return $order;
                 } else {
+                    //大部分正常订单的流程
                     Action::add($order, null, $user, 'user', '用户支付成功');
                     // 支付成功后续使用异步队列处理
                     \think\Queue::push('\addons\shopro\job\OrderPaid@paid', ['order' => $order, 'user' => $user], 'shopro-high');

+ 1 - 1
addons/shopro/service/pay/PayRefund.php

@@ -154,7 +154,7 @@ class PayRefund
             'order_type' => $pay->order_type,
         ]);
 
-        $refund = $this->completed($refund);
+        $refund = $this->completed($refund);//只是改状态
 
         return $refund;
     }

+ 5 - 5
application/admin/model/shopro/order/Order.php

@@ -47,11 +47,11 @@ class Order extends Common
     const STATUS_COMPLETED = 'completed';
     const STATUS_PENDING = 'pending';       // 待定 后付款
 
-
-    const APPLY_REFUND_STATUS_NOAPPLY = 0;
-    const APPLY_REFUND_STATUS_APPLY = 1;
-    const APPLY_REFUND_STATUS_FINISH = 2;
-    const APPLY_REFUND_STATUS_REFUSE = -1;
+    //申请退款状态
+    const APPLY_REFUND_STATUS_NOAPPLY = 0;  //默认未申请
+    const APPLY_REFUND_STATUS_APPLY = 1;    //已申请
+    const APPLY_REFUND_STATUS_FINISH = 2;   //已同意
+    const APPLY_REFUND_STATUS_REFUSE = -1;  //已拒绝
 
 
     public function statusList()

+ 15 - 9
application/api/controller/Demo.php

@@ -54,18 +54,24 @@ class Demo extends Api
     public function test1()
     {
         $a = [
-            '35' => [
-                'item_id' => 35,
+            '23' => [
+                'item_id' => 23,
                 'level' => 5,
-                'content' => '很好',
-                'images' => '/1.jpg',
+                'content' => '很好23',
+                'images' => [
+                    '/uploads/20241019/244017dc8c5a698037da7bab78da2d34.png',
+                    '/uploads/20241019/244017dc8c5a698037da7bab78da2d34.png'
+                ],
             ],
-            /*'2' => [
-                'item_id' => 2,
+            '24' => [
+                'item_id' => 24,
                 'level' => 4,
-                'content' => '很好',
-                'images' => '21.jpg',
-            ],*/
+                'content' => '很好24',
+                'images' => [
+                    '/uploads/20241019/244017dc8c5a698037da7bab78da2d34.png',
+                    '/uploads/20241019/244017dc8c5a698037da7bab78da2d34.png'
+                ],
+            ],
 
         ];
         dump(json_encode($a));