fuwencai 3 år sedan
förälder
incheckning
0f564f009b
3 ändrade filer med 28 tillägg och 4 borttagningar
  1. 25 0
      Makefile
  2. 1 2
      api/internal/types/types.go
  3. 2 2
      api/jyOrder.api

+ 25 - 0
Makefile

@@ -0,0 +1,25 @@
+SHELL=cmd
+.PHONY: all
+all:  fmt tidy lint
+genRpc:
+	cd rpc && goctl rpc proto -src jyOrder.proto -dir .
+	@echo "===========> genRpc finish"
+
+genApi:
+	cd api && goctl api go -api jyOrder.api -dir .
+	@echo "===========> genApi finish"
+
+fmt:
+	go fmt ./...
+	@echo "===========> fmt finish"
+tidy:
+	go mod tidy
+	@echo "===========> tidy finish"
+
+lint:
+	@echo "===========> Run golangci to lint source codes"
+	@golangci-lint run
+
+cover:
+	@echo "===========> Run go test "
+	cd service &&  go test -v -coverprofile=coverage   && go tool cover -html=coverage -o coverage.html

+ 1 - 2
api/internal/types/types.go

@@ -7,7 +7,7 @@ type Request struct {
 	User_nickname       string `form:"user_nickname,optional"`
 	Pay_time            string `form:"pay_time,optional"`
 	Order_status        int64  `form:"order_status"`
-	Create_time         string `form:"create_time"`
+	Create_time         string `form:"create_time,optional"`
 	User_openid         string `form:"user_openid,optional"`
 	Service_status      int64  `form:"service_status,optional"`
 	Service_time        string `form:"service_time,optional"`
@@ -53,7 +53,6 @@ type Request struct {
 	Company_name        string `form:"company_name,optional"`
 	BillingMode         int64  `form:"billingMode,optional"`
 	Sale_time           string `form:"sale_time,optional"`
-	Entry_time          string `form:"entry_time,optional"`
 	Commission          int64  `form:"commission,optional"`
 	ProceduresMoney     int64  `form:"procedures_money,optional"`
 	SalesChannel        string `form:"salesChannel,optional"`

+ 2 - 2
api/jyOrder.api

@@ -67,9 +67,9 @@ type request {
 	PaybackCompany      string `form:"paybackCompany,optional"`
 	SalesPersonId       int64  `form:"salesperson_id,optional"`
 	CreatePerson        string `form:"create_person,optional"`
-	LastUpdatePerson    string  `form:"last_update_person,optional"`
+	LastUpdatePerson    string `form:"last_update_person,optional"`
 	LastUpdateTime      string `form:"last_update_time,optional"`
-	AuditStatus         int64 `form:"audit_status,optional"`
+	AuditStatus         int64  `form:"audit_status,optional"`
 }
 
 type response {