d

frontendApi/modules/v1/controllers/ShopController.php

@@ -815,7 +815,32 @@ class ShopController extends BaseController {
             return static::notice(Yii::t('app', 'stockistDoesNotExist'), 400);
         }
 
-        return static::notice(['userId' => (int)$userId]);
+        // 会员信息
+        $user = User::findOneAsArray('ID=:ID', [':ID' => $userId]);
+        if (!$user) {
+            return static::notice(Yii::t('app', 'memberDoesNotExist'), 400);
+        }
+
+        $condition = ' AND STATUS=1 AND (FIND_IN_SET(2,GIFT_TYPE)>0 OR FIND_IN_SET(4,GIFT_TYPE)>0) AND N.COUNTRY_ID=:COUNTRY_ID';
+        $data = ShopGoods::lists($condition, [':COUNTRY_ID' => $user['COUNTRY_ID']], [
+            'select' => 'S.*,N.MARKET_PRICE,N.SELL_PRICE,N.TAX_RATE,N.LOCAL_CURRENCY_ID,N.COUNTRY_ID',
+            'from' => ShopGoods::tableName() . ' AS S',
+            'join' => [
+                ['INNER JOIN', ShopGoodsNature::tableName() . ' AS N', 'N.GOODS_ID = S.ID'],
+            ],
+            'orderBy' => 'SORT ASC,CREATED_AT DESC',
+            'limit' => 100,
+        ]);
+
+        $currencies = Currency::getAllData();
+        $currencies = array_column($currencies, NULL, 'ID');
+
+        foreach ($data['list'] as $key => $value) {
+            $data['list'][$key]['DISCOUNT'] = in_array($value['TYPE'], [1, 2]) ? ShopGoods::getGoodType()[$value['TYPE']]['discount'] : $value['SELL_DISCOUNT'] * 100;
+            $data['list'][$key]['COIN'] = $currencies[$value['LOCAL_CURRENCY_ID']]['CODE'] ?? '';
+        }
+
+        return static::notice($data);
     }
 
     /**