From 0d2318d86f1d2616199480226add13082c505d70 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Wed, 29 May 2024 15:46:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81=E7=BB=93?= =?UTF-8?q?=E6=9E=84=EF=BC=8C=E4=BF=AE=E6=AD=A3=E8=AF=AD=E6=B3=95=E9=94=99?= =?UTF-8?q?=E8=AF=AF=EF=BC=8C=E6=9B=B4=E6=96=B0=E6=95=B0=E6=8D=AE=E9=80=BB?= =?UTF-8?q?=E8=BE=91=EF=BC=8C=E6=B7=BB=E5=8A=A0=E8=AE=A2=E5=8D=95=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operation/OpurchaseclassofferAllLists.php | 2 +- .../logic/operation/OpurchaseclassLogic.php | 19 +++++++++---------- app/admin/logic/supplier/SupplierLogic.php | 8 ++++++-- app/common/logic/PayNotifyLogic.php | 3 +++ 4 files changed, 19 insertions(+), 13 deletions(-) diff --git a/app/admin/lists/operation/OpurchaseclassofferAllLists.php b/app/admin/lists/operation/OpurchaseclassofferAllLists.php index b4d7f9d..7b01099 100644 --- a/app/admin/lists/operation/OpurchaseclassofferAllLists.php +++ b/app/admin/lists/operation/OpurchaseclassofferAllLists.php @@ -29,7 +29,7 @@ class OpurchaseclassofferAllLists extends BaseAdminDataLists implements ListsSea public function setSearch(): array { return [ - '=' => ['is_adopt', 'is_storage', 'is_retrieval'], + '=' => ['is_adopt', 'is_storage', 'is_stream'], 'between_time' => 'create_time' ]; } diff --git a/app/admin/logic/operation/OpurchaseclassLogic.php b/app/admin/logic/operation/OpurchaseclassLogic.php index 55c4a9f..5a92f63 100644 --- a/app/admin/logic/operation/OpurchaseclassLogic.php +++ b/app/admin/logic/operation/OpurchaseclassLogic.php @@ -255,14 +255,14 @@ class OpurchaseclassLogic extends BaseLogic $find->notes = $notes; $find->before_nums = $find->nums; $find->nums = $nums; - $find->storage_admin_id=Request()->adminId; - $price=0; + $find->storage_admin_id = Request()->adminId; + $price = 0; if ($nums != 0) { $price = bcmul($find['price'], $nums, 2); Supplier::where('id', $find['supplier_id'])->inc('mer_money', $price)->update(); } - $number=Opurchaseclass::where('id',$find['order_id'])->value('number'); - $time=time(); + $number = Opurchaseclass::where('id', $find['order_id'])->value('number'); + $time = time(); //供应链获得流水 $record = [ 'financial_record_sn' => $time, @@ -279,14 +279,13 @@ class OpurchaseclassLogic extends BaseLogic FinancialRecord::create($record); } $res = $find->save(); - $jg_register_id = Db::name('user_auth_shop')->where('pid', $find['supplier_id'])->where('type',2)->value('jg_register_id'); - if($jg_register_id){ - $jg=(new JgPushService())->sendMsg($jg_register_id, '平台提醒：您的商品已被采纳,请尽快发货' , '/pages/quote/list'); - if($jg!==true){ + $jg_register_id = Db::name('user_auth_shop')->where('pid', $find['supplier_id'])->where('type', 2)->value('jg_register_id'); + if ($jg_register_id) { + $jg = (new JgPushService())->sendMsg($jg_register_id, '平台提醒：您的商品已被采纳,请尽快发货', '/pages/quote/list'); + if ($jg !== true) { Db::rollback(); - self::setError('设置成功。但极光推送失败:'.$jg); + self::setError('设置成功。但极光推送失败:' . $jg); return false; - } } if ($res) { diff --git a/app/admin/logic/supplier/SupplierLogic.php b/app/admin/logic/supplier/SupplierLogic.php index 01f8632..6177b5a 100644 --- a/app/admin/logic/supplier/SupplierLogic.php +++ b/app/admin/logic/supplier/SupplierLogic.php @@ -92,7 +92,11 @@ class SupplierLogic extends BaseLogic */ public static function status(array $params): bool { - $apply_info = Db::name('user_auth_shop')->where('id', $params['apply_id'])->findOrEmpty(); + $apply_info = Db::name('user_auth_shop')->where('id', $params['apply_id'])->find(); + if(!$apply_info){ + self::setError('商户中间数据不存在'); + return false; + } Db::startTrans(); try { if ($params['status'] == 1) { @@ -150,7 +154,7 @@ class SupplierLogic extends BaseLogic Supplier::where('id', $params['id'])->update([ 'status' => 0, ]); - Db::name('user_auth_shop')->where('id', $params['apply_id'])->update($data); + Db::name('user_auth_shop')->where('id', $apply_info['id'])->update($data); } if (!empty($apply_info['jg_register_id'])) { diff --git a/app/common/logic/PayNotifyLogic.php b/app/common/logic/PayNotifyLogic.php index c140e67..45eb18b 100644 --- a/app/common/logic/PayNotifyLogic.php +++ b/app/common/logic/PayNotifyLogic.php @@ -121,6 +121,7 @@ class PayNotifyLogic extends BaseLogic } else { PushService::push('store_merchant_' . $order['merchant'], $order['merchant'], ['type' => 'store_merchant', 'msg' => '您有一笔新的订单']); Redis::send('push-platform-print', ['order_id' => $order['id']], 60); + Db::name('order_middle')->insert(['c_order_id' =>$order['id']]); } if (!empty($extra['payer']['openid']) && $order->pay_type != 9) { Redis::send('push-delivery', ['order_id' => $orderSn, 'openid' => $extra['payer']['openid']], 5); @@ -135,6 +136,7 @@ class PayNotifyLogic extends BaseLogic $order = Opurchaseclass::where('number', $orderSn)->findOrEmpty(); $order_arr = explode(',', $order['order_arr']); (new FinancialRecord())->where('order_id', 'in', $order_arr)->update(['status' => 1]); + Db::name('order_middle')->where('c_order_id', 'in', $order_arr)->update(['b_order_id' => $order['id']]); $time = time(); //商户支出流水 $record[] = [ @@ -173,6 +175,7 @@ class PayNotifyLogic extends BaseLogic $order = Opurchaseclass::where('number', $orderSn)->findOrEmpty(); $order_arr = explode(',', $order['order_arr']); (new FinancialRecord())->where('order_id', 'in', $order_arr)->update(['status' => 1]); + Db::name('order_middle')->where('b_order_id', 'in', $order_arr)->update(['p_order_id' => $order['id']]); $time = time(); //平台支出流水 $record[] = [