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

- up

Browse Source
This commit is contained in:
gazebo
2019-09-07 10:47:13 +08:00
parent 92b6c24347
commit 937cfe187c
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
business/jxstore/tempop/tempop.go
View File

@@ -1068,7 +1068,7 @@ func CreateConsumerFromOrders(ctx *jxcontext.Context, vendorIDs []int, fromDate,
} }
} }
} }
if order2 == nil && order.VendorID == model.VendorIDMTWM && time.Now().Sub(curDate) < 30*24*time.Hour { if order2 == nil && order.VendorID == model.VendorIDMTWM && time.Now().Sub(curDate) < 60*24*time.Hour {
order2, err = handler.GetOrder(order.VendorOrderID) order2, err = handler.GetOrder(order.VendorOrderID)
} }
if order2 != nil { if order2 != nil {
@@ -1078,9 +1078,11 @@ func CreateConsumerFromOrders(ctx *jxcontext.Context, vendorIDs []int, fromDate,
} }
} }
} }
if err = cms.HandleOrder4Consignee(&order.GoodsOrder); err == nil { /*
updateFields = append(updateFields, "UserID") if err = cms.HandleOrder4Consignee(&order.GoodsOrder); err == nil {
} updateFields = append(updateFields, "UserID")
}
*/
if len(updateFields) > 0 { if len(updateFields) > 0 {
dao.UpdateEntity(db, &order.GoodsOrder, updateFields...) dao.UpdateEntity(db, &order.GoodsOrder, updateFields...)
} }

2
business/jxutils/jxutils.go
View File

@@ -682,7 +682,7 @@ func GetRealMobile4Order(order *model.GoodsOrder) (mobileNumber string) {
} }
func GetAuthType4Vendor(vendorID int) (authType string) { func GetAuthType4Vendor(vendorID int) (authType string) {
authType = model.VendorNames[vendorID] authType = dao.ConvertJsonFieldPrefix(model.VendorNames[vendorID])
if authType != "" { if authType != "" {
authType = "vendor." + authType authType = "vendor." + authType
} }