From 3f8e88bff186069b329c676101adcf86a3eeb958 Mon Sep 17 00:00:00 2001
From: liu <1873441552@qq.com>
Date: Sat, 22 Jun 2024 18:27:58 +0800
Subject: [PATCH] =?UTF-8?q?=E9=99=90=E5=88=B6=E7=8E=B0=E9=87=91=E6=94=AF?=
 =?UTF-8?q?=E4=BB=98=E7=9B=B8=E5=85=B3=E5=A4=84=E7=90=86=E5=92=8C=E6=9C=AA?=
 =?UTF-8?q?=E6=A0=B8=E9=94=80=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/logic/user/UserLogic.php                 | 4 ++++
 app/common/logic/store_order/StoreOrderLogic.php | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/app/api/logic/user/UserLogic.php b/app/api/logic/user/UserLogic.php
index 7d789ab6e..65d300c19 100644
--- a/app/api/logic/user/UserLogic.php
+++ b/app/api/logic/user/UserLogic.php
@@ -99,6 +99,10 @@ class UserLogic extends BaseLogic
             $data['return_money'] = Db::name('vip_flow')->
                     where(['user_id'=>$uid,'status'=>0])
                     ->sum('number');
+            //小程序 未核销的订单
+            $data['no_writeoff'] = StoreOrder::where([
+                'is_writeoff'=>0,'uid'=>$uid
+            ])->whereIn('shipping_type',[1,2])->count();
 
         }else{
             $data = [];
diff --git a/app/common/logic/store_order/StoreOrderLogic.php b/app/common/logic/store_order/StoreOrderLogic.php
index 71277f06e..ee40f3342 100644
--- a/app/common/logic/store_order/StoreOrderLogic.php
+++ b/app/common/logic/store_order/StoreOrderLogic.php
@@ -119,6 +119,10 @@ class StoreOrderLogic extends BaseLogic
                 $pay_price =bcsub(self::$pay_price, self::$activity_price, 2); //减去活动优惠金额
                 $activity_string = '减免';
             }
+            if($pay_type == 19){
+                $pay_price = self::$pay_price;
+                $activity_string = '';
+            }
 
 //            if($pay_price < 500){
 //                throw new \think\Exception('金额低于500');