diff --git a/crmeb/app/api/controller/v1/store/StoreCouponsController.php b/crmeb/app/api/controller/v1/store/StoreCouponsController.php index 4925e2cfe..234087391 100644 --- a/crmeb/app/api/controller/v1/store/StoreCouponsController.php +++ b/crmeb/app/api/controller/v1/store/StoreCouponsController.php @@ -50,6 +50,9 @@ class StoreCouponsController * 领取优惠券 * @param Request $request * @return mixed + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException */ public function receive(Request $request) { @@ -82,6 +85,7 @@ class StoreCouponsController * @param StoreCouponIssueServices $service * @param $cartId * @param $new + * @param $shippingType * @return mixed * @throws \Psr\SimpleCache\InvalidArgumentException * @throws \think\db\exception\DataNotFoundException diff --git a/crmeb/app/services/activity/coupon/StoreCouponUserServices.php b/crmeb/app/services/activity/coupon/StoreCouponUserServices.php index 1bd6b2353..cb84ac6fb 100644 --- a/crmeb/app/services/activity/coupon/StoreCouponUserServices.php +++ b/crmeb/app/services/activity/coupon/StoreCouponUserServices.php @@ -170,6 +170,8 @@ class StoreCouponUserServices extends BaseServices $coupon['start_time'] = $coupon['start_time'] ? date('Y/m/d', $coupon['start_time']) : date('Y/m/d', $coupon['add_time']); $coupon['add_time'] = date('Y/m/d', $coupon['add_time']); $coupon['end_time'] = date('Y/m/d', $coupon['end_time']); + $coupon['start_use_time'] = $coupon['start_use_time'] > 0 ? date('Y/m/d', $coupon['start_use_time']) : 0; + $coupon['end_use_time'] = $coupon['start_use_time'] > 0 ? date('Y/m/d', $coupon['end_use_time']) : 0; $coupon['title'] = $coupon['coupon_title']; $coupon['type'] = $coupon['applicable_type']; $coupon['use_min_price'] = floatval($coupon['use_min_price']);