root пре 3 година
родитељ
комит
b0e5eb1984
1 измењених фајлова са 12 додато и 4 уклоњено
  1. 12 4
      common/models/forms/OrderDeleteForm.php

+ 12 - 4
common/models/forms/OrderDeleteForm.php

@@ -96,6 +96,7 @@ class OrderDeleteForm extends Model
         $transaction = $db->beginTransaction();
         try {
             $userId = $orderInfo['USER_ID'];
+            $decInfo = [];
             $isLock = 0 ; // 是否锁定会员单
             // 如果是注册订单,则删除订单并退还金额,然后再冻结用户
             if ($orderInfo['ORDER_TYPE'] == 'ZC') {
@@ -181,10 +182,17 @@ class OrderDeleteForm extends Model
                 $transaction->rollBack();
                 throw new Exception('退还订单金额失败,删除订单失败');
             }
+            $upgradeType = 0; // 升级单类型
+            $returnLv = '';
+            $oriLvs = '';
+            if (!empty($decInfo)) {
+                $upgradeType = $decInfo['UPGRADE_TYPE'];
+                $returnLv = $decInfo['ORI_LV'];
+                $oriLvs = $decInfo['UPGRADE_LV'];
+            }
             // 退款成功,记录数据信息
             $periodObj = Period::instance();
             $nowPeriodNum = $periodObj->getNowPeriodNum();
-            $baseInfo = Info::baseInfoZh($orderInfo['USER_ID']);
             $returnOrderModel = new ReturnOrder();
             $returnOrderModel->ID = SnowFake::instance()->generateId();
             $returnOrderModel->SN = $sn;
@@ -199,7 +207,7 @@ class OrderDeleteForm extends Model
             $returnOrderModel->USER_ID = $orderInfo['USER_ID'];
             $returnOrderModel->PERIOD_NUM = $nowPeriodNum;
             $returnOrderModel->ORDER_PERIOD_NUM = $orderInfo['PERIOD_NUM'];
-            $returnOrderModel->UPGRADE_TYPE = 0;// 不能删除升级单,默认0即可
+            $returnOrderModel->UPGRADE_TYPE = $upgradeType;
             $returnOrderModel->USER_NAME = $orderInfo['USER_NAME'];
             $returnOrderModel->PROVINCE = $orderInfo['PROVINCE'];
             $returnOrderModel->CITY = $orderInfo['CITY'];
@@ -210,8 +218,8 @@ class OrderDeleteForm extends Model
             $returnOrderModel->ORI_BONUS = $bonus;
             $returnOrderModel->ORI_EXCHANGE_POINTS = $exchange;
             $returnOrderModel->ORI_RECONSUME_POINTS = $point;
-            $returnOrderModel->ORI_DEC_LV = $baseInfo['DEC_LV'];
-            $returnOrderModel->RETURN_DEC_LV = $baseInfo['DEC_LV'];
+            $returnOrderModel->ORI_DEC_LV = $oriLvs;
+            $returnOrderModel->RETURN_DEC_LV = $returnLv;
             $returnOrderModel->IS_LOCKING = $isLock;
             if (!$returnOrderModel->save()) {
                 $transaction->rollBack();