Commit 861a57fa authored by jianghaiming's avatar jianghaiming

update:Set

parent 18ea4ea3
......@@ -64,6 +64,6 @@ class GoodsException extends BaseException
45 => '还没有try,就去执行confirm',
46 => '已经执行过cancel',
47 => 'sku rollback error',
48 => '商户结算价不能大于分润价加支付价',
48 => '请满足以下条件后提交,售价-分销总金额-手续费>=结算价',
];
}
\ No newline at end of file
......@@ -760,14 +760,14 @@ class GoodsService
if ($marketing["commission_mode"] == Marketing::COMMISSION_MODE_RATE) {
$commissionTotal = ($marketing["first_commission_value"] + $marketing["second_commission_value"]) / 10000 * $price;
if (($price - $commissionTotal - $chargeFee) < $clearPrice) {
throw new GoodsException(['cus' => 40]);
throw new GoodsException(['cus' => 48]);
}
}
if ($marketing["commission_mode"] == Marketing::COMMISSION_MODE_FIXED) {
$commissionTotal = ($marketing["first_commission_value"] + $marketing["second_commission_value"]);
if (($price - $commissionTotal - $chargeFee) < $clearPrice) {
throw new GoodsException(['cus' => 40]);
throw new GoodsException(['cus' => 48]);
}
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment