- check store_map

business/jxstore/cms/sync.go

@@ -328,7 +328,7 @@ func (v *VendorSync) LoopSingleStoreVendors(ctx *jxcontext.Context, db *dao.DaoD
 	if err = dao.GetRows(db, &storeMaps, `
 	SELECT *
 	FROM store_map
-	WHERE vendor_id IN (`+dao.GenQuestionMarks(len(v.SingleStoreVendorIDs))+")", v.SingleStoreVendorIDs); err == nil {
+	WHERE deleted_at = ? AND vendor_id IN (`+dao.GenQuestionMarks(len(v.SingleStoreVendorIDs))+")", utils.DefaultTimeValue, v.SingleStoreVendorIDs); err == nil {
 		task := tasksch.NewParallelTask(taskName, nil, userName, handler, storeMaps)
 		ctx.SetTaskOrAddChild(task, nil)
 		tasksch.ManageTask(task).Run()

business/partner/purchase/ebai/store.go

@@ -49,13 +49,13 @@ func (p *PurchaseHandler) CreateStore(db *dao.DaoDB, storeID int, userName strin
     IF(t1.updated_at > t2.updated_at, t1.last_operator, t2.last_operator) real_last_operator, t2.sync_status,
     province.ebai_code province_id, city.ebai_code city_id, district.ebai_code district_id
     FROM store t1
-    LEFT JOIN store_map t2 ON t1.id = t2.store_id AND t2.vendor_id = ?
+    LEFT JOIN store_map t2 ON t1.id = t2.store_id AND t2.vendor_id = ? AND t2.deleted_at = ?
     JOIN place district ON t1.district_code = district.code
     JOIN place city ON t1.city_code = city.code
     JOIN place province ON city.parent_code = province.code
     WHERE t1.id = ? AND t2.id IS NULL;
     `
-	if err = dao.GetRow(db, &store, sql, model.VendorIDEBAI, storeID); err == nil {
+	if err = dao.GetRow(db, &store, sql, model.VendorIDEBAI, utils.DefaultTimeValue, storeID); err == nil {
 		params := genStoreMapFromStore(&store)
 		params["shop_id"] = store.ID
 		params["business_form_id"] = "179"
@@ -135,16 +135,18 @@ func (p *PurchaseHandler) ReadStore(vendorStoreID string) (*model.Store, error)
 }
 
 func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName string) (err error) {
-	var store tEbaiStoreInfo
+	var stores []*tEbaiStoreInfo
 	sql := `
 	SELECT t1.*, t2.status ebai_store_status, t2.vendor_store_id,
 	IF(t1.updated_at > t2.updated_at, t1.last_operator, t2.last_operator) real_last_operator, t2.sync_status
 	FROM store t1
-	JOIN store_map t2 ON t1.id = t2.store_id AND t2.vendor_id = ?
+	JOIN store_map t2 ON t1.id = t2.store_id AND t2.vendor_id = ? AND (t2.deleted_at = ? OR t2.sync_status <> 0)
-	WHERE t1.id = ?;
+	WHERE t1.id = ?
+	ORDER BY t2.updated_at
 	`
-	if err = dao.GetRow(db, &store, sql, model.VendorIDEBAI, storeID); err == nil {
+	if err = dao.GetRow(db, &stores, sql, model.VendorIDEBAI, utils.DefaultTimeValue, storeID); err == nil {
-		params := genStoreMapFromStore(&store)
+		for _, store := range stores {
+			params := genStoreMapFromStore(store)
 			// globals.SugarLogger.Debug(utils.Format4Output(params, false))
 			if globals.EnableStoreWrite {
 				if err = api.EbaiAPI.ShopUpdate(params); err == nil {
@@ -174,6 +176,10 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin
 						} else if mergeStatus == model.StoreStatusClosed {
 							err = api.EbaiAPI.ShopClose("", utils.Str2Int64(store.VendorStoreID))
 						}
+						if err != nil {
+							return err
+						}
+					}
 				}
 			}
 		}

business/partner/purchase/jd/store.go

@@ -86,19 +86,19 @@ func (p *PurchaseHandler) ReadStore(vendorStoreID string) (*model.Store, error)
 
 // stoerIDs为nil表示所有
 func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName string) (err error) {
-	var store tJdStoreInfo
+	var stores []*tJdStoreInfo
 	sql := `
 	SELECT t1.*, city.jd_code jd_city_code, district.jd_code jd_district_code, t2.status jd_store_status, t2.vendor_store_id,
 	IF(t1.updated_at > t2.updated_at, t1.last_operator, t2.last_operator) real_last_operator, t2.sync_status
 	FROM store t1
-	JOIN store_map t2 ON t1.id = t2.store_id AND t2.vendor_id = ?
+	JOIN store_map t2 ON t1.id = t2.store_id AND t2.vendor_id = ? AND (t2.deleted_at = ? OR t2.sync_status <> 0)
 	LEFT JOIN place city ON t1.city_code = city.code
 	LEFT JOIN place district ON t1.district_code = district.code
 	WHERE t1.id = ?
-	ORDER BY t2.updated_at DESC
+	ORDER BY t2.updated_at
-	LIMIT 1;
 	`
-	if err = dao.GetRow(db, &store, sql, model.VendorIDJD, storeID); err == nil {
+	if err = dao.GetRows(db, &stores, sql, model.VendorIDJD, utils.DefaultTimeValue, storeID); err == nil {
+		for _, store := range stores {
 			outSystemID := ""
 			if store.SyncStatus&model.SyncFlagDeletedMask == 0 {
 				outSystemID = utils.Int2Str(int(store.ID))
@@ -132,7 +132,10 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin
 			_, params["closeStatus"] = JxStoreStatus2JdStatus(jxutils.MergeStoreStatus(store.Status, store.JdStoreStatus))
 			// globals.SugarLogger.Debug(utils.Format4Output(params, false))
 			if globals.EnableStoreWrite {
-			err = api.JdAPI.UpdateStoreInfo4Open(store.VendorStoreID, store.RealLastOperator, params)
+				if err = api.JdAPI.UpdateStoreInfo4Open(store.VendorStoreID, store.RealLastOperator, params); err != nil {
+					return err
+				}
+			}
 		}
 	}
 	return err

business/partner/purchase/jd/store_sku.go

@@ -29,23 +29,30 @@ func (p *PurchaseHandler) SyncStoresSkus(db *dao.DaoDB, storeIDs []int, skuIDs [
 	}
 	task := tasksch.RunManagedParallelTask("SyncStoresSkus", tasksch.NewParallelConfig().SetParallelCount(parallelCount), userName, func(t *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (interface{}, error) {
 		storeID := batchItemList[0].(int)
-		sqlParams := []interface{}{
+		sqlWhere := `
+		WHERE (t1.deleted_at = ? OR t1.jd_sync_status <> 0) AND t1.store_id = ?
+		`
+		sqlWhereParams := []interface{}{
 			utils.DefaultTimeValue,
 			storeID,
 		}
+
+		if skuIDs != nil && len(skuIDs) > 0 {
+			sqlWhere += " AND t1.sku_id IN (" + dao.GenQuestionMarks(len(skuIDs)) + ")"
+			sqlWhereParams = append(sqlWhereParams, skuIDs)
+		}
+
 		sql := `
 		SELECT t1.*, t2.price_percentage
 		FROM store_sku_bind t1
-		JOIN store_map t2 ON t1.store_id = t2.store_id
+		JOIN store_map t2 ON t1.store_id = t2.store_id AND t2.vendor_id = ? AND t2.deleted_at = ?
-		WHERE (t1.deleted_at = ? OR t1.jd_sync_status <> 0) AND t1.store_id = ?
+		` + sqlWhere
-		`
-		if skuIDs != nil && len(skuIDs) > 0 {
-			sql += " AND t1.sku_id IN (" + dao.GenQuestionMarks(len(skuIDs)) + ")"
-			sqlParams = append(sqlParams, skuIDs)
-		}
 		var storeSkus []*tStoreSkuBindExt
-		// globals.SugarLogger.Debug(sql, sqlParams)
+		sqlParams := []interface{}{
-		if err = dao.GetRows(db, &storeSkus, sql, sqlParams); err == nil {
+			model.VendorIDJD,
+			utils.DefaultTimeValue,
+		}
+		if err = dao.GetRows(db, &storeSkus, sql, append(sqlParams, sqlWhereParams...)...); err == nil {
 			outStationNo := utils.Int2Str(storeID)
 			task := tasksch.RunParallelTask("SyncStoresSkus inner", tasksch.NewParallelConfig().SetBatchSize(MaxSkuBatchSize), userName, func(t *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (interface{}, error) {
 				var skuPriceInfoList []*jdapi.SkuPriceInfo
@@ -101,12 +108,8 @@ func (p *PurchaseHandler) SyncStoresSkus(db *dao.DaoDB, storeIDs []int, skuIDs [
 				sql := `
 				UPDATE store_sku_bind t1
 				SET t1.jd_sync_status = 0
-				WHERE (t1.deleted_at = ? OR t1.jd_sync_status <> 0) AND t1.store_id = ?
+				` + sqlWhere
-				`
+				_, err = dao.ExecuteSQL(db, sql, sqlWhereParams...)
-				if skuIDs != nil && len(skuIDs) > 0 {
-					sql += " AND sku_id IN (" + dao.GenQuestionMarks(len(skuIDs)) + ")"
-				}
-				_, err = dao.ExecuteSQL(db, sql, sqlParams)
 			}
 		}
 		return nil, err