From 99b33d1c83b74e1d0e6fb98404414b4b7ccbb132 Mon Sep 17 00:00:00 2001
From: yanzai <boy_yan@163.com>
Date: Wed, 3 Apr 2024 12:36:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E7=BB=93=E7=AE=97?=
 =?UTF-8?q?=E5=88=97=20=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/src/pages/order/order.vue              | 42 +++++++++++++++-----
 app/Http/Controllers/UserOrderController.php | 18 ++++++++-
 2 files changed, 49 insertions(+), 11 deletions(-)

diff --git a/admin/src/pages/order/order.vue b/admin/src/pages/order/order.vue
index b0fc826..cfb00a7 100644
--- a/admin/src/pages/order/order.vue
+++ b/admin/src/pages/order/order.vue
@@ -167,9 +167,9 @@ const user_order_columns = [{
           }
         ),
       ]),
-      h('div', null, [
+      h('div',null, [
         h('b', '套餐名称: '),
-        h('span',{ onClick: ()=>combo_name_click(row.buy_info) }, null, name),
+        h('span',{class: ['hover1'], onClick: ()=>combo_name_click(row.buy_info) }, null, name),
       ]),
       h('div', {class: ['line_wrapper']}, [
         h('b', '自选项目: '),
@@ -335,14 +335,20 @@ const user_order_columns = [{
   key: 'receivers',
   render(row) {
 	  let s_info=JSON.parse(row.receivers)
-	  if(s_info)
+	  let s_response=JSON.parse(row.sharing_response)
+	   
 	  console.log(s_info)
     let children = [
       h('div', null, [
         h('b', '订单总金额: '),
         h('span', row.price),
       ]),
-      h('div', null, [
+	  h('div', null, !!s_response?[
+	    h('b', '不折扣金额: '),
+	    h('span', !!s_response?'￥'+s_response.hold:''),
+		h('span',{class: ['fontcolor_lan','hover1'] ,onClick: ()=>hold_click(row.hold_items) }, " 共"+row.hold_items.length+"个项目"),
+	  ]:''),
+      h('div', null, !!s_info ?[
         h('b', '各方应收: '),
 		h('div',  !!s_info ? s_info.map((item) => {
 			if(item.account!='代理'){
@@ -350,7 +356,7 @@ const user_order_columns = [{
 			}
 		 
 		}).join('\r\n') : ''),
-      ]),
+      ]:''),
       h('div', null, [
         h('b', '结算状态: '),
         h(
@@ -438,9 +444,24 @@ const combo_name_click=(combo)=>{
 	}
 	
 }
+let hold_item_show=ref(false)
+let hold_item_list=ref([]);
+const hold_click=(item)=>{
+	hold_item_show.value=true
+	hold_item_list.value=item
+}
 </script>
 <template>
   <div>
+	  <n-modal v-model:show="hold_item_show" preset="card" :style="{width: '400px'}"
+	           title="不折扣项目" :auto-focus="false"
+	           :bordered="false">
+	    <div>
+	  			<div v-for="(item,index) in hold_item_list" :key="index">
+	  				{{item.item_id}} -{{item.desc}}
+	  			</div>
+	    </div>
+	  </n-modal>
 	  <n-modal v-model:show="comboinfo_show" preset="card" :style="{width: '400px'}"
 	           title="套餐项目" :auto-focus="false"
 	           :bordered="false">
@@ -448,10 +469,6 @@ const combo_name_click=(combo)=>{
 			<div v-for="(item,index) in comboItemList" :key="index">
 				{{item.name}} ￥{{item.price}}
 			</div>
-	      <n-space justify="center">
-	       <!-- <n-button @click="UserOrderCancel()" type="info">确定</n-button> -->
-	   <!--     <n-button @click="comboinfo_show = false">确定</n-button> -->
-	      </n-space>
 	    </div>
 	  </n-modal>
     <n-modal v-model:show="cancel_show" preset="card" :style="{width: '400px'}"
@@ -530,6 +547,9 @@ const combo_name_click=(combo)=>{
   </div>
 </template>
 <style>
+	.fontcolor_lan{
+		color: #55aaff;
+	}
 .line_wrapper {
   display: flex;
 }
@@ -537,6 +557,9 @@ const combo_name_click=(combo)=>{
 .items_content_wrapper {
   width: 200px;
 }
+.hover1{
+	cursor: pointer;
+}
 </style>
 <style scoped>
 .op0 {
@@ -576,6 +599,7 @@ const combo_name_click=(combo)=>{
 .create {
   background: #4b9d5f60;
 }
+
 </style>
 <route>
 {"meta":{"title":"订单管理"}}
diff --git a/app/Http/Controllers/UserOrderController.php b/app/Http/Controllers/UserOrderController.php
index fb5eb87..a8e1c60 100644
--- a/app/Http/Controllers/UserOrderController.php
+++ b/app/Http/Controllers/UserOrderController.php
@@ -14,6 +14,7 @@ use App\Models\UserPerson;
 use App\Models\WeChatPay;
 use App\Models\WeChatRefund;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
 use Yo;
 use Login;
 use Lu;
@@ -763,7 +764,7 @@ class UserOrderController extends Controller
     $status = $request->post('status');
 //    $list = UserOrder::select('*')
 //      ->where('hospital', $hospital);
-    $list = UserOrder::select('user_orders.*', 'profitsharing_logs.receivers','profitsharing_logs.status as sharing_status')
+    $list = UserOrder::select('user_orders.*', 'profitsharing_logs.receivers','profitsharing_logs.status as sharing_status','profitsharing_logs.response as sharing_response')
       ->where('user_orders.hospital', $hospital)
       ->leftjoin('profitsharing_logs', 'user_orders.id', '=', 'profitsharing_logs.order');
 
@@ -810,7 +811,20 @@ class UserOrderController extends Controller
           break;
       }
     }
-    return Yo::echo($list->orderBy('id', 'desc')->paginate(10));
+    $list=$list->orderBy('id', 'desc')->paginate(10);
+    foreach ($list as $key=>$value){
+      $items=[];
+      $buy_info=json_decode($value->buy_info,true);
+      foreach ($buy_info['items'] as $k=>$v){
+        $items[]=$v['id'];
+      }
+      foreach ($buy_info['combo']['items'] as $k=>$v){
+        $items[]=$v['id'];
+      }
+      $hold_item=DB::table('no_profitsharings')->where('hospital',$hospital)->whereIn('item_id',$items)->get();
+      $list[$key]['hold_items']=$hold_item;
+    }
+    return Yo::echo($list);
   }
 
   public function callback($id)