Kirin 3 年之前
父节点
当前提交
38a093f188
共有 2 个文件被更改,包括 7 次插入7 次删除
  1. 2 2
      app/api/controller/PublicController.php
  2. 5 5
      app/models/store/StoreOrder.php

+ 2 - 2
app/api/controller/PublicController.php

@@ -45,8 +45,8 @@ class PublicController
         var_dump(count($order));
         try {
             foreach ($order as $v) {
-                $res = MiniProgramService::profit_sharing_finish($v['transaction_id'], $v['order_id']);
-//                $res = MiniProgramService::profit_sharing_query($v['transaction_id'], $res['order_id']);
+                $res = MiniProgramService::profit_sharing_finish($v['transaction_id'], 'over_' . $v['order_id']);
+//                $res = MiniProgramService::profit_sharing_query($v['transaction_id'], $v['order_id']);
                 var_dump($res);
 //                exit;
             }

+ 5 - 5
app/models/store/StoreOrder.php

@@ -2272,19 +2272,19 @@ class StoreOrder extends BaseModel
         if (!$order['transaction_id']) return true;
         $store = SystemStore::get($order['store_id']);
         if (!$store) {
-            MiniProgramService::profit_sharing_finish($order['transaction_id'], $order['order_id']);
+            MiniProgramService::profit_sharing_finish($order['transaction_id'], 'over_' . $order['order_id']);
             return true;
         }
         $store_leader = SystemAdmin::where('roles', sys_config('default_store_admin', 7))
             ->where('store_id', $store['id'])->where('is_del', 0)->where('status', 1)
             ->find();
         if (!$store_leader) {
-            MiniProgramService::profit_sharing_finish($order['transaction_id'], $order['order_id']);
+            MiniProgramService::profit_sharing_finish($order['transaction_id'], 'over_' . $order['order_id']);
             return true;
         }
         $user = User::where('admin_id', $store_leader['id'])->find();
         if (!$user) {
-            MiniProgramService::profit_sharing_finish($order['transaction_id'], $order['order_id']);
+            MiniProgramService::profit_sharing_finish($order['transaction_id'], 'over_' . $order['order_id']);
             return true;
         }
         $p_user_info = WechatUser::get($user['uid']);
@@ -2299,7 +2299,7 @@ class StoreOrder extends BaseModel
         $p_separate_account_amount = floor($p_amount * 100); // 发起人分账金额,以分为单位
 
         if ($p_separate_account_amount <= 0) {
-            MiniProgramService::profit_sharing_finish($order['transaction_id'], $order['order_id']);
+            MiniProgramService::profit_sharing_finish($order['transaction_id'], 'over_' . $order['order_id']);
             return true;
         }
 
@@ -2338,7 +2338,7 @@ class StoreOrder extends BaseModel
                     $value->save();
                 }
             }
-            MiniProgramService::profit_sharing_finish($order['transaction_id'], $order['order_id']);
+            MiniProgramService::profit_sharing_finish($order['transaction_id'], 'over_' . $order['order_id']);
         }
         return true;
     }