diff --git a/crmeb/app/api/controller/v1/order/StoreOrderController.php b/crmeb/app/api/controller/v1/order/StoreOrderController.php index 74f282d8c..40643831f 100644 --- a/crmeb/app/api/controller/v1/order/StoreOrderController.php +++ b/crmeb/app/api/controller/v1/order/StoreOrderController.php @@ -263,9 +263,6 @@ class StoreOrderController return app('json')->fail(410215); } - //重新生成订单号去支付 -// $order['order_id'] = mt_rand(100, 999) . '_' . $order['order_id']; - //0元支付 if (bcsub((string)$orderInfo['pay_price'], '0', 2) <= 0) { //创建订单jspay支付 diff --git a/crmeb/app/services/activity/coupon/StoreCouponIssueServices.php b/crmeb/app/services/activity/coupon/StoreCouponIssueServices.php index 0d6718540..9c8d16ce0 100644 --- a/crmeb/app/services/activity/coupon/StoreCouponIssueServices.php +++ b/crmeb/app/services/activity/coupon/StoreCouponIssueServices.php @@ -259,7 +259,7 @@ class StoreCouponIssueServices extends BaseServices $data['add_time'] = $item['start_use_time']; $data['end_time'] = $item['end_use_time']; } - $data['type'] = 'get'; + $data['type'] = 'send'; $issue['uid'] = $uid; $issue['issue_coupon_id'] = $item['id']; $issue['add_time'] = $time; diff --git a/crmeb/app/services/order/StoreOrderDeliveryServices.php b/crmeb/app/services/order/StoreOrderDeliveryServices.php index da2b3d109..1def0cef5 100644 --- a/crmeb/app/services/order/StoreOrderDeliveryServices.php +++ b/crmeb/app/services/order/StoreOrderDeliveryServices.php @@ -569,6 +569,7 @@ class StoreOrderDeliveryServices extends BaseServices /** * 虚拟商品自动发货 * @param $orderInfo + * @throws \ReflectionException */ public function virtualSend($orderInfo) { diff --git a/crmeb/app/services/product/product/StoreProductCouponServices.php b/crmeb/app/services/product/product/StoreProductCouponServices.php index da8ea57fb..b3362dccb 100644 --- a/crmeb/app/services/product/product/StoreProductCouponServices.php +++ b/crmeb/app/services/product/product/StoreProductCouponServices.php @@ -92,6 +92,9 @@ class StoreProductCouponServices extends BaseServices * @param int $uid * @param $orderId * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException */ public function giveOrderProductCoupon(int $uid, $orderId) {