diff --git a/app/api/logic/order/OrderLogic.php b/app/api/logic/order/OrderLogic.php index 6f854771a..10ad1ff89 100644 --- a/app/api/logic/order/OrderLogic.php +++ b/app/api/logic/order/OrderLogic.php @@ -102,6 +102,7 @@ class OrderLogic extends BaseLogic //理论上每笔都是拆分了 $cart_select[$k]['name'] = $find['store_name']; $cart_select[$k]['imgs'] = $find['image']; + $cart_select[$k]['store_id'] = $params['store_id']??0; $cart_select[$k]['unit_name'] = StoreProductUnit::where(['id' => $find['unit']])->value('name'); self::$total = bcadd(self::$total, $cart_select[$k]['total'], 2); self::$cost = bcadd(self::$cost, $cart_select[$k]['cost'], 2); diff --git a/app/common/logic/PayNotifyLogic.php b/app/common/logic/PayNotifyLogic.php index acbcbfebc..9c14a4c13 100644 --- a/app/common/logic/PayNotifyLogic.php +++ b/app/common/logic/PayNotifyLogic.php @@ -251,7 +251,7 @@ class PayNotifyLogic extends BaseLogic if ($order->pay_type != 9 || $order->pay_type != 10) { $financeLogic->in($transaction_id, $order['pay_price'], OrderEnum::USER_ORDER_PAY); //用户单入账 //商户应该获得的钱 每个商品的price-ot_price 利润 - if ($order->profit !== "0.00") { + if (isset($order->profit) && $order->profit > 0) { //手续费 $fees = bcdiv(bcmul($order['pay_price'], '0.02', 2), 1, 2); $financeLogic->in($transaction_id, $fees, OrderEnum::ORDER_COMMITION, $order['store_id']); //手续费入账