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

Merge branch 'jdshop' of e.coding.net:rosydev/jx-callback into jdshop

Browse Source
This commit is contained in:
邹宗楠
2023-01-10 16:27:48 +08:00
parent 19fb3812c9 c14956703d
commit a41dd2656b
2 changed files with 41 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
business/partner/delivery/tiktok_store/waybill.go
View File

@@ -13,7 +13,6 @@ import (
"git.rosy.net.cn/jx-callback/business/model"
"git.rosy.net.cn/jx-callback/business/model/dao"
"git.rosy.net.cn/jx-callback/business/partner"
"git.rosy.net.cn/jx-callback/business/partner/delivery"
"git.rosy.net.cn/jx-callback/globals"
"git.rosy.net.cn/jx-callback/globals/api"
"time"
@@ -62,11 +61,8 @@ func (c *DeliveryHandler) GetStore(ctx *jxcontext.Context, storeID int, vendorSt
VendorStoreID: utils.Int64ToStr(storeInfo.StoreDetail.Store.StoreId),
CourierStatus: int(storeInfo.StoreDetail.Store.State),
}
<<<<<<< HEAD
=======
} else {
globals.SugarLogger.Debugf("GetStoreDetail err %s", err)
>>>>>>> 68b5033815cd812e1d9516b5f64acfab2665ee94
}
return storeDetail, err
}
@@ -81,28 +77,29 @@ func (c *DeliveryHandler) IsErrStoreExist(err error) bool {
// 呼叫运力并发货
func (c *DeliveryHandler) CreateWaybill(order *model.GoodsOrder, maxDeliveryFee int64) (bill *model.Waybill, err error) {
relInfo, err := dao.GetStoreDetail(dao.GetDB(), order.JxStoreID, model.VendorIDDD, "")
if err != nil {
return nil, errors.New("获取抖音平台账号信息失败，请重试")
}
apiObj := getAPI(relInfo.VendorOrgCode)
if order.VendorID != model.VendorIDDD {
return nil, errors.New("非抖音平台店铺不可发抖音配送")
}
bill = &model.Waybill{
VendorOrderID: order.VendorOrderID,
OrderVendorID: order.VendorID,
VendorWaybillID: order.VendorOrderID, //抖音配送订单号即运单号
WaybillVendorID: model.VendorIDDYPS,
}
if dispatcherFee, err := apiObj.GetDispatcherInfo(int64(order.StoreID), order.VendorOrderID, tiktok_api.DispatcherFeeTypeCall); err == nil {
bill.DesiredFee = dispatcherFee
}
if err := apiObj.ShopOrderDispatcher(utils.Str2Int64(order.VendorStoreID), order.VendorOrderID, tiktok_api.DispatcherFeeTypeCall); err != nil {
return nil, err
}
delivery.OnWaybillCreated(bill)
return bill, nil
return nil, nil
//relInfo, err := dao.GetStoreDetail(dao.GetDB(), order.JxStoreID, model.VendorIDDD, "")
//if err != nil {
// return nil, errors.New("获取抖音平台账号信息失败，请重试")
//}
//apiObj := getAPI(relInfo.VendorOrgCode)
//if order.VendorID != model.VendorIDDD {
// return nil, errors.New("非抖音平台店铺不可发抖音配送")
//}
//bill = &model.Waybill{
// VendorOrderID: order.VendorOrderID,
// OrderVendorID: order.VendorID,
// VendorWaybillID: order.VendorOrderID, //抖音配送订单号即运单号
// WaybillVendorID: model.VendorIDDYPS,
//}
//if dispatcherFee, err := apiObj.GetDispatcherInfo(int64(order.StoreID), order.VendorOrderID, tiktok_api.DispatcherFeeTypeCall); err == nil {
// bill.DesiredFee = dispatcherFee
//}
//if err := apiObj.ShopOrderDispatcher(utils.Str2Int64(order.VendorStoreID), order.VendorOrderID, tiktok_api.DispatcherFeeTypeCall); err != nil {
// return nil, err
//}
//delivery.OnWaybillCreated(bill)
//return bill, nil
}
func (c *DeliveryHandler) CancelWaybill(bill *model.Waybill, cancelReasonID int, cancelReason string) (err error) {
@@ -122,15 +119,16 @@ func (c *DeliveryHandler) CancelWaybill(bill *model.Waybill, cancelReasonID int,
}
func (c *DeliveryHandler) GetWaybillFee(order *model.GoodsOrder) (deliveryFeeInfo *partner.WaybillFeeInfo, err error) {
relInfo, err := dao.GetStoreDetail(dao.GetDB(), order.JxStoreID, model.VendorIDDD, "")
if err != nil {
return nil, errors.New("获取抖音平台账号信息失败，请重试")
}
if dispatcherFee, err := getAPI(relInfo.VendorOrgCode).GetDispatcherInfo(utils.Str2Int64(relInfo.VendorStoreID), order.VendorOrderID, tiktok_api.DispatcherFeeTypeCall); err == nil {
deliveryFeeInfo = &partner.WaybillFeeInfo{}
deliveryFeeInfo.DeliveryFee = dispatcherFee
}
return deliveryFeeInfo, err
return nil, nil
//relInfo, err := dao.GetStoreDetail(dao.GetDB(), order.JxStoreID, model.VendorIDDD, "")
//if err != nil {
// return nil, errors.New("获取抖音平台账号信息失败，请重试")
//}
//if dispatcherFee, err := getAPI(relInfo.VendorOrgCode).GetDispatcherInfo(utils.Str2Int64(relInfo.VendorStoreID), order.VendorOrderID, tiktok_api.DispatcherFeeTypeCall); err == nil {
// deliveryFeeInfo = &partner.WaybillFeeInfo{}
// deliveryFeeInfo.DeliveryFee = dispatcherFee
//}
//return deliveryFeeInfo, err
}
func getDispatcherFee(storeID int64, vendorOrderID string, dispatcherType int32) int64 {
if relInfo, err := dao.GetStoreDetailForDD(dao.GetDB(), 0, model.VendorIDDD, utils.Int64ToStr(storeID), ""); err != nil {

11
business/partner/purchase/tiktok_store/waybill.go
View File

@@ -89,20 +89,25 @@ func SetStoreAutoCallRider(vendorOrgCode, opType string, storeID int64) error {
}
//批量查询自动呼叫运力配置
func GetStoreAutoCallRiderInfo(vendorOrgCode string, storeIDs []int64) (autoCallInfos map[int64]*superm_getStoreAutoCallRiderInfo_response.AutoCallInfo, err error) {
func GetStoreAutoCallRiderInfo(vendorOrgCode string, storeIDs []int64) (map[int64]*superm_getStoreAutoCallRiderInfo_response.AutoCallInfo, error) {
if len(storeIDs) == 0 {
return nil, errors.New("门店ID为空，请检查")
}
errList := errlist.ErrList{}
tAutoCallInfos := make(map[int64]*superm_getStoreAutoCallRiderInfo_response.AutoCallInfo, 0)
for _, i := range storeIDs {
if autoCallInfo, err := getAPI(vendorOrgCode, 0, "").GetStoreAutoCallRiderInfo(i); err != nil {
errList.AddErr(err)
} else {
autoCallInfos[i] = autoCallInfo
tAutoCallInfos[i] = &superm_getStoreAutoCallRiderInfo_response.AutoCallInfo{
ServiceStatus: autoCallInfo.ServiceStatus,
ServiceType: autoCallInfo.ServiceType,
DelayTime: autoCallInfo.DelayTime,
}
}
}
if errList.GetErrListAsOne() != nil {
return nil, errList.GetErrListAsOne()
}
return autoCallInfos, nil
return tAutoCallInfos, nil
}