liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

回滚部分代码

Browse Source
This commit is contained in:
邹宗楠
2022-03-05 14:45:24 +08:00
parent 27e8e18b5b
commit c6d2d26bb1
1 changed files with 32 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
business/partner/delivery/mtps/waybill.go
View File

@@ -4,7 +4,6 @@ import (
"crypto/sha1" "crypto/sha1"
"errors" "errors"
"fmt" "fmt"
"math/rand"
"net/http" "net/http"
"net/url" "net/url"
"sort" "sort"
@@ -180,21 +179,6 @@ func (c *DeliveryHandler) callbackMsg2Waybill(msg *mtpsapi.CallbackOrderMsg) (re
func (c *DeliveryHandler) GetWaybillFee(order *model.GoodsOrder) (deliveryFeeInfo *partner.WaybillFeeInfo, err error) { func (c *DeliveryHandler) GetWaybillFee(order *model.GoodsOrder) (deliveryFeeInfo *partner.WaybillFeeInfo, err error) {
db := dao.GetDB() db := dao.GetDB()
deliveryFeeInfo = &partner.WaybillFeeInfo{} deliveryFeeInfo = &partner.WaybillFeeInfo{}
api.MtpsAPI.PreCreateByShop(&mtpsapi.PreCreateByShopParam{
DeliveryID: time.Now().Unix()*100 + int64(rand.Intn(2)),
OrderID: order.VendorOrderID,
ShopID: utils.Int2Str(order.StoreID),
DeliveryServiceCode: mtpsapi.DeliveryServiceCodeIntime,
ReceiverName: order.ConsigneeName,
ReceiverAddress: order.ConsigneeAddress,
ReceiverPhone: order.ConsigneeMobile,
ReceiverLng: order.ConsigneeLng,
ReceiverLat: order.ConsigneeLat,
GoodsValue: utils.Int64ToFloat64(order.ActualPayPrice),
GoodsWeight: utils.Int2Float64(order.Weight),
PayTypeCode: 0,
OuterOrderSourceDesc: "101",
})
deliveryFeeInfo.RefDeliveryFee, deliveryFeeInfo.RefAddFee, err = delivery.CalculateOrderDeliveryFee(order, time.Now(), db) deliveryFeeInfo.RefDeliveryFee, deliveryFeeInfo.RefAddFee, err = delivery.CalculateOrderDeliveryFee(order, time.Now(), db)
if err == nil { if err == nil {
if _, err = c.getMTPSShopID(order, db); err == nil { if _, err = c.getMTPSShopID(order, db); err == nil {
@@ -204,6 +188,38 @@ func (c *DeliveryHandler) GetWaybillFee(order *model.GoodsOrder) (deliveryFeeInf
return deliveryFeeInfo, err return deliveryFeeInfo, err
} }
//
//// todo 是否应该语法订单
//func (c *DeliveryHandler) GetWaybillFee(order *model.GoodsOrder) (deliveryFeeInfo *partner.WaybillFeeInfo, err error) {
// db := dao.GetDB()
// deliveryFeeInfo = &partner.WaybillFeeInfo{}
// api.MtpsAPI.PreCreateByShop(&mtpsapi.PreCreateByShopParam{
// DeliveryID: time.Now().Unix()*100 + int64(rand.Intn(2)),
// OrderID: order.VendorOrderID,
// ShopID: utils.Int2Str(order.StoreID),
// DeliveryServiceCode: mtpsapi.DeliveryServiceCodeIntime,
// ReceiverName: order.ConsigneeName,
// ReceiverAddress: order.ConsigneeAddress,
// ReceiverPhone: order.ConsigneeMobile,
// ReceiverLng: order.ConsigneeLng,
// ReceiverLat: order.ConsigneeLat,
// GoodsValue: utils.Int64ToFloat64(order.ActualPayPrice),
// GoodsWeight: utils.Int2Float64(order.Weight),
// PayTypeCode: 0,
// OuterOrderSourceDesc: "101",
// })
// deliveryFeeInfo.RefDeliveryFee, deliveryFeeInfo.RefAddFee, err = delivery.CalculateOrderDeliveryFee(order, time.Now(), db)
// baseapi.SugarLogger.Debug("errrr:=====", err)
// baseapi.SugarLogger.Debug("delFee:=====", deliveryFeeInfo.RefDeliveryFee)
// baseapi.SugarLogger.Debug("FeeInfo:=====", deliveryFeeInfo.RefAddFee)
// if err == nil {
// if _, err = c.getMTPSShopID(order, db); err == nil {
// deliveryFeeInfo.DeliveryFee = deliveryFeeInfo.RefDeliveryFee
// }
// }
// return deliveryFeeInfo, err
//}
// IDeliveryPlatformHandler（美团配送） // IDeliveryPlatformHandler（美团配送）
func (c *DeliveryHandler) CreateWaybill(order *model.GoodsOrder, maxDeliveryFee int64) (bill *model.Waybill, err error) { func (c *DeliveryHandler) CreateWaybill(order *model.GoodsOrder, maxDeliveryFee int64) (bill *model.Waybill, err error) {
db := dao.GetDB() db := dao.GetDB()