From a597d160ee39223d304c534838dc39b2caa3d8c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Mon, 14 Dec 2020 16:58:28 +0800
Subject: [PATCH] fnps

---
 business/jxstore/tempop/tempop.go       |  2 +-
 business/partner/delivery/fn/store.go   |  9 +++++++++
 business/partner/delivery/fn/waybill.go | 27 ++++++++++++++++++++++++-
 3 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/business/jxstore/tempop/tempop.go b/business/jxstore/tempop/tempop.go
index 00fe55919..760637469 100644
--- a/business/jxstore/tempop/tempop.go
+++ b/business/jxstore/tempop/tempop.go
@@ -1829,7 +1829,7 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) {
 	var (
 		db = dao.GetDB()
 	)
-	stores, _ := dao.GetStoreList(db, nil, nil, nil, nil, "")
+	stores, _ := dao.GetStoreList(db, []int{}, nil, nil, nil, "")
 	for _, v := range stores {
 		if v.StoreLevel == "A" || v.StoreLevel == "B" || v.StoreLevel == "C" || v.StoreLevel == "D" {
 			cms.UpdateOrCreateCourierStores(ctx, v.ID, false, false, false)
diff --git a/business/partner/delivery/fn/store.go b/business/partner/delivery/fn/store.go
index bea1096e1..a7d8f816a 100644
--- a/business/partner/delivery/fn/store.go
+++ b/business/partner/delivery/fn/store.go
@@ -62,5 +62,14 @@ func (c *DeliveryHandler) IsErrStoreNotExist(err error) bool {
 }
 
 func (c *DeliveryHandler) UpdateStore(ctx *jxcontext.Context, storeDetail *dao.StoreDetail2) (err error) {
+	err = api.FnAPI.UpdateStore(&fnpsapi.CreateStoreParam{
+		ChainStoreCode: utils.Int2Str(storeDetail.ID),
+		ChainStoreName: storeDetail.Name,
+		ContactPhone:   storeDetail.Tel1,
+		Address:        storeDetail.Address,
+		PositionSource: 3,
+		Longitude:      utils.Float64ToStr(jxutils.IntCoordinate2Standard(storeDetail.Lng)),
+		Latitude:       utils.Float64ToStr(jxutils.IntCoordinate2Standard(storeDetail.Lat)),
+	})
 	return err
 }
diff --git a/business/partner/delivery/fn/waybill.go b/business/partner/delivery/fn/waybill.go
index 0d1ba3c60..493a4b346 100644
--- a/business/partner/delivery/fn/waybill.go
+++ b/business/partner/delivery/fn/waybill.go
@@ -4,6 +4,8 @@ import (
 	"time"
 
 	"git.rosy.net.cn/baseapi/utils"
+	"github.com/astaxie/beego"
+	"github.com/astaxie/beego/orm"
 
 	"git.rosy.net.cn/jx-callback/business/jxutils"
 	"git.rosy.net.cn/jx-callback/business/partner/delivery"
@@ -116,8 +118,31 @@ func (c *DeliveryHandler) CreateWaybill(order *model.GoodsOrder, maxDeliveryFee
 	return bill, err
 }
 
-func (c *DeliveryHandler) GetWaybillFee(order *model.GoodsOrder) (deliveryFeeInfo *partner.WaybillFeeInfo, err error) {
+func (c *DeliveryHandler) getMTPSShopID(order *model.GoodsOrder, db *dao.DaoDB) (retVal string, err error) {
+	saleStoreID := jxutils.GetSaleStoreIDFromOrder(order)
+	storeCourierList, err2 := dao.GetOpenedStoreCouriersByStoreID(db, saleStoreID, model.VendorIDFengNiao)
+	if err = err2; err != nil && err != orm.ErrNoRows {
+		return "", err
+	}
+	if len(storeCourierList) == 0 {
+		return "", partner.ErrStoreHaveNoCourier
+	}
+	retVal = storeCourierList[0].VendorStoreID
+	if beego.BConfig.RunMode == "dev" {
+		retVal = "test_0001"
+	}
+	return retVal, nil
+}
 
+func (c *DeliveryHandler) GetWaybillFee(order *model.GoodsOrder) (deliveryFeeInfo *partner.WaybillFeeInfo, err error) {
+	db := dao.GetDB()
+	deliveryFeeInfo = &partner.WaybillFeeInfo{}
+	deliveryFeeInfo.RefDeliveryFee, deliveryFeeInfo.RefAddFee, err = delivery.CalculateOrderDeliveryFee(order, time.Now(), db)
+	if err == nil {
+		if _, err = c.getMTPSShopID(order, db); err == nil {
+			deliveryFeeInfo.DeliveryFee = deliveryFeeInfo.RefDeliveryFee
+		}
+	}
 	return deliveryFeeInfo, err
 }