Explorar el Código

feat: EK-76: Member Auto-Maintenance.

kevinElken hace 10 meses
padre
commit
990d024f93

+ 16 - 0
common/helpers/PayStack.php

@@ -20,6 +20,15 @@ class PayStack
     {
         $secretKey = self::getSecretKey();
 
+        if (YII_ENV != YII_ENV_PROD) {
+            return [
+                'status' => true,
+                'data' => [
+                    'amount' => $amount
+                ]
+            ];
+        }
+
         try {
             $url = "https://api.paystack.co/transaction/initialize";
             $fields = [
@@ -68,6 +77,13 @@ class PayStack
     {
         $secretKey = self::getSecretKey();
 
+        if (YII_ENV != YII_ENV_PROD) {
+            return [
+                'status' => true,
+                'data'   => ['amount' => $ref['amount']],
+            ];
+        }
+
         try {
             $curl = curl_init();
             curl_setopt_array($curl, [

+ 3 - 3
common/models/ApproachReconsumeOrder.php

@@ -53,9 +53,9 @@ use Yii;
  * @property string $PAY_AMOUNT_STANDARD 支付价格
  * @property string $ORDER_AMOUNT_STANDARD 订单总价格($)
  * @property string $EXCHANGE_RATE 汇率
- * @property string COUNTRY_ID 国家ID
- * @property int CURRENCY_ID 币种ID
- * @property int AUTO_MAINTENANCE AMP订单
+ * @property string $COUNTRY_ID 国家ID
+ * @property int $CURRENCY_ID 币种ID
+ * @property int $AUTO_MAINTENANCE AMP订单
  * @property string $DEC_USER_ID  会员编号
  */
 class ApproachReconsumeOrder extends \common\components\ActiveRecord

+ 1 - 1
common/models/forms/ApproachAutoMaintenanceOrderForm.php

@@ -648,7 +648,7 @@ class ApproachAutoMaintenanceOrderForm extends Model
         $orderModel->ADDRESS = $this->detailaddress;
         $orderModel->FRONT_REMARK = $this->remark;
         $orderModel->WAREHOUSE = $warehouse;
-        $orderModel->STATUS = \Yii::$app->params['orderStatus']['notPaid']['value'];
+        $orderModel->STATUS = Yii::$app->params['orderStatus']['notPaid']['value'];
         $orderModel->CREATED_AT = Date::nowTime();
         $orderModel->CREATE_USER = $loginUserName;
         $orderModel->EMAIL = $email ?? '';

+ 0 - 2
common/models/forms/ApproachOrderForm.php

@@ -633,8 +633,6 @@ class ApproachOrderForm extends Model
         }
         ApproachOrderGoods::batchInsert($this->_orderGoods);
 
-        // TODO: 记录流水
-
         return $orderModel;
     }
 

+ 9 - 5
frontendApi/modules/v1/controllers/ShopController.php

@@ -1916,7 +1916,7 @@ ORDER;
                     return static::notice(Form::formatErrorsForApi($formModel->getErrors()), 400);
                 }
             } catch (HttpException|Exception|\Throwable $e) {
-                return static::notice(Form::formatErrorsForApi($formModel->getErrors()), 400);
+                return static::notice(Form::formatErrorsForApi($e->getMessage()), 400);
             }
         }
     }
@@ -1932,10 +1932,14 @@ ORDER;
             $post = \Yii::$app->request->post();
             $post['type'] = DeclarationForm::TYPE_FX;
 
-            if ($formModel->load($post, '') && $order = $formModel->autoMaintenanceSureOrder()) {
-                return static::notice($order);
-            } else {
-                return static::notice(Form::formatErrorsForApi($formModel->getErrors()),400);
+            try {
+                if ($formModel->load($post, '') && $order = $formModel->autoMaintenanceSureOrder()) {
+                    return static::notice($order);
+                } else {
+                    return static::notice(Form::formatErrorsForApi($formModel->getErrors()), 400);
+                }
+            } catch (\yii\db\Exception|HttpException|Exception $e) {
+                return static::notice(Form::formatErrorsForApi($e->getMessage()), 400);
             }
         }
     }