Merge branch 'master' of e.coding.net:zdap/weixiu/weixiu_api into wuye-m

app/adminapi/logic/works/ServiceWorkLogic.php

@@ -369,6 +369,7 @@ class ServiceWorkLogic extends BaseLogic
      * @return array|false
      */
     public static function detail($params){
+        $work_where = !empty($params['work_sn'])?['work_sn'=>$params['work_sn']]:['id'=>$params['id']];
         $result = ServiceWork::with([
             'worker'=> function(Query $query) {
                 $query->field('id,worker_number,real_name,mobile');
@@ -380,7 +381,8 @@ class ServiceWorkLogic extends BaseLogic
                 $query->field('id,work_id,opera_log,create_time');
             }
         ])->append(['id','work_status_text','service_status_text'])
-            ->findOrEmpty($params['id'])->toArray();
+            ->where($work_where)
+            ->findOrEmpty()->toArray();
 
         //师傅工单按钮状态
         $work_service_status = 0;

app/api/logic/ServiceOrderLogic.php

@@ -406,7 +406,6 @@ class ServiceOrderLogic extends BaseLogic
                     'user_id' => $params['user_id'],
                     'sn'=>$params['sn']
                 ])->findOrEmpty()->toArray();
-
             if(empty($order_info)){
                 throw new Exception('订单不存在');
             }
@@ -431,13 +430,15 @@ class ServiceOrderLogic extends BaseLogic
             //获取师傅参数
             if(!empty($order_info['service_work']['master_worker_id'])){
                 $worker = MasterWorker::find($order_info['service_work']['master_worker_id']);
-                $order_info['master_worker']['avatar'] = $worker['avatar'];
-                $order_info['master_worker']['real_name'] = $worker['real_name'];
-                $order_info['master_worker']['worker_number'] = $worker['worker_number'];
-                $order_info['master_worker']['mobile'] = $worker['mobile'];
+                $order_info['master_worker']['avatar'] = !empty($worker)?$worker['avatar']:'';
+                $order_info['master_worker']['real_name'] = !empty($worker)?$worker['real_name']:'';
+                $order_info['master_worker']['worker_number'] = !empty($worker)?$worker['worker_number']:'';
+                $order_info['master_worker']['mobile'] = !empty($worker)?$worker['mobile']:'';
+
                 $maintain_exp_type = !empty($worker->worker_register->maintain_exp_type)?$worker->worker_register->maintain_exp_type:'';
                 $order_info['master_worker']['worker_exp'] = DictData::where(['type_value'=>'worker_exp_type','value'=>$maintain_exp_type])->value('name');
             }
+
             //搜索当前工单下的所有订单记录
             $order_info['pay_orders'] = \app\common\model\recharge\RechargeOrder::where(['work_id'=>$order_info['work_id']])->field('id as order_id, pay_status ,refund_status,payment_type,pay_way,pay_time,order_total,order_amount,coupon_price')->order('id asc')->select()->toArray();
 

app/common/command/QueryRefund.php

@@ -195,8 +195,9 @@ class QueryRefund extends Command
         //更新工单退款状态以及处理师傅金额和物业金额
         $order = RechargeOrder::where('id',$order_id)->findOrEmpty();
         $work = ServiceWork::where('id',$order->work_id)->findOrEmpty();
+        Log::write($work->toArray());
         if(!$work->isEmpty()){
-            if(($work->work_pay_status == '1' || $work->work_pay_status == '2') and $work->service_status != '5'){
+            if(($work->work_pay_status == '1' || $work->work_pay_status == '2') and $work->service_status != '5' and $work->work_status != '9'){
                 //师傅余额变动
                 $change_amount = MasterWorkerAccountLog::where(['work_sn'=>$work->work_sn,'action'=>1])->value('change_amount');
 

app/common/logic/PayNotifyLogic.php

@@ -105,7 +105,7 @@ class PayNotifyLogic extends BaseLogic
 
             //判断是否是一口价预支付订单，支付成功后生成尾款订单
             $order_goods = OrderGoods::where('sn',$order->sn)->findOrEmpty();
-            if(!$order_goods->isEmpty() and $order_goods->goods_payment_type == 3 and bcsub($order_goods->base_service_fee,$order_goods->service_fee,2)>0){
+            if(!$order_goods->isEmpty() and $order_goods->goods_payment_type == 3 and bcsub($order_goods->base_service_fee,$order_goods->service_fee,2)>=0){
                 //新增待支付尾款
                 $order_data = [
                     'order_type'=>$order['order_type'],

app/workerapi/controller/WorksController.php

@@ -87,6 +87,9 @@ class WorksController extends BaseApiController
         $params = (new ServiceWorkValidate())->goCheck('detail',[
             'user_id' => $this->userId,
         ]);
+        if(empty($params['id']) && empty($params['work_sn'])){
+            $this->fail('参数错误');
+        }
         $result = ServiceWorkLogic::detail($params);
         if (false === $result) {
             return $this->fail(ServiceWorkLogic::getError());

app/workerapi/validate/ServiceWorkValidate.php

@@ -85,7 +85,7 @@ class ServiceWorkValidate extends BaseValidate
      */
     public function sceneDetail()
     {
-        return $this->only(['id']);
+        return $this->only(['*']);
     }
 
     /**