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

饿百自提单识别

Browse Source
This commit is contained in:
苏尹岚
2020-05-15 09:30:59 +08:00
parent 5e5b6e8ce2
commit d727cf0d1e
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
business/jxstore/cms/store_sku.go
View File

@@ -549,8 +549,6 @@ func GetStoresSkusNew(ctx *jxcontext.Context, storeIDs, skuIDs []int, isFocus, i
} }
var tmpList []*tGetStoresSkusInfo var tmpList []*tGetStoresSkusInfo
beginTime := time.Now() beginTime := time.Now()
fmt.Println("test1", sql)
fmt.Println(sqlParams)
if err = dao.GetRows(db, &tmpList, sql, sqlParams...); err != nil { if err = dao.GetRows(db, &tmpList, sql, sqlParams...); err != nil {
dao.Rollback(db) dao.Rollback(db)
return nil, err return nil, err

14
business/partner/purchase/ebai/order.go
View File

@@ -61,10 +61,14 @@ var (
} }
) )
func mapDeliveryType(ebaiDeliveryParty int) (deliveryType string) { func mapDeliveryType(ebaiDeliveryParty int, businessType int) (deliveryType string) {
deliveryType = deliveryTypeMap[ebaiDeliveryParty] if businessType == ebaiapi.DeliveryBusinessTypeZT {
if deliveryType == "" { return model.OrderDeliveryTypeSelfTake
deliveryType = model.OrderDeliveryTypePlatform } else {
deliveryType = deliveryTypeMap[ebaiDeliveryParty]
if deliveryType == "" {
deliveryType = model.OrderDeliveryTypePlatform
}
} }
return deliveryType return deliveryType
} }
@@ -226,7 +230,7 @@ func (p *PurchaseHandler) Map2Order(orderData map[string]interface{}) (order *mo
ActualPayPrice: utils.ForceInterface2Int64(orderMap["user_fee"]), ActualPayPrice: utils.ForceInterface2Int64(orderMap["user_fee"]),
BaseFreightMoney: utils.ForceInterface2Int64(orderMap["send_fee"]), BaseFreightMoney: utils.ForceInterface2Int64(orderMap["send_fee"]),
TotalShopMoney: utils.ForceInterface2Int64(orderMap["shop_fee"]), TotalShopMoney: utils.ForceInterface2Int64(orderMap["shop_fee"]),
DeliveryType: mapDeliveryType(int(utils.ForceInterface2Int64(orderMap["delivery_party"]))), DeliveryType: mapDeliveryType(int(utils.ForceInterface2Int64(orderMap["delivery_party"])), int(utils.ForceInterface2Int64(orderMap["business_type"]))),
InvoiceTitle: utils.Interface2String(orderMap["invoice_title"]), InvoiceTitle: utils.Interface2String(orderMap["invoice_title"]),
InvoiceTaxerID: utils.Interface2String(orderMap["taxer_id"]), InvoiceTaxerID: utils.Interface2String(orderMap["taxer_id"]),