Accept Merge Request #213: (qidongsheng -> jdshop)

Merge Request: 修改对比方法和美团配送状态方法的调用
Created By: @漆东升
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/213

business/jxstore/cms/store_sku_check.go

@@ -363,14 +363,8 @@ func CompareJxAndVendor(vendorID int, storeIDStr, vendorStoreID, storeName strin
 		/*写京西skuIDStr*/
 		//utils.Writelog("skuIDStr" + skuIDStr)
 		var jxSkuDetailName string
-		//多规格商品不用比较数量单位
-		if jxSkuInfo.IsSpu == 0 {
 		//jxSkuDetailName : 前缀 ([荐]) + 分类名(xxx水饺) + 数量单位(约..g/份) + 注释 (补充..)
 		jxSkuDetailName = jxutils.ComposeSkuNameOriginal(jxSkuInfo.SkuName.Prefix, jxSkuInfo.SkuName.Name, jxSkuInfo.Skus[0].Comment, jxSkuInfo.SkuName.Unit, jxSkuInfo.Skus[0].SkuSpecQuality, jxSkuInfo.Skus[0].SkuSpecUnit, 0)
-		} else {
-			//jxSkuDetailName : 前缀 ([荐]) + 分类名(xxx水饺) + 数量单位(约..g/份) + 注释 (补充..)
-			jxSkuDetailName = jxutils.ComposeSkuNameOriginal(jxSkuInfo.SkuName.Prefix, jxSkuInfo.SkuName.Name, jxSkuInfo.Skus[0].Comment, "", jxSkuInfo.Skus[0].SkuSpecQuality, "", 0)
-		}
 		//utils.Writelog("jxSkuDetailName:" + jxSkuDetailName)
 		//jxSkuSaleStatus : 商品状态 ，skustatus 优先级高于 StoreSkuStatus
 		jxSkuSaleStatus := jxutils.MergeSkuStatus(jxSkuInfo.Skus[0].SkuStatus, jxSkuInfo.Skus[0].StoreSkuStatus)
@@ -608,7 +602,7 @@ func StoreOpenAll(ctx *jxcontext.Context) {
 	/*	美团配送的门店是否存在，调用美团配送的api（有可能接了），查询京西门店对应的美团配送门店是否存在，若不存在则要在京西这边解绑美团配送门店
 		怎么解绑可以在网页上门店管理那点一下看看调的什么接口，传的什么参数*/
 	/*获取所有门店信息*/
-test:
+	//test:
 	for _, StoreCourierList1 := range StoreCourierList {
 		diff := false
 		StoreLists, _ := dao.GetStoreList(db, []int{StoreCourierList1.StoreID}, nil, nil, nil, "")
@@ -648,7 +642,7 @@ test:
 				globals.SugarLogger.Debug(err.Error())
 				return
 			}
-			break test
+			//break test
 		}
 	}
 	globals.SugarLogger.Debug("StoreOpenAll skuID is Complete")
@@ -807,7 +801,7 @@ test:
 //}
 //}
 
-//}func StoreOpenAll(ctx *jxcontext.Context) {
+//func StoreOpenAll(ctx *jxcontext.Context) {
 //	db := dao.GetDB()
 //	StoreLists, err := dao.GetStoreList(db, nil, nil, []int{1}, nil, "")
 //	if err != nil {
@@ -951,7 +945,8 @@ func TestDiff(ctx *jxcontext.Context, vendorIDList []int, storeIDList []int) {
 			//获取总共几个门店任务
 			filterStoreList := GetFilterStoreList(jxStoreInfoList.Stores, vendorMap, storeIDMap)
 			diffData.InitData()
-			jxStoreInfoListValue := filterStoreList[0]
+			for i := range filterStoreList {
+				jxStoreInfoListValue := filterStoreList[i]
 				storeID := jxStoreInfoListValue.ID
 				storeIDStr := utils.Int2Str(storeID)
 				storeName := jxStoreInfoListValue.Name
@@ -968,18 +963,19 @@ func TestDiff(ctx *jxcontext.Context, vendorIDList []int, storeIDList []int) {
 							if multiFlag == false {
 								jxSkuInfoDataMulti, _ = GetStoreSkus(ctx, storeID, filterJxDepotUnSaleSkuIds, true, "", true, false, map[string]interface{}{}, 0, -1)
 								/*重新计算价格*/
-							SetJxPrice(jxSkuInfoDataMulti, storeID)
+								SetJxPrice(jxSkuInfoDataMulti, storeID, vendorID)
 								filterJxSkuInfoMapMulti = GetFilterJxSkuInfoMap(jxSkuInfoDataMulti.SkuNames) //map[京西商品ID:StoreSkuNameExt]
 								multiFlag = true
 							}
 						} else {
 							if singleFlag == false {
 								jxSkuInfoDataSingle, _ = GetStoreSkus(ctx, storeID, nil, true, "", true, false, map[string]interface{}{}, 0, -1)
+								/*重新计算价格*/
+								SetJxPrice(jxSkuInfoDataSingle, storeID, vendorID)
 								filterJxSkuInfoMapSingle = GetFilterJxSkuInfoMap(jxSkuInfoDataSingle.SkuNames) //map[京西商品ID:StoreSkuNameExt]
 								singleFlag = true
 							}
 						}
-
 						vendorStoreID := vendorListValue.VendorStoreID
 						baseapi.SugarLogger.Debugf("CheckSkuDiffBetweenJxAndVendor storeID:%d vendorID:%d vendorStoreID:%s vendorListValue:%v", storeID, vendorID, vendorStoreID, vendorListValue)
 
@@ -1009,6 +1005,7 @@ func TestDiff(ctx *jxcontext.Context, vendorIDList []int, storeIDList []int) {
 				}
 			}
 		}
+	}
 
 	/********************************第三步****************************/
 	c := func(data map[int][]DiffData, depotData map[int][]DepotDiffData) {
@@ -1335,9 +1332,9 @@ func WriteToExcel(task *tasksch.SeqTask, data map[int][]DiffData, depotData map[
 	}
 }
 
-func SetJxPrice(jxSkuInfoDataMulti *dao.StoreSkuNamesInfo, storeId int) (err error) {
+func SetJxPrice(jxSkuInfoDataMulti *dao.StoreSkuNamesInfo, storeId int, Vendorid int) (err error) {
 	db := dao.GetDB()
-	storeDetail, err := dao.GetStoreDetail(dao.GetDB(), storeId, model.VendorIDJX)
+	storeDetail, err := dao.GetStoreDetail(dao.GetDB(), storeId, Vendorid)
 	if err != nil {
 		dao.Rollback(db)
 		return err

business/jxstore/cms/sync.go

@@ -1300,7 +1300,7 @@ func SetMTPSStatus(ctx *jxcontext.Context) {
 	/*	美团配送的门店是否存在，调用美团配送的api（有可能接了），查询京西门店对应的美团配送门店是否存在，若不存在则要在京西这边解绑美团配送门店
 		怎么解绑可以在网页上门店管理那点一下看看调的什么接口，传的什么参数*/
 	/*获取所有门店信息*/
-test:
+	//test:
 	for _, StoreCourierList1 := range StoreCourierList {
 		diff := false
 		StoreLists, _ := dao.GetStoreList(db, []int{StoreCourierList1.StoreID}, nil, nil, nil, "")
@@ -1340,7 +1340,7 @@ test:
 				globals.SugarLogger.Debug(err.Error())
 				return
 			}
-			break test
+			//break test
 		}
 	}
 	globals.SugarLogger.Debug("StoreOpenAll skuID is Complete")