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

1

Browse Source
This commit is contained in:
邹宗楠
2023-10-18 19:00:31 +08:00
parent 75c0404fe8
commit d949fb70ec
3 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -470,16 +470,13 @@ func (s *DefScheduler) QueryOrderWaybillFeeInfoEx(ctx *jxcontext.Context, vendor
if order.DeliveryType == model.OrderDeliveryTypeSelfTake { if order.DeliveryType == model.OrderDeliveryTypeSelfTake {
return nil, fmt.Errorf("订单:%s是自提单", vendorOrderID) return nil, fmt.Errorf("订单:%s是自提单", vendorOrderID)
} }
globals.SugarLogger.Debugf("==============1")
// 获取用户送货地址 // 获取用户送货地址
storeCourierList, err := dao.GetStoreCourierList(db, []int{jxutils.GetSaleStoreIDFromOrder(order)}, nil, model.StoreStatusAll, model.StoreAuditStatusOnline) storeCourierList, err := dao.GetStoreCourierList(db, []int{jxutils.GetSaleStoreIDFromOrder(order)}, nil, model.StoreStatusAll, model.StoreAuditStatusOnline)
globals.SugarLogger.Debugf("==============2")
if err != nil { if err != nil {
return nil, err return nil, err
} }
// 美团配送订单兑现 // 美团配送订单兑现
waybillList, err := partner.CurOrderManager.GetOrderWaybillInfo(ctx, vendorOrderID, vendorID, true, false) waybillList, err := partner.CurOrderManager.GetOrderWaybillInfo(ctx, vendorOrderID, vendorID, true, false)
globals.SugarLogger.Debugf("==============3")
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -494,7 +491,6 @@ func (s *DefScheduler) QueryOrderWaybillFeeInfoEx(ctx *jxcontext.Context, vendor
} }
store, _ := dao.GetStoreDetail(db, order.JxStoreID, order.VendorID, order.VendorOrgCode) store, _ := dao.GetStoreDetail(db, order.JxStoreID, order.VendorID, order.VendorOrgCode)
globals.SugarLogger.Debugf("==============STORE := %s", utils.Format4Output(store, false))
for _, storeCourier := range storeCourierList { for _, storeCourier := range storeCourierList {
var feeInfo *partner.WaybillFeeInfo var feeInfo *partner.WaybillFeeInfo
if waybillMap[storeCourier.VendorID] != nil { if waybillMap[storeCourier.VendorID] != nil {
@@ -511,10 +507,7 @@ func (s *DefScheduler) QueryOrderWaybillFeeInfoEx(ctx *jxcontext.Context, vendor
if handler := partner.GetDeliveryPlatformFromVendorID(storeCourier.VendorID); handler != nil { if handler := partner.GetDeliveryPlatformFromVendorID(storeCourier.VendorID); handler != nil {
if handler.Use4CreateWaybill { if handler.Use4CreateWaybill {
// 获取订单配送费用 // 获取订单配送费用
globals.SugarLogger.Debugf("==================4 ")
feeInfo, err = handler.Handler.GetWaybillFee(order) feeInfo, err = handler.Handler.GetWaybillFee(order)
globals.SugarLogger.Debugf("=======feeinfo : %s", utils.Format4Output(feeInfo, false))
globals.SugarLogger.Debugf("=======feeinfo : %v", err)
if err != nil { if err != nil {
feeInfo = &partner.WaybillFeeInfo{ feeInfo = &partner.WaybillFeeInfo{
ErrCode: partner.WaybillFeeErrCodeCourierOthers, ErrCode: partner.WaybillFeeErrCodeCourierOthers,

2
business/partner/purchase/tao_vegetable/order.go
View File

@@ -101,6 +101,7 @@ func (p *PurchaseHandler) getOrder(vendorOrgCode string, vendorOrderID int64, ve
//var weight int = 0 //var weight int = 0
order.PmSubsidyMoney = *orderDetail.SkuDiscountPlatformFee // 平台承担优惠 order.PmSubsidyMoney = *orderDetail.SkuDiscountPlatformFee // 平台承担优惠
// 添加需要赠送的东西(暂时没有赠品套餐直接商品) // 添加需要赠送的东西(暂时没有赠品套餐直接商品)
globals.SugarLogger.Debugf("======orderDetail := %s", utils.Format4Output(orderDetail, false))
multiSkuMap := make(map[int]int) multiSkuMap := make(map[int]int)
if len(*orderDetail.SubOrderResponseList) > 0 { if len(*orderDetail.SubOrderResponseList) > 0 {
for _, extra := range *orderDetail.SubOrderResponseList { for _, extra := range *orderDetail.SubOrderResponseList {
@@ -201,6 +202,7 @@ func (p *PurchaseHandler) getOrder(vendorOrgCode string, vendorOrderID int64, ve
order.OrderSeq = orderSeq + 1 order.OrderSeq = orderSeq + 1
// 包装袋金额 // 包装袋金额
globals.SugarLogger.Debugf("==============order := %s", utils.Format4Output(order, false))
store, _ := dao.GetStoreDetailByVendorStoreID(dao.GetDB(), order.VendorStoreID, model.VendorIDTaoVegetable, order.VendorOrgCode) store, _ := dao.GetStoreDetailByVendorStoreID(dao.GetDB(), order.VendorStoreID, model.VendorIDTaoVegetable, order.VendorOrgCode)
if store != nil { if store != nil {
order.StoreName = store.Name // 真实门店名称 order.StoreName = store.Name // 真实门店名称

3
controllers/jx_order.go
View File

@@ -6,7 +6,6 @@ import (
"fmt" "fmt"
"git.rosy.net.cn/jx-callback/business/bidding" "git.rosy.net.cn/jx-callback/business/bidding"
"git.rosy.net.cn/jx-callback/business/partner/delivery" "git.rosy.net.cn/jx-callback/business/partner/delivery"
"git.rosy.net.cn/jx-callback/globals"
"strings" "strings"
"time" "time"
@@ -111,8 +110,6 @@ func (c *OrderController) ConfirmSelfTake() {
func (c *OrderController) QueryOrderWaybillFeeInfo() { func (c *OrderController) QueryOrderWaybillFeeInfo() {
c.callQueryOrderWaybillFeeInfo(func(params *tOrderQueryOrderWaybillFeeInfoParams) (retVal interface{}, errCode string, err error) { c.callQueryOrderWaybillFeeInfo(func(params *tOrderQueryOrderWaybillFeeInfoParams) (retVal interface{}, errCode string, err error) {
retVal, err = defsch.FixedScheduler.QueryOrderWaybillFeeInfoEx(params.Ctx, params.VendorOrderID, params.VendorID) retVal, err = defsch.FixedScheduler.QueryOrderWaybillFeeInfoEx(params.Ctx, params.VendorOrderID, params.VendorID)
globals.SugarLogger.Debugf("=====retVal := %s", utils.Format4Output(retVal, false))
globals.SugarLogger.Debugf("=====retVal := %v", err)
return retVal, "", err return retVal, "", err
}) })
} }