|
|
@@ -115,10 +115,12 @@ class OrderClearController extends BaseController
|
|
|
$get = Yii::$app->request->get();
|
|
|
$id = $get['id'] ?? 0;
|
|
|
$payWay = $get['payWay'] ?? dict::getDict('payWay', 'wxPay');
|
|
|
+ $payRemark = $get['payRemark']??'';
|
|
|
$clear = OrderClearClass::getById($id, true);
|
|
|
if (empty($clear)) {
|
|
|
util::fail('没有找到结账单');
|
|
|
}
|
|
|
+
|
|
|
$ghsId = $clear->ghsId ?? 0;
|
|
|
$ghs = GhsClass::getLockById($ghsId);
|
|
|
if ($ghs->shopId != $this->shopId) {
|
|
|
@@ -206,6 +208,9 @@ class OrderClearController extends BaseController
|
|
|
$transaction = $connection->beginTransaction();
|
|
|
try {
|
|
|
|
|
|
+ $clear->payRemark = $payRemark;
|
|
|
+ $clear->save();
|
|
|
+
|
|
|
$amount = $clear->actPrice ?? 0;
|
|
|
$customId = $clear->customId ?? 0;
|
|
|
$custom = CustomClass::getLockById($customId);
|