wip:产品类型

.gitignore

@@ -17,3 +17,4 @@ temp/
 temp.yaml
 bin
 /logs/
+*.exe

go.mod

@@ -1,6 +1,8 @@
 module debrisProduct
 
-go 1.20
+go 1.21
+
+toolchain go1.22.4
 
 require (
 	app.yhyue.com/moapp/jybase v0.0.0-20240617105649-cedad42b8b1f
@@ -8,6 +10,7 @@ require (
 	github.com/gogf/gf/contrib/drivers/mysql/v2 v2.7.2
 	github.com/gogf/gf/contrib/nosql/redis/v2 v2.7.2
 	github.com/gogf/gf/v2 v2.7.2
+	github.com/google/uuid v1.6.0
 	github.com/lionsoul2014/ip2region/binding/golang v0.0.0-20240510055607-89e20ab7b6c6
 )
 
@@ -50,7 +53,6 @@ require (
 	github.com/google/gnostic-models v0.6.8 // indirect
 	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
-	github.com/google/uuid v1.6.0 // indirect
 	github.com/gorilla/websocket v1.5.1 // indirect
 	github.com/grokify/html-strip-tags-go v0.1.0 // indirect
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.0 // indirect

go.sum

@@ -850,10 +850,12 @@ github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk5
 github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137/go.mod h1:OMCwj8VM1Kc9e19TLln2VL61YJF0x1XFtfdL4JdbSyE=
 github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a/go.mod h1:SGnFV6hVsYE877CKEZ6tDNTjaSXYUk6QqoIK6PrAtcc=
 github.com/alicebob/gopher-json v0.0.0-20230218143504-906a9b012302 h1:uvdUDbHQHO85qeSydJtItA4T55Pw6BtAejd0APRJOCE=
+github.com/alicebob/gopher-json v0.0.0-20230218143504-906a9b012302/go.mod h1:SGnFV6hVsYE877CKEZ6tDNTjaSXYUk6QqoIK6PrAtcc=
 github.com/alicebob/miniredis/v2 v2.17.0/go.mod h1:gquAfGbzn92jvtrSC69+6zZnwSODVXVpYDRaGhWaL6I=
 github.com/alicebob/miniredis/v2 v2.22.0/go.mod h1:XNqvJdQJv5mSuVMc0ynneafpnL/zv52acZ6kqeS0t88=
 github.com/alicebob/miniredis/v2 v2.30.5/go.mod h1:b25qWj4fCEsBeAAR2mlb0ufImGC6uH3VlUfb/HS5zKg=
 github.com/alicebob/miniredis/v2 v2.32.1 h1:Bz7CciDnYSaa0mX5xODh6GUITRSx+cVhjNoOR4JssBo=
+github.com/alicebob/miniredis/v2 v2.32.1/go.mod h1:AqkLNAfUm0K07J28hnAyyQKf/x0YkCY/g5DCtuL01Mw=
 github.com/aliyun/aliyun-oss-go-sdk v2.1.6+incompatible/go.mod h1:T/Aws4fEfogEE9v+HPhhw+CntffsBHJ8nXQCwKr0/g8=
 github.com/andybalholm/brotli v1.0.4/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
 github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
@@ -883,7 +885,9 @@ github.com/bos-hieu/mongostore v0.0.2/go.mod h1:8AbbVmDEb0yqJsBrWxZIAZOxIfv/tsP8
 github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b/go.mod h1:H0wQNHz2YrLsuXOZozoeDmnHXkNCRmMW0gwFWDfEZDA=
 github.com/bradleypeabody/gorilla-sessions-memcache v0.0.0-20181103040241-659414f458e1/go.mod h1:dkChI7Tbtx7H1Tj7TqGSZMOeGpMP5gLHtjroHd4agiI=
 github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs=
+github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdbAV9g4c=
 github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA=
+github.com/bsm/gomega v1.27.10/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0H+O0=
 github.com/bufbuild/protocompile v0.4.0/go.mod h1:3v93+mbWn/v3xzN+31nwkJfrEpAUwp+BagBSZWx+TP8=
 github.com/bufbuild/protocompile v0.6.0/go.mod h1:YNP35qEYoYGme7QMtz5SBCoN4kL4g12jTtjuzRNdjpE=
 github.com/cenkalti/backoff/v4 v4.2.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
@@ -1082,6 +1086,7 @@ github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqw
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
 github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
+github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls=
 github.com/go-test/deep v1.0.7/go.mod h1:QV8Hv/iy04NyLBxAdO9njL0iVPN1S4d/A3NVv1V36o8=
 github.com/go-xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a/go.mod h1:56xuuqnHyryaerycW3BfssRdxQstACi0Epw/yC5E2xM=
 github.com/go-xorm/xorm v0.7.9/go.mod h1:XiVxrMMIhFkwSkh96BW7PACl7UhLtx2iJIHMdmjh5sQ=
@@ -1133,6 +1138,7 @@ github.com/golang/glog v1.0.0/go.mod h1:EWib/APOK0SL3dFbYqvxE3UYd8E6s1ouQ7iEp/0L
 github.com/golang/glog v1.1.0/go.mod h1:pfYeQZ3JWZoXTV5sFc986z3HTpwQs9At6P4ImfuP3NQ=
 github.com/golang/glog v1.1.2/go.mod h1:zR+okUeTbrL6EL3xHUDxZuEtGv04p5shwip1+mL/rLQ=
 github.com/golang/glog v1.2.0 h1:uCdmnmatrKCgMBlM4rMuJZWOkPDqdbZPnrMXDY4gI68=
+github.com/golang/glog v1.2.0/go.mod h1:6AhwSGph0fcJtXVM/PEHPqZlFeoLxhs7/t5UDAwmO+w=
 github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
@@ -1226,6 +1232,7 @@ github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLe
 github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20211214055906-6f57359322fd h1:1FjCyPC+syAzJ5/2S8fqdZK1R22vvA0J7JZKcuOIQ7Y=
+github.com/google/pprof v0.0.0-20211214055906-6f57359322fd/go.mod h1:KgnwoLYCZ8IQu3XUZ8Nc/bM9CCZFOyjUNOSygVozoDg=
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
 github.com/google/s2a-go v0.1.0/go.mod h1:OJpEgntRZo8ugHpF9hkoLJbS5dSI20XZeXJ9JVywLlM=
 github.com/google/s2a-go v0.1.3/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A=
@@ -1529,6 +1536,7 @@ github.com/onsi/ginkgo/v2 v2.4.0/go.mod h1:iHkDK1fKGcBoEHT5W7YBq4RFWaQulw+caOMkA
 github.com/onsi/ginkgo/v2 v2.5.0/go.mod h1:Luc4sArBICYCS8THh8v3i3i5CuSZO+RaQRaJoeNwomw=
 github.com/onsi/ginkgo/v2 v2.7.0/go.mod h1:yjiuMwPokqY1XauOgju45q3sJt6VzQ/Fict1LFVcsAo=
 github.com/onsi/ginkgo/v2 v2.13.0 h1:0jY9lJquiL8fcf3M4LAXN5aMlS/b2BV86HFFPCPMgE4=
+github.com/onsi/ginkgo/v2 v2.13.0/go.mod h1:TE309ZR8s5FsKKpuB1YAQYBzCaAfUgatB/xlT/ETL/o=
 github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
 github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
@@ -1546,6 +1554,7 @@ github.com/onsi/gomega v1.24.0/go.mod h1:Z/NWtiqwBrwUt4/2loMmHL63EDLnYHmVbuBpDr2
 github.com/onsi/gomega v1.24.1/go.mod h1:3AOiACssS3/MajrniINInwbfOOtfZvplPzuRSmvt1jM=
 github.com/onsi/gomega v1.26.0/go.mod h1:r+zV744Re+DiYCIPRlYOTxn0YkOLcAnW8k1xXdMPGhM=
 github.com/onsi/gomega v1.29.0 h1:KIA/t2t5UBzoirT4H9tsML45GEbo3ouUnBHsCfD2tVg=
+github.com/onsi/gomega v1.29.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ=
 github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc=
 github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw=
 github.com/openzipkin/zipkin-go v0.3.0/go.mod h1:4c3sLeE8xjNqehmF5RpAFLPLJxXscc0R4l6Zg0P1tTQ=
@@ -1642,6 +1651,7 @@ github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFR
 github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
 github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
 github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
+github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=
 github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ=
 github.com/rs/xid v1.4.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
 github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU=
@@ -1743,6 +1753,7 @@ github.com/yuin/gopher-lua v0.0.0-20200816102855-ee81675732da/go.mod h1:E1AXubJB
 github.com/yuin/gopher-lua v0.0.0-20210529063254-f4c35e4016d9/go.mod h1:E1AXubJBdNmFERAOucpDIxNzeGfLzg0mYh+UfMWdChA=
 github.com/yuin/gopher-lua v1.1.0/go.mod h1:GBR0iDaNXjAgGg9zfCvksxSRnQx76gclCIb7kdAd1Pw=
 github.com/yuin/gopher-lua v1.1.1 h1:kYKnWBjvbNP4XLT3+bPEwAXJx262OhaHDWDVOPjL46M=
+github.com/yuin/gopher-lua v1.1.1/go.mod h1:GBR0iDaNXjAgGg9zfCvksxSRnQx76gclCIb7kdAd1Pw=
 github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
 github.com/zeebo/assert v1.3.0/go.mod h1:Pq9JiuJQpG8JLJdtkwrJESF0Foym2/D9XMU5ciN/wJ0=
 github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaDcA=
@@ -2373,6 +2384,7 @@ golang.org/x/tools v0.8.0/go.mod h1:JxBZ99ISMI5ViVkT1tr6tdNmXeTrcpVSD3vZ1RsRdN4=
 golang.org/x/tools v0.9.1/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc=
 golang.org/x/tools v0.10.0/go.mod h1:UJwyiVBsOA2uwvK/e5OY3GTpDUJriEd+/YlqAwLPmyM=
 golang.org/x/tools v0.16.1 h1:TLyB3WofjdOEepBHAU20JdNC1Zbg87elYofWYAY5oZA=
+golang.org/x/tools v0.16.1/go.mod h1:kYVVN6I1mBNoB1OX+noeBjbRk4IUEPa7JJ+TJMEooJ0=
 golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

internal/controller/order/order_v1_create_order.go

@@ -30,7 +30,7 @@ type filterMap struct {
 	IndustryCode string   `json:"industryCode" doc:"所属行业code"`
 	FromMiniCode string   `json:"fromMiniCode" doc:"购买来源"`
 	CycleCount   int      `json:"cycleCount"` //日期数量(订单详情展示使用)
-	CycleUnit    int      `json:"cycleUnit"`  //日期单位(订单详情展示使用)1:年 2:月 4:季度同超级订阅
+	CycleUnit    int      `json:"cycleUnit"`  //日期单位(订单详情展示使用)1:年 2:月 3:天 4:季度同超级订阅
 }
 
 func (c *ControllerV1) CreateOrder(ctx context.Context, req *v1.CreateOrderReq) (res *v1.CreateOrderRes, err error) {
@@ -59,6 +59,13 @@ func (c *ControllerV1) CreateOrder(ctx context.Context, req *v1.CreateOrderReq)
 		return nil, gerror.New("重复购买")
 	}
 
+	//一分钱活动
+	if orderMoney == 1 {
+		if !isRedCentBuy(ctx, req.BuyAll) {
+			return nil, gerror.New("重复购买")
+		}
+	}
+	
 	if err := g.DB("jianyu").Transaction(ctx, func(ctx context.Context, tx gdb.TX) error {
 		if _, err = g.DB("jianyu").Save(ctx, "dataexport_order", map[string]interface{}{
 			"order_money":          orderMoney,

internal/controller/order/order_v1_get_price_list.go

@@ -26,7 +26,7 @@ type PriceSetting struct {
 	FirstPrice int    `json:"firstPrice" dc:"首单价格"`
 }
 
-// GetTime 1:年 2:月 4:季度同超级订阅
+// GetTime 1:年 2:月 3:天 4:季度同超级订阅
 func (p *PriceSetting) GetTime() (num, unit int, show string, err error) {
 	var (
 		v = gstr.Trim(p.Time)
@@ -43,6 +43,9 @@ func (p *PriceSetting) GetTime() (num, unit int, show string, err error) {
 	case "M": //月
 		unit = 2
 		show = fmt.Sprintf("%d月", num)
+	case "D": //天
+		unit = 3
+		show = fmt.Sprintf("%d天", num)
 	case "Q": //季
 		unit = 4
 		show = fmt.Sprintf("%d季", num)
@@ -70,6 +73,13 @@ func (c *ControllerV1) GetPriceList(ctx context.Context, req *v1.GetPriceListReq
 	res = &v1.GetPriceListRes{}
 	now := time.Now()
 	for _, p := range pricesSetting {
+		//一分钱活动
+		if p.Price == 1 {
+			if !isRedCentBuy(ctx, req.BuyAll) {
+				continue
+			}
+			firstBuy = false
+		}
 		n, u, show, e := p.GetTime()
 		if e != nil {
 			continue
@@ -104,6 +114,8 @@ func getEffectiveTime(t time.Time, n int, u int) string {
 	case 2:
 		e = t.AddDate(0, n, 0)
 	case 3:
+		e = t.AddDate(0, 0, n)
+	case 4:
 		e = t.AddDate(0, 3*n, 0)
 	default:
 		return fmt.Sprintf("%s-", s)
@@ -111,7 +123,7 @@ func getEffectiveTime(t time.Time, n int, u int) string {
 	return fmt.Sprintf("%s-%s", s, e.Format(consts.Date_Full_Format_DOT))
 }
 
-// 1:年 2:月 4:季度同超级订阅
+// 1:年 2:月 3:天 4:季度同超级订阅
 func getOneDayPrice(sell int, n int, u int) float64 {
 	x := big.NewFloat(gconv.Float64(sell))
 	y := big.NewFloat(100)
@@ -122,6 +134,8 @@ func getOneDayPrice(sell int, n int, u int) float64 {
 	case 2:
 		days = big.NewFloat(gconv.Float64(30 * n))
 	case 3:
+		days = big.NewFloat(gconv.Float64(n))
+	case 4:
 		days = big.NewFloat(gconv.Float64(30 * 3 * n))
 	default:
 		return -1
@@ -181,3 +195,30 @@ func getPriceSetting(ctx context.Context, isAll bool, name string) *PriceSetting
 	}
 	return nil
 }
+
+// 当前小程序是否已参与1分钱购买活动
+func isRedCentBuy(ctx context.Context, isAll bool) (isRedCent bool) {
+	var (
+		bizCtx = service.BizCtx().Get(ctx)
+		pIds   []string
+	)
+	for _, id := range service.Power().GetPositionIdByBaseUserId(ctx, bizCtx.User.BaseUserId) {
+		pIds = append(pIds, fmt.Sprintf("%d", id))
+	}
+	if len(pIds) == 0 {
+		return true
+	}
+	if isAll { //判断是否购买过综合服务
+		allProductName := fmt.Sprintf("%s|综合服务", GetCombinationName(bizCtx.MiniProgram.Name, bizCtx.MiniProgram.IndustryName))
+		total, err := g.DB().GetCount(ctx, fmt.Sprintf(`SELECT COUNT(*) FROM jianyu.dataexport_order WHERE product_type=? AND order_status = 1 AND pay_money = 1 AND user_id in (%s) AND filter like '%%"industryCode":"%s"%%' `, strings.Join(pIds, `,`), bizCtx.MiniProgram.IndustryCode), allProductName)
+		if total == 0 && err == nil {
+			return true
+		}
+	} else {
+		total, err := g.DB().GetCount(ctx, fmt.Sprintf("SELECT COUNT(*) FROM jianyu.dataexport_order WHERE order_status = 1 AND pay_money = 1 AND user_id in (%s) AND filter like '%%%s%%' ", strings.Join(pIds, `,`), bizCtx.MiniProgram.Code))
+		if total == 0 && err == nil {
+			return true
+		}
+	}
+	return
+}

manifest/config/setting-af.yaml

@@ -134,6 +134,22 @@ cgyx:
         - name: 自定义
           val: exact
   price:
+    - name: 全国一天
+      area: -1
+      time: 1D
+      price: 1
+      discount: 0
+      sell: 1
+      firstDis: 0
+      firstPrice: 1
+    - name: 单省一天
+      area: 1
+      time: 1D
+      price: 1
+      discount: 0
+      sell: 1
+      firstDis: 0
+      firstPrice: 1
     - name: 全国一年
       area: -1
       time: 1Y
@@ -270,6 +286,22 @@ zbxm:
         - name: 自定义
           val: exact
   price:
+    - name: 全国一天
+      area: -1
+      time: 1D
+      price: 1
+      discount: 0
+      sell: 1
+      firstDis: 0
+      firstPrice: 1
+    - name: 单省一天
+      area: 1
+      time: 1D
+      price: 1
+      discount: 0
+      sell: 1
+      firstDis: 0
+      firstPrice: 1
     - name: 全国一年
       area: -1
       time: 1Y
@@ -399,6 +431,22 @@ hydqxm:
         - name: 按合同金额由小到大排序
           val: sortByAmountAsc
   price:
+    - name: 全国一天
+      area: -1
+      time: 1D
+      price: 1
+      discount: 0
+      sell: 1
+      firstDis: 0
+      firstPrice: 1
+    - name: 单省一天
+      area: 1
+      time: 1D
+      price: 1
+      discount: 0
+      sell: 1
+      firstDis: 0
+      firstPrice: 1
     - name: 全国一年
       area: -1
       time: 1Y
@@ -488,6 +536,22 @@ qzcgf:
         - name: 按最近采购时间排序
           val: sortByData
   price:
+    - name: 全国一天
+      area: -1
+      time: 1D
+      price: 1
+      discount: 0
+      sell: 1
+      firstDis: 0
+      firstPrice: 1
+    - name: 单省一天
+      area: 1
+      time: 1D
+      price: 1
+      discount: 0
+      sell: 1
+      firstDis: 0
+      firstPrice: 1
     - name: 全国一年
       area: -1
       time: 1Y

manifest/config/setting-clzl.yaml

@@ -107,6 +107,22 @@ cgyx:
         - name: 其他
           val: "其它"
   price:
+    - name: 全国一天
+      area: -1
+      time: 1D
+      price: 1
+      discount: 0
+      sell: 1
+      firstDis: 0
+      firstPrice: 1
+    - name: 单省一天
+      area: 1
+      time: 1D
+      price: 1
+      discount: 0
+      sell: 1
+      firstDis: 0
+      firstPrice: 1
     - name: 全国一年
       area: -1
       time: 1Y
@@ -209,6 +225,22 @@ zbxm:
         - name: 其他
           val: "其它"
   price:
+    - name: 全国一天
+      area: -1
+      time: 1D
+      price: 1
+      discount: 0
+      sell: 1
+      firstDis: 0
+      firstPrice: 1
+    - name: 单省一天
+      area: 1
+      time: 1D
+      price: 1
+      discount: 0
+      sell: 1
+      firstDis: 0
+      firstPrice: 1
     - name: 全国一年
       area: -1
       time: 1Y
@@ -304,6 +336,22 @@ hydqxm:
         - name: 500万以上
           val: "500-"
   price:
+    - name: 全国一天
+      area: -1
+      time: 1D
+      price: 1
+      discount: 0
+      sell: 1
+      firstDis: 0
+      firstPrice: 1
+    - name: 单省一天
+      area: 1
+      time: 1D
+      price: 1
+      discount: 0
+      sell: 1
+      firstDis: 0
+      firstPrice: 1
     - name: 全国一年
       area: -1
       time: 1Y
@@ -393,6 +441,22 @@ qzcgf:
         - name: 按最近采购时间排序
           val: sortByData
   price:
+    - name: 全国一天
+      area: -1
+      time: 1D
+      price: 1
+      discount: 0
+      sell: 1
+      firstDis: 0
+      firstPrice: 1
+    - name: 单省一天
+      area: 1
+      time: 1D
+      price: 1
+      discount: 0
+      sell: 1
+      firstDis: 0
+      firstPrice: 1
     - name: 全国一年
       area: -1
       time: 1Y

manifest/config/setting-hjcg.yaml

@@ -102,6 +102,22 @@ cgyx:
         - name: 其他
           val: "其它"
   price:
+    - name: 全国一天
+      area: -1
+      time: 1D
+      price: 1
+      discount: 0
+      sell: 1
+      firstDis: 0
+      firstPrice: 1
+    - name: 单省一天
+      area: 1
+      time: 1D
+      price: 1
+      discount: 0
+      sell: 1
+      firstDis: 0
+      firstPrice: 1
     - name: 全国一年
       area: -1
       time: 1Y
@@ -204,6 +220,22 @@ zbxm:
         - name: 其他
           val: "其它"
   price:
+    - name: 全国一天
+      area: -1
+      time: 1D
+      price: 1
+      discount: 0
+      sell: 1
+      firstDis: 0
+      firstPrice: 1
+    - name: 单省一天
+      area: 1
+      time: 1D
+      price: 1
+      discount: 0
+      sell: 1
+      firstDis: 0
+      firstPrice: 1
     - name: 全国一年
       area: -1
       time: 1Y
@@ -293,6 +325,22 @@ qzcgf:
         - name: 按最近采购时间排序
           val: sortByData
   price:
+    - name: 全国一天
+      area: -1
+      time: 1D
+      price: 1
+      discount: 0
+      sell: 1
+      firstDis: 0
+      firstPrice: 1
+    - name: 单省一天
+      area: 1
+      time: 1D
+      price: 1
+      discount: 0
+      sell: 1
+      firstDis: 0
+      firstPrice: 1
     - name: 全国一年
       area: -1
       time: 1Y

manifest/config/setting-jjztb.yaml

@@ -102,6 +102,22 @@ cgyx:
         - name: 其他
           val: "其它"
   price:
+    - name: 全国一天
+      area: -1
+      time: 1D
+      price: 1
+      discount: 0
+      sell: 1
+      firstDis: 0
+      firstPrice: 1
+    - name: 单省一天
+      area: 1
+      time: 1D
+      price: 1
+      discount: 0
+      sell: 1
+      firstDis: 0
+      firstPrice: 1
     - name: 全国一年
       area: -1
       time: 1Y
@@ -204,6 +220,22 @@ zbxm:
         - name: 其他
           val: "其它"
   price:
+    - name: 全国一天
+      area: -1
+      time: 1D
+      price: 1
+      discount: 0
+      sell: 1
+      firstDis: 0
+      firstPrice: 1
+    - name: 单省一天
+      area: 1
+      time: 1D
+      price: 1
+      discount: 0
+      sell: 1
+      firstDis: 0
+      firstPrice: 1
     - name: 全国一年
       area: -1
       time: 1Y
@@ -293,6 +325,22 @@ qzcgf:
         - name: 按最近采购时间排序
           val: sortByData
   price:
+    - name: 全国一天
+      area: -1
+      time: 1D
+      price: 1
+      discount: 0
+      sell: 1
+      firstDis: 0
+      firstPrice: 1
+    - name: 单省一天
+      area: 1
+      time: 1D
+      price: 1
+      discount: 0
+      sell: 1
+      firstDis: 0
+      firstPrice: 1
     - name: 全国一年
       area: -1
       time: 1Y

manifest/config/setting-wy.yaml

@@ -134,6 +134,22 @@ cgyx:
         - name: 自定义
           val: exact
   price:
+    - name: 全国一天
+      area: -1
+      time: 1D
+      price: 1
+      discount: 0
+      sell: 1
+      firstDis: 0
+      firstPrice: 1
+    - name: 单省一天
+      area: 1
+      time: 1D
+      price: 1
+      discount: 0
+      sell: 1
+      firstDis: 0
+      firstPrice: 1
     - name: 全国一年
       area: -1
       time: 1Y
@@ -300,6 +316,22 @@ zbxm:
         - name: 自定义
           val: exact
   price:
+    - name: 全国一天
+      area: -1
+      time: 1D
+      price: 1
+      discount: 0
+      sell: 1
+      firstDis: 0
+      firstPrice: 1
+    - name: 单省一天
+      area: 1
+      time: 1D
+      price: 1
+      discount: 0
+      sell: 1
+      firstDis: 0
+      firstPrice: 1
     - name: 全国一年
       area: -1
       time: 1Y
@@ -431,6 +463,22 @@ hydqxm:
         - name: 按合同金额由小到大排序
           val: sortByAmountAsc
   price:
+    - name: 全国一天
+      area: -1
+      time: 1D
+      price: 1
+      discount: 0
+      sell: 1
+      firstDis: 0
+      firstPrice: 1
+    - name: 单省一天
+      area: 1
+      time: 1D
+      price: 1
+      discount: 0
+      sell: 1
+      firstDis: 0
+      firstPrice: 1
     - name: 全国一年
       area: -1
       time: 1Y
@@ -522,6 +570,22 @@ qzcgf:
         - name: 按最近采购时间排序
           val: sortByData
   price:
+    - name: 全国一天
+      area: -1
+      time: 1D
+      price: 1
+      discount: 0
+      sell: 1
+      firstDis: 0
+      firstPrice: 1
+    - name: 单省一天
+      area: 1
+      time: 1D
+      price: 1
+      discount: 0
+      sell: 1
+      firstDis: 0
+      firstPrice: 1
     - name: 全国一年
       area: -1
       time: 1Y

manifest/config/setting-ywsj.yaml

@@ -101,6 +101,22 @@ cgyx:
         - name: 其他
           val: "其它"
   price:
+    - name: 全国一天
+      area: -1
+      time: 1D
+      price: 1
+      discount: 0
+      sell: 1
+      firstDis: 0
+      firstPrice: 1
+    - name: 单省一天
+      area: 1
+      time: 1D
+      price: 1
+      discount: 0
+      sell: 1
+      firstDis: 0
+      firstPrice: 1
     - name: 全国一年
       area: -1
       time: 1Y
@@ -203,6 +219,22 @@ zbxm:
         - name: 其他
           val: "其它"
   price:
+    - name: 全国一天
+      area: -1
+      time: 1D
+      price: 1
+      discount: 0
+      sell: 1
+      firstDis: 0
+      firstPrice: 1
+    - name: 单省一天
+      area: 1
+      time: 1D
+      price: 1
+      discount: 0
+      sell: 1
+      firstDis: 0
+      firstPrice: 1
     - name: 全国一年
       area: -1
       time: 1Y
@@ -298,6 +330,22 @@ hydqxm:
         - name: 500万以上
           val: "500-"
   price:
+    - name: 全国一天
+      area: -1
+      time: 1D
+      price: 1
+      discount: 0
+      sell: 1
+      firstDis: 0
+      firstPrice: 1
+    - name: 单省一天
+      area: 1
+      time: 1D
+      price: 1
+      discount: 0
+      sell: 1
+      firstDis: 0
+      firstPrice: 1
     - name: 全国一年
       area: -1
       time: 1Y
@@ -387,6 +435,22 @@ qzcgf:
         - name: 按最近采购时间排序
           val: sortByData
   price:
+    - name: 全国一天
+      area: -1
+      time: 1D
+      price: 1
+      discount: 0
+      sell: 1
+      firstDis: 0
+      firstPrice: 1
+    - name: 单省一天
+      area: 1
+      time: 1D
+      price: 1
+      discount: 0
+      sell: 1
+      firstDis: 0
+      firstPrice: 1
     - name: 全国一年
       area: -1
       time: 1Y