1
This commit is contained in:
@@ -58,6 +58,10 @@ func SendFilesToStores(ctx *jxcontext.Context, files []*multipart.FileHeader, ti
|
|||||||
fileHeader := fileInfo.FileHeader
|
fileHeader := fileInfo.FileHeader
|
||||||
db := dao.GetDB()
|
db := dao.GetDB()
|
||||||
storeID, _ := dao.GetRealLinkStoreID(db, fileInfo.StoreID)
|
storeID, _ := dao.GetRealLinkStoreID(db, fileInfo.StoreID)
|
||||||
|
storeDetail, _ := dao.GetStoreDetail(db, storeID, 0, "")
|
||||||
|
if storeDetail != nil && storeDetail.PushBill == 1 {
|
||||||
|
return retVal, err
|
||||||
|
}
|
||||||
file, err := fileHeader.Open()
|
file, err := fileHeader.Open()
|
||||||
if err == nil {
|
if err == nil {
|
||||||
ret := storage.PutRet{}
|
ret := storage.PutRet{}
|
||||||
|
|||||||
@@ -19,14 +19,13 @@ func GetBadCommentOrderId(jxStoreId int, startTime, endTime time.Time, foodNameL
|
|||||||
model.VendorIDMTWM,
|
model.VendorIDMTWM,
|
||||||
startTime,
|
startTime,
|
||||||
endTime,
|
endTime,
|
||||||
foodNameList,
|
|
||||||
})
|
})
|
||||||
if len(foodNameList) != 0 {
|
if len(foodNameList) != 0 {
|
||||||
sql += `AND s.sku_name IN (` + dao.GenQuestionMarks(len(foodNameList)) + `) GROUP BY s.vendor_order_id LIMIT 0, 1000`
|
sql += `AND s.sku_name IN (` + dao.GenQuestionMarks(len(foodNameList)) + `) GROUP BY s.vendor_order_id ORDER BY count desc LIMIT 0, 10`
|
||||||
sqlParams = append(sqlParams, foodNameList)
|
sqlParams = append(sqlParams, foodNameList)
|
||||||
}
|
}
|
||||||
if len(skuList) != 0 {
|
if len(skuList) != 0 {
|
||||||
sql += `AND s.sku_id IN (` + dao.GenQuestionMarks(len(skuList)) + `) GROUP BY s.vendor_order_id LIMIT 0, 1000`
|
sql += `AND s.sku_id IN (` + dao.GenQuestionMarks(len(skuList)) + `) GROUP BY s.vendor_order_id ORDER BY count desc LIMIT 0, 10`
|
||||||
sqlParams = append(sqlParams, skuList)
|
sqlParams = append(sqlParams, skuList)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -38,6 +37,7 @@ func GetBadCommentOrderId(jxStoreId int, startTime, endTime time.Time, foodNameL
|
|||||||
// 全等于的话就是目标订单
|
// 全等于的话就是目标订单
|
||||||
vendorOrderIdList := make([]string, 0, 0)
|
vendorOrderIdList := make([]string, 0, 0)
|
||||||
for _, v := range commentOrder {
|
for _, v := range commentOrder {
|
||||||
|
if foodNameList != nil {
|
||||||
if v.Count == len(foodNameList) {
|
if v.Count == len(foodNameList) {
|
||||||
return v.VendorOrderId, nil
|
return v.VendorOrderId, nil
|
||||||
} else if v.Count-1 == len(foodNameList) || v.Count-2 == len(foodNameList) {
|
} else if v.Count-1 == len(foodNameList) || v.Count-2 == len(foodNameList) {
|
||||||
@@ -45,6 +45,16 @@ func GetBadCommentOrderId(jxStoreId int, startTime, endTime time.Time, foodNameL
|
|||||||
} else if v.Count+1 == len(foodNameList) || v.Count+2 == len(foodNameList) {
|
} else if v.Count+1 == len(foodNameList) || v.Count+2 == len(foodNameList) {
|
||||||
vendorOrderIdList = append(vendorOrderIdList, v.VendorOrderId)
|
vendorOrderIdList = append(vendorOrderIdList, v.VendorOrderId)
|
||||||
}
|
}
|
||||||
|
} else if skuList != nil {
|
||||||
|
if v.Count == len(skuList) {
|
||||||
|
return v.VendorOrderId, nil
|
||||||
|
} else if v.Count-1 == len(skuList) || v.Count-2 == len(skuList) {
|
||||||
|
vendorOrderIdList = append(vendorOrderIdList, v.VendorOrderId)
|
||||||
|
} else if v.Count+1 == len(skuList) || v.Count+2 == len(skuList) {
|
||||||
|
vendorOrderIdList = append(vendorOrderIdList, v.VendorOrderId)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
sql2 := `SELECT * FROM order_sku WHERE vendor_order_id = ?`
|
sql2 := `SELECT * FROM order_sku WHERE vendor_order_id = ?`
|
||||||
@@ -56,6 +66,7 @@ func GetBadCommentOrderId(jxStoreId int, startTime, endTime time.Time, foodNameL
|
|||||||
}
|
}
|
||||||
|
|
||||||
var skuMatchingCount int = 0
|
var skuMatchingCount int = 0
|
||||||
|
if foodNameList != nil {
|
||||||
for _, sf := range skuFinancial {
|
for _, sf := range skuFinancial {
|
||||||
for _, fnl := range foodNameList {
|
for _, fnl := range foodNameList {
|
||||||
if sf.SkuName == fnl {
|
if sf.SkuName == fnl {
|
||||||
@@ -63,6 +74,15 @@ func GetBadCommentOrderId(jxStoreId int, startTime, endTime time.Time, foodNameL
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
} else if skuList != nil {
|
||||||
|
for _, sf := range skuFinancial {
|
||||||
|
for _, fnl := range skuList {
|
||||||
|
if sf.SkuID == fnl {
|
||||||
|
skuMatchingCount += 1
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
mathProbability[v] = float64(skuMatchingCount) / float64(len(skuFinancial))
|
mathProbability[v] = float64(skuMatchingCount) / float64(len(skuFinancial))
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user