|
|
@@ -92,7 +92,7 @@ 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,STATUS,NOTE')
|
|
|
+ ->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,ORDER_CATEGORY,CREATE_USER')
|
|
|
->where("SN=:SN", [':SN' => $sn])
|
|
|
->asArray()
|
|
|
->one();
|
|
|
@@ -101,7 +101,7 @@ class OrderDeleteForm extends Model
|
|
|
// 如果是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')
|
|
|
+ ->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,ORDER_CATEGORY,CREATE_USER')
|
|
|
->where("SN=:SN", [':SN' => $sn])
|
|
|
->asArray()
|
|
|
->one();
|
|
|
@@ -179,6 +179,15 @@ class OrderDeleteForm extends Model
|
|
|
$isLock = 1;
|
|
|
}
|
|
|
}
|
|
|
+ // PayStack支付退单不处理
|
|
|
+ } else if (!$approachOrderInfo && $orderInfo['ORDER_CATEGORY'] === 'STUDIO') {
|
|
|
+ // 工作室复消:退款给下单人
|
|
|
+ $createUser = User::findOneAsArray('USER_NAME=:USER_NAME', [':USER_NAME' => $orderInfo['CREATE_USER']]);
|
|
|
+ if (!$createUser) {
|
|
|
+ $transaction->rollBack();
|
|
|
+ throw new Exception('删除订单失败。查找下单人失败');
|
|
|
+ }
|
|
|
+ $userId = $createUser['ID'];
|
|
|
}
|
|
|
|
|
|
if (!$approachOrderInfo) {
|