Merge branch 'jdshop' of e.coding.net:rosydev/jx-callback into jdshop

business/jxstore/cms/store.go

@@ -6369,11 +6369,16 @@ func SingleBindTaoVegetable(ctx *jxcontext.Context, bind []TaoBindInfo) (error,
 			VendorStoreID:    v.VendorStoreID,
 		}
 		//跟美团同步 平台调价、调价套餐
-		if localStore, err := dao.GetStoreDetail(dao.GetDB(), utils.Str2Int(storeID), model.VendorIDMTWM, ""); err == nil {
-			if localStore.PricePercentage != 0 {
-				storeMap.PricePercentage = localStore.PricePercentage
+		var (
+			cond = map[string]interface{}{
+				model.FieldStoreID:  storeID,
+				model.FieldVendorID: model.VendorIDMTWM,
 			}
-			//else if localStore.priceper
+			tempMaps []*model.StoreMap
+		)
+		if err := dao.GetEntitiesByKV(db, &tempMaps, cond, false); err == nil && len(tempMaps) > 0 {
+			storeMap.PricePercentage = tempMaps[0].PricePercentage
+			storeMap.PricePercentagePack = tempMaps[0].PricePercentagePack
 		}
 		storeMaps = append(storeMaps, storeMap)
 	}