From 2d0dcf8a4be1191ae7bf3cc285902ed166190c45 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Tue, 25 Jun 2024 14:08:10 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E4=BA=A7=E5=93=81?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=8F=82=E6=95=B0=E5=88=B0=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E5=AD=98=E5=82=A8=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/logic/store_product/StoreProductLogic.php | 2 +-
 app/api/controller/IndexController.php              | 6 +++++-
 app/queue/redis/StoreStorageSend.php                | 1 +
 app/statistics/controller/IndexController.php       | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/admin/logic/store_product/StoreProductLogic.php b/app/admin/logic/store_product/StoreProductLogic.php
index 8cdfb894c..bcecea565 100644
--- a/app/admin/logic/store_product/StoreProductLogic.php
+++ b/app/admin/logic/store_product/StoreProductLogic.php
@@ -53,6 +53,7 @@ class StoreProductLogic extends BaseLogic
                 'manufacturer_information' => $params['manufacturer_information']??'',
                 'swap' => $params['swap'] ?? 0,
                 'batch' => $params['batch'] ?? 0,
+                'product_type' => $params['product_type'] ?? 0,
             ];
             // if ($params['rose'] > 0) {
             //     $rose_price = bcmul($params['cost'], $params['rose'], 2);
@@ -154,7 +155,6 @@ class StoreProductLogic extends BaseLogic
                 'batch' => $params['batch'],
                 'manufacturer_information' => $params['manufacturer_information']??'',
                 'swap' => $params['swap'] ?? 0,
-
             ];
 
             StoreProduct::where('id', $params['id'])->update($data);
diff --git a/app/api/controller/IndexController.php b/app/api/controller/IndexController.php
index 415e8f76c..e7cd97861 100644
--- a/app/api/controller/IndexController.php
+++ b/app/api/controller/IndexController.php
@@ -10,6 +10,7 @@ use app\common\model\Config as ModelConfig;
 use app\common\model\store_branch_product\StoreBranchProduct;
 use app\common\model\system_store\SystemStore;
 use app\common\service\pay\PayService;
+use app\common\service\PushService;
 use app\common\service\wechat\WechatTemplate;
 use Exception;
 use support\Cache;
@@ -28,7 +29,10 @@ class IndexController extends BaseApiController
 
     public function index()
     {
-d(2);
+        $uid=9;
+      $a=  PushService::push('wechat_mmp_'.$uid, $uid, ['type'=>'INDUSTRYMEMBERS','msg'=>'支付超时,订单已被取消,请重新提交订单','data'=>['id'=>5]]);
+
+return json($a);
 
 
 
diff --git a/app/queue/redis/StoreStorageSend.php b/app/queue/redis/StoreStorageSend.php
index 33b263814..02e7eefe6 100644
--- a/app/queue/redis/StoreStorageSend.php
+++ b/app/queue/redis/StoreStorageSend.php
@@ -64,6 +64,7 @@ class StoreStorageSend implements Consumer
                     'batch' => $find['batch'],
                     'store_id' => $store_id,
                     'sales' => 0,
+                    'product_type' => $find['product_type'],
                     'stock' => 0,
                 ];
                 $branch = StoreBranchProduct::create($product);
diff --git a/app/statistics/controller/IndexController.php b/app/statistics/controller/IndexController.php
index e6f2ed0f4..2e0099062 100644
--- a/app/statistics/controller/IndexController.php
+++ b/app/statistics/controller/IndexController.php
@@ -12,7 +12,7 @@ use DateTime;
 class IndexController extends BaseLikeController
 {
 
-    public $store_id=3;
+    public $store_id=0;
 
     public function index()
     {