商品增加筛选类型

common/config/config-product.php

@@ -107,12 +107,14 @@ return [
 //        'agencyId' => '549034453991107',   // 商户号
 //        'childMerchantId' => '',   // 子商户号
 //        'terminalId' => '20020453',   // 终端号
-//        'currencyType' => 'HKD', // 结算币种
+//        'currencyType' => 'HKD', // 支付币种
         'agencyId' => '549034453991109',   // 商户号
         'childMerchantId' => '',   // 子商户号
         'terminalId' => '20020461',   // 终端号
-        'currencyType' => 'CNY', // 结算币种
-        'notifyUrl' => 'https://fapi.ncshop.elken.com/v1/shop/upop-webhook', // 异步通知url
-        'returnUrl' => 'https://fapi.ncshop.elken.com/v1/shop/upop-webhook', // 同步通知url
+        'currencyType' => 'CNY', // 支付币种
+//        'notifyUrl' => 'https://nc-fapi-mips.elken.com:8013/v1/shop/upop-webhook', // 异步通知url(test)
+//        'returnUrl' => 'https://nc-fapi-mips.elken.com:8013/v1/shop/upop-webhook', // 同步通知url(test)
+        'notifyUrl' => 'https://fapi.ncshop.elken.com/v1/shop/upop-webhook', // 异步通知url(prod)
+        'returnUrl' => 'https://fapi.ncshop.elken.com/v1/shop/upop-webhook', // 同步通知url(prod)
     ],
 ];

frontendApi/modules/v1/controllers/ShopController.php

@@ -50,7 +50,9 @@ class ShopController extends BaseController {
      * @throws \yii\web\HttpException
      */
     public function actionIndex() {
-        $condition = ' AND STATUS=1 AND (FIND_IN_SET(2,GIFT_TYPE)>0';
+        $type = \Yii::$app->request->get('type', 2);
+
+        $condition = " AND CATE_ID={$type} AND STATUS=1 AND (FIND_IN_SET(2,GIFT_TYPE)>0";
 //        $isStudio = User::getEnCodeInfo(\Yii::$app->user->id)['IS_STUDIO'];
 //        if($isStudio==1){
 //            $condition.= " OR FIND_IN_SET(4,GIFT_TYPE)>0";
@@ -62,7 +64,7 @@ class ShopController extends BaseController {
             'from' => ShopGoods::tableName(),
         ]);
         foreach ($data['list'] as $key => $value) {
-            $data['list'][$key]['DISCOUNT'] = $value['SELL_DISCOUNT']*100;
+            $data['list'][$key]['DISCOUNT'] = $value['SELL_DISCOUNT'] * 100;
             $data['list'][$key]['CATE'] = ShopGoods::GOODS_TYPE[$value['CATE_ID']]['name'] ?? '';
         }
         return static::notice($data);
@@ -374,8 +376,8 @@ class ShopController extends BaseController {
                     "order_no" => $order->SN,   // 第三方订单号
 //                    "amount" => number_format($order['PAY_AMOUNT'], 2),   // 交易金额(元) 2位小数
                     "amount" => number_format('0.10', 2),   // TODO: 交易金额(元) 2位小数
-                    "currency_type" => \Yii::$app->params['UPOP']['currencyType'],   // 交易币种 HKD(港币)
-                    "sett_currency_type" => 'HKD',  // 清算币种 HKD(港币)
+                    "currency_type" => \Yii::$app->params['UPOP']['currencyType'],   // 交易币种 HKD(港币) CNY(人民币)
+                    "sett_currency_type" => 'HKD',  // 清算币种 HKD(港币) 固定
                     "product_name" => $orderProducts['GOODS_TITLE'], // 产品名称
                     "return_url" => \Yii::$app->params['UPOP']['returnUrl'], // 同步通知地址
                     "notify_url" => \Yii::$app->params['UPOP']['notifyUrl'], // 异步通知地址