diff --git a/business/jxstore/financial/financial.go b/business/jxstore/financial/financial.go index 02ee2541c..2d11bd640 100644 --- a/business/jxstore/financial/financial.go +++ b/business/jxstore/financial/financial.go @@ -58,6 +58,10 @@ func SendFilesToStores(ctx *jxcontext.Context, files []*multipart.FileHeader, ti fileHeader := fileInfo.FileHeader db := dao.GetDB() 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() if err == nil { ret := storage.PutRet{} diff --git a/business/model/dao/dao_order_sku_financial.go b/business/model/dao/dao_order_sku_financial.go index d059abefd..41933f53f 100644 --- a/business/model/dao/dao_order_sku_financial.go +++ b/business/model/dao/dao_order_sku_financial.go @@ -19,14 +19,13 @@ func GetBadCommentOrderId(jxStoreId int, startTime, endTime time.Time, foodNameL model.VendorIDMTWM, startTime, endTime, - foodNameList, }) 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) } 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) } @@ -38,13 +37,24 @@ func GetBadCommentOrderId(jxStoreId int, startTime, endTime time.Time, foodNameL // 全等于的话就是目标订单 vendorOrderIdList := make([]string, 0, 0) for _, v := range commentOrder { - if v.Count == len(foodNameList) { - return v.VendorOrderId, nil - } else if v.Count-1 == len(foodNameList) || v.Count-2 == len(foodNameList) { - vendorOrderIdList = append(vendorOrderIdList, v.VendorOrderId) - } else if v.Count+1 == len(foodNameList) || v.Count+2 == len(foodNameList) { - vendorOrderIdList = append(vendorOrderIdList, v.VendorOrderId) + if foodNameList != nil { + if v.Count == len(foodNameList) { + return v.VendorOrderId, nil + } else if v.Count-1 == len(foodNameList) || v.Count-2 == len(foodNameList) { + vendorOrderIdList = append(vendorOrderIdList, v.VendorOrderId) + } else if v.Count+1 == len(foodNameList) || v.Count+2 == len(foodNameList) { + 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 = ?` @@ -56,10 +66,20 @@ func GetBadCommentOrderId(jxStoreId int, startTime, endTime time.Time, foodNameL } var skuMatchingCount int = 0 - for _, sf := range skuFinancial { - for _, fnl := range foodNameList { - if sf.SkuName == fnl { - skuMatchingCount += 1 + if foodNameList != nil { + for _, sf := range skuFinancial { + for _, fnl := range foodNameList { + if sf.SkuName == fnl { + skuMatchingCount += 1 + } + } + } + } else if skuList != nil { + for _, sf := range skuFinancial { + for _, fnl := range skuList { + if sf.SkuID == fnl { + skuMatchingCount += 1 + } } } }