diff --git a/app/common/repositories/store/order/StoreOrderCreateRepository.php b/app/common/repositories/store/order/StoreOrderCreateRepository.php index ec703a28..15b64165 100644 --- a/app/common/repositories/store/order/StoreOrderCreateRepository.php +++ b/app/common/repositories/store/order/StoreOrderCreateRepository.php @@ -504,9 +504,6 @@ class StoreOrderCreateRepository extends StoreOrderRepository $item['describe']='仅限平台指定商家商品可使用'; return $item; }); - // if(count($platformConsumption)>1){ - // $consumption=$platformConsumption[0]; - // } } // } @@ -583,13 +580,13 @@ class StoreOrderCreateRepository extends StoreOrderRepository } } if($this->store_consumption_user['type']==1){ - if($pay_price>$this->store_consumption_user['balance']){ + if($pay_price > $this->store_consumption_user['balance']){ $pay_price = bcsub($pay_price, $this->store_consumption_user['balance'], 2); $this->consumption_money=$this->store_consumption_user['balance']; $a=$this->store_consumption_user['balance']; }else{ $pay_price=0; - $this->consumption_money=bcsub($this->store_consumption_user['balance'],$pay_price, 2); + $this->consumption_money=$pay_price; $a=$this->consumption_money; } } @@ -636,7 +633,7 @@ class StoreOrderCreateRepository extends StoreOrderRepository $status = ($address || $order_model || $allow_no_address) ? ($noDeliver ? 'noDeliver' : 'finish') : 'noAddress'; $order = $merchantCartList; $consumption_money = $this->consumption_money; - $total_price = $order_total_price; + $total_price = bcsub($order_total_price,$consumption_money,2); $openIntegral = $merIntegralFlag && !$order_type && $sysIntegralConfig['integral_status'] && $sysIntegralConfig['integral_money'] > 0; $total_coupon = bcadd($order_svip_discount, bcadd(bcadd($total_platform_coupon_price, $order_coupon_price, 2), $order_total_integral_price, 2), 2); $is_self_pickup=true; @@ -962,6 +959,7 @@ class StoreOrderCreateRepository extends StoreOrderRepository $balance=['balance'=>0,'status'=>1]; Db::name('store_consumption_user')->where('coupon_user_id',$groupOrder['coupon_user_id'])->update(); } + } } app()->make(UserBillRepository::class)->decBill($user['uid'], 'consumption', 'deduction', [