From 85997befc800fabcf91fba660994bbbe84dd2f6b Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Wed, 20 Nov 2024 16:59:09 +0800
Subject: [PATCH] =?UTF-8?q?feat(purchase):=20=E6=9B=B4=E6=96=B0=E9=87=87?=
 =?UTF-8?q?=E8=B4=AD=E4=BF=A1=E6=81=AF=E4=B8=AD=E9=87=87=E8=B4=AD=E4=BA=BA?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E8=8E=B7=E5=8F=96=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将采购人名称获取方式从 User 模型改为 DeliveryService 模型
- 在企业微信通知中添加采购总价信息
- 优化企业微信通知中的采购金额显示，区分单价和总价
---
 .../purchase_product_offer/PurchaseProductOfferLogic.php      | 2 +-
 .../purchase_product_offer/PurchaseProductOfferListsTwo.php   | 2 +-
 app/common/service/workWechat/ProductOffer.php                | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/admin/logic/purchase_product_offer/PurchaseProductOfferLogic.php b/app/admin/logic/purchase_product_offer/PurchaseProductOfferLogic.php
index 2bab8379..42e18dcb 100644
--- a/app/admin/logic/purchase_product_offer/PurchaseProductOfferLogic.php
+++ b/app/admin/logic/purchase_product_offer/PurchaseProductOfferLogic.php
@@ -173,7 +173,7 @@ class PurchaseProductOfferLogic extends BaseLogic
             Db::commit();
             $offer['store_name']=$product['store_name'];
             $offer['unit_name']=$unit_name;
-            $offer['buyer_name']=User::where('id',$offer['buyer_id'])->value('real_name');
+            $offer['buyer_name']=DeliveryService::where('uid',$offer['buyer_id'])->value('nickname');
             if($offer['pay_type']==1){
                 $offer['pay_type_name']='赊账';
             }elseif($offer['pay_type']==2){
diff --git a/app/api/lists/purchase_product_offer/PurchaseProductOfferListsTwo.php b/app/api/lists/purchase_product_offer/PurchaseProductOfferListsTwo.php
index 803664e3..3e9810f5 100644
--- a/app/api/lists/purchase_product_offer/PurchaseProductOfferListsTwo.php
+++ b/app/api/lists/purchase_product_offer/PurchaseProductOfferListsTwo.php
@@ -56,7 +56,7 @@ class PurchaseProductOfferListsTwo extends BaseApiDataLists implements ListsSear
                 $item->store_name=$find->store_name;
                 $item->unit_name=StoreProductUnit::where('id',$item->unit)->value('name');
                 $item->category_name=StoreCategory::where('id',$find->top_cate_id)->value('name');
-                $item->buyer_name=User::where('id',$item['buyer_id'])->value('real_name');
+                $item->buyer_name=DeliveryService::where('uid',$item->buyer_id)->value('nickname');
 
             })
             ->toArray();
diff --git a/app/common/service/workWechat/ProductOffer.php b/app/common/service/workWechat/ProductOffer.php
index 06305f96..cf2b8706 100644
--- a/app/common/service/workWechat/ProductOffer.php
+++ b/app/common/service/workWechat/ProductOffer.php
@@ -17,6 +17,7 @@ class ProductOffer
                 $num = $data['buyer_nums'];
                 $unit_name = $data['unit_name'];
                 $price = $data['price'];
+                $total_price = $data['total_price'];
                 $create_time = $data['create_time'];
                 $buyer_name = $data['buyer_name'];
                 $pay_type = $data['pay_type_name'];
@@ -26,7 +27,8 @@ class ProductOffer
                 >商品名称:<font color=\"comment\">$store_name</font>
                 >数量/单位:<font color=\"comment\">$num/$unit_name</font>
                 >采购人:<font color=\"comment\">$buyer_name</font>
-                >采购金额:<font color=\"comment\">$price</font>
+                >采购单价:<font color=\"comment\">$price</font>
+                >采购总价:<font color=\"comment\">$total_price</font>
                 >采购时间:<font color=\"comment\">$create_time</font>
                 >支付方式:<font color=\"comment\">$pay_type</font>
                 [下载今日采购表格]($urls)"]];