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');