edit

app/ExcelTemp/ExcelTemp.php

@@ -506,6 +506,7 @@ trait ExcelTemp
                 ['field_name' => '距离', 'field_value' => 'distance'],
                 ['field_name' => '服务商名', 'field_value' => 'ser_name'],
                 ['field_name' => '结算单号', 'field_value' => 'wam'],
+                ['field_name' => '结算金额', 'field_value' => 'all_price'],
                 ['field_name' => '反馈时间', 'field_value' => 'feed_time'],
                 ['field_name' => '门店别名', 'field_value' => 'shop_alias'],
                 ['field_name' => '年', 'field_value' => 'creact_year'],

app/Http/Controllers/Api/SynOrderRejectedController.php

@@ -64,7 +64,7 @@ class SynOrderRejectedController extends BaseController
                             } else {
                                 if(in_array($v['company_id'],[14])){
                                     DB::table('order_rejected')->insert(['or_order_num'=>$orderListArr['order_num'],'or_ser_id'=>$orderListArr['ser_id'],'or_creact_time'=>date("Y-m-d H:i:s"),'or_centent'=>'超过15分钟未结单','or_show'=>1,'or_type'=>2]);
-                                    $rest = CommonService::accMe($v['sys_num'], '超时未接单', "拒单，超十五分钟未结单", $v['serial_number'] . "等", '1', 8, '系统录入', '1133');//添加备注
+                                    $rest = CommonService::accMe($v['sys_num'], '超时未接单', "超十五分钟未接单", $v['serial_number'] . "等", '1', 8, '系统录入', '1133');//添加备注
                                     DB::beginTransaction();
                                     $ret = OrderList::where('sys_num',$v['sys_num'])->update(['ol_distype'=>3]);
                                     $rets = Orders::where('sys_num',$v['sys_num'])->update(['distype'=>5]);
@@ -80,7 +80,7 @@ class SynOrderRejectedController extends BaseController
                                         $num++;
                                     }
                                 }else {
-                                    $rest = CommonService::accMe($v['sys_num'], '系统拒单', "拒单，超十五分钟未结单", $v['serial_number'] . "等", '1', 8, '系统录入', '1133');//添加备注
+                                    $rest = CommonService::accMe($v['sys_num'], '系统拒单', "拒单，超十五分钟未接单", $v['serial_number'] . "等", '1', 8, '系统录入', '1133');//添加备注
                                     $input['or_centent'] = '超过15分钟未结单';
                                     $input['or_show'] = '1';
                                     $input['sys_num'] = $v['sys_num'];

app/Http/Controllers/ExcelInfo/ExceloutController.php

@@ -2259,9 +2259,9 @@ public function performBserviStore($res,$con='BserviStore'){
                     $admin = Admin::whereIn('id',$ser_ids)->select('id','company_name','ad_alias')->get()->toarray();
                     $admin = CommonService::jointArrayKey($admin,'id');
                 }
-                if(in_array('wam', $group) || in_array('feed_time', $group)){
+                if(in_array('wam', $group) || in_array('feed_time', $group) || in_array('all_price', $group)){
                     $order_num = array_column($db, 'order_num');
-                    $sql = "SELECT feeds_time,wat_num,a.order_num FROM gone_order_list as a LEFT JOIN gone_settlement_list as b on a.serial_number = b.list_id where a.order_num in ('".implode("','", $order_num)."')";
+                    $sql = "SELECT feeds_time,wat_num,a.order_num,all_price FROM gone_order_list as a LEFT JOIN gone_settlement_list as b on a.serial_number = b.list_id where a.order_num in ('".implode("','", $order_num)."')";
                     $settment = DB::select($sql);
                     $settment = CommonService::dataToArray($settment);
                     $settment = CommonService::jointArrayKey($settment, 'order_num');
@@ -2297,6 +2297,8 @@ public function performBserviStore($res,$con='BserviStore'){
                             $rs[$k][strtolower(chr(65+$num))]  = $settment[$v['order_num']]['wat_num'];
                         }elseif($vg == 'feed_time'){
                             $rs[$k][strtolower(chr(65+$num))]  = $settment[$v['order_num']]['feeds_time'];
+                        }elseif($vg == 'all_price'){
+                            $rs[$k][strtolower(chr(65+$num))]  = $settment[$v['order_num']]['all_price'];
                         }elseif($vg == 'creact_year'){
                             $rs[$k][strtolower(chr(65+$num))]  = $year;
                         }elseif($vg == 'creact_mouth'){

app/Http/Controllers/ExcelInfo/ExcelpermissController.php

@@ -179,6 +179,7 @@ class ExcelpermissController extends BaseController
                     $field_value = array_column($adg_action, 'field_value');
                     $field_value = CommonService::dataToArray($field_value);
                     $list = CommonService::arrayFilterFieldValue($list, [['field_value' => $field_value]]);
+                    $list = CommonService::resetListKey($list);
                 }else{
                     $list = [];
                 }

app/Http/Controllers/Orders/OrderListController.php

@@ -317,6 +317,8 @@ class OrderListController extends BaseController
                     }
                 }
             }
+//            $supply_price = $supply_price*$MsgArr['goods_num'];
+//            $supply_price = sprintf("%.2f", $supply_price);
             $sub_type = PlatformService::getBusType($orderListArr['p_id']);
             if ($sub_type == 2) {
                 $get['goods_price'] = $orderListArr['goods_price'];
@@ -1543,7 +1545,29 @@ class OrderListController extends BaseController
             }
 
         }
-
+        $SettlementList = SettlementList::where('list_id',$orderListArr['serial_number'])->first();
+        if(empty($SettlementList['order_price'])){
+            $MsgArr = OrderListService::getOrderMsgById($orderListArr['order_goods_id']);
+            $supply_price = GhPrice::where('goods_id',$MsgArr['goods_id'])
+                ->where('ser_id',$orderListArr['ser_id'])
+                ->orderBy('id','Desc')
+                ->value('supply_price');
+            if(!$supply_price){
+                $supply_price = GhPrice::where('goods_id',$MsgArr['goods_id'])
+                    ->where('ser_id',0)
+                    ->orderBy('id','Desc')
+                    ->value('supply_price');
+                if(!$supply_price){
+                    return $this->error('缺少结算价', ErrorInc::MYSQL_FAILED);exit;
+                }
+            }
+            SettlementMoney::where('sem_type',1)->where('sem_slid',$SettlementList['id'])->update(['sem_price'=>$supply_price]);
+            $arr['all_price'] = SettlementMoney::where('sem_slid',$SettlementList['id'])->sum('sem_price');
+            $arr['order_price'] = $supply_price;
+            if(empty($arr['all_price'])){
+                $arr['all_price'] = $supply_price;
+            }
+        }
 
         $poss['stauas'] = 40;//派工单表完成
         $post['order_status'] = 40;//订单表完成
@@ -1562,6 +1586,7 @@ class OrderListController extends BaseController
         if($settlementthree){
             $arr['update_three'] = 1;
         }
+
         $restSettlement_list = SettlementList::where('list_id',$orderListArr['serial_number'])->update($arr);
         if($restOrder_list && $restSettlement_list){
 

app/Http/Controllers/Orders/OrdersController.php

@@ -150,8 +150,8 @@ class OrdersController extends BaseController
         if($input['is_excel']==2){
             if(isset($input['creatData'])){
                 $days = (strtotime($input['creatData'][1]) - strtotime($input['creatData'][0]))/3600/24;
-                if($days>60){
-                    return $this->error('查询时间超过了60天', ErrorInc::FAILED_PARAM);exit;
+                if($days>90){
+                    return $this->error('查询时间超过了90天', ErrorInc::FAILED_PARAM);exit;
                 }
             }else{
                 return $this->error('请输入查询时间',ErrorInc::FAILED_PARAM);exit;

app/Services/Api/MobileWeb/LoginService.php

@@ -361,10 +361,10 @@ class LoginService
                     return ['ErrorCode' => 1, 'ErrorMessage' => '操作成功', 'data' => $data['data']];
                 }
             }
-            return ['ErrorCode' => 201, 'ErrorMessage' => '自动登录失败', 'data' => $return_data];
+            return ['ErrorCode' => 201, 'ErrorMessage' => '未检测到登录记录:'.$jsoninfo["openid"], 'data' => $return_data];
 
         }else{
-            return ["ErrorCode" => ErrorInc::SAPI_FAILED, 'ErrorMessage' => '自动登录失败', 'data' => $jsoninfo];
+            return ["ErrorCode" => ErrorInc::SAPI_FAILED, 'ErrorMessage' => '微信授权失败', 'data' => $jsoninfo];
         }
     }
 }

app/Services/Api/MobileWeb/OrderListService.php

@@ -384,7 +384,7 @@ class OrderListService extends Model
             return ['ErrorCode' => ErrorInc::BUSINESS_FORBID, 'ErrorMessage' => '当前服务单已锁定，无法接单！', 'Data' => []];
         }
         $MsgArr = OrderMsg::where('id',$orderListArr['order_goods_id'])
-            ->select("goods_id","goods_name","goods_brand","goods_price")
+            ->select("goods_id","goods_name","goods_brand","goods_price","goods_num")
             ->first();
         $goods_name = $MsgArr['goods_name'];
         $goods_id = $MsgArr['goods_id'];
@@ -410,6 +410,8 @@ class OrderListService extends Model
                 $supply_price='0.00';
             }
         }
+//        $supply_price = $supply_price*$MsgArr['goods_num'];
+//        $supply_price = sprintf("%.2f", $supply_price);
         //end Dong
         $arr['sys_num']=$orderListArr['sys_num']; //系统单号
         $arr['order_num']=$orderListArr['order_num']; //平台单号
@@ -561,8 +563,9 @@ class OrderListService extends Model
             // 该订单有多款商品，该工单不可拒单
             return ['ErrorCode' => 201, 'ErrorMessage' => '订单包含多个商品是否全部拒单', 'Data' => []];
         }
+        $compamy_name = Admin::where('id',$orderListArr['ser_id'])->value('company_name');
         DB::beginTransaction(); //开启事务
-        $rest = CommonService::accMe($orderListArr['sys_num'], '派工单列表web', "拒单，".$request['remarks'], implode(',', $serial_number), 2, 2, $session['install_name'], $session['admin_id']);
+        $rest = CommonService::accMe($orderListArr['sys_num'], '派工单列表web', "拒单，（".$compamy_name."）".$request['remarks'], implode(',', $serial_number), 2, 2, $session['install_name'], $session['admin_id']);
         $resultOrderList = OrderList::where("sys_num",$orderListArr['sys_num'])->delete();
         if($orderListArr['stauas']==30){
             $settListArr = SettlementList::where("sys_num",$orderListArr['sys_num'])->where("sett_status",'>',1)->first();
@@ -1549,7 +1552,7 @@ class OrderListService extends Model
     public static function getPicName ( $type ){
         switch ( $type ){
             case 1:
-                $typeName='客户确认单';
+                $typeName='确认收货截图';
                 break;
             case 2:
                 $typeName='电池上车图';