From cffa2badfedf655853cc8124aa3f8e2557a57fc7 Mon Sep 17 00:00:00 2001
From: liqianjin <949671634@qq.com>
Date: Tue, 22 Oct 2024 10:53:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A7=AF=E5=88=86=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E5=92=8C=E6=94=AF=E4=BB=98=E7=AD=89=E7=BA=A7=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/controller/Ordercreate.php |  1 -
 app/model/order/OrderCreate.php    | 11 +++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/api/controller/Ordercreate.php b/app/api/controller/Ordercreate.php
index 5b58114..ac46046 100644
--- a/app/api/controller/Ordercreate.php
+++ b/app/api/controller/Ordercreate.php
@@ -185,7 +185,6 @@ class Ordercreate extends BaseApi
         if (empty($data[ 'cart_ids' ]) && empty($data[ 'sku_id' ])) return $this->response($this->error('', '缺少必填参数商品数据'));
         if ($data[ 'buyer_ask_delivery_time' ]) $data[ 'buyer_ask_delivery_time' ] = strtotime($data[ "buyer_ask_delivery_time" ]);
 
-
         $res = $order_create->calculate($data);
         return $this->response($this->success($res));
     }
diff --git a/app/model/order/OrderCreate.php b/app/model/order/OrderCreate.php
index 191161e..e0cb613 100644
--- a/app/model/order/OrderCreate.php
+++ b/app/model/order/OrderCreate.php
@@ -505,7 +505,7 @@ class OrderCreate extends BaseModel
         $join = [
             ['fenxiao_level l', 'f.level_id = l.level_id', 'right']
         ];
-        $fenxiao_info = model('fenxiao')->getInfo([['f.member_id','=',68]],'f.fenxiao_id,f.level_id,l.level_num','f',$join);
+        $fenxiao_info = model('fenxiao')->getInfo([['f.member_id','=',$data['member_id']]],'f.fenxiao_id,f.level_id,l.level_num','f',$join);
 
         if((!$fenxiao_info || $fenxiao_info['level_num'] === 0) && $search !== false){
             return $this->error(1, "请升级为会员再进货");
@@ -1113,10 +1113,12 @@ class OrderCreate extends BaseModel
                 }
             }
         }
+
         //满额包邮插件
         $shop_goods = $this->freeShippingCalculate($shop_goods, $data);
         //会员等级包邮权益
         $shop_goods = $this->memberLevelCalculate($shop_goods, $data);
+
         //是否符合免邮
         $is_free_delivery = $shop_goods['is_free_delivery'] ?? false;
         if ($is_free_delivery) {
@@ -1128,14 +1130,18 @@ class OrderCreate extends BaseModel
         $shop_goods['order_money'] = $order_money; //订单总金额
         //优惠券活动(采用站点id:coupon_id)
         $shop_goods = $this->couponPromotion($shop_goods, $data);
+
         $coupon_money = $shop_goods['coupon_money'] ?? 0;
         $order_money = $shop_goods['order_money'];
 
         // 积分抵现
         $shop_goods['max_usable_point'] = 0;
         $point_money = 0;
+
         if ($data['member_account']['point'] > 0 && addon_is_exit('pointcash', $site_id)) {
+
             $shop_goods = $this->getMaxUsablePoint($shop_goods, $data);
+
             $point_money = $shop_goods['point_money'] ?? 0;
             $order_money = $shop_goods['order_money'];
         }
@@ -1843,7 +1849,8 @@ class OrderCreate extends BaseModel
             $max_point = round($deduction_money * $config['cash_rate']);
             $point = $max_point > $data['member_account']['point'] ? $data['member_account']['point'] : $max_point;
         }
-        if ($data['is_point'] && $point > 0) {
+
+        if ($point > 0) {
             $point_money = round(($point * (1 / $config['cash_rate'])), 2);
             if ($point_money > $order_money) {
                 $point_money = $order_money;