diff --git a/app/Controller/v3/OrderOnlineController.php b/app/Controller/v3/OrderOnlineController.php index 3498eaa..9da4214 100644 --- a/app/Controller/v3/OrderOnlineController.php +++ b/app/Controller/v3/OrderOnlineController.php @@ -128,7 +128,20 @@ class OrderOnlineController extends BaseController $res['store_list'] = $this->shopCartService->getGoodsByShopcartId($shopcartIds); //获取用户优惠券 - $res['coupon'] = $this->couponRecService->allForOnlineOrderAvailable($userId, $marketId); + $coupons = $this->couponRecService->allForOnlineOrderAvailable($userId, $marketId); + $res['coupon'] = []; + foreach ($coupons as $key => &$item) { + foreach ($item as $k => &$rec) { + for ($i=0; $i<$rec->number_remain; $i++) { + if ($key == 'available') { + $res['coupon']['available'][] = $rec; + } elseif ($key == 'not_available') { + $res['coupon']['not_available'][] = $rec; + } + } + } + } + // $res['coupon'] = $coupons; //增值服务接口 $res['value_added_service'] = [ 'text' => '增值服务包含洗菜、切菜、打包等所产生的人工成本费及包装费。', diff --git a/app/Service/v3/Implementations/FeiePrintService.php b/app/Service/v3/Implementations/FeiePrintService.php index 59a3a33..6becd6e 100644 --- a/app/Service/v3/Implementations/FeiePrintService.php +++ b/app/Service/v3/Implementations/FeiePrintService.php @@ -170,8 +170,8 @@ class FeiePrintService implements FeiePrintServiceInterface $orderInfo .= '送货地点:' . $arr->address . '
'; $tel = substr_replace( $arr->tel, '****', 3, 4); $orderInfo .= '联系电话:' . $tel . '
'; - $orderInfo .= '下单时间:' . $arr->delivery_time_note . '
'; - $orderInfo .= '送达时间:' . $arr->pay_time_text . '
'; + $orderInfo .= '下单时间:' . $arr->pay_time_text . '
'; + $orderInfo .= '送达时间:' . $arr->delivery_time_note . '
'; //$orderInfo .= 'http://www.feieyun.com';//把解析后的二维码生成的字符串用标签套上即可自动生成二维码 return $orderInfo; }