Quellcode durchsuchen

feat: EK-76: Member Auto-Maintenance.

kevinElken vor 9 Monaten
Ursprung
Commit
5e7bdba8a6
1 geänderte Dateien mit 6 neuen und 5 gelöschten Zeilen
  1. 6 5
      common/models/forms/OrderForm.php

+ 6 - 5
common/models/forms/OrderForm.php

@@ -1262,8 +1262,8 @@ class OrderForm extends Model
                     }
 
                     $currentPv = $goods['PRICE_PV'];
-                    $totalPv += $this->payType == 'prp' ? 0 : $realPv * intval($v);
-                    $totalRealPv += $this->payType == 'prp' ? 0 : $realPv * intval($v);
+                    $totalPv += $realPv * intval($v);
+                    $totalRealPv += $realPv * intval($v);
                     $remainPv = 0;
                     $this->_remainPv += 0;
 
@@ -1273,10 +1273,10 @@ class OrderForm extends Model
                     $this->_orderGoods[] = [
                         'GOODS_ID' => $goods['ID'],
                         'PRICE' => $goodsNature['SELL_PRICE'],
-                        'PV' => $this->payType == 'prp' ? 0 : $currentPv, // $goods['PRICE_PV'],
+                        'PV' => $currentPv,
                         'REAL_PRICE' => $realPrice,
-                        'REAL_PV' => $this->payType == 'prp' ? 0 : $realPv,
-                        'REMAIN_PV' => $this->payType == 'prp' ? 0 : $remainPv,
+                        'REAL_PV' => $realPv,
+                        'REMAIN_PV' => $remainPv,
                         'POINT' => $goods['POINT'],
                         'BUY_NUMS' => intval($v),
                         'SKU_CODE' => $goods['GOODS_NO'],
@@ -1451,6 +1451,7 @@ class OrderForm extends Model
                         'IS_DELETE' => 0,
                         'PERIOD_NUM' => $nowPeriodNum
                     ])
+                    ->where('SN<>:SN', [':SN' => $order->SN])
                     ->scalar();
 
                 if ($memberOrderBv >= $divideLine) {