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-06-14 15:23:02 +08:00
parent caa0b76302
commit 140d07bb92
14 changed files with 285 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
business/partner/delivery/dada/waybill.go
View File

@@ -95,7 +95,7 @@ func (c *DeliveryHandler) onWaybillMsg(msg *dadaapi.CallbackMsg) (retVal *dadaap
order.Status = model.WaybillStatusUnknown
}
err := dadaapi.Err2CallbackResponse(partner.CurOrderManager.OnWaybillStatusChanged(order), utils.Int2Str(order.Status))
defer delivery.GetOrderRiderInfoToPlatform(order.VendorOrderID) // 骑手位置更新
defer delivery.GetOrderRiderInfoToPlatform(order.VendorOrderID) // 骑手位置更新
return err
}
@@ -120,6 +120,12 @@ func (c *DeliveryHandler) callbackMsg2Waybill(msg *dadaapi.CallbackMsg) (retVal
}
func StoreDetail2ShopInfo(storeDetail *dao.StoreDetail2) (shopInfo *dadaapi.ShopInfo) {
// 获取品牌名称
brandInfo, err := dao.GetBrands(dao.GetDB(), "", storeDetail.BrandID, "", false, "")
if err != nil {
return nil
}
lng := jxutils.IntCoordinate2Standard(storeDetail.Lng)
lat := jxutils.IntCoordinate2Standard(storeDetail.Lat)
cityName := storeDetail.CityName
@@ -135,7 +141,7 @@ func StoreDetail2ShopInfo(storeDetail *dao.StoreDetail2) (shopInfo *dadaapi.Shop
}
shopInfo = &dadaapi.ShopInfo{
OriginShopID: storeDetail.VendorStoreID,
StationName: globals.StoreName + "-" + storeDetail.Name,
StationName: brandInfo[0].Name + "-" + storeDetail.Name,
Business: dadaapi.BusinessTypeConvStore, // 故意设置成这个的
CityName: cityName,
AreaName: districtName,

9
business/partner/delivery/fn/store.go
View File

@@ -34,11 +34,9 @@ func getAuditStatus(vendorAuditStatus int) int {
}
func (c *DeliveryHandler) CreateStore(ctx *jxcontext.Context, storeDetail *dao.StoreDetail2) (vendorStoreID string, status int, err error) {
globals.SugarLogger.Debug("蜂鸟门店创建")
// 获取品牌名称
brandInfo, err := dao.GetBrands(dao.GetDB(), "", storeDetail.BrandID, "", false, "")
if err != nil {
globals.SugarLogger.Debug("蜂鸟门店创建--1", err)
return "", 0, err
}
createStore := &fnpsapi.CreateStoreBaseInfo{
@@ -69,7 +67,6 @@ func (c *DeliveryHandler) CreateStore(ctx *jxcontext.Context, storeDetail *dao.S
fnShopId, err := api.FnAPI.CreateStore(createStore)
if err != nil {
globals.SugarLogger.Debug("蜂鸟门店创建--2", err)
return "", 0, err
}
@@ -145,6 +142,12 @@ func (c *DeliveryHandler) UpdateStore(ctx *jxcontext.Context, storeDetail *dao.S
updateStore.HeadShopName = brandInfo[0].Name + "-" + storeDetail.Name
updateStore.BranchShopName = storeDetail.Name
}
if updateStore.OwnerName == "" {
updateStore.OwnerName = "石锋"
}
if updateStore.OwnerIDNum == "" {
updateStore.OwnerIDNum = "610126198012230014"
}
return api.FnAPI.UpdateStore(updateStore)
}