|
|
@@ -24,7 +24,7 @@ use Yii;
|
|
|
class RechargeController extends BaseController
|
|
|
{
|
|
|
|
|
|
- //获取商城端充值页小程序短链接和说明内容
|
|
|
+ //获取商城端充值页和订单页小程序短链接
|
|
|
public function actionGetMallRechargeShortLink()
|
|
|
{
|
|
|
$get = Yii::$app->request->get();
|
|
|
@@ -109,11 +109,25 @@ class RechargeController extends BaseController
|
|
|
if ($shOrder->forward != 1) {
|
|
|
util::fail('不是售后付款单');
|
|
|
}
|
|
|
+ if ($shOrder->mainId != $this->mainId) {
|
|
|
+ util::fail('不是你的单');
|
|
|
+ }
|
|
|
//判断是否充值过了
|
|
|
OrderClass::shOrderRecharge($shOrder);
|
|
|
$shOrderSn = $shOrder->orderSn ?? '';
|
|
|
}
|
|
|
|
|
|
+ $refundOrderId = $post['refundOrderId'] ?? 0;
|
|
|
+ $refundOrderSn = '';
|
|
|
+ if (!empty($refundOrderId)) {
|
|
|
+ //线下订单售后,充值
|
|
|
+ $myOrder = OrderClass::getById($refundOrderId, true);
|
|
|
+ if ($myOrder->mainId != $this->mainId) {
|
|
|
+ util::fail('不是你的订单');
|
|
|
+ }
|
|
|
+ $refundOrderSn = $myOrder->orderSn ?? '';
|
|
|
+ }
|
|
|
+
|
|
|
$customName = $custom->name;
|
|
|
$userId = $custom->userId ?? 0;
|
|
|
$hdId = $custom->hdId;
|
|
|
@@ -146,6 +160,8 @@ class RechargeController extends BaseController
|
|
|
'userId' => $userId,
|
|
|
'shOrderId' => $shOrderId,
|
|
|
'shOrderSn' => $shOrderSn,
|
|
|
+ 'refundOrderId' => $refundOrderId,
|
|
|
+ 'refundOrderSn' => $refundOrderSn,
|
|
|
];
|
|
|
$respond = \bizHd\recharge\classes\RechargeClass::addRecharge($rechargeData);
|
|
|
|