From e7bad7dc253941987f12bfd7e144bd07300e91eb Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Tue, 30 Jul 2019 14:43:28 +0800
Subject: [PATCH] + UpdateWaybillTip

---
 business/partner/partner_order.go       |  5 +++++
 business/partner/purchase/jd/order.go   | 25 +++++++++++++++++++------
 business/partner/purchase/mtwm/order.go |  7 +++++++
 3 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/business/partner/partner_order.go b/business/partner/partner_order.go
index d78cb6491..a7bb1f987 100644
--- a/business/partner/partner_order.go
+++ b/business/partner/partner_order.go
@@ -48,3 +48,8 @@ type IPurchasePlatformOrderHandler interface {
 	// // 确认收到退货
 	ConfirmReceivedReturnGoods(ctx *jxcontext.Context, order *model.AfsOrder) (err error)
 }
+
+type IUpdateWaybillTip interface {
+	// 添加快递小费，这个不是递增的，最后一次操作会覆盖之前的设置，但只能增加，不能减少，且tipFee只能为100的倍数
+	UpdateWaybillTip(ctx *jxcontext.Context, order *model.GoodsOrder, tipFee int64) (err error)
+}
diff --git a/business/partner/purchase/jd/order.go b/business/partner/purchase/jd/order.go
index 0a4b38276..2ce4c73ae 100644
--- a/business/partner/purchase/jd/order.go
+++ b/business/partner/purchase/jd/order.go
@@ -425,15 +425,15 @@ func (c *PurchaseHandler) ListOrders(ctx *jxcontext.Context, parentTask tasksch.
 	}
 	fromDate := utils.Time2Date(queryDate)
 	toDate := fromDate.Add(24*time.Hour - 1)
-	params := map[string]interface{}{
-		"orderPurchaseTime_begin": utils.Time2Str(fromDate),
-		"orderPurchaseTime_end":   utils.Time2Str(toDate),
-		jdapi.KeyPageNo:           jdapi.AllPage,
+	queryParam := &jdapi.OrderQueryParam{
+		OrderPurchaseTimeBegin: utils.Time2Str(fromDate),
+		OrderPurchaseTimeEnd:   utils.Time2Str(toDate),
+		PageNo:                 jdapi.AllPage,
 	}
 	if vendorStoreID != "" {
-		params["deliveryStationNo"] = vendorStoreID
+		queryParam.DeliveryStationNo = vendorStoreID
 	}
-	orderList, _, err := api.JdAPI.OrderQuery2(params)
+	orderList, _, err := api.JdAPI.OrderQuery2(queryParam)
 	if err == nil {
 		vendorOrderIDs = make([]string, len(orderList))
 		for k, v := range orderList {
@@ -442,3 +442,16 @@ func (c *PurchaseHandler) ListOrders(ctx *jxcontext.Context, parentTask tasksch.
 	}
 	return vendorOrderIDs, err
 }
+
+func (c *PurchaseHandler) UpdateWaybillTip(ctx *jxcontext.Context, order *model.GoodsOrder, tipFee int64) (err error) {
+	orderInfo, err := api.JdAPI.QuerySingleOrder2(order.VendorOrderID)
+	if err == nil {
+		tip2Add := int(tipFee) - orderInfo.Tips
+		if tip2Add > 0 {
+			if globals.EnableJdStoreWrite {
+				err = api.JdAPI.OrderAddTips(order.VendorOrderID, tip2Add, ctx.GetUserName())
+			}
+		}
+	}
+	return err
+}
diff --git a/business/partner/purchase/mtwm/order.go b/business/partner/purchase/mtwm/order.go
index 85a940000..2691b9d29 100644
--- a/business/partner/purchase/mtwm/order.go
+++ b/business/partner/purchase/mtwm/order.go
@@ -575,3 +575,10 @@ func (c *PurchaseHandler) ListOrders(ctx *jxcontext.Context, parentTask tasksch.
 	}
 	return vendorOrderIDs, err
 }
+
+func (c *PurchaseHandler) UpdateWaybillTip(ctx *jxcontext.Context, order *model.GoodsOrder, tipFee int64) (err error) {
+	if globals.EnableMtwmStoreWrite {
+		err = api.MtwmAPI.OrderUpdateTip(utils.Str2Int64(order.VendorOrderID), jxutils.IntPrice2Standard(tipFee))
+	}
+	return err
+}