Accept Merge Request #137: (yonghui -> mark)

Merge Request: 畅销品自动关注，暂时只整4个小城市
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/137

business/jxstore/cms/cms.go

@@ -365,7 +365,7 @@ func DeleteConfig(ctx *jxcontext.Context, key, configType string) (err error) {
 			}
 		}
 		errList.AddErr(err)
-		storeList, err2 := dao.GetStoreList(db, nil, nil, key)
+		storeList, err2 := dao.GetStoreList(db, nil, nil, nil, nil, key)
 		if err = err2; err == nil && len(storeList) > 0 {
 			storeIDs := make([]int, len(storeList))
 			for k, v := range storeList {

business/jxstore/cms/store.go

@@ -1993,7 +1993,7 @@ func SendAlarmVendorSnapshot(ctx *jxcontext.Context, parentTask tasksch.ITask, p
 	}
 
 	if len(userList) > 0 {
-		allStores, err := dao.GetStoreList(db, nil, nil, "")
+		allStores, err := dao.GetStoreList(db, nil, nil, nil, nil, "")
 		if err != nil {
 			return err
 		}
@@ -2167,7 +2167,7 @@ func SaveAndSendAlarmVendorSnapshot(ctx *jxcontext.Context, vendorIDs, storeIDs
 
 func SyncStoresCourierInfo(ctx *jxcontext.Context, storeIDs []int, isAsync, isContinueWhenError bool) (hint string, err error) {
 	db := dao.GetDB()
-	storeList2, err := dao.GetStoreList(db, storeIDs, nil, "")
+	storeList2, err := dao.GetStoreList(db, storeIDs, nil, nil, nil, "")
 	var storeList []*model.Store
 	for _, v := range storeList2 {
 		if v.Status != model.StoreStatusDisabled {

business/jxstore/cms/store_sku.go

@@ -830,10 +830,6 @@ func UpdateStoresSkusByBind(ctx *jxcontext.Context, parentTask tasksch.ITask, sk
 		}
 	}()
 	for _, storeID := range storeIDs {
-		fmt.Println(storeID)
-		for _, v := range skuBindInfosMap[storeID] {
-			fmt.Println(*v)
-		}
 		skuIDs, err2 := updateStoresSkusWithoutSync(ctx, db, []int{storeID}, skuBindInfosMap[storeID], false)
 		if err = err2; err != nil {
 			dao.Rollback(db)
@@ -2234,7 +2230,7 @@ func GetTopSkusByCityCode(ctx *jxcontext.Context, cityCode, storeID int) (skuNam
 		var skuNameList []*model.SkuName
 		//不可售的商品nameID列表
 		sql := `
-			SELECT DISTINCT b.name_id id,1 brand_id
+			SELECT DISTINCT b.name_id id
 			FROM store_sku_bind a
 			JOIN sku b ON a.sku_id = b.id AND b.deleted_at = ?
 			WHERE a.deleted_at = ?
@@ -2274,29 +2270,36 @@ func GetTopSkusByCityCode(ctx *jxcontext.Context, cityCode, storeID int) (skuNam
 		}
 		for _, v := range skuNameAndPlace {
 			if skuNameMap[v.ID] != nil {
-				priceReferList, _ := dao.GetPriceReferSnapshotNoPage(db, []int{cityCode}, nil, []int{v.ID}, utils.Time2Date(time.Now().AddDate(0, 0, -1)))
+				var skuList []*model.SkuAndName
-				if len(priceReferList) > 0 {
+				storeSkuSyncInfo, _ := dao.GetStoreSkusAndSkuName(db, []int{storeID}, nil, []int{v.ID})
-					v.UnitPrice = priceReferList[0].MidUnitPrice * payPercentage / 100
+				for _, storeSkuSync := range storeSkuSyncInfo {
+					sku, _ := dao.GetSkus(db, []int{storeSkuSync.ID}, nil, nil, nil)
+					sku[0].Price = int(storeSkuSync.Price)
+					skuList = append(skuList, sku...)
 				}
-				v.Type = skuNameMap[v.ID].BrandID
+				v.UnitPrice = int(storeSkuSyncInfo[0].UnitPrice)
-				skuList, _ := dao.GetSkus(db, nil, []int{v.ID}, nil, nil)
 				v.Skus = skuList
 				for _, vv := range skuList {
-					var storeSkuNameExt []*dao.StoreSkuNameExt
+					var (
-					var skusList []*dao.StoreSkuExt
+						storeSkuNameExt []*dao.StoreSkuNameExt
+						skusList        []*dao.StoreSkuExt
+					)
+					vv.StoreSkuStatus = model.StoreSkuBindStatusDontSale
 					skus := &dao.StoreSkuExt{
-						SkuID: vv.ID,
+						SkuID:     vv.ID,
+						BindPrice: vv.Price,
 					}
 					skusList = append(skusList, skus)
 					storeSkuName := &dao.StoreSkuNameExt{
-						Skus: skusList,
+						Skus:          skusList,
+						StoreID:       storeID,
+						PayPercentage: payPercentage,
 					}
 					storeSkuNameExt = append(storeSkuNameExt, storeSkuName)
 					skuNamesInfo := &dao.StoreSkuNamesInfo{
 						SkuNames: storeSkuNameExt,
 					}
 					dao.UpdateActPrice4StoreSkuNameNew(db, []int{storeID}, []int{vv.ID}, skuNamesInfo, -1)
-					vv.StoreSkuStatus = model.StoreSkuBindStatusDontSale
 					if skuNamesInfo.SkuNames[0].Skus[0] != nil {
 						vv.ActPrice = skuNamesInfo.SkuNames[0].Skus[0].ActPrice
 						vv.ActID = skuNamesInfo.SkuNames[0].Skus[0].ActID
@@ -2879,7 +2882,7 @@ func FocusStoreSkusByExcelBin(ctx *jxcontext.Context, reader io.Reader, isAsync,
 				skuIDs = append(skuIDs, k)
 			}
 			skuList, err := dao.GetSkus(db, skuIDs, nil, nil, nil)
-			storeList, err := dao.GetStoreList(db, nil, nil, "")
+			storeList, err := dao.GetStoreList(db, nil, nil, nil, nil, "")
 			if err != nil && len(skuList) == 0 {
 				return result, err
 			}
@@ -3052,12 +3055,18 @@ func FocusStoreSkusBySku(ctx *jxcontext.Context, skuBindInfos []*StoreSkuBindInf
 	return hint, err
 }
 
-func AutoFocusStoreSkusWithoutFocusForTopSkus(ctx *jxcontext.Context, isAsync, isContinueWhenError bool) (hint string, err error) {
+func AutoFocusStoreSkusForTopSkus(ctx *jxcontext.Context, isAsync, isContinueWhenError bool) (hint string, err error) {
 	db := dao.GetDB()
 	var (
-		result1 []interface{}
+		result1   []interface{}
+		cityCodes = []int{
+			530100, //昆明
+			430300, //湘潭市
+			510700, //绵阳市
+			520100, //贵阳市
+		}
 	)
-	storeList, err := dao.GetStoreList(db, nil, nil, "")
+	storeList, err := dao.GetStoreList(db, nil, cityCodes, nil, nil, "")
 	taskSeqFunc := func(task *tasksch.SeqTask, step int, params ...interface{}) (result interface{}, err error) {
 		switch step {
 		case 0:
@@ -3089,7 +3098,7 @@ func AutoFocusStoreSkusWithoutFocusForTopSkus(ctx *jxcontext.Context, isAsync, i
 				for _, v := range skuName {
 					skuNameMap[v.ID] = v.ID
 				}
-				skuNameAndPlaceList, err2 := GetTopSkusByCityCode(ctx, v.CityCode, v.ID)
+				skuNameAndPlaceList, err2 := GetTopSkusByCityCode(ctx, v.CityCode, 0)
 				if err2 != nil {
 					return retVal, err2
 				}
@@ -3103,17 +3112,18 @@ func AutoFocusStoreSkusWithoutFocusForTopSkus(ctx *jxcontext.Context, isAsync, i
 					var skuBindInfoList []*StoreSkuBindInfo
 					for _, vv := range skuNameAndPlaceList {
 						if skuNameMap[vv.ID] != 0 {
+							storeSkuBindInfo := &StoreSkuBindInfo{
+								StoreID: v.ID,
+								NameID:  vv.ID,
+								// UnitPrice: priceReferList[0].MidUnitPrice * payPercentage / 100,
+								IsFocus: 1,
+								IsSale:  0,
+							}
 							priceReferList, err := dao.GetPriceReferSnapshotNoPage(db, []int{vv.CityCode}, nil, []int{vv.ID}, utils.Time2Date(time.Now().AddDate(0, 0, -1)))
 							if err == nil && len(priceReferList) > 0 {
-								storeSkuBindInfo := &StoreSkuBindInfo{
+								storeSkuBindInfo.UnitPrice = priceReferList[0].MidUnitPrice * payPercentage / 100
-									StoreID:   v.ID,
-									NameID:    vv.ID,
-									UnitPrice: priceReferList[0].MidUnitPrice * payPercentage / 100,
-									IsFocus:   1,
-									IsSale:    0,
-								}
-								skuBindInfoList = append(skuBindInfoList, storeSkuBindInfo)
 							}
+							skuBindInfoList = append(skuBindInfoList, storeSkuBindInfo)
 						}
 					}
 					retVal = skuBindInfoList
@@ -3148,7 +3158,7 @@ func AutoFocusStoreSkusWithoutFocus(ctx *jxcontext.Context, skuIDs []int, isSync
 		nameMap = make(map[int]*StoreSkuBindInfo)
 	)
 	db := dao.GetDB()
-	storeList, err := dao.GetStoreList(db, nil, nil, "")
+	storeList, err := dao.GetStoreList(db, nil, nil, nil, nil, "")
 	for _, v := range storeList {
 		storeSkuList, _ := dao.GetStoreSkusAndSkuName(db, []int{v.ID}, skuIDs, nil)
 		for _, vv := range storeSkuList {

business/jxstore/cms/user2.go

@@ -219,7 +219,7 @@ func TryAddStoreBossRole4User(ctx *jxcontext.Context, user *model.User) (err err
 	if user.Type&model.UserTypeStoreBoss != 0 {
 		userMobile := user.GetMobile()
 		if userMobile != "" {
-			if storeList, err := dao.GetStoreList(dao.GetDB(), nil, []string{userMobile}, ""); err == nil && len(storeList) > 0 {
+			if storeList, err := dao.GetStoreList(dao.GetDB(), nil, nil, nil, []string{userMobile}, ""); err == nil && len(storeList) > 0 {
 				roleList := make([]*authz.RoleInfo, len(storeList))
 				for k, v := range storeList {
 					roleList[k] = autils.NewStoreBossRole(v.ID)

business/jxstore/misc/misc.go

@@ -146,6 +146,9 @@ func Init() {
 		ScheduleTimerFunc("CreateStorePriceScore", func() {
 			cms.CreateStorePriceScore(jxcontext.AdminCtx)
 		}, createStorePriceTimeList)
+		ScheduleTimerFunc("AutoFocusStoreSkusForTopSkus", func() {
+			cms.AutoFocusStoreSkusForTopSkus(jxcontext.AdminCtx, true, true)
+		}, createStorePriceTimeList)
 	}
 	ScheduleTimerFunc("AutoSaleStoreSku", func() {
 		cms.AutoSaleStoreSku(jxcontext.AdminCtx, nil, false)

business/jxstore/report/report.go

@@ -102,7 +102,7 @@ func BeginSavePriceRefer(ctx *jxcontext.Context, cityCodes, skuIDs []int, isAsyn
 				resultMap        = make(map[int]map[int]*model.PriceReferSnapshot)
 				resultCountryMap = make(map[int]*model.PriceReferSnapshot)
 			)
-			storeList, err := dao.GetStoreList(db, nil, nil, "")
+			storeList, err := dao.GetStoreList(db, nil, nil, nil, nil, "")
 			if err != nil {
 				return result, err
 			}

business/model/dao/store.go

@@ -422,7 +422,7 @@ func GetOpenedStoreCouriersByStoreID(db *DaoDB, storeID, vendorID int) (storeMap
 	return storeMaps, nil
 }
 
-func GetStoreList(db *DaoDB, idList []int, mobileList []string, shortRoleName string) (storeList []*model.Store, err error) {
+func GetStoreList(db *DaoDB, idList, cityCodes, statuss []int, mobileList []string, shortRoleName string) (storeList []*model.Store, err error) {
 	sql := `
 	SELECT t1.*
 	FROM store t1
@@ -434,6 +434,14 @@ func GetStoreList(db *DaoDB, idList []int, mobileList []string, shortRoleName st
 		sql += "  AND t1.id IN (" + GenQuestionMarks(len(idList)) + ")"
 		sqlParams = append(sqlParams, idList)
 	}
+	if len(cityCodes) > 0 {
+		sql += "  AND t1.city_code IN (" + GenQuestionMarks(len(cityCodes)) + ")"
+		sqlParams = append(sqlParams, cityCodes)
+	}
+	if len(statuss) > 0 {
+		sql += "  AND t1.status IN (" + GenQuestionMarks(len(statuss)) + ")"
+		sqlParams = append(sqlParams, statuss)
+	}
 	if len(mobileList) > 0 {
 		sql += "  AND (t1.tel1 IN (" + GenQuestionMarks(len(mobileList)) + ") OR t1.tel2 IN (" + GenQuestionMarks(len(mobileList)) + "))"
 		sqlParams = append(sqlParams, mobileList, mobileList)

business/model/dao/store_sku.go

@@ -1535,7 +1535,7 @@ func GetPriceReferPrice(db *DaoDB, cityCode int, skuID int, snapDate time.Time)
 
 func GetStoreSkusAndSkuName(db *DaoDB, storeIDs, skuIDs, nameIDs []int) (storeSkuSyncInfo []*StoreSkuSyncInfo, err error) {
 	sql := `
-	SELECT a.id bind_id, a.store_id, a.jd_sync_status, a.mtwm_sync_status, a.ebai_sync_status, a.unit_price, 
+	SELECT a.id bind_id, a.store_id, a.jd_sync_status, a.mtwm_sync_status, a.ebai_sync_status, a.unit_price, a.price,
 	c.id name_id, c.unit, b.*
 	FROM store_sku_bind a
 	JOIN sku b ON b.id = a.sku_id AND b.deleted_at = ?

controllers/cms_store_sku.go

@@ -626,3 +626,18 @@ func (c *StoreSkuController) FocusStoreSkusBySku() {
 		return retVal, "", err
 	})
 }
+
+// @Title 自动关注畅销品
+// @Description 自动关注畅销品
+// @Param	token				header			string	true	"认证token"
+// @Param	isAsync				formData		bool	true	"是否异步，缺省是同步"
+// @Param	isContinueWhenError	formData		bool	true	"单个同步失败是否继续，缺省false"
+// @Success 200 {object} controllers.CallResult
+// @Failure 200 {object} controllers.CallResult
+// @router /AutoFocusStoreSkusForTopSkus [post]
+func (c *StoreSkuController) AutoFocusStoreSkusForTopSkus() {
+	c.callAutoFocusStoreSkusForTopSkus(func(params *tStoreSkuAutoFocusStoreSkusForTopSkusParams) (retVal interface{}, errCode string, err error) {
+		retVal, err = cms.AutoFocusStoreSkusForTopSkus(params.Ctx, params.IsAsync, params.IsContinueWhenError)
+		return retVal, "", err
+	})
+}

routers/commentsRouter_controllers.go

@@ -1665,6 +1665,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:StoreSkuController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:StoreSkuController"],
+        beego.ControllerComments{
+            Method: "AutoFocusStoreSkusForTopSkus",
+            Router: `/AutoFocusStoreSkusForTopSkus`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:StoreSkuController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:StoreSkuController"],
         beego.ControllerComments{
             Method: "CopyStoreSkus",