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

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

Browse Source
This commit is contained in:
richboo111
2022-12-26 11:31:59 +08:00
parent 0f71eb5254 fd8d0b987c
commit 1735620300
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
business/jxutils/netprinter/netprinter.go
View File

@@ -40,6 +40,7 @@ func PrintOrder(ctx *jxcontext.Context, vendorOrderID string, vendorID int) (pri
order.StoreID = storeID order.StoreID = storeID
order.JxStoreID = storeID order.JxStoreID = storeID
} }
order.Status = model.OrderStatusNew
printResult, err = PrintOrderByOrder(ctx, order, "order", nil) printResult, err = PrintOrderByOrder(ctx, order, "order", nil)
} }
return printResult, err return printResult, err

3
business/partner/delivery/mtps/store.go
View File

@@ -68,6 +68,9 @@ func (c *DeliveryHandler) CreateStore(ctx *jxcontext.Context, storeDetail *dao.S
DeliveryServiceCodes: utils.Int2Str(mtpsapi.DeliveryServiceCodeRapid), DeliveryServiceCodes: utils.Int2Str(mtpsapi.DeliveryServiceCodeRapid),
} }
shopStatus := mtpsapi.ShopStatusAuditCreated shopStatus := mtpsapi.ShopStatusAuditCreated
if shopInfo.ShopLat <= 9999999 {
shopInfo.ShopLat *= 10
}
// 获取品牌名称 // 获取品牌名称
brandInfo, err := dao.GetBrands(dao.GetDB(), "", storeDetail.BrandID, "", false, "") brandInfo, err := dao.GetBrands(dao.GetDB(), "", storeDetail.BrandID, "", false, "")
if err != nil { if err != nil {