diff --git a/crmeb/app/services/order/StoreCartServices.php b/crmeb/app/services/order/StoreCartServices.php index d4efe3568..9367bd849 100644 --- a/crmeb/app/services/order/StoreCartServices.php +++ b/crmeb/app/services/order/StoreCartServices.php @@ -679,6 +679,7 @@ class StoreCartServices extends BaseServices * @param $num * @param $new * @return bool + * @throws \ReflectionException */ public function checkLimit($uid, $product_id, $num, $new) { @@ -701,8 +702,8 @@ class StoreCartServices extends BaseServices } } else if ($limitInfo['limit_type'] == 2) { $cartNum = $this->dao->sum(['uid' => $uid, 'product_id' => $product_id], 'cart_num'); - $orderPayNum = $orderCartServices->sum(['uid' => $uid, 'product_id' => $product_id], 'cart_num'); - $orderRefundNum = $orderCartServices->sum(['uid' => $uid, 'product_id' => $product_id], 'refund_num'); + $orderPayNum = $orderCartServices->sum(['uid' => $uid, 'product_id' => $product_id, 'pid' => 0], 'cart_num'); + $orderRefundNum = $orderCartServices->sum(['uid' => $uid, 'product_id' => $product_id, 'pid' => 0], 'refund_num'); $orderNum = $orderPayNum - $orderRefundNum; if (($num + $orderNum + $cartNum) > $limitInfo['limit_num']) { throw new ApiException(410240, ['limit' => $limitInfo['limit_num'], 'pay_num' => $orderNum]); diff --git a/crmeb/app/services/order/StoreOrderRefundServices.php b/crmeb/app/services/order/StoreOrderRefundServices.php index 3fd06be86..97dc9f9ed 100644 --- a/crmeb/app/services/order/StoreOrderRefundServices.php +++ b/crmeb/app/services/order/StoreOrderRefundServices.php @@ -435,9 +435,9 @@ class StoreOrderRefundServices extends BaseServices $res = true; //回退优惠卷 拆分子订单不退优惠券 if (!$order['pid'] && $order['coupon_id'] && $order['coupon_price']) { - /** @var StoreCouponUserServices $coumonUserServices */ - $coumonUserServices = app()->make(StoreCouponUserServices::class); - $res = $res && $coumonUserServices->recoverCoupon((int)$order['coupon_id']); + /** @var StoreCouponUserServices $couponUserServices */ + $couponUserServices = app()->make(StoreCouponUserServices::class); + $res = $couponUserServices->recoverCoupon((int)$order['coupon_id']); $statusService->save([ 'oid' => $order['id'], 'change_type' => 'coupon_back',