aa

business/jxstore/tempop/tempop.go

@@ -1865,19 +1865,29 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) {
 	// 	}, storeMaps)
 	// tasksch.HandleTask(task, nil, true).Run()
 	// _, err = task.GetResult(0)
-	for i := 1; i < 26; i++ {
+	var (
-		result, _ := api.JdShop2API.ShopList(i)
+		storeMaps []*model.StoreMap
-		for _, v := range result.List {
+		db        = dao.GetDB()
-			storeDetail, _ := dao.GetStoreDetailByVendorStoreID(dao.GetDB(), utils.Int2Str(v.StoreID), model.VendorIDJDShop, "2")
+	)
-			if v.Kilometres == "" {
+	sql := `
-				err = api.JdShop2API.CreateGisFence(v.StoreID)
+		SELECT * FROM store_map WHERE deleted_at = ? AND vendor_org_code = ? AND vendor_id = ? 
-			}
+	`
-			start, end := jxutils.JxOperationTime2StrTime(storeDetail.OpenTime1), jxutils.JxOperationTime2StrTime(storeDetail.CloseTime1)
+	sqlParams := []interface{}{
-			if storeDetail.CloseTime2 != 0 {
+		utils.DefaultTimeValue, "2", model.VendorIDJDShop,
-				end = jxutils.JxOperationTime2StrTime(storeDetail.CloseTime2)
+	}
-			}
+	dao.GetRows(db, &storeMaps, sql, sqlParams)
-			err = api.JdShop2API.UpdateDeliveryPromise(start, end, v.StoreID)
+	for _, v := range storeMaps {
+		stores, _ := dao.GetStoreList(db, []int{v.StoreID}, nil, nil, nil, nil, "")
+		store := stores[0]
+		// if v.Kilometres == "" {
+		// 	err = api.JdShop2API.CreateGisFence(v.StoreID)
+		// }
+		start, end := jxutils.JxOperationTime2StrTime(store.OpenTime1), jxutils.JxOperationTime2StrTime(store.CloseTime1)
+		if store.CloseTime2 != 0 {
+			end = jxutils.JxOperationTime2StrTime(store.CloseTime2)
 		}
+		err = api.JdShop2API.UpdateDeliveryPromise(start, end, v.StoreID)
+
 	}
 	return err
 }