From ddad83cd063e275a966e7eb13ad9df85e74e62b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Mon, 28 Aug 2023 15:58:58 +0800
Subject: [PATCH] 1

---
 business/jxcallback/orderman/order.go   | 21 ++++++++++++++++-----
 business/partner/purchase/mtwm/order.go |  9 +++++++++
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go
index a3ea29068..2f13601de 100644
--- a/business/jxcallback/orderman/order.go
+++ b/business/jxcallback/orderman/order.go
@@ -2457,13 +2457,24 @@ func DelOrderSkuInfo(ctx *jxcontext.Context, vendorOrderID string, vendorID, id
 	}
 	for _, v := range order.Skus {
 		if v.ID == int64(id) {
-			sql := `
+			if v.Count == model.YES {
+				sql := `
 					DELETE FROM order_sku WHERE id = ?
 				`
-			sqlParams := []interface{}{v.ID}
-			dao.ExecuteSQL(db, sql, sqlParams)
-			shopPrice = v.ShopPrice * int64(v.Count)
-			earningPrice = v.EarningPrice * int64(v.Count)
+				sqlParams := []interface{}{v.ID}
+				dao.ExecuteSQL(db, sql, sqlParams)
+			} else {
+				sql := `
+					UPDATE order_sku SET count = ? WHERE id = ?
+				`
+				sqlParams := []interface{}{v.Count - 1, v.ID}
+				dao.ExecuteSQL(db, sql, sqlParams)
+			}
+
+			shopPrice = v.ShopPrice * int64(1)
+			earningPrice = v.EarningPrice * int64(1)
+			//shopPrice = v.ShopPrice * int64(v.Count)
+			//earningPrice = v.EarningPrice * int64(v.Count)
 		}
 	}
 	order.ShopPrice -= shopPrice
diff --git a/business/partner/purchase/mtwm/order.go b/business/partner/purchase/mtwm/order.go
index c4f84abad..43b68cf67 100644
--- a/business/partner/purchase/mtwm/order.go
+++ b/business/partner/purchase/mtwm/order.go
@@ -395,6 +395,15 @@ func (c *PurchaseHandler) onOrderMsg(msg *mtwmapi.CallbackMsg) (response *mtwmap
 									c.OnOrderDetail(orderMap, partner.UpdatedPeration)
 								}
 							})
+							// 美团订单完成时,获取跑腿费用
+							if fee, feeErr := partner.GetPurchasePlatformFromVendorID(order.VendorID).GetPlatformLogisticsFee(order); feeErr != nil {
+								bill, err := partner.CurOrderManager.LoadWaybill(order.VendorOrderID, model.VendorIDMTWM)
+								if bill == nil && err == nil {
+									bill.ActualFee = fee
+									bill.DesiredFee = fee
+									dao.UpdateEntity(dao.GetDB(), bill, "ActualFee", "DesiredFee")
+								}
+							}
 						}
 
 					}