|
|
@@ -7,6 +7,7 @@ use bizHd\shop\classes\MainClass;
|
|
|
use bizHd\shop\classes\ShopMoneyChangeClass;
|
|
|
use bizHd\work\classes\WorkClass;
|
|
|
use common\components\dict;
|
|
|
+use common\components\orderSn;
|
|
|
use common\components\util;
|
|
|
use Yii;
|
|
|
use bizHd\base\classes\BaseClass;
|
|
|
@@ -30,7 +31,7 @@ class SettleClass extends BaseClass
|
|
|
util::fail('已经结过了哦');
|
|
|
}
|
|
|
$shopId = $order->shopId ?? 0;
|
|
|
- $orderSn = $order->orderSn ?? '';
|
|
|
+ $settleOrderSn = orderSn::getSettleSn();
|
|
|
$customId = $order->customId ?? 0;
|
|
|
$customName = $order->customName ?? '';
|
|
|
$staffId = $staff->id ?? 0;
|
|
|
@@ -52,6 +53,7 @@ class SettleClass extends BaseClass
|
|
|
'payTime' => date("Y-m-d H:i:s"),
|
|
|
'hdShopAdminId' => $staffId,
|
|
|
'hdShopName' => $staffName,
|
|
|
+ 'orderSn' => $settleOrderSn,
|
|
|
];
|
|
|
$settleReturn = self::addData($settleData);
|
|
|
$settleId = $settleReturn->id ?? 0;
|
|
|
@@ -69,7 +71,7 @@ class SettleClass extends BaseClass
|
|
|
$moneyBalance = bcadd($main->money, $remainDebtPrice, 2);
|
|
|
$main->money = $moneyBalance;
|
|
|
$main->save();
|
|
|
- $moneyEvent = $customName . "现金结尾款" . floatval($remainDebtPrice) . "元(单号 {$orderSn})";
|
|
|
+ $moneyEvent = $customName . "现金结尾款" . floatval($remainDebtPrice) . "元(单号 {$settleOrderSn})";
|
|
|
$moneyRemark = '';
|
|
|
|
|
|
$capitalType = dict::getDict('capitalType', 'hdXsClear', 'id');
|