Merge branch 'master_dev' of git.shenbd.com:qm-develop/shenbd into master_dev

application/controllers/User.php

@@ -86,8 +86,8 @@ class UserController extends \Our\Controller_AbstractIndex {
             $data['userType'] = \Our\ApiConst::wechatUserType;
             $member= $this->memberService->loginWithWechatInfo($data,$authInfo);
             if($member){
-                $userToken=$this->memberService->findMbUserTokenByMemberId($member['member_id']);
-                $this->memberService->clearKey($userToken['token']);
+                /*$userToken=$this->memberService->findMbUserTokenByMemberId($member['member_id']);
+                $this->memberService->clearKey($userToken['token']);*/
                 $this->memberService->clearKey($this->key);
                 $this->key=Common::bulidToken('', '', '', \Our\ApiConst::wechatDeviceType);
                 session_id($this->key);
@@ -95,7 +95,7 @@ class UserController extends \Our\Controller_AbstractIndex {
                 $this->sess['user_type'] = \Our\ApiConst::wechatUserType;
                 $this->sess[NameConst::sessionKey]=$this->key;
                 $member[NameConst::sessionKey]=$this->key;
-                $this->memberService->saveMember($member);
+                //$this->memberService->saveMember($member);
                 $this->success(array('key'=>$this->key,'memberName'=>$member['member_name'],'memberAvatar'=>$member['memberAvatarUrl']));
             }
 

application/models/Business/Order/OrderService.php

@@ -424,7 +424,8 @@ class OrderServiceModel extends \Business\AbstractModel
             $update['reason_info'] = '用户付款' . $waitDiff . '分钟内，店铺未接单,自动取消订单';
             $update['buyer_message'] = '用户付款' . $waitDiff. '分钟内，店铺未接单,自动取消订单';
             $update['is_suc_refund'] = 1;
-            $res = $refundReturnDao->addRefundReturn($update);
+            //$res = $refundReturnDao->addRefundReturn($update);
+            $res=true;
             if (!$res) {
                 echo '退款记录:' . json_encode($orderInfo) . '写入失败!!' . "\r\n";
             }else{

public/test/user/loginWithWechatInfo.php

@@ -11,10 +11,10 @@
 
 <form action="/user/loginWithWechatInfo" method="post">
     用户头像:<input name="data[avatar]" value="https://tva3.sinaimg.cn/crop.0.1.1242.1242.180/4711809ejw8f387zus4vpj20yi0ykjwd.jpg"/><br />
-    key:<input name="data[key]" value="a47c3f7e20cd11d9473e39b36ce512ad"/><br />
+    key:<input name="data[key]" value="28d391fe06706bff971e2ef95d3dcdbb"/><br />
     gender:<input name="data[gender]" value="1"/><br />
-    encryptedData:<input name="data[encryptedData]" value="kXGXJHHrTjZtBCvDtKLWv/utlY5AUbbvA2wleUx94n6nUiF6mcz9AUgNziDVDXokRq855pwjGtzHwxdwg3Se7Z4bJWzkCJnC1Vk/CBd1kXHz77ct9rRyruCz27VYHMjKPzfqEmVl7MfVg+xyoXYZQoUgz98yTBlREmmIfW5gEfSTKKW73mrVoXJJvszBj3VdwaqSWiSa4whds6OZWNpgUWlFxdntY0q5nBEaKTcxPfpF3QxKlFmD4bw30Q2c41M+wTeD/txDVtqEUJf9U5rSuA0cZSzgHllTEoS4KxXunasT0WhXJ0+Uow6xDkvMvSe2az1qAmVHweKTr5mp7wAGYn5GlrcG6cXRgfctEGQg6k/rJUQMLmiurE5Z0ERLeyWUUKU1ZSlPfYgfJ5L1zLzygIudHTozCjUDHhXh0/DTaCq5ZdTEw9FYL34uZ2TsiPUEGz/VgsD/CTgvw32O9PYBjfESt8aBFk+cKxt7eJZueWyly4H7YhT5k9+TTqiQ4GY/v81BcErat/Gx8Cn/UoQh7g=="/><br />
-    iv:<input name="data[iv]" value="yopI5yZHu+2vlaOatNyjIA=="/><br />
+    encryptedData:<input name="data[encryptedData]" value="7vq6fElU/Ly3EXz5o/kyPWyUW8LwN5oKkyX6k3OSJ+QVLSWv0nmhpWik7MnemEr9K6ToLaRnVmgtCqg8/D0Lq+xcyr6DQGvY1ihB8UecVoc3Qrz9A9OKGK1RvIoa82Z+KCXG1cg9BYWOXyCaoXw6HmqLiBD42nyC2uwUg3ShgiX0noo1H8uu7f2MRW5ig94JGnSgbqqVI3dh8cJW9oFA1fzPrT/48NbUWJjbApPhuR4SCLkf6a2d628t7Giym296BZ9jUTalJDTKxI3jWgr1ll7G0toE9oePrkvH5c9BWgDJ+YrdjpqSTeXXpiHFPDpBQqt8d0+5t6m5kGmGSKi0zM9ze+u/t3qL5b3uBo9GPAGpUrVZeBYlxUEoxGruFwdg6H/cPMQOOlSyabsiF9VMLl+kdAW4C2SunZIHgvYZ3dhyaDHJOqcCUSuqVTZY7Yi/X8U+uVFxCRDNRAJ/L39kHP/p+eDqoaMZethMKp/bfPQGCL32RSQzFA1BEcoZ9AEZMLZCIyS6vvjNlw/LHyUVQg=="/><br />
+    iv:<input name="data[iv]" value="3pbYLsryffNZbzPqaNBneQ=="/><br />
     nickname:<input name="data[nickname]" value="lindongming123"/><br />
     <input type="submit" value="提交">
 </form>