Kirin 3 년 전
부모
커밋
399b3e44f0

+ 28 - 1
app/http/middleware/AuthTokenMiddleware.php

@@ -5,6 +5,7 @@ namespace app\http\middleware;
 
 
 use app\models\user\User;
+use app\models\user\UserSpread;
 use app\models\user\UserToken;
 use app\Request;
 use crmeb\exceptions\AuthException;
@@ -26,9 +27,35 @@ class AuthTokenMiddleware implements MiddlewareInterface
         $request->filter(['htmlspecialchars', 'strip_tags', 'addslashes', 'trim']);
         $authInfo = null;
         $token = trim(ltrim($request->header('Authori-zation'), 'Bearer'));
-        if(!$token)  $token = trim(ltrim($request->header('Authorization'), 'Bearer'));//正式版,删除此行,某些服务器无法获取到token调整为 Authori-zation
+        if (!$token) $token = trim(ltrim($request->header('Authorization'), 'Bearer'));//正式版,删除此行,某些服务器无法获取到token调整为 Authori-zation
         try {
             $authInfo = UserRepository::parseToken($token);
+            if (!is_null($authInfo)) {
+                $authInfo['user']['lock_spread_user'] = User::where('uid', $authInfo['user']->spread_uid)->field('nickname,phone,avatar')->find();
+                if (!$authInfo['user']['lock_spread_user']) {
+                    $spread_user = UserSpread::where('uid', $authInfo['user']->uid)->order('spread_time', 'desc')->find();
+                    if ($spread_user) {
+                        $sp = $spread_user['spread_uid'];
+                        $userlist = User::column('uid,spread_uid', 'uid');
+                        while ($sp) {
+                            if ($sp == $authInfo['user']->uid) {
+                                $spread_user['spread_uid'] = 0;
+                                break;
+                            }
+                            $sp = $userlist[$sp]['spread_uid'];
+                        }
+                        if (!$spread_user['spread_uid']) {
+                            $authInfo['user']['unlock_spread_user'] = null;
+                        } else {
+                            $authInfo['user']['unlock_spread_user'] = User::where('uid', $spread_user['spread_uid'])->field('nickname,phone,avatar')->find();
+                        }
+                    } else {
+                        $authInfo['user']['unlock_spread_user'] = null;
+                    }
+                } else {
+                    $authInfo['user']['unlock_spread_user'] = null;
+                }
+            }
         } catch (AuthException $e) {
             if ($force)
                 return app('json')->make($e->getCode(), $e->getMessage());

+ 6 - 6
app/models/store/StoreOrder.php

@@ -867,7 +867,7 @@ class StoreOrder extends BaseModel
                     $res = $res && $res1;
                     $sp_money = bcmul($every_money_real, bcdiv($area_recommend_ratio, 100, 4), 2);
                     if ($v['spread_uid'] && $sp_money > 0) {
-                        $sp = User::where('uid', $v['spread_uid']);
+                        $sp = User::where('uid', $v['spread_uid'])->find();
                         $balance = bcadd($sp['brokerage_price'], $sp_money, 2);
                         $mark = $userInfo['nickname'] . '成功消费[实物产品]' . floatval($order['pay_price']) . '元,推荐代理分红' . floatval($sp_money);
                         $res1 = UserBill::income('推荐代理分红', $sp['uid'], 'now_money', 'brokerage', $sp_money, $order['id'], $balance, $mark, 0);
@@ -882,7 +882,7 @@ class StoreOrder extends BaseModel
                     $res = $res && $res1 && $res2;
                     $sp_money = bcmul($every_money_virtual, bcdiv($area_recommend_ratio, 100, 4), 2);
                     if ($v['spread_uid'] && $sp_money > 0) {
-                        $sp = User::where('uid', $v['spread_uid']);
+                        $sp = User::where('uid', $v['spread_uid'])->find();
                         $balance = bcadd($sp['brokerage_price'], $sp_money, 2);
                         $mark = $userInfo['nickname'] . '成功消费[虚拟产品]' . floatval($order['pay_price']) . '元,推荐代理分红' . floatval($sp_money);
                         $res1 = UserBill::income('推荐代理分红', $sp['uid'], 'now_money', 'brokerage', $sp_money, $order['id'], $balance, $mark, 0);
@@ -908,7 +908,7 @@ class StoreOrder extends BaseModel
                     $res = $res && $res1;
                     $sp_money = bcmul($every_money_real, bcdiv($area_recommend_ratio, 100, 4), 2);
                     if ($v['spread_uid'] && $sp_money > 0) {
-                        $sp = User::where('uid', $v['spread_uid']);
+                        $sp = User::where('uid', $v['spread_uid'])->find();
                         $balance = bcadd($sp['brokerage_price'], $sp_money, 2);
                         $mark = $userInfo['nickname'] . '成功消费[实物产品]' . floatval($order['pay_price']) . '元,推荐代理分红' . floatval($sp_money);
                         $res1 = UserBill::income('推荐代理分红', $sp['uid'], 'now_money', 'brokerage', $sp_money, $order['id'], $balance, $mark, 0);
@@ -923,7 +923,7 @@ class StoreOrder extends BaseModel
                     $res = $res && $res1 && $res2;
                     $sp_money = bcmul($every_money_virtual, bcdiv($area_recommend_ratio, 100, 4), 2);
                     if ($v['spread_uid'] && $sp_money > 0) {
-                        $sp = User::where('uid', $v['spread_uid']);
+                        $sp = User::where('uid', $v['spread_uid'])->find();
                         $balance = bcadd($sp['brokerage_price'], $sp_money, 2);
                         $mark = $userInfo['nickname'] . '成功消费[虚拟产品]' . floatval($order['pay_price']) . '元,推荐代理分红' . floatval($sp_money);
                         $res1 = UserBill::income('推荐代理分红', $sp['uid'], 'now_money', 'brokerage', $sp_money, $order['id'], $balance, $mark, 0);
@@ -949,7 +949,7 @@ class StoreOrder extends BaseModel
                     $res = $res && $res1;
                     $sp_money = bcmul($every_money_real, bcdiv($area_recommend_ratio, 100, 4), 2);
                     if ($v['spread_uid'] && $sp_money > 0) {
-                        $sp = User::where('uid', $v['spread_uid']);
+                        $sp = User::where('uid', $v['spread_uid'])->find();
                         $balance = bcadd($sp['brokerage_price'], $sp_money, 2);
                         $mark = $userInfo['nickname'] . '成功消费[实物产品]' . floatval($order['pay_price']) . '元,推荐代理分红' . floatval($sp_money);
                         $res1 = UserBill::income('推荐代理分红', $sp['uid'], 'now_money', 'brokerage', $sp_money, $order['id'], $balance, $mark, 0);
@@ -964,7 +964,7 @@ class StoreOrder extends BaseModel
                     $res = $res && $res1 && $res2;
                     $sp_money = bcmul($every_money_virtual, bcdiv($area_recommend_ratio, 100, 4), 2);
                     if ($v['spread_uid'] && $sp_money > 0) {
-                        $sp = User::where('uid', $v['spread_uid']);
+                        $sp = User::where('uid', $v['spread_uid'])->find();
                         $balance = bcadd($sp['brokerage_price'], $sp_money, 2);
                         $mark = $userInfo['nickname'] . '成功消费[虚拟产品]' . floatval($order['pay_price']) . '元,推荐代理分红' . floatval($sp_money);
                         $res1 = UserBill::income('推荐代理分红', $sp['uid'], 'now_money', 'brokerage', $sp_money, $order['id'], $balance, $mark, 0);

+ 33 - 0
app/models/store/StoreProduct.php

@@ -133,6 +133,39 @@ class StoreProduct extends BaseModel
         return self::setLevelPrice($list, $uid);
     }
 
+    /**
+     * 获取产品价格
+     * @param array $cartId
+     * @return array
+     */
+    public static function getProductPrice(array $cartId)
+    {
+        $cartInfo = StoreOrderCartInfo::whereIn('cart_id', $cartId)->column('cart_info');
+        $sumProductPriceReal = 0;//非指定返佣商品总金额
+        $sumProductPriceVirtual = 0;//非指定返佣商品总金额
+        foreach ($cartInfo as $value) {
+            $product = json_decode($value, true);
+            $cartNum = $product['cart_num'] ?? 0;
+            if (isset($product['productInfo'])) {
+                $productInfo = $product['productInfo'];
+                if ($productInfo['store_type'] == 1) {
+                    if (isset($productInfo['attrInfo'])) {
+                        $sumProductPriceReal = bcadd($sumProductPriceReal, bcmul($cartNum, $productInfo['attrInfo']['price'] ?? 0, 2), 2);
+                    } else {
+                        $sumProductPriceReal = bcadd($sumProductPriceReal, bcmul($cartNum, $productInfo['price'] ?? 0, 2), 2);
+                    }
+                } else {
+                    if (isset($productInfo['attrInfo'])) {
+                        $sumProductPriceVirtual = bcadd($sumProductPriceVirtual, bcmul($cartNum, $productInfo['attrInfo']['price'] ?? 0, 2), 2);
+                    } else {
+                        $sumProductPriceVirtual = bcadd($sumProductPriceVirtual, bcmul($cartNum, $productInfo['price'] ?? 0, 2), 2);
+                    }
+                }
+            }
+        }
+        return [$sumProductPriceReal, $sumProductPriceVirtual];
+    }
+
     /*
      * 分类搜索
      * @param string $value

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
public/static/plug/form-create/province_city_area.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
public/static/plug/form-create/province_city_area_old.js


+ 1 - 1
route/api/route.php

@@ -104,7 +104,7 @@ Route::group(function () {
     Route::post('coupon/receive', 'store.StoreCouponsController/receive')->name('couponReceive'); //领取优惠券
     Route::post('coupon/receive/batch', 'store.StoreCouponsController/receive_batch')->name('couponReceiveBatch'); //批量领取优惠券
     Route::get('coupons/user/:types', 'store.StoreCouponsController/user')->name('couponsUser');//用户已领取优惠券
-    Route::get('coupons/order/:price', 'store.StoreCouponsController/order')->name('couponsOrder');//优惠券 订单列表
+    Route::get('coupons/order/:price/:cartId', 'store.StoreCouponsController/order')->name('couponsOrder');//优惠券 订单列表
     //购物车类
     Route::get('cart/list', 'store.StoreCartController/lst')->name('cartList'); //购物车列表
     Route::post('cart/add', 'store.StoreCartController/add')->name('cartAdd'); //购物车添加

이 변경점에서 너무 많은 파일들이 변경되어 몇몇 파일들은 표시되지 않았습니다.