|
|
@@ -56,7 +56,7 @@ class PurchaseClearClass extends BaseClass
|
|
|
if ($purchase->ghsId != $currentGhsId) {
|
|
|
util::fail('请选择同个供应商的订单');
|
|
|
}
|
|
|
- $totalPrice = bcadd($totalPrice, $purchase->realPrice, 2);
|
|
|
+ $totalPrice = bcadd($totalPrice, $purchase->remainDebtPrice, 2);
|
|
|
$saleId = $purchase->saleId;
|
|
|
$saleArr[] = $saleId;
|
|
|
}
|
|
|
@@ -137,7 +137,7 @@ class PurchaseClearClass extends BaseClass
|
|
|
util::fail('没有找到客户信息');
|
|
|
}
|
|
|
|
|
|
- \bizHd\ghs\classes\GhsClass::clearDebtAmountReduce($ghs, $custom, $order->actPrice, $order);
|
|
|
+ \bizHd\ghs\classes\GhsClass::clearDebtAmountReduce($ghs, $custom, $order->remainDebtPrice, $order);
|
|
|
|
|
|
$shopId = $ghs->shopId;
|
|
|
$shop = ShopClass::getLockById($shopId);
|
|
|
@@ -149,7 +149,7 @@ class PurchaseClearClass extends BaseClass
|
|
|
ShopClass::customClearAddBalance($shop, $order);
|
|
|
}
|
|
|
//供应商的门店应收客户款减少
|
|
|
- $currentGathering = bcsub($shop->mayGathering, $order->actPrice, 2);
|
|
|
+ $currentGathering = bcsub($shop->mayGathering, $order->remainDebtPrice, 2);
|
|
|
$shop->mayGathering = $currentGathering;
|
|
|
$shop->save();
|
|
|
|
|
|
@@ -168,15 +168,16 @@ class PurchaseClearClass extends BaseClass
|
|
|
$purchase->debt = PurchaseClass::DEBT_NO;
|
|
|
$purchase->payWay = $payWay;
|
|
|
$purchase->clearId = $clearId;
|
|
|
+ $purchase->remainDebtPrice = 0;
|
|
|
$purchase->save();
|
|
|
$saleIds[] = $purchase->saleId;
|
|
|
}
|
|
|
|
|
|
//销售单状态变化
|
|
|
- OrderClass::updateByIds($saleIds, ['debt' => OrderClass::DEBT_NO, 'clearId' => $clearId]);
|
|
|
+ OrderClass::updateByIds($saleIds, ['debt' => OrderClass::DEBT_NO, 'clearId' => $clearId, 'remainDebtPrice' => 0]);
|
|
|
|
|
|
//客户付供应商款减少
|
|
|
- CustomClass::clearDebtAmountReduce($custom, $ghs, $order->actPrice, $order);
|
|
|
+ CustomClass::clearDebtAmountReduce($custom, $ghs, $order->remainDebtPrice, $order);
|
|
|
|
|
|
if (isset($order->customShopAdminId) && !empty($order->customShopAdminId)) {
|
|
|
WxMessageClass::clearInform($shop, $order, $custom);
|