From 31f3f4dd03c280f409dca2e645b4225b99bf097d Mon Sep 17 00:00:00 2001
From: 王晓刚 <wxg@bronet.cn>
Date: Mon, 24 Jun 2019 18:49:54 +0800
Subject: [PATCH] 去除收货地址为空的订单

---
 app/portal/controller/OrderController.php          | 2 ++
 simplewind/cmf/controller/WeChatBaseController.php | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/portal/controller/OrderController.php b/app/portal/controller/OrderController.php
index ea2e874..0af798a 100644
--- a/app/portal/controller/OrderController.php
+++ b/app/portal/controller/OrderController.php
@@ -47,6 +47,8 @@ class OrderController extends WeChatBaseController
                     if(empty($vo['indent_address'])){
                         unset($data[$key]);
                     }
+                }else{
+                    unset($data[$key]);
                 }
             }
         }
diff --git a/simplewind/cmf/controller/WeChatBaseController.php b/simplewind/cmf/controller/WeChatBaseController.php
index 78d080e..0d1ae2b 100644
--- a/simplewind/cmf/controller/WeChatBaseController.php
+++ b/simplewind/cmf/controller/WeChatBaseController.php
@@ -204,8 +204,8 @@ class WeChatBaseController extends BaseController
      */
     public function checkWeChatUserLogin()
     {
-       /*$user = Db::name('user')->where('id',7)->find();
-       cmf_update_current_user($user);*/
+//       $user = Db::name('user')->where('id',2)->find();
+//       cmf_update_current_user($user);
         $userId = cmf_get_current_user_id();
         if (empty($userId)) {
             $config = [
--
libgit2 0.24.0