From d9a0c0049ba86bf7135f7f7a768e4ffa5b7a6c41 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Tue, 23 Jan 2024 17:31:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/api/Demo.php                   | 88 +++++++++----------
 .../api/store/order/StoreProcessing.php       |  4 +-
 2 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/app/controller/api/Demo.php b/app/controller/api/Demo.php
index a3c0401f..68b95bae 100644
--- a/app/controller/api/Demo.php
+++ b/app/controller/api/Demo.php
@@ -50,75 +50,75 @@ class Demo extends BaseController
         //     //    Queue::push(ProductCopyJob::class, ['product_id' => $item['product_id']]);//短信通知
 
         // }
-            $arr=[
-                ['product_id'=>171650,],
-                ['product_id'=>171649,],
-                ['product_id'=>171648,],
-                ['product_id'=>171647],
-            ];
-        $mer_id=167;//导入到的商户
-        $street_code=510521107;//导入到的商户
-        $type_id=17;//导入到的商户分类
-        $category_id=2566;//导入到的商户分类
-        foreach($arr as $k=>$v){
-            Queue::push(ProductCopyJob::class, ['product_id' => $v['product_id'], 'mer_id' =>$mer_id,'street_code'=>$street_code,'type_id'=>$type_id,'category_id'=>$category_id]);//短信通知
+        $arr = [
+            ['product_id' => 171650,],
+            ['product_id' => 171649,],
+            ['product_id' => 171648,],
+            ['product_id' => 171647],
+        ];
+        $mer_id = 167; //导入到的商户
+        $street_code = 510521107; //导入到的商户
+        $type_id = 17; //导入到的商户分类
+        $category_id = 2566; //导入到的商户分类
+        foreach ($arr as $k => $v) {
+            Queue::push(ProductCopyJob::class, ['product_id' => $v['product_id'], 'mer_id' => $mer_id, 'street_code' => $street_code, 'type_id' => $type_id, 'category_id' => $category_id]); //短信通知
         }
 
 
-        $mer_id=236;//导入到的商户
-        $street_code=510521123;//导入到的商户
-        foreach($arr as $k=>$v){
-            Queue::push(ProductCopyJob::class, ['product_id' => $v['product_id'], 'mer_id' =>$mer_id,'street_code'=>$street_code,'type_id'=>$type_id,'category_id'=>$category_id]);//短信通知
+        $mer_id = 236; //导入到的商户
+        $street_code = 510521123; //导入到的商户
+        foreach ($arr as $k => $v) {
+            Queue::push(ProductCopyJob::class, ['product_id' => $v['product_id'], 'mer_id' => $mer_id, 'street_code' => $street_code, 'type_id' => $type_id, 'category_id' => $category_id]); //短信通知
         }
 
-        $mer_id=237;//导入到的商户
-        $street_code=510521115;//导入到的商户
+        $mer_id = 237; //导入到的商户
+        $street_code = 510521115; //导入到的商户
 
-        foreach($arr as $k=>$v){
-            Queue::push(ProductCopyJob::class, ['product_id' => $v['product_id'], 'mer_id' =>$mer_id,'street_code'=>$street_code,'type_id'=>$type_id,'category_id'=>$category_id]);//短信通知
+        foreach ($arr as $k => $v) {
+            Queue::push(ProductCopyJob::class, ['product_id' => $v['product_id'], 'mer_id' => $mer_id, 'street_code' => $street_code, 'type_id' => $type_id, 'category_id' => $category_id]); //短信通知
         }
 
-        $mer_id=238;//导入到的商户
-        $street_code=510521105;//导入到的商户
+        $mer_id = 238; //导入到的商户
+        $street_code = 510521105; //导入到的商户
 
-        foreach($arr as $k=>$v){
-            Queue::push(ProductCopyJob::class, ['product_id' => $v['product_id'], 'mer_id' =>$mer_id,'street_code'=>$street_code,'type_id'=>$type_id,'category_id'=>$category_id]);//短信通知
+        foreach ($arr as $k => $v) {
+            Queue::push(ProductCopyJob::class, ['product_id' => $v['product_id'], 'mer_id' => $mer_id, 'street_code' => $street_code, 'type_id' => $type_id, 'category_id' => $category_id]); //短信通知
         }
 
-        $mer_id=239;//导入到的商户
-        $street_code=510521116;//导入到的商户
+        $mer_id = 239; //导入到的商户
+        $street_code = 510521116; //导入到的商户
 
-        foreach($arr as $k=>$v){
-            Queue::push(ProductCopyJob::class, ['product_id' => $v['product_id'], 'mer_id' =>$mer_id,'street_code'=>$street_code,'type_id'=>$type_id,'category_id'=>$category_id]);//短信通知
+        foreach ($arr as $k => $v) {
+            Queue::push(ProductCopyJob::class, ['product_id' => $v['product_id'], 'mer_id' => $mer_id, 'street_code' => $street_code, 'type_id' => $type_id, 'category_id' => $category_id]); //短信通知
         }
 
         //江阳
-        $mer_id=31;//导入到的商户
-        $street_code=510502108;//导入到的商户
+        $mer_id = 31; //导入到的商户
+        $street_code = 510502108; //导入到的商户
 
-        foreach($arr as $k=>$v){
-            Queue::push(ProductCopyJob::class, ['product_id' => $v['product_id'], 'mer_id' =>$mer_id,'street_code'=>$street_code,'type_id'=>$type_id,'category_id'=>$category_id]);//短信通知
+        foreach ($arr as $k => $v) {
+            Queue::push(ProductCopyJob::class, ['product_id' => $v['product_id'], 'mer_id' => $mer_id, 'street_code' => $street_code, 'type_id' => $type_id, 'category_id' => $category_id]); //短信通知
         }
 
-        $mer_id=32;//导入到的商户
-        $street_code=510502107;//导入到的商户
+        $mer_id = 32; //导入到的商户
+        $street_code = 510502107; //导入到的商户
 
-        foreach($arr as $k=>$v){
-            Queue::push(ProductCopyJob::class, ['product_id' => $v['product_id'], 'mer_id' =>$mer_id,'street_code'=>$street_code,'type_id'=>$type_id,'category_id'=>$category_id]);//短信通知
+        foreach ($arr as $k => $v) {
+            Queue::push(ProductCopyJob::class, ['product_id' => $v['product_id'], 'mer_id' => $mer_id, 'street_code' => $street_code, 'type_id' => $type_id, 'category_id' => $category_id]); //短信通知
         }
 
-        $mer_id=118;//导入到的商户
-        $street_code=510502106;//导入到的商户
+        $mer_id = 118; //导入到的商户
+        $street_code = 510502106; //导入到的商户
 
-        foreach($arr as $k=>$v){
-            Queue::push(ProductCopyJob::class, ['product_id' => $v['product_id'], 'mer_id' =>$mer_id,'street_code'=>$street_code,'type_id'=>$type_id,'category_id'=>$category_id]);//短信通知
+        foreach ($arr as $k => $v) {
+            Queue::push(ProductCopyJob::class, ['product_id' => $v['product_id'], 'mer_id' => $mer_id, 'street_code' => $street_code, 'type_id' => $type_id, 'category_id' => $category_id]); //短信通知
         }
 
-        $mer_id=39;//导入到的商户
-        $street_code=510502105;//导入到的商户
+        $mer_id = 39; //导入到的商户
+        $street_code = 510502105; //导入到的商户
 
-        foreach($arr as $k=>$v){
-            Queue::push(ProductCopyJob::class, ['product_id' => $v['product_id'], 'mer_id' =>$mer_id,'street_code'=>$street_code,'type_id'=>$type_id,'category_id'=>$category_id]);//短信通知
+        foreach ($arr as $k => $v) {
+            Queue::push(ProductCopyJob::class, ['product_id' => $v['product_id'], 'mer_id' => $mer_id, 'street_code' => $street_code, 'type_id' => $type_id, 'category_id' => $category_id]); //短信通知
         }
     }
 
diff --git a/app/controller/api/store/order/StoreProcessing.php b/app/controller/api/store/order/StoreProcessing.php
index fa4c0c37..66c7a46b 100644
--- a/app/controller/api/store/order/StoreProcessing.php
+++ b/app/controller/api/store/order/StoreProcessing.php
@@ -66,8 +66,8 @@ class StoreProcessing extends BaseController
             //     'mer_id' => $order['mer_id'],
             //     'financial_record_sn' => $financeSn . '2'
             // ];
-            unset($order['order_id'], $order['orderProduct'], $order['user'], $order['supply_chain_rate'], $order['logistics_code'], $order['logistics_phone']);
-            $order_id = Db::name('store_order_other')->insertGetId($order);
+            unset($order['order_id'], $order['orderProduct'], $order['user'], $order['supply_chain_rate'], $order['logistics_code'], $order['logistics_phone'],$order['consumption_money']);
+            $order_id = Db::name('store_order_other')->strict(false)->insertGetId($order);
 
             foreach ($arr as $key => $value) {
                 $arr[$key]['order_id'] = $order_id;