wesmiler 2 månader sedan
förälder
incheckning
56da87cfc2
2 ändrade filer med 2 tillägg och 3 borttagningar
  1. 1 2
      app/Services/Api/GoodsService.php
  2. 1 1
      app/Services/Api/OrderService.php

+ 1 - 2
app/Services/Api/GoodsService.php

@@ -222,10 +222,9 @@ class GoodsService extends BaseService
      * @param $orderNo 订单号
      * @param $orderNo 订单号
      * @return array|false
      * @return array|false
      */
      */
-    public function getOrderGoods($ids, $goods, $userId, $orderNo='')
+    public function getOrderGoods($ids, $goods, $userId, $orderNo='', $discountPoint=0)
     {
     {
         // 用户信息
         // 用户信息
-        $discountPoint = 0;
         if(empty($orderNo)){
         if(empty($orderNo)){
             $userInfo = MemberModel::where(['id' => $userId, 'mark' => 1])
             $userInfo = MemberModel::where(['id' => $userId, 'mark' => 1])
                 ->select(['id','openid', 'discount_point', 'status'])
                 ->select(['id','openid', 'discount_point', 'status'])

+ 1 - 1
app/Services/Api/OrderService.php

@@ -227,7 +227,7 @@ class OrderService extends BaseService
 
 
         // 商品数据
         // 商品数据
         $orderNo = get_order_num('JK');
         $orderNo = get_order_num('JK');
-        $result = GoodsService::make()->getOrderGoods($ids, $goods, $userId, $orderNo);
+        $result = GoodsService::make()->getOrderGoods($ids, $goods, $userId, $orderNo,$discountPoint);
         if (empty($result)) {
         if (empty($result)) {
             RedisService::clear($cacheLockKey);
             RedisService::clear($cacheLockKey);
             $this->error = GoodsService::make()->getError();
             $this->error = GoodsService::make()->getError();