删单增加PayStack处理

common/models/ReturnOrder.php

@@ -24,6 +24,8 @@ use Yii;
  * @property int $COUNTY 县区
  * @property string $ADDRESS 详细地址
  * @property int $CREATE_AT 订单创建时间
+ * @property int $PAY_STATUS 支付状态
+ * @property string $PAY_NOTE 支付信息
  */
 class ReturnOrder extends \common\components\ActiveRecord
 {

common/models/forms/OrderDeleteForm.php

@@ -10,6 +10,8 @@ use common\helpers\user\Balance;
 use common\helpers\user\Cash;
 use common\helpers\user\Info;
 use common\libs\logging\operate\AdminOperate;
+use common\models\ApproachDecOrder;
+use common\models\ApproachOrder;
 use common\models\DealType;
 use common\models\DecOrder;
 use common\models\Order;
@@ -80,6 +82,9 @@ class OrderDeleteForm extends Model
         return array_merge($parentScenarios, $customScenarios);
     }
 
+    /**
+     * @throws Exception
+     */
     public function returnOrder() {
         if(!$this->validate()){
             return null;
@@ -87,10 +92,26 @@ class OrderDeleteForm extends Model
         $sn = $this->orderSn;
         // 获取订单详情
         $orderInfo = Order::findUseDbCalc()
-        ->select('ID,DEC_SN,SN,USER_ID,ORDER_TYPE,IS_DELETE,PAY_AMOUNT,PAY_TYPE,ORDER_AMOUNT,USER_NAME,PV,PAY_PV,PERIOD_NUM,PROVINCE,CITY,COUNTY,ADDRESS')
+        ->select('ID,DEC_SN,SN,USER_ID,ORDER_TYPE,IS_DELETE,PAY_AMOUNT,PAY_TYPE,ORDER_AMOUNT,USER_NAME,PV,PAY_PV,PERIOD_NUM,PROVINCE,CITY,COUNTY,ADDRESS,STATUS,NOTE')
         ->where("SN=:SN", [':SN' => $sn])
         ->asArray()
         ->one();
+
+        $approachOrderInfo = [];
+        // 如果是PayStack支付,订单是未支付状态,则去中间表查询,如果两个表都没有数据,订单不存在
+        if (!$orderInfo) {
+            $approachOrderInfo = ApproachOrder::findUseDbCalc()
+                ->select('ID,DEC_SN,SN,USER_ID,ORDER_TYPE,IS_DELETE,PAY_AMOUNT,PAY_TYPE,ORDER_AMOUNT,USER_NAME,PV,PAY_PV,PERIOD_NUM,PROVINCE,CITY,COUNTY,ADDRESS,STATUS,NOTE')
+                ->where("SN=:SN", [':SN' => $sn])
+                ->asArray()
+                ->one();
+        }
+        if (!$orderInfo && !$approachOrderInfo) {
+            throw new Exception('订单不存在');
+        }
+
+        $orderInfo = $orderInfo ?: $approachOrderInfo;
+
         // 如果会员已经是锁定状态了,删除订单的时候,是否还要退还金额
         $db = \Yii::$app->db;
         $transaction = $db->beginTransaction();
@@ -101,134 +122,215 @@ class OrderDeleteForm extends Model
             // 如果是注册订单,则删除订单并退还金额,然后再冻结用户
             if ($orderInfo['ORDER_TYPE'] == 'ZC') {
                 // 查询报单数据,因为如果是报单,则要退还给报单中心
-                $decInfo = DecOrder::findUseDbCalc()
-                ->select('USER_ID,TO_USER_ID,DETAIL_TYPE,UPGRADE_TYPE,ORI_LV,UPGRADE_LV')
-                ->where("ORDER_SN=:ORDER_SN", [':ORDER_SN' => $sn])
-                ->asArray()
-                ->one();
+                if (!$approachOrderInfo) {
+                    $decInfo = DecOrder::findUseDbCalc()
+                        ->select('USER_ID,TO_USER_ID,DETAIL_TYPE,UPGRADE_TYPE,ORI_LV,UPGRADE_LV')
+                        ->where("ORDER_SN=:ORDER_SN", [':ORDER_SN' => $sn])
+                        ->asArray()
+                        ->one();
+                    // 删除报单
+                    $delDecOrder = DecOrder::updateAll(
+                        ['IS_DEL'=>1, 'DELETED_AT'=>Date::nowTime()],
+                        'ORDER_SN=:ORDER_SN',
+                        ['ORDER_SN'=>$sn]
+                    );
+                } else {
+                    $decInfo = ApproachDecOrder::findUseDbCalc()
+                        ->select('USER_ID,TO_USER_ID,DETAIL_TYPE,UPGRADE_TYPE,ORI_LV,UPGRADE_LV')
+                        ->where("ORDER_SN=:ORDER_SN", [':ORDER_SN' => $sn])
+                        ->asArray()
+                        ->one();
+                    // 删除报单
+                    $delDecOrder = ApproachDecOrder::updateAll(
+                        ['IS_DEL'=>1, 'DELETED_AT'=>Date::nowTime()],
+                        'ORDER_SN=:ORDER_SN',
+                        ['ORDER_SN'=>$sn]
+                    );
+                }
+
                 $userId = $decInfo['USER_ID']; 
-                // 删除报单
-                $delDecOrder = DecOrder::updateAll(
-                    ['IS_DEL'=>1, 'DELETED_AT'=>Date::nowTime()], 
-                    'ORDER_SN=:ORDER_SN', 
-                    ['ORDER_SN'=>$sn]
-                );
+
                 if (!$delDecOrder) {
                     $transaction->rollBack();
                     throw new Exception('删除报单失败，删除订单失败');
                 }
-                // 如果删除的是升级单,则需要回退用户的级别
-                if ($decInfo['DETAIL_TYPE'] == 2) {
-                    $oriLv = $decInfo['ORI_LV'];
-                    $userModel = User::findOne(['ID' => $orderInfo['USER_ID']]);
-                    $userModel->DEC_LV = $oriLv;
-                    $userModel->UPDATED_AT = Date::nowTime();
-                    if(!$userModel->save(false)) {
-                        $transaction->rollBack();
-                        throw new Exception('回退会员级别失败，删除订单失败');
-                    }
-                } else {
-                    // 锁定用户
-                    $userModel = User::findOne(['ID' => $orderInfo['USER_ID']]);
-                    $userModel->STATUS = 0;
-                    $userModel->STATUS_AT = Date::nowTime();
-                    if(!$userModel->save(false)) {
-                        $transaction->rollBack();
-                        throw new Exception('锁定会员失败，删除订单失败');
+
+                // 支付成功才需要处理
+                if ($orderInfo['STATUS'] == \Yii::$app->params['orderStatus']['paid']['value']) {
+                    // 如果删除的是升级单,则需要回退用户的级别
+                    if ($decInfo['DETAIL_TYPE'] == 2) {
+                        $oriLv = $decInfo['ORI_LV'];
+                        $userModel = User::findOne(['ID' => $orderInfo['USER_ID']]);
+                        $userModel->DEC_LV = $oriLv;
+                        $userModel->UPDATED_AT = Date::nowTime();
+                        if(!$userModel->save(false)) {
+                            $transaction->rollBack();
+                            throw new Exception('回退会员级别失败，删除订单失败');
+                        }
+                    } else {
+                        // 锁定用户
+                        $userModel = User::findOne(['ID' => $orderInfo['USER_ID']]);
+                        $userModel->STATUS = 0;
+                        $userModel->STATUS_AT = Date::nowTime();
+                        if(!$userModel->save(false)) {
+                            $transaction->rollBack();
+                            throw new Exception('锁定会员失败，删除订单失败');
+                        }
+                        $isLock = 1;
                     }
-                    $isLock = 1;
                 }
-            } 
-            // 公共的退钱,删除订单操作
-            $delOrder = Order::updateAll(
-                ['IS_DELETE'=>1, 'DELETED_AT'=>Date::nowTime()], 
-                'SN=:SN', 
-                ['SN'=>$sn]
-            );
+            }
+
+            if (!$approachOrderInfo) {
+                // 公共的退钱,删除订单操作
+                $delOrder = Order::updateAll(
+                    ['IS_DELETE' => 1, 'DELETED_AT' => Date::nowTime()],
+                    'SN=:SN',
+                    ['SN' => $sn]
+                );
+            } else {
+                // 公共的退钱,删除订单操作
+                $delOrder = ApproachOrder::updateAll(
+                    ['IS_DELETE' => 1, 'DELETED_AT' => Date::nowTime()],
+                    'SN=:SN',
+                    ['SN' => $sn]
+                );
+            }
             if (!$delOrder) {
                 $transaction->rollBack();
                 throw new Exception('删除订单失败');
             }
-            
-            // 记录退还前的账户原资金
-            $cash = $point = $bonus = $exchange = 0;
-            $userBonus = UserBonus::findUseSlaves()
-            ->select('BONUS,RECONSUME_POINTS,EXCHANGE_POINTS')
-            ->where('USER_ID=:USER_ID', [':USER_ID' => $userId])
-            ->asArray()
-            ->one();
-            if ($userBonus) {
-                $point = $userBonus['RECONSUME_POINTS'];
-                $bonus = $userBonus['BONUS'];
-                $exchange = $userBonus['EXCHANGE_POINTS'];
-            }
-            $cashWallet = UserWallet::findOneAsArray('USER_ID=:USER_ID', [':USER_ID'=>$userId], 'CASH');
-            if ($cashWallet) {
-                $cash = $cashWallet['CASH'];
-            }
-            // 开始退钱,退积分等
+
             $payType = $orderInfo['PAY_TYPE']; // 支付方式
-            $payAmount = $orderInfo['PAY_AMOUNT']; // 支付的金额
-            //退还
-            $amountResult = false;
-            if($payType == 'cash') {
-                $amountResult = Cash::changeUserCash($userId, 'CASH', +abs($payAmount), ['REMARK' => '退货退还余额']);
-            } else if ($payType == 'exchange') {
-                $amountResult = Balance::changeUserBonus($userId,'exchange_points', +abs($payAmount),['DEAL_TYPE_ID' => DealType::EXCHANGE_POINTS_EXCHANGE,'REMARK' => '退货退还无业绩兑换点数']);
-            } else if ($payType == 'pay_stack') {
-                // TODO：PayStack支付只删除订单,人工退款
-                $transaction = true;
+            if ($payType != 'pay_stack') {
+                // 记录退还前的账户原资金
+                $cash = $point = $bonus = $exchange = 0;
+                $userBonus = UserBonus::findUseSlaves()
+                    ->select('BONUS,RECONSUME_POINTS,EXCHANGE_POINTS')
+                    ->where('USER_ID=:USER_ID', [':USER_ID' => $userId])
+                    ->asArray()
+                    ->one();
+                if ($userBonus) {
+                    $point = $userBonus['RECONSUME_POINTS'];
+                    $bonus = $userBonus['BONUS'];
+                    $exchange = $userBonus['EXCHANGE_POINTS'];
+                }
+                $cashWallet = UserWallet::findOneAsArray('USER_ID=:USER_ID', [':USER_ID' => $userId], 'CASH');
+                if ($cashWallet) {
+                    $cash = $cashWallet['CASH'];
+                }
+                // 开始退钱,退积分等
+                $payAmount = $orderInfo['PAY_AMOUNT']; // 支付的金额
+                //退还
+                if ($payType == 'cash') {
+                    $amountResult = Cash::changeUserCash($userId, 'CASH', +abs($payAmount), ['REMARK' => '退货退还余额']);
+                } else if ($payType == 'exchange') {
+                    $amountResult = Balance::changeUserBonus($userId, 'exchange_points', +abs($payAmount), ['DEAL_TYPE_ID' => DealType::EXCHANGE_POINTS_EXCHANGE, 'REMARK' => '退货退还无业绩兑换点数']);
+                } else {
+                    $amountResult = Balance::changeUserBonus($userId, 'reconsume_points', +abs($payAmount), ['DEAL_TYPE_ID' => DealType::RECONSUME_POINTS_EXCHANGE, 'REMARK' => '退货退还复销点数']);
+                }
+
+                if ($amountResult !== true) {
+                    $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();
+                $returnOrderModel = new ReturnOrder();
+                $returnOrderModel->ID = SnowFake::instance()->generateId();
+                $returnOrderModel->SN = $sn;
+                $returnOrderModel->DEC_SN = $orderInfo['DEC_SN'];
+                $returnOrderModel->CREATE_AT = Date::nowTime();
+                $returnOrderModel->ORDER_TYPE = $orderInfo['ORDER_TYPE'];
+                $returnOrderModel->ORDER_AMOUNT = $orderInfo['ORDER_AMOUNT'];
+                $returnOrderModel->PV = $orderInfo['PV'];
+                $returnOrderModel->PAY_PV = $orderInfo['PAY_PV'];
+                $returnOrderModel->PAY_AMOUNT = $orderInfo['PAY_AMOUNT'];
+                $returnOrderModel->PAY_TYPE = $orderInfo['PAY_TYPE'];
+                $returnOrderModel->USER_ID = $orderInfo['USER_ID'];
+                $returnOrderModel->PERIOD_NUM = $nowPeriodNum;
+                $returnOrderModel->PAY_STATUS = $orderInfo['STATUS'];
+                $returnOrderModel->PAY_NOTE = $orderInfo['NOTE'];
+                $returnOrderModel->ORDER_PERIOD_NUM = $orderInfo['PERIOD_NUM'];
+                $returnOrderModel->UPGRADE_TYPE = $upgradeType;
+                $returnOrderModel->USER_NAME = $orderInfo['USER_NAME'];
+                $returnOrderModel->PROVINCE = $orderInfo['PROVINCE'];
+                $returnOrderModel->CITY = $orderInfo['CITY'] ?? 0;
+                $returnOrderModel->COUNTY = $orderInfo['COUNTY'] ?? 0;
+                $returnOrderModel->ADDRESS = $orderInfo['ADDRESS'] ?? '';
+                $returnOrderModel->ADMIN_ID = \Yii::$app->user->id;
+                $returnOrderModel->ORI_CASH = $cash;
+                $returnOrderModel->ORI_BONUS = $bonus;
+                $returnOrderModel->ORI_EXCHANGE_POINTS = $exchange;
+                $returnOrderModel->ORI_RECONSUME_POINTS = $point;
+                $returnOrderModel->ORI_DEC_LV = $oriLvs;
+                $returnOrderModel->RETURN_DEC_LV = $returnLv;
+                $returnOrderModel->IS_LOCKING = $isLock;
+                if (!$returnOrderModel->save()) {
+                    $transaction->rollBack();
+                    $this->addErrors($returnOrderModel->getErrors());
+                    return false;
+                }
             } else {
-                $amountResult = Balance::changeUserBonus($userId,'reconsume_points', +abs($payAmount),['DEAL_TYPE_ID' => DealType::RECONSUME_POINTS_EXCHANGE,'REMARK' => '退货退还复销点数']);
-            }
+                // 如果是PayStack支付,只处理支付成功的
+                $upgradeType = 0; // 升级单类型
+                $returnLv = '';
+                $oriLvs = '';
+                if (!empty($decInfo)) {
+                    $upgradeType = $decInfo['UPGRADE_TYPE'];
+                    $returnLv = $decInfo['ORI_LV'];
+                    $oriLvs = $decInfo['UPGRADE_LV'];
+                }
 
-            if ($amountResult !== true) {
-                $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();
-            $returnOrderModel = new ReturnOrder();
-            $returnOrderModel->ID = SnowFake::instance()->generateId();
-            $returnOrderModel->SN = $sn;
-            $returnOrderModel->DEC_SN = $orderInfo['DEC_SN'];
-            $returnOrderModel->CREATE_AT = Date::nowTime();
-            $returnOrderModel->ORDER_TYPE = $orderInfo['ORDER_TYPE'];
-            $returnOrderModel->ORDER_AMOUNT = $orderInfo['ORDER_AMOUNT'];
-            $returnOrderModel->PV = $orderInfo['PV'];
-            $returnOrderModel->PAY_PV = $orderInfo['PAY_PV'];
-            $returnOrderModel->PAY_AMOUNT = $orderInfo['PAY_AMOUNT'];
-            $returnOrderModel->PAY_TYPE = $orderInfo['PAY_TYPE'];
-            $returnOrderModel->USER_ID = $orderInfo['USER_ID'];
-            $returnOrderModel->PERIOD_NUM = $nowPeriodNum;
-            $returnOrderModel->ORDER_PERIOD_NUM = $orderInfo['PERIOD_NUM'];
-            $returnOrderModel->UPGRADE_TYPE = $upgradeType;
-            $returnOrderModel->USER_NAME = $orderInfo['USER_NAME'];
-            $returnOrderModel->PROVINCE = $orderInfo['PROVINCE'];
-            $returnOrderModel->CITY = $orderInfo['CITY'];
-            $returnOrderModel->COUNTY = $orderInfo['COUNTY'];
-            $returnOrderModel->ADDRESS = $orderInfo['ADDRESS'];
-            $returnOrderModel->ADMIN_ID = \Yii::$app->user->id;
-            $returnOrderModel->ORI_CASH = $cash;
-            $returnOrderModel->ORI_BONUS = $bonus;
-            $returnOrderModel->ORI_EXCHANGE_POINTS = $exchange;
-            $returnOrderModel->ORI_RECONSUME_POINTS = $point;
-            $returnOrderModel->ORI_DEC_LV = $oriLvs;
-            $returnOrderModel->RETURN_DEC_LV = $returnLv;
-            $returnOrderModel->IS_LOCKING = $isLock;
-            if (!$returnOrderModel->save()) {
-                $transaction->rollBack();
-                $this->addErrors($returnOrderModel->getErrors());
-                return false;
+                // 退款成功,记录数据信息
+                $periodObj = Period::instance();
+                $nowPeriodNum = $periodObj->getNowPeriodNum();
+                $returnOrderModel = new ReturnOrder();
+                $returnOrderModel->ID = SnowFake::instance()->generateId();
+                $returnOrderModel->SN = $sn;
+                $returnOrderModel->DEC_SN = $orderInfo['DEC_SN'];
+                $returnOrderModel->CREATE_AT = Date::nowTime();
+                $returnOrderModel->ORDER_TYPE = $orderInfo['ORDER_TYPE'];
+                $returnOrderModel->ORDER_AMOUNT = $orderInfo['ORDER_AMOUNT'];
+                $returnOrderModel->PV = $orderInfo['PV'];
+                $returnOrderModel->PAY_PV = $orderInfo['PAY_PV'];
+                $returnOrderModel->PAY_AMOUNT = $orderInfo['PAY_AMOUNT'];
+                $returnOrderModel->PAY_TYPE = $orderInfo['PAY_TYPE'];
+                $returnOrderModel->USER_ID = $orderInfo['USER_ID'];
+                $returnOrderModel->PERIOD_NUM = $nowPeriodNum;
+                $returnOrderModel->PAY_STATUS = $orderInfo['STATUS'];
+                $returnOrderModel->PAY_NOTE = $orderInfo['NOTE'];
+                $returnOrderModel->ORDER_PERIOD_NUM = $orderInfo['PERIOD_NUM'];
+                $returnOrderModel->UPGRADE_TYPE = $upgradeType;
+                $returnOrderModel->USER_NAME = $orderInfo['USER_NAME'];
+                $returnOrderModel->PROVINCE = $orderInfo['PROVINCE'];
+                $returnOrderModel->CITY = $orderInfo['CITY'] ?? 0;
+                $returnOrderModel->COUNTY = $orderInfo['COUNTY'] ?? 0;
+                $returnOrderModel->ADDRESS = $orderInfo['ADDRESS'] ?? '';
+                $returnOrderModel->ADMIN_ID = \Yii::$app->user->id;
+                $returnOrderModel->ORI_CASH = 0;
+                $returnOrderModel->ORI_BONUS = 0;
+                $returnOrderModel->ORI_EXCHANGE_POINTS = 0;
+                $returnOrderModel->ORI_RECONSUME_POINTS = 0;
+                $returnOrderModel->ORI_DEC_LV = $oriLvs;
+                $returnOrderModel->RETURN_DEC_LV = $returnLv;
+                $returnOrderModel->IS_LOCKING = $isLock;
+                if (!$returnOrderModel->save()) {
+                    $transaction->rollBack();
+                    $this->addErrors($returnOrderModel->getErrors());
+                    return false;
+                }
             }
             
             $transaction->commit();
@@ -249,6 +351,16 @@ class OrderDeleteForm extends Model
         ->where("SN=:SN", [':SN' => $sn])
         ->asArray()
         ->one();
+
+        $approachOrderDetail = [];
+        if (!$orderDetail) {
+            $orderDetail = $approachOrderDetail = ApproachOrder::findUseDbCalc()
+                ->select('ID,DEC_SN,USER_ID,ORDER_TYPE,IS_DELETE,PERIOD_NUM')
+                ->where("SN=:SN", [':SN' => $sn])
+                ->asArray()
+                ->one();
+        }
+
         if (empty($orderDetail)) {
             $this->addError($attribute, '未找到订单信息,订单编号为：'.$this->orderSn);
             return ;
@@ -274,11 +386,20 @@ class OrderDeleteForm extends Model
         }
 
         if ($orderDetail['ORDER_TYPE'] == 'ZC') {
-            $decDetail = DecOrder::findUseDbCalc()
-            ->select('TO_USER_ID,DETAIL_TYPE,UPGRADE_TYPE,IS_DEL')
-            ->where("ORDER_SN=:ORDER_SN", [':ORDER_SN' => $sn])
-            ->asArray()
-            ->one();
+            if (!$approachOrderDetail) {
+                $decDetail = DecOrder::findUseDbCalc()
+                    ->select('TO_USER_ID,DETAIL_TYPE,UPGRADE_TYPE,IS_DEL')
+                    ->where("ORDER_SN=:ORDER_SN", [':ORDER_SN' => $sn])
+                    ->asArray()
+                    ->one();
+            } else {
+                $decDetail = ApproachDecOrder::findUseDbCalc()
+                    ->select('TO_USER_ID,DETAIL_TYPE,UPGRADE_TYPE,IS_DEL')
+                    ->where("ORDER_SN=:ORDER_SN", [':ORDER_SN' => $sn])
+                    ->asArray()
+                    ->one();
+            }
+
             if (empty($decDetail)) {
                 $this->addError($attribute, '未获取到对应报单信息,订单编号为：'.$this->orderSn);
                 return ;
@@ -287,14 +408,26 @@ class OrderDeleteForm extends Model
                 $this->addError($attribute, '对应报单信息已被删除,订单编号为：'.$this->orderSn);
                 return ;
             }
+
             if ($decDetail['DETAIL_TYPE'] == 2) {
-                // 如果删除升级单,则此升级单必须是用户的最后一个升级单
-                $lastUpgradeOrder = DecOrder::findUseDbCalc()
-                ->select('ORDER_SN')
-                ->where("TO_USER_ID=:TO_USER_ID AND IS_DEL=0 AND DETAIL_TYPE=2", [':TO_USER_ID' => $decDetail['TO_USER_ID']])
-                ->orderBy('CREATED_AT DESC')
-                ->asArray()
-                ->one();
+                if (!$approachOrderDetail) {
+                    // 如果删除升级单,则此升级单必须是用户的最后一个升级单
+                    $lastUpgradeOrder = DecOrder::findUseDbCalc()
+                        ->select('ORDER_SN')
+                        ->where("TO_USER_ID=:TO_USER_ID AND IS_DEL=0 AND DETAIL_TYPE=2", [':TO_USER_ID' => $decDetail['TO_USER_ID']])
+                        ->orderBy('CREATED_AT DESC')
+                        ->asArray()
+                        ->one();
+                } else {
+                    // 如果删除升级单,则此升级单必须是用户的最后一个升级单
+                    $lastUpgradeOrder = ApproachDecOrder::findUseDbCalc()
+                        ->select('ORDER_SN')
+                        ->where("TO_USER_ID=:TO_USER_ID AND IS_DEL=0 AND DETAIL_TYPE=2", [':TO_USER_ID' => $decDetail['TO_USER_ID']])
+                        ->orderBy('CREATED_AT DESC')
+                        ->asArray()
+                        ->one();
+                }
+
                 $lastUpgradeSn = $lastUpgradeOrder['ORDER_SN'];
                 if ($sn != $lastUpgradeSn) {
                     $this->addError($attribute, '有更晚的订单，此订单不能删除,订单编号为：'.$this->orderSn);
@@ -302,21 +435,40 @@ class OrderDeleteForm extends Model
                 }
             } else {
                 // 如果是注册单,但是这个用户存在升级单,则也不能进行删除
-                $hasUpgradeOrder = DecOrder::findUseDbCalc()
-                ->select('TO_USER_ID,DETAIL_TYPE,UPGRADE_TYPE,IS_DEL')
-                ->where("TO_USER_ID=:TO_USER_ID AND IS_DEL=0 AND DETAIL_TYPE=2", [':TO_USER_ID' => $decDetail['TO_USER_ID']])
-                ->asArray()
-                ->one();
+                if (!$approachOrderDetail) {
+                    $hasUpgradeOrder = DecOrder::findUseDbCalc()
+                        ->select('TO_USER_ID,DETAIL_TYPE,UPGRADE_TYPE,IS_DEL')
+                        ->where("TO_USER_ID=:TO_USER_ID AND IS_DEL=0 AND DETAIL_TYPE=2", [':TO_USER_ID' => $decDetail['TO_USER_ID']])
+                        ->asArray()
+                        ->one();
+                } else {
+                    $hasUpgradeOrder = ApproachDecOrder::findUseDbCalc()
+                        ->select('TO_USER_ID,DETAIL_TYPE,UPGRADE_TYPE,IS_DEL')
+                        ->where("TO_USER_ID=:TO_USER_ID AND IS_DEL=0 AND DETAIL_TYPE=2", [':TO_USER_ID' => $decDetail['TO_USER_ID']])
+                        ->asArray()
+                        ->one();
+                }
+
                 if (!empty($hasUpgradeOrder)) {
                     $this->addError($attribute, '此注册报单，存在升级单，无法删除,订单编号为：'.$this->orderSn);
                     return ;
                 }
-                // 删除注册单,判断是否有复消单,如果存在复消单,需要先删除复消单
-                $hasFxOrder = Order::findUseDbCalc()
-                ->select('SN')
-                ->where("USER_ID=:USER_ID AND IS_DELETE=0 AND ORDER_TYPE='FX'", [':USER_ID' => $decDetail['TO_USER_ID']])
-                ->asArray()
-                ->one();
+
+                if (!$approachOrderDetail) {
+                    // 删除注册单,判断是否有复消单,如果存在复消单,需要先删除复消单
+                    $hasFxOrder = Order::findUseDbCalc()
+                        ->select('SN')
+                        ->where("USER_ID=:USER_ID AND IS_DELETE=0 AND ORDER_TYPE='FX'", [':USER_ID' => $decDetail['TO_USER_ID']])
+                        ->asArray()
+                        ->one();
+                } else {
+                    // 删除注册单,判断是否有复消单,如果存在复消单,需要先删除复消单
+                    $hasFxOrder = ApproachOrder::findUseDbCalc()
+                        ->select('SN')
+                        ->where("USER_ID=:USER_ID AND IS_DELETE=0 AND ORDER_TYPE='FX'", [':USER_ID' => $decDetail['TO_USER_ID']])
+                        ->asArray()
+                        ->one();
+                }
                 if (!empty($hasFxOrder)) {
                     $this->addError($attribute, '此注册报单，存在复消单，无法删除,订单编号为：'.$this->orderSn);
                     return ;

sql/upgrade/1684.sql

@@ -27,4 +27,8 @@ CREATE TABLE `AR_RETURN_ORDER` (
 `RETURN_DEC_LV` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '删除后用户的级别(退回到的级别)',
 `IS_LOCKING` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否锁定会员,默认0不锁定. 1为删除会锁定会员',
 PRIMARY KEY (`ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='删除订单记录表';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='删除订单记录表';
+
+
+ALTER TABLE `AR_RETURN_ORDER` ADD COLUMN `PAY_STATUS` int(3) NOT NULL DEFAULT 0 COMMENT '支付状态';
+ALTER TABLE `AR_RETURN_ORDER` ADD COLUMN `PAY_NOTE` text COLLATE utf8mb4_bin DEFAULT NULL COMMENT '支付信息';