aa

business/jxcallback/orderman/order.go

@@ -4,6 +4,7 @@ import (
 	"crypto/md5"
 	"errors"
 	"fmt"
+	beego "github.com/astaxie/beego/server/web"
 	"math"
 	"strings"
 	"time"
@@ -1824,7 +1825,13 @@ func RefreshOrderSkuInfo(ctx *jxcontext.Context, vendorOrderID string, vendorID,
 		}
 		storeSku := storeSkus[0]
 		//if v.ShopPrice == v.EarningPrice {
-		v.EarningPrice = int64(math.Round(float64(storeSku.Price) * float64(order.OrderPayPercentage) / 100))
+		if beego.BConfig.RunMode == "jxgy" {
+			if v.SalePrice > v.ShopPrice {
+				v.EarningPrice = int64(math.Round(float64(storeSku.Price) * float64(order.OrderPayPercentage) / 100))
+			}
+		} else {
+			v.EarningPrice = int64(math.Round(float64(storeSku.Price) * float64(order.OrderPayPercentage) / 100))
+		}
 		//}
 		v.ShopPrice = int64(storeSku.Price)
 		dao.UpdateEntity(db, v, "ShopPrice", "EarningPrice")

business/model/dao/page_store.go

@@ -99,3 +99,113 @@ func QueryPageStores(db *DaoDB, pageSize, offset int, keyword string, vendorStor
 	}
 	return pagedInfo, err
 }
+
+func QueryPageStores2(db *DaoDB, pageSize, offset int, keyword string, vendorStoreID string, vendorID, cityCode, districtCode int, tel string,
+	minShopScore float32, minRecentOrderNum, minSkuCount int, lng1, lat1, lng2, lat2 float64) (pagedInfo *model.PagedInfo, err error) {
+	sqlJD := `
+		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 := `
+
+	`
+	sqlMT := `
+		
+	`
+	sql := `
+		SELECT SQL_CALC_FOUND_ROWS
+				t1.*,
+				t2.name city_name, t3.name district_name
+				FROM (
+	`
+	if vendorID == -1 {
+		sql += sqlJD + ` UNION`
+		sql += sqlEbai + ` UNION`
+		sql += sqlMT
+	} else {
+		switch vendorID {
+		case model.VendorIDJD:
+			sql += sqlJD
+		case model.VendorIDMTWM:
+			sql += sqlMT
+		case model.VendorIDEBAI:
+			sql += sqlEbai
+		}
+	}
+	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)
+	}
+	if vendorID != -1 {
+		sql += " AND t1.vendor_id = ?"
+		sqlParams = append(sqlParams, vendorID)
+	}
+	if cityCode != 0 {
+		sql += " AND t1.city_code = ?"
+		sqlParams = append(sqlParams, cityCode)
+	}
+	if districtCode != 0 {
+		sql += " AND t1.district_code = ?"
+		sqlParams = append(sqlParams, districtCode)
+	}
+	if tel != "" {
+		sql += " AND t1.tel1 = ?"
+		sqlParams = append(sqlParams, tel)
+	}
+	if minShopScore > 0 {
+		sql += " AND t1.shop_score >= ?"
+		sqlParams = append(sqlParams, minShopScore)
+	}
+	if minRecentOrderNum > 0 {
+		sql += " AND t1.recent_order_num >= ?"
+		sqlParams = append(sqlParams, minRecentOrderNum)
+	}
+	if minSkuCount > 0 {
+		sql += " AND t1.sku_count >= ?"
+		sqlParams = append(sqlParams, minSkuCount)
+	}
+	if lng1 > 0 {
+		sql += " AND t1.lng >= ? AND t1.lat >= ? AND t1.lng <= ? AND t1.lat <= ?"
+		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 ?"
+		sqlParams = append(sqlParams, keywordLike, keywordLike, keywordLike, keywordLike, keywordLike, keywordLike, keywordLike, keywordLike)
+		sql += ")"
+	}
+	sql += `
+	ORDER BY t1.recent_order_num DESC
+	LIMIT ? OFFSET ?
+	`
+	pageSize = jxutils.FormalizePageSize(pageSize)
+	offset = jxutils.FormalizePageOffset(offset)
+	sqlParams = append(sqlParams, pageSize, offset)
+	var shopList []*PageShopWithPlaceName
+	txDB, _ := Begin(db)
+	defer func() {
+		if r := recover(); r != nil {
+			Rollback(db, txDB)
+			panic(r)
+		}
+	}()
+	if err = GetRowsTx(txDB, &shopList, sql, sqlParams...); err == nil {
+		pagedInfo = &model.PagedInfo{
+			TotalCount: GetLastTotalRowCount2(db, txDB),
+			Data:       shopList,
+		}
+		Commit(db, txDB)
+	} else {
+		Rollback(db, txDB)
+	}
+	return pagedInfo, err
+}

controllers/net_spider.go

@@ -47,7 +47,6 @@ func (c *NetSpiderController) GetAndStoreCitiesShops() {
 // @Param	keyword			query		string	false	"查询关键字（可以为空，为空表示不限制）"
 // @Param	vendorStoreID	query		string	false	"门店号"
 // @Param	vendorID		query		int		false	"平台ID"
-// @Param	orgCode			query		string	false	"连锁品牌名"
 // @Param	cityCode		query		int		false	"城市代码"
 // @Param	districtCode	query		int		false	"行政区代码"
 // @Param	tel				query		string	false	"手机号"
@@ -83,7 +82,7 @@ func (c *NetSpiderController) QueryPageStores() {
 			offset = 0
 			pageSize = model.UnlimitedPageSize
 		}
-		pagedInfo, err := dao.QueryPageStores(dao.GetDB(), pageSize, offset, params.Keyword, params.VendorStoreID, params.VendorID, params.OrgCode,
+		pagedInfo, err := dao.QueryPageStores(dao.GetDB(), pageSize, offset, params.Keyword, params.VendorStoreID, params.VendorID, "",
 			params.CityCode, params.DistrictCode, params.Tel, float32(params.MinShopScore), params.MinRecentOrderNum, params.MinSkuCount,
 			lng1, lat1, lng2, lat2)
 		if err == nil {