|
|
@@ -94,6 +94,7 @@ class OrderClearClass extends BaseClass
|
|
|
'modifyPrice' => $totalAmount,
|
|
|
'payWay' => 0,
|
|
|
'complete' => 1,
|
|
|
+ 'remark' => '充值余额结账',
|
|
|
];
|
|
|
$clearInfo = self::clear($clearData, $idText, $sjId, $shopId);
|
|
|
//结账消费余额
|
|
|
@@ -182,6 +183,7 @@ class OrderClearClass extends BaseClass
|
|
|
$deadline = date("Y-m-d H:i:s", time() + 30 * 24 * 60 * 60);
|
|
|
}
|
|
|
$payWay = isset($post['payWay']) && is_numeric($post['payWay']) ? $post['payWay'] : dict::getDict('payWay', 'unPay');
|
|
|
+ $remark = $post['remark'] ?? '';
|
|
|
$clearData = [
|
|
|
'prePrice' => $amount,
|
|
|
'actPrice' => $modifyPrice,
|
|
|
@@ -212,6 +214,7 @@ class OrderClearClass extends BaseClass
|
|
|
'num' => count($ids),
|
|
|
'ghsShopName' => $ghsShopName,
|
|
|
'hasNoticeCustom' => 0,
|
|
|
+ 'remark' => $remark,
|
|
|
];
|
|
|
if ($modifyPrice < $amount) {
|
|
|
$clearData['discountAmount'] = bcsub($amount, $modifyPrice, 2);
|