feat:移除录入时间字段

.gitignore

@@ -0,0 +1,3 @@
+/.output/
+.idea
+go.mod

api/internal/logic/createorderlogic.go

@@ -79,7 +79,6 @@ func (l *CreateOrderLogic) CreateOrder(req types.Request) (*types.Response, erro
 		CompanyName:       req.Company_name,
 		BillingMode:       req.BillingMode,
 		SaleTime:          req.Sale_time,
-		EntryTime:         req.Entry_time,
 		Commission:        req.Commission,
 		ProceduresMoney:   req.ProceduresMoney,
 		SalesChannel:      req.SalesChannel,

api/internal/logic/updateorderlogic.go

@@ -33,7 +33,6 @@ func (l *UpdateOrderLogic) UpdateOrder(req types.Request) (*types.Response, erro
 		UserNickname:      req.User_nickname,
 		PayTime:           req.Pay_time,
 		OrderStatus:       req.Order_status,
-		CreateTime:        req.Create_time,
 		UserOpenid:        req.User_openid,
 		ServiceStatus:     req.Service_status,
 		Filter:            req.Filter,
@@ -78,7 +77,6 @@ func (l *UpdateOrderLogic) UpdateOrder(req types.Request) (*types.Response, erro
 		CompanyName:       req.Company_name,
 		BillingMode:       req.BillingMode,
 		SaleTime:          req.Sale_time,
-		EntryTime:         req.Entry_time,
 		Commission:        req.Commission,
 		ProceduresMoney:   req.ProceduresMoney,
 		SalesChannel:      req.SalesChannel,

api/jyOrder.api

@@ -14,7 +14,7 @@ type request {
 	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"`
@@ -60,7 +60,6 @@ type request {
 	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"`
@@ -70,6 +69,7 @@ type request {
 	CreatePerson        string `form:"create_person,optional"`
 	LastUpdatePerson    string  `form:"last_update_person,optional"`
 	LastUpdateTime      string `form:"last_update_time,optional"`
+	AuditStatus         int64 `form:"audit_status,optional"`
 }
 
 type response {

rpc/etc/jyorder.yaml

@@ -4,7 +4,7 @@ Etcd:
   Hosts:
   - 127.0.0.1:2379
   Key: jyorder.rpc
-DataSource: root:Topnet123@tcp(127.0.0.1:3366)/jianyu?charset=utf8mb4&parseTime=true&loc=Local
+DataSource: root:Topnet123@tcp(192.168.3.11:3366)/jianyu?charset=utf8mb4&parseTime=true&loc=Local
 FileSystemConf:
   Etcd:
     Hosts:

rpc/internal/server/jyorderserver.go

@@ -33,7 +33,7 @@ func (s *JyOrderServer) CreateOrderDetailed(ctx context.Context, in *jyOrder.Req
 	return l.CreateOrderDetailed(in)
 }
 
-// 创建订单
+// 修改订单
 func (s *JyOrderServer) UpdateOrder(ctx context.Context, in *jyOrder.Request) (*jyOrder.Response, error) {
 	l := logic.NewUpdateOrderLogic(ctx, s.svcCtx)
 	return l.UpdateOrder(in)

rpc/jyOrder.proto

@@ -55,7 +55,6 @@ message Request {
   string company_name = 49;
   int64  billingMode = 50;
   string sale_time = 51;
-  string entry_time = 52;
   int64  commission = 53;
   int64  procedures_money = 54;
   string salesChannel = 55;
@@ -65,6 +64,7 @@ message Request {
   string create_person = 59;
   string last_update_person = 60;
   string last_update_time = 61;
+  int64  audit_status = 62;
 }
 
 message Response {

rpc/jyorderclient/jyorder.go

@@ -1,7 +1,7 @@
 // Code generated by goctl. DO NOT EDIT!
 // Source: jyOrder.proto
 
-//go:generate mockgen -destination ./jyorder_mock.go -package jyorder -source $GOFILE
+//go:generate mockgen -destination ./jyorder_mock.go -package jyorderclient -source $GOFILE
 
 package jyorderclient
 
@@ -23,7 +23,7 @@ type (
 		CreateOrder(ctx context.Context, in *Request) (*Response, error)
 		// 创建订单明细
 		CreateOrderDetailed(ctx context.Context, in *RequestDetailed) (*Response, error)
-		// 创建订单
+		// 修改订单
 		UpdateOrder(ctx context.Context, in *Request) (*Response, error)
 	}
 

service/orderService.go

@@ -67,9 +67,6 @@ func (s OrderService) CreateOrder(in *jyOrder.Request) (int64, string, int64) {
 	order["is_backstage_order"] = in.IsBackstageOrder
 	order["original_price"] = in.OriginalPrice
 	order["order_code"] = in.OrderCode
-	if in.EntryTime != "" {
-		order["entry_time"] = util.ConversionDateTime(in.EntryTime)
-	}
 	order["create_person"] = in.CreatePerson
 	if in.OrderChannel == "d03" {
 		delete(order, "return_status")
@@ -119,7 +116,6 @@ func (s OrderService) UpdateOrder(in *jyOrder.Request) (int64, string) {
 	order["order_money"] = in.OrderMoney
 	order["user_nickname"] = in.UserNickname
 	order["order_status"] = in.OrderStatus
-	order["create_time"] = util.If(in.CreateTime == "", nil, in.CreateTime)
 	order["user_openid"] = in.UserOpenid
 	order["service_status"] = in.ServiceStatus
 	order["filter"] = in.Filter