自动合格 bug fix

common/models/forms/OrderForm.php

@@ -99,7 +99,7 @@ class OrderForm extends Model
             'remark' => 'Remark', // 备注
             'type' => 'Order Type',// 订单类型
             'addressId' => 'Shipping address',// 收货地址
-            'payType' => 'Pay Typa',// 支付方式
+            'payType' => 'Pay Type',// 支付方式
             'goodsId' => 'Product ID',//商品ID
             'goodsNum' => 'Product quantity',//商品数量
             'userName' => 'Repeat sales Member No. does not exist',//复消会员编号
@@ -466,7 +466,7 @@ class OrderForm extends Model
                         $realPv = $goods['PRICE_PV'] * $discount;
                         $realPriceStandard = $goods['SELL_PRICE_STANDARD'] * $discount;
                     }
-                    if($goods['PV_SPLIT']==1){//当商品为PV分期时
+                    if($goods['PV_SPLIT']==1){ // 当商品为PV分期时
                         $pvSplit = $this->_pvSplit($realPv);
                         $currentPv = $pvSplit['current'];
                         $remainPv = $pvSplit['remain'];
@@ -526,6 +526,7 @@ class OrderForm extends Model
 
         $this->_decAmount = $totalAmount;
         $this->_decPv = $totalPv;
+        $this->_realPv = $totalRealPv;
         $this->_freight = ($totalAmount >= $freeShipping) ? 0 : $freight;
         if($this->_address['PROVINCE']==1){
             $this->_freight = 0;
@@ -543,38 +544,33 @@ class OrderForm extends Model
             if ($result['code'] !== 200) {
                 throw new Exception($result['message']);
             }
-			
-			
-			
+
 			/**
-			             * 2022-04-28
-			             * York
-			             * 支付后减少库存
-			             */
-			            foreach ($this->goodsNum as $k => $v){
-			                if ($v){
-			                    $goods = ShopGoods::findOneAsArray('ID=:ID AND STATUS=1',[':ID'=> $ids[$k]]);
-			                    if ($goods['STORE_NUMS'] >= $this->goodsNum[$k]){
-			                        $data = ShopGoods::find()->where(['ID' => $ids[$k]])->one();
-			                        $goods_store_nums = $data->STORE_NUMS - $this->goodsNum[$k];
-			                        $data->STORE_NUMS = $goods_store_nums;
-			                        $data->update();
-			                        //下单后库存小于等于0 商品下架
-			                        if($goods_store_nums <= 0){
-			                            $data->STATUS = 0;
-			                            $data->UPDATED_AT = Date::nowTime();
-			                            $data->update();
-			
-			                        }
-			                    }else{
-			                        throw new Exception($goods['GOODS_NAME'].'库存不足，无法购买商品');
-			
-			                    }
-			
-			
-			                }
-			            }
-			//                exit();
+             * 2022-04-28
+             * York
+             * 支付后减少库存
+             */
+            foreach ($this->goodsNum as $k => $v){
+                if ($v){
+                    $goods = ShopGoods::findOneAsArray('ID=:ID AND STATUS=1',[':ID'=> $ids[$k]]);
+                    if ($goods['STORE_NUMS'] >= $this->goodsNum[$k]){
+                        $data = ShopGoods::find()->where(['ID' => $ids[$k]])->one();
+                        $goods_store_nums = $data->STORE_NUMS - $this->goodsNum[$k];
+                        $data->STORE_NUMS = $goods_store_nums;
+                        $data->update();
+                        //下单后库存小于等于0 商品下架
+                        if($goods_store_nums <= 0){
+                            $data->STATUS = 0;
+                            $data->UPDATED_AT = Date::nowTime();
+                            $data->update();
+
+                        }
+                    }else{
+                        throw new Exception($goods['GOODS_NAME'].'库存不足，无法购买商品');
+
+                    }
+                }
+            }
 
             //写入订单
             if (!$orderResult = $this->addOrder()) {

frontendApi/modules/v1/controllers/DashboardController.php

@@ -95,7 +95,7 @@ class DashboardController extends BaseController
         ];
 
         //剩余分期PV显示
-        $myRemainPv = RemainPv::findOne(['USER_ID'=>$baseInfo['ID']])->REMAIN_PV;
+        $myRemainPv = RemainPv::findOne(['USER_ID'=>$baseInfo['ID']])->REMAIN_PV?:0;
 
         return static::notice([
             'nowTime' => $nowTime,