Merge remote-tracking branch 'origin/master'

app/Service/DouShopService.php

@@ -28,7 +28,7 @@ class DouShopService extends Service
 
     //------------------获取token
     public function getToken($data){
-        if(empty($data['shop_id'])) return [false, '店铺ID不能为空'];
+        if(empty($data['shop_id'])) return [false, '请选择店铺不能为空'];
 
         $key = $this->appKey . $data['shop_id'] . self::RedisKey;
         $token = Redis::get($key);
@@ -332,7 +332,7 @@ class DouShopService extends Service
             $tmp['contract_fee'] = $value['order_amount'] / 100;
             foreach ($value['product'] as $p){
                if(! isset($product_map[$p['code']])) return [false, '产品编码:' . $p['code'] . '在系统中不存在或已被删除'];
-                $tmp['product_total'] += $p['sum_amount'];
+                $tmp['product_total'] += $p['sum_amount'] / 100;
 
                 //产品子表
                 $product_tmp = $product_map[$p['code']] ?? [];
@@ -382,10 +382,8 @@ class DouShopService extends Service
                 $insert3 = [];
                 foreach ($last_insert_id as $key => $value){
                     if(isset($insert_detail_man[$key])) {
-                        foreach ($insert_detail_man[$key] as $val){
-                            $val['sales_order_id'] = $value;
-                            $insert3[] = $val;
-                        }
+                        $insert_detail_man[$key]['sales_order_id'] = $value;
+                        $insert3[] = $insert_detail_man[$key];
                     }
                 }
                 SalesOrderInfo::insert($insert3);

app/Service/FollowUpRecordService.php

@@ -149,7 +149,17 @@ class FollowUpRecordService extends Service
         $basic_type = BasicType::whereIn('id',array_unique(array_column($data['data'],'basic_type_id')))
             ->pluck('title','id')
             ->toArray();
+        $follow_up_record_id = FollowUpRecordFile::where('del_time',0)
+            ->where('type',FollowUpRecordFile::type_one)
+            ->whereIn('follow_up_record_id',array_column($data['data'],'id'))
+            ->where('file','<>','')
+            ->select('follow_up_record_id')
+            ->get()->toArray();
+        $follow_up_record_id = array_unique(array_column($follow_up_record_id,'follow_up_record_id'));
         foreach ($data['data'] as $key => $value){
+            $has_image = 0;
+            if(in_array($value['id'], $follow_up_record_id)) $has_image = 1;
+            $data['data'][$key]['has_image'] = $has_image;
             $data['data'][$key]['basic_type_name'] = $basic_type[$value['basic_type_id']] ?? '';
             $data['data'][$key]['crt_time'] = $value['crt_time'] ? date("Y-m-d H:i:s",$value['crt_time']): '';
         }

app/Service/OaService.php

@@ -624,7 +624,13 @@ class OaService extends Service
                     if (empty($employee_ids)) {
                         $oaOrder->state = 2;
                         $oaOrder->save();
-                        //审核通过
+
+                        list($parent_status,$parent_msg) = $this->returnOa($oaOrder->order_no, 1, $oaOrder->opt_case);
+                        if(!$parent_status){
+                            DB::rollBack();
+                            return [false,$parent_msg];
+                        }
+                        //审核通过 发送消息
                         $tmp_data = [
                             $order_detail['order_number'],
                             SysMenu::where('id',$oaOrder->menu_id)->value('title'),
@@ -635,11 +641,6 @@ class OaService extends Service
 
                         ];
                         $this->sendWxMsg($order_detail['crt_id'],2,0,$oaOrder->menu_id,$tmp_data);
-                        list($parent_status,$parent_msg) = $this->returnOa($oaOrder->order_no, 1, $oaOrder->opt_case);
-                        if(!$parent_status){
-                            DB::rollBack();
-                            return [false,$parent_msg];
-                        }
                     } else {
                         $oaOrder->state = 1;
                         $oaOrder->save();
@@ -685,12 +686,13 @@ class OaService extends Service
                     if ($detail['sort'] == 1||true) {
                         $oaOrder->state = 3;
                         $oaOrder->save();
-                        $this->sendWxMsg($order_detail['crt_id'],3,2,$oaOrder->menu_id,$tmp_data);
                         list($parent_status,$parent_msg) = $this->returnOa($oaOrder->order_no, 2, $oaOrder->opt_case);
                         if(!$parent_status){
                             DB::rollBack();
                             return [false,$parent_msg];
                         }
+                        //发送消息
+                        $this->sendWxMsg($order_detail['crt_id'],3,2,$oaOrder->menu_id,$tmp_data);
                     }else{
                         $id = OaOrderSub::where('sort', ($detail['sort'] - 1))->where('oa_order_id', $oaOrder->id)->value('id');
                         $employee_ids = OaOrderSubEmployee::where('oa_order_sub_id',$id)->pluck('employee_id')->toArray();
@@ -857,11 +859,9 @@ class OaService extends Service
 //        $oaOrder->state = 1;
 //        $oaOrder->save();
         list($parent_status,$parent_msg) = $this->returnOa($order_no, 3, $op_case);
-        if(!$parent_status){
-            return [false,$parent_msg];
-        }
-        return [true, '弃审成功'];
+        if(!$parent_status) return [false,$parent_msg];
 
+        return [true, ''];
     }
 
 

config/logging.php

@@ -119,7 +119,7 @@ return [
             'driver' => 'daily',
             'path' => storage_path('logs/api_log.log'),
             'level' => 'debug',
-            'days' => 7,
+            'days' => 3,
         ],
     ],