用户信息调整消息

application/api/controller/Order.php

@@ -177,7 +177,8 @@ class Order extends Api
                 $where[$o.'.user_car_number'] = $carNumber;
             }
             $where[$o.'.user_id'] = $this->auth->id;
-            $where[$o.'.status'] = 3;//状态:2=待处理,3=已完成,4=已取消
+            $where[$o.'.status'] = ['in',[2,3]];//状态:2=待处理,3=已完成,4=已取消
+            $where[$st.'.baoyang_switch'] = 1;//弹出保养时间:1=是,0=否
             $field = $o.'.id,servicetype_id,server_info,finish_time,next_date,next_carlicheng,pay_fee,appen_fee,'.$st.'.title as `service_title`';
             $result = $this->model->alias($o)->field($field)
                 ->join($st,$st.'.id = '.$o.'.servicetype_id','LEFT')

application/api/controller/User.php

@@ -655,7 +655,10 @@ class User extends Api
     {
         try {
             $userInfo = $this->auth->getUserinfo();
-            
+            $userCouponsWhere['user_id'] = $this->auth->id;
+            $userCouponsWhere['endtime'] = ['gt', time()];
+            $userCouponsNum = Db::name('user_coupons')->where($userCouponsWhere)->sum('remain');
+            $userInfo['coupons_num'] = $userCouponsNum;
             $this->success('获取成功',$userInfo);
         } catch (Exception $e) {
             $this->error($e->getMessage());

application/api/controller/company/Order.php

@@ -8,7 +8,6 @@ use think\Db;
 
 use alipaysdkphpallmaster\aop\AopClient;
 use alipaysdkphpallmaster\aop\request\AlipayTradePayRequest;
-use think\Log;
 
 /**
  * 订单管理
@@ -129,10 +128,7 @@ class Order extends Apic
         //订单取消发送消息
         $userService = new UserService();
         $params['order_id'] = $id;
-        $orderRes = $userService->msgPreOrder($params);
-        if (!$orderRes['status']) {
-            Log::error('order_id:'.$id.' error:'.$orderRes['msg']);
-        }
+        $userService->msgOrder($params);
         $this->success('取消成功');
 
     }
@@ -168,10 +164,7 @@ class Order extends Apic
         //订单取消发送消息
         $userService = new UserService();
         $params['order_id'] = $id;
-        $orderRes = $userService->msgPreOrder($params);
-        if (!$orderRes['status']) {
-            Log::error('order_id:'.$id.' error:'.$orderRes['msg']);
-        }
+        $userService->msgOrder($params);
         //是否弹出保养
         $baoyang_switch = Db::name('servicetype')->where('id',$info['servicetype_id'])->value('baoyang_switch');
 

application/api/controller/company/Preorder.php

@@ -42,10 +42,7 @@ class Preorder extends Apic
         Db::name('pre_order')->where('id',$id)->where('company_id',$this->auth->company_id)->update($update);
         $userService = new UserService();
         $params['pre_order_id'] = $id;
-        $preOrderRes = $userService->msgPreOrder($params);
-        if (!$preOrderRes['status']) {
-            Log::error('pre_order_id:'.$id.' error:'.$preOrderRes['msg']);
-        }
+        $userService->msgPreOrder($params);
         $this->success('取消成功');
     }
 

application/common/service/UserService.php

@@ -6,6 +6,7 @@ use app\common\model\PreOrder;
 use GuzzleHttp\Client;
 use think\Db;
 use think\Exception;
+use think\Log;
 
 class UserService
 {
@@ -147,6 +148,12 @@ class UserService
         } catch (Exception $e) {
             $result['status'] = 0;
             $result['msg'] = $e->getMessage();
+            $errorData = [
+                'pre_order_id' => $preOrderId,
+                'params' => isset($paramsData) ? $paramsData : [],
+                'error' => $result['msg'],
+            ];
+            Log::error(json_encode($errorData));
         }
         return $result;
     }
@@ -187,8 +194,9 @@ class UserService
                 "phrase4" => ["value" => $statusText],
                 "time2" => ["value" => date('Y年m月d日 H:i:s',$order['createtime'])],
             ];
+            $orderMsg['page'] = $orderMsg['page'].'?id='.$order['id'];
             $paramsData = $orderMsg;
-            $paramsData['mini_openid'] = $orderMsg['mini_openid'];
+            $paramsData['mini_openid'] = $order['mini_openid'];
             $paramsData['data'] = $data;
             $msgRes = $this->wechatMessageSend($paramsData);
             if (!$msgRes['status']) {
@@ -197,6 +205,12 @@ class UserService
         } catch (Exception $e) {
             $result['status'] = 0;
             $result['msg'] = $e->getMessage();
+            $errorData = [
+                'order_id' => $orderId,
+                'params' => isset($paramsData) ? $paramsData : [],
+                'error' => $result['msg'],
+            ];
+            Log::error(json_encode($errorData));
         }
         return $result;
     }

application/extra/param.php

@@ -5,13 +5,13 @@ return [
     'wechat_template' => [
         'pre_order' => [  //预约模版
             'template_id'       => 'are5ILn3yVsSo1mgDmvrsruFSFDZ599Qf7j4BRf8TIU',//模版ID
-            'page'              => 'page/home/index',//跳转地址
+            'page'              => 'pages/home/maintenance/reserveRecord',//跳转地址
             'miniprogram_state' => 'trial',//跳转小程序类型：developer为开发版；trial为体验版；formal为正式版；默认为正式版
             'lang'              => 'zh_CN',//支持zh_CN(简体中文)、en_US(英文)、zh_HK(繁体中文)、zh_TW(繁体中文)，默认为zh_CN
         ],
         'order' => [  //订单模版
             'template_id'       => 'tMSenoMJundYGJHx6JyotRepbN8d80whfobs_EvS_lY',//模版ID
-            'page'              => 'page/home/index',//跳转地址
+            'page'              => 'pages/order/detail',//跳转地址
             'miniprogram_state' => 'trial',//跳转小程序类型：developer为开发版；trial为体验版；formal为正式版；默认为正式版
             'lang'              => 'zh_CN',//支持zh_CN(简体中文)、en_US(英文)、zh_HK(繁体中文)、zh_TW(繁体中文)，默认为zh_CN
         ],