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-04 19:56:51 +08:00
parent da96198616
commit 27e8e18b5b
3 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
business/jxcallback/scheduler/defsch/defsch_ext.go
View File

@@ -125,7 +125,7 @@ func (s *DefScheduler) CreateWaybillOnProviders4SavedOrder(ctx *jxcontext.Contex
if forceCreate { if forceCreate {
maxDeliveryFee = math.MaxInt64 maxDeliveryFee = math.MaxInt64
} }
// 生成美团订单 // 生成美团订单(三方订单)
if bills, err = s.CreateWaybillOnProviders(ctx, order, courierVendorIDs, excludeCourierVendorIDs, maxDeliveryFee, forceCreate); err == nil { if bills, err = s.CreateWaybillOnProviders(ctx, order, courierVendorIDs, excludeCourierVendorIDs, maxDeliveryFee, forceCreate); err == nil {
if forceCreate { if forceCreate {
order.DeliveryFlag |= model.OrderDeliveryFlagMaskScheduleDisabled order.DeliveryFlag |= model.OrderDeliveryFlagMaskScheduleDisabled
@@ -332,6 +332,7 @@ func (s *DefScheduler) CancelAll3rdWaybills(ctx *jxcontext.Context, vendorOrderI
return err return err
} }
// 查询三方运单费用
func (s *DefScheduler) QueryOrderWaybillFeeInfoEx(ctx *jxcontext.Context, vendorOrderID string, vendorID int) (deliveryFeeMap map[int]*partner.WaybillFeeInfo, err error) { func (s *DefScheduler) QueryOrderWaybillFeeInfoEx(ctx *jxcontext.Context, vendorOrderID string, vendorID int) (deliveryFeeMap map[int]*partner.WaybillFeeInfo, err error) {
jxutils.CallMsgHandler(func() { jxutils.CallMsgHandler(func() {
deliveryFeeMap, err = func() (deliveryFeeMap map[int]*partner.WaybillFeeInfo, err error) { deliveryFeeMap, err = func() (deliveryFeeMap map[int]*partner.WaybillFeeInfo, err error) {

6
business/model/api_config.go
View File

@@ -24,9 +24,9 @@ const (
VendorIDWXPay = 51 // 微信支付 VendorIDWXPay = 51 // 微信支付
VendorIDDeliveryBegin = 101 VendorIDDeliveryBegin = 101
VendorIDDada = 101 VendorIDDada = 101 // 达达配送
VendorIDMTPS = 102 VendorIDMTPS = 102 // 美团配送
VendorIDFengNiao = 103 VendorIDFengNiao = 103 // 蜂鸟配送
VendorIDJDWL = 401 //京东物流 VendorIDJDWL = 401 //京东物流
VendorIDDeliveryEnd = 500 VendorIDDeliveryEnd = 500

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

@@ -4,6 +4,7 @@ import (
"crypto/sha1" "crypto/sha1"
"errors" "errors"
"fmt" "fmt"
"math/rand"
"net/http" "net/http"
"net/url" "net/url"
"sort" "sort"
@@ -179,6 +180,21 @@ 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 {