|
|
@@ -209,7 +209,6 @@ class PurchaseClearController extends BaseController
|
|
|
{
|
|
|
ini_set('date.timezone', 'Asia/Shanghai');
|
|
|
$post = Yii::$app->request->post();
|
|
|
- $couponId = $post['couponId'] ?? 0;
|
|
|
$orderSn = isset($post['orderSn']) ? $post['orderSn'] : 0;
|
|
|
$order = PurchaseClearClass::getByCondition(['orderSn' => $orderSn], true);
|
|
|
if (empty($order)) {
|
|
|
@@ -229,7 +228,6 @@ class PurchaseClearController extends BaseController
|
|
|
$order->save();
|
|
|
util::fail('订单已经失效,请重新发起结算');
|
|
|
}
|
|
|
- $name = '采购单结算';
|
|
|
$totalFee = $order->actPrice;
|
|
|
|
|
|
$capitalType = dict::getDict('capitalType', 'hdPurchaseClear', 'id');
|
|
|
@@ -260,10 +258,10 @@ class PurchaseClearController extends BaseController
|
|
|
$closeParams = [
|
|
|
'orderSn' => $oldOrderSn,
|
|
|
];
|
|
|
- $response = $laResource->close($closeParams);
|
|
|
- if (isset($response['code']) == false || $response['code'] != 'BBS00000') {
|
|
|
+ $response = $laResource->cashClose($closeParams);
|
|
|
+ if (isset($response['code']) == false || $response['code'] != '000000') {
|
|
|
$msg = $response['msg'] ?? '';
|
|
|
- noticeUtil::push('重点注意,花店结账,单号:' . $oldOrderSn . ',关单没有成功,原因:' . $msg . ',可能造成无法结账', '15280215347');
|
|
|
+ noticeUtil::push('重点注意,花店结账,单号:' . $oldOrderSn . ',关单没有成功(收银台-支付宝),原因:' . $msg . ',可能造成无法结账', '15280215347');
|
|
|
util::fail('出错了,请取消本单重试');
|
|
|
}
|
|
|
|
|
|
@@ -286,17 +284,16 @@ class PurchaseClearController extends BaseController
|
|
|
'lklCertificatePath' => $lklCertificatePath,
|
|
|
];
|
|
|
$laResource = new Lakala($params);
|
|
|
- $notifyUrl = Yii::$app->params['hdHost'] . "/notice/pay-callback";
|
|
|
+ $notifyUrl = Yii::$app->params['hdHost'] . "/notice/cash-pay-callback";
|
|
|
$wxParams = [
|
|
|
'orderSn' => $orderSn,
|
|
|
'amount' => $totalFee,
|
|
|
'capitalType' => $capitalType,
|
|
|
'notifyUrl' => $notifyUrl,
|
|
|
- 'subject' => $name,
|
|
|
- 'couponId' => $couponId,
|
|
|
+ 'subject' => $orderSn,
|
|
|
];
|
|
|
- $response = $laResource->driveWxPay($wxParams);
|
|
|
- if (isset($response['code']) == false || $response['code'] != 'BBS00000') {
|
|
|
+ $response = $laResource->cashierPay($wxParams);
|
|
|
+ if (isset($response['code']) == false || $response['code'] != '000000') {
|
|
|
$errMsg = $response['msg'] ?? '';
|
|
|
$ghsName = $order->ghsName ?? '';
|
|
|
$ghsShopName = $order->ghsShopName ?? '';
|
|
|
@@ -306,7 +303,7 @@ class PurchaseClearController extends BaseController
|
|
|
noticeUtil::push("\n提示:结账付款失败\n原因:" . $errMsg . "。\n商家:" . $ghsFullName . "\n客户:" . $customFullName, '15280215347');
|
|
|
util::fail('结账付款失败,' . $errMsg . ',请联系门店');
|
|
|
}
|
|
|
- $payUrl = '';
|
|
|
+ $payUrl = $response['resp_data']['counter_url'] ? $response['resp_data']['counter_url'] : '';
|
|
|
$new = [
|
|
|
'payUrl' => $payUrl,
|
|
|
'orderSn' => $orderSn,
|