aa

business/jxcallback/orderman/order.go

@@ -1303,7 +1303,7 @@ func MergeJdsOrders(ctx *jxcontext.Context, vendorOrderIDs []string) (vendorOrde
 	order.SalePrice = salePrice
 	order.ShopPrice = shopPrice
 	order.TotalShopMoney = totalShop
-	order.VendorOrderID = utils.Int64ToStr(utils.Str2Int64(orders[0].VendorOrderID2)*10000) + utils.Int2Str(time.Now().Second())
+	order.VendorOrderID = utils.Int64ToStr(utils.Str2Int64(orders[0].VendorOrderID2)*1000000) + utils.Int2Str(time.Now().Second())
 	if len(order.VendorOrderID) < 18 {
 		order.VendorOrderID = order.VendorOrderID + "0"
 	}
@@ -1486,7 +1486,7 @@ func TransferJdsOrder(ctx *jxcontext.Context, vendorOrderID string, storeID int)
 			if len(order.VendorOrderID2) > 18 {
 				order.VendorOrderID2 = order.VendorOrderID2[0:12]
 			}
-			order.VendorOrderID = utils.Int64ToStr(utils.Str2Int64(order.VendorOrderID2)*10000) + utils.Int2Str(time.Now().Second())
+			order.VendorOrderID = utils.Int64ToStr(utils.Str2Int64(order.VendorOrderID2)*1000000) + utils.Int2Str(time.Now().Second())
 			if len(order.VendorOrderID) < 18 {
 				order.VendorOrderID = order.VendorOrderID + "0"
 			}

business/jxutils/jxutils.go

@@ -158,13 +158,13 @@ func GetPossibleVendorIDFromVendorOrderID(vendorOrderID string) (vendorID int) {
 			} else {
 				vendorID = model.VendorIDEBAI
 			}
-		} else if orderIDLen == len("33437032333978492") {
+		} else if orderIDLen == len("33437032333978492") || orderIDLen == len("116379390766579767") {
 			vendorID = model.VendorIDMTWM
 		} else if orderIDLen == len("5287873015048") {
 			vendorID = model.VendorIDWSC
 		} else if orderIDLen == len("1000004390") {
 			vendorID = model.VendorIDJX
-		} else if orderIDLen == len("124557362562000001") || orderIDLen == len("13153183146800000100") {
+		} else if orderIDLen == len("13153183146800000100") {
 			vendorID = model.VendorIDJDShop
 		}
 	}

business/model/dao/page_store.go

@@ -3,6 +3,7 @@ package dao
 import (
 	"git.rosy.net.cn/jx-callback/business/jxutils"
 	"git.rosy.net.cn/jx-callback/business/model"
+	"git.rosy.net.cn/jx-callback/globals/api"
 )
 
 type PageShopWithPlaceName struct {
@@ -106,7 +107,6 @@ func QueryPageStores2(db *DaoDB, pageSize, offset int, keyword string, vendorSto
 		SELECT name, 0 vendor_id, wmpoiid vendor_store_id, orgcode org_code, set vendor_status, address, phone tel1, pj shop_score, month_sales_tip recent_order_num,
 		bak_info city_name
 		FROM jingdong_showd
-		
 	`
 	sqlEbai := `
 
@@ -116,8 +116,7 @@ func QueryPageStores2(db *DaoDB, pageSize, offset int, keyword string, vendorSto
 	`
 	sql := `
 		SELECT SQL_CALC_FOUND_ROWS
-				t1.*,
+				t1.*
-				t2.name city_name, t3.name district_name
 				FROM (
 	`
 	if vendorID == -1 {
@@ -136,11 +135,9 @@ func QueryPageStores2(db *DaoDB, pageSize, offset int, keyword string, vendorSto
 	}
 	sql += `
 	)t1 
-	LEFT JOIN place t2 ON t2.name = t1.
 	WHERE 1 = 1
 	`
 	sqlParams := []interface{}{}
-
 	if vendorStoreID != "" {
 		sql += " AND t1.vendor_store_id = ?"
 		sqlParams = append(sqlParams, vendorStoreID)
@@ -169,14 +166,14 @@ func QueryPageStores2(db *DaoDB, pageSize, offset int, keyword string, vendorSto
 		sql += " AND t1.recent_order_num >= ?"
 		sqlParams = append(sqlParams, minRecentOrderNum)
 	}
-	if minSkuCount > 0 {
+	//if minSkuCount > 0 {
-		sql += " AND t1.sku_count >= ?"
+	//	sql += " AND t1.sku_count >= ?"
-		sqlParams = append(sqlParams, minSkuCount)
+	//	sqlParams = append(sqlParams, minSkuCount)
-	}
+	//}
-	if lng1 > 0 {
+	//if lng1 > 0 {
-		sql += " AND t1.lng >= ? AND t1.lat >= ? AND t1.lng <= ? AND t1.lat <= ?"
+	//	sql += " AND t1.lng >= ? AND t1.lat >= ? AND t1.lng <= ? AND t1.lat <= ?"
-		sqlParams = append(sqlParams, lng1, lat1, lng2, lat2)
+	//	sqlParams = append(sqlParams, lng1, lat1, lng2, lat2)
-	}
+	//}
 	if keyword != "" {
 		keywordLike := "%" + keyword + "%"
 		sql += " AND (t1.name LIKE ? OR t1.tel1 LIKE ? OR t1.tel2 LIKE ? OR t1.org_code LIKE ? OR t1.address LIKE ? OR t2.name LIKE ? OR t3.name LIKE ? OR t1.licence_code LIKE ?"
@@ -201,9 +198,28 @@ func QueryPageStores2(db *DaoDB, pageSize, offset int, keyword string, vendorSto
 	if err = GetRowsTx(txDB, &shopList, sql, sqlParams...); err == nil {
 		pagedInfo = &model.PagedInfo{
 			TotalCount: GetLastTotalRowCount2(db, txDB),
-			Data:       shopList,
+			//Data:       shopList,
 		}
 		Commit(db, txDB)
+		var newShopList []*PageShopWithPlaceName
+		for _, v := range shopList {
+			if v.Address != "" && v.CityName != "" {
+				if city, _ := GetPlaceByName(db, v.CityName, 2, 0); city != nil {
+					lng, lat, _ := api.AutonaviAPI.GetCoordinateFromAddressByPage(v.Address, city.Code)
+					if lng1 > 0 {
+						if !(lng >= lng1 && lat >= lat1 && lng <= lng2 && lat <= lat2) {
+							newShopList = append(newShopList, v)
+						}
+					} else {
+						newShopList = append(newShopList, v)
+					}
+				}
+				newShopList = append(newShopList, v)
+			} else {
+				newShopList = append(newShopList, v)
+			}
+		}
+		pagedInfo.Data = shopList
 	} else {
 		Rollback(db, txDB)
 	}

business/partner/purchase/jdshop/callback.go

@@ -96,13 +96,13 @@ func result2Orders(msg *jdshopapi.CallBackResult) (order *model.GoodsOrder, err
 		db = dao.GetDB()
 	)
 	//有可能是库里已经有这个订单了
-	orderE, err := partner.CurOrderManager.LoadOrder(msg.OrderID+"000001", model.VendorIDJDShop)
+	orderE, err := partner.CurOrderManager.LoadOrder(msg.OrderID+"00000001", model.VendorIDJDShop)
 	if orderE != nil {
 		return order, fmt.Errorf("已经存在此订单！")
 	}
 	order = &model.GoodsOrder{
 		VendorOrderID2:   msg.OrderID,
-		VendorOrderID:    msg.OrderID + "000001",
+		VendorOrderID:    msg.OrderID + "00000001",
 		VendorID:         model.VendorIDJDShop,
 		BaseFreightMoney: jxutils.StandardPrice2Int(utils.Str2Float64(msg.FreightPrice)),
 		VendorStatus:     msg.OrderState,