From fab8b21ab3b6f62a253fa81066d5b4dd4419f9ca Mon Sep 17 00:00:00 2001
From: Lemon <15040771@qq.com>
Date: Thu, 17 Sep 2020 21:34:26 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=89=93=E5=8D=B0=20=E4=B8=8B=E5=8D=95?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Service/v3/Implementations/FeiePrintService.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/Service/v3/Implementations/FeiePrintService.php b/app/Service/v3/Implementations/FeiePrintService.php
index 20b8eeb..6becd6e 100644
--- a/app/Service/v3/Implementations/FeiePrintService.php
+++ b/app/Service/v3/Implementations/FeiePrintService.php
@@ -170,6 +170,7 @@ class FeiePrintService implements FeiePrintServiceInterface
         $orderInfo .= '送货地点：' . $arr->address . '<BR>';
         $tel = substr_replace( $arr->tel, '****', 3, 4);
         $orderInfo .= '联系电话：' . $tel . '<BR>';
+        $orderInfo .= '下单时间：' . $arr->pay_time_text . '<BR>';
         $orderInfo .= '送达时间：' . $arr->delivery_time_note . '<BR>';
         //$orderInfo .= '<QR>http://www.feieyun.com</QR>';//把解析后的二维码生成的字符串用标签套上即可自动生成二维码
         return $orderInfo;

From cef6d4ba72a1c41b7713cf08f87fa3d9b89f0737 Mon Sep 17 00:00:00 2001
From: weigang <mr.shuixiang@aliyun.com>
Date: Thu, 17 Sep 2020 21:47:24 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8=E5=BE=AA?=
 =?UTF-8?q?=E7=8E=AF=E5=8D=95=E5=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Controller/v3/OrderOnlineController.php | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

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' => '增值服务包含洗菜、切菜、打包等所产生的人工成本费及包装费。',