1

application/store/controller/Order.php

@@ -254,24 +254,27 @@ class Order extends Controller
         $post = $this->app->request->post();
         if (isset($post['id']) && $post['id']) {
             $worker_id = $post['worker_id'];
-            Db::name('store_order')->where('id',$id)->update(['worker_id' => $worker_id,'status'=>2,'remark'=>$post['remark']]);
-            //添加指派记录
-            $order_no = Db::name('store_order')->where('id',$id)->value('order_no');
-            $send_log_data = array(
-                'order_id' => $id,
-                'order_no' => $order_no,
-                'worker_id' => session('user.engineer_id'),
-                'send_worker_id' => $worker_id
-            );
-            Db::name('store_send_log')->insert($send_log_data);
-            //发送邮箱
-            $engineer_mail = Db::name('store_engineer')->where('mail is not null')->where('id',$worker_id)->where('is_deleted',0)->value('mail');
-            if($engineer_mail){
-                mail_push($engineer_mail,$id);
+            $order_info = Db::name('store_order')->where('id',$id)->find();
+            Db::name('store_order')->where('id',$id)->update(['worker_id' => $worker_id,'status'=>$post['status'],'price_total'=>$post['price_total'],'price_amount'=>$post['price_total'] + $order_info['coupon_amount'],'remark'=>$post['remark']]);
+            if($worker_id != $order_info['worker_id']){
+                //添加指派记录
+                $order_no = Db::name('store_order')->where('id',$id)->value('order_no');
+                $send_log_data = array(
+                    'order_id' => $id,
+                    'order_no' => $order_no,
+                    'worker_id' => session('user.engineer_id'),
+                    'send_worker_id' => $worker_id
+                );
+                Db::name('store_send_log')->insert($send_log_data);
+                //发送邮箱
+                $engineer_mail = Db::name('store_engineer')->where('mail is not null')->where('id',$worker_id)->where('is_deleted',0)->value('mail');
+                if($engineer_mail){
+                    mail_push($engineer_mail,$id);
+                }
             }
-            $this->success('派送成功！');
+            $this->success('操作成功！');
         } else {
-            $engineer_id = session('user.engineer_id');
+            /*$engineer_id = session('user.engineer_id');*/
             $store_worker = Db::name('store_engineer')->field('id,name,phone')->where('is_deleted',0)->select();
             if($store_worker){
                 $this->store_worker = $store_worker;

application/store/view/order/index.html

@@ -116,7 +116,7 @@
                 {/if}
 
                 {if isset($a.engineer_id) && $a.engineer_id > 0 && $vo.status == 2 && $vo.worker_id == $a.engineer_id}
-                <a data-title="分配订单" class="layui-btn layui-btn-sm layui-bg-red " data-modal='{:url("send_order")}?id={$vo.id}'>分配订单</a>
+                <a data-title="操作订单" class="layui-btn layui-btn-sm layui-bg-red " data-modal='{:url("send_order")}?id={$vo.id}'>操作订单</a>
                 {/if}
             </td>
         </tr>

application/store/view/order/send_order.html

@@ -15,8 +15,15 @@
         </div>
 
             <div>
+                <label class="layui-col-xs2 think-form-label">订单金额:</label>
+                <div class="layui-col-xs10" style="margin-top: 10px;">
+                    <textarea  class="layui-textarea" name="price_total" style="min-height: 100px;" >{$vo.price_total|default=""}</textarea>
+                </div>
+            </div>
+
+            <div>
                 <label class="layui-col-xs2 think-form-label">订单状态:</label>
-                <label class="layui-col-xs10">
+                <label class="layui-col-xs10" style="margin-top: 10px;">
                     <select class="layui-select" required name="status" lay-search >
                         <option  value="2" {if $vo.status == 2}selected{/if}>已分配</option>
                         <option  value="1" {if $vo.status == 1}selected{/if}>未分配</option>