合并分支 'Branch_liuzhen' 到 'master'

Branch liuzhen



查看合并请求 !175

@@ -94,12 +94,12 @@ class HouseAdmin extends Backend
                     }
                     }
                     $result = $this->model->allowField(true)->save($params);
                     $result = $this->model->allowField(true)->save($params);
 
 
-//                    $house_admin_id = $this->model->getLastInsID();
-//
-//                    $data = Db::name('house_admin')->where('id',$house_admin_id)->find();
-//                    if(!empty($data['user_id'])){
-//                        Db::name('user')->where('id',$data['user_id'])->update(['identity'=>1]);
-//                    }
+                    $house_admin_id = $this->model->getLastInsID();
+
+                    $data = Db::name('house_admin')->where('id',$house_admin_id)->find();
+                    if(!empty($data['user_id'])){
+                        Db::name('user')->where('id',$data['user_id'])->update(['identity'=>1]);
+                    }
 
 
                     Db::commit();
                     Db::commit();
                 } catch (ValidateException $e) {
                 } catch (ValidateException $e) {

@@ -714,6 +714,7 @@ class User extends Api
         $list = UserMoneyLog::where($where)
         $list = UserMoneyLog::where($where)
         	->field("memo,money,from_unixtime(createtime, '%Y-%m-%d %H:%i:%S') createtime")
         	->field("memo,money,from_unixtime(createtime, '%Y-%m-%d %H:%i:%S') createtime")
             ->page($page,$pageNum)
             ->page($page,$pageNum)
+            ->order('createtime','DESC')
         	->select();
         	->select();
         $this->success('成功',compact('total_num','list'));
         $this->success('成功',compact('total_num','list'));
     }
     }

@@ -274,7 +274,7 @@ class Ajax extends Frontend
     public function refund_notify() {
     public function refund_notify() {
         $app = new Application(ConfigService::load());
         $app = new Application(ConfigService::load());
         $response = $app->payment->handleRefundNotify(function ($message, $reqInfo) {
         $response = $app->payment->handleRefundNotify(function ($message, $reqInfo) {
-            Log::write(date('Y-m-d H:i') . '订单退款操作,返回数据：' . json_encode($message, JSON_UNESCAPED_UNICODE), 'notice');
+//            Log::write(date('Y-m-d H:i') . '订单退款操作,返回数据：' . json_encode($message, JSON_UNESCAPED_UNICODE), 'notice');
             // 其中 $message['req_info'] 获取到的是加密解密信息
             // 其中 $message['req_info'] 获取到的是加密解密信息
             // $reqInfo 成功时为1
             // $reqInfo 成功时为1
             // 你的业务逻辑...
             // 你的业务逻辑...
@@ -285,7 +285,7 @@ class Ajax extends Frontend
                     'out_refund_no'     => $message['req_info']['out_refund_no']
                     'out_refund_no'     => $message['req_info']['out_refund_no']
                 ];
                 ];
                 $refund = Db::name('Refund')->where($refund_where)->find();
                 $refund = Db::name('Refund')->where($refund_where)->find();
-                Log::write(date('Y-m-d H:i') . '订单退款操作1,返回数据：' . json_encode($refund, JSON_UNESCAPED_UNICODE), 'notice');
+//                Log::write(date('Y-m-d H:i') . '订单退款操作1,返回数据：' . json_encode($refund, JSON_UNESCAPED_UNICODE), 'notice');
                 if($refund['status'] == 1) {
                 if($refund['status'] == 1) {
                     return true;
                     return true;
                 } else {
                 } else {
@@ -325,7 +325,7 @@ class Ajax extends Frontend
                     } elseif($message['req_info']['refund_status'] == 'REFUNDCLOSE') {
                     } elseif($message['req_info']['refund_status'] == 'REFUNDCLOSE') {
                         $update['status'] = 3;
                         $update['status'] = 3;
                     }
                     }
-                    Log::write(date('Y-m-d H:i') . '订单退款操作3,返回数据：' . json_encode($refund_where, JSON_UNESCAPED_UNICODE), 'notice');
+//                    Log::write(date('Y-m-d H:i') . '订单退款操作3,返回数据：' . json_encode($refund_where, JSON_UNESCAPED_UNICODE), 'notice');
                     $result = Db::name('Refund')->where($refund_where)->update($update);
                     $result = Db::name('Refund')->where($refund_where)->update($update);
                     if(!$result || !$ask_order_result) {
                     if(!$result || !$ask_order_result) {
                         Log::write(date('Y-m-d H:i') . '订单退款操作5,返回数据：' . json_encode([$result,$ask_order_result], JSON_UNESCAPED_UNICODE), 'notice');
                         Log::write(date('Y-m-d H:i') . '订单退款操作5,返回数据：' . json_encode([$result,$ask_order_result], JSON_UNESCAPED_UNICODE), 'notice');