撞单

api/internal/logic/createorderlogic.go

@@ -92,6 +92,7 @@ func (l *CreateOrderLogic) CreateOrder(req types.Request) (*types.Response, erro
 		BuyCount:          req.BuyCount,
 		EntId:             req.EntId,
 		SaleDep:           req.SaleDep,
+		SaleMoney:         req.SaleMoney,
 	})
 	if err != nil {
 		return nil, err

api/internal/types/types.go

@@ -58,7 +58,7 @@ type Request struct {
 	SalesChannel        string `form:"salesChannel,optional"`
 	OrderChannel        string `form:"orderChannel,optional"`
 	PaybackCompany      string `form:"paybackCompany,optional"`
-	SalesPersonId       int64  `form:"salesperson_id,optional"`
+	SalesPersonId       string `form:"salesperson_id,optional"`
 	CreatePerson        string `form:"create_person,optional"`
 	LastUpdatePerson    string `form:"last_update_person,optional"`
 	LastUpdateTime      string `form:"last_update_time,optional"`
@@ -67,6 +67,7 @@ type Request struct {
 	EntId               int64  `form:"entId,optional"`
 	BuyCount            int64  `form:"buyCount,optional"`
 	SaleDep             string `form:"saleDep,optional"`
+	SaleMoney           string `form:"saleMoney,optional"`
 }
 
 type Response struct {

api/jyOrder.api

@@ -65,7 +65,7 @@ type request {
 	SalesChannel        string `form:"salesChannel,optional"`
 	OrderChannel        string `form:"orderChannel,optional"`
 	PaybackCompany      string `form:"paybackCompany,optional"`
-	SalesPersonId       int64  `form:"salesperson_id,optional"`
+	SalesPersonId       string `form:"salesperson_id,optional"`
 	CreatePerson        string `form:"create_person,optional"`
 	LastUpdatePerson    string `form:"last_update_person,optional"`
 	LastUpdateTime      string `form:"last_update_time,optional"`
@@ -74,6 +74,7 @@ type request {
 	EntId               int64  `form:"entId,optional"`
 	BuyCount            int64  `form:"buyCount,optional"`
 	SaleDep             string `form:"saleDep,optional"`
+	SaleMoney           string `form:"saleMoney,optional"`
 }
 
 type response {

rpc/jyOrder.proto

@@ -60,7 +60,7 @@ message Request {
   string salesChannel = 55;
   string orderChannel = 56;
   string  paybackCompany = 57;
-  int64 salesperson_id = 58;
+  string salesperson_id = 58;
   string create_person = 59;
   string last_update_person = 60;
   string last_update_time = 61;
@@ -69,6 +69,7 @@ message Request {
   int64 ent_id = 64;
   int64 buy_count = 65;
   string saleDep = 66;
+  string saleMoney = 67;
 }
 
 message Response {

rpc/jyOrder/jyOrder.pb.go

@@ -81,7 +81,7 @@ type Request struct {
 	SalesChannel      string `protobuf:"bytes,55,opt,name=salesChannel,proto3" json:"salesChannel,omitempty"`
 	OrderChannel      string `protobuf:"bytes,56,opt,name=orderChannel,proto3" json:"orderChannel,omitempty"`
 	PaybackCompany    string `protobuf:"bytes,57,opt,name=paybackCompany,proto3" json:"paybackCompany,omitempty"`
-	SalespersonId     int64  `protobuf:"varint,58,opt,name=salesperson_id,json=salespersonId,proto3" json:"salesperson_id,omitempty"`
+	SalespersonId     string `protobuf:"bytes,58,opt,name=salesperson_id,json=salespersonId,proto3" json:"salesperson_id,omitempty"`
 	CreatePerson      string `protobuf:"bytes,59,opt,name=create_person,json=createPerson,proto3" json:"create_person,omitempty"`
 	LastUpdatePerson  string `protobuf:"bytes,60,opt,name=last_update_person,json=lastUpdatePerson,proto3" json:"last_update_person,omitempty"`
 	LastUpdateTime    string `protobuf:"bytes,61,opt,name=last_update_time,json=lastUpdateTime,proto3" json:"last_update_time,omitempty"`
@@ -90,6 +90,7 @@ type Request struct {
 	EntId             int64  `protobuf:"varint,64,opt,name=ent_id,json=entId,proto3" json:"ent_id,omitempty"`
 	BuyCount          int64  `protobuf:"varint,65,opt,name=buy_count,json=buyCount,proto3" json:"buy_count,omitempty"`
 	SaleDep           string `protobuf:"bytes,66,opt,name=saleDep,proto3" json:"saleDep,omitempty"`
+	SaleMoney         string `protobuf:"bytes,67,opt,name=saleMoney,proto3" json:"saleMoney,omitempty"`
 }
 
 func (x *Request) Reset() {
@@ -516,11 +517,11 @@ func (x *Request) GetPaybackCompany() string {
 	return ""
 }
 
-func (x *Request) GetSalespersonId() int64 {
+func (x *Request) GetSalespersonId() string {
 	if x != nil {
 		return x.SalespersonId
 	}
-	return 0
+	return ""
 }
 
 func (x *Request) GetCreatePerson() string {
@@ -579,6 +580,13 @@ func (x *Request) GetSaleDep() string {
 	return ""
 }
 
+func (x *Request) GetSaleMoney() string {
+	if x != nil {
+		return x.SaleMoney
+	}
+	return ""
+}
+
 type Response struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -717,7 +725,7 @@ var File_jyOrder_proto protoreflect.FileDescriptor
 
 var file_jyOrder_proto_rawDesc = []byte{
 	0x0a, 0x0d, 0x6a, 0x79, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22,
-	0xd6, 0x11, 0x0a, 0x07, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1b, 0x0a, 0x09, 0x70,
+	0xf4, 0x11, 0x0a, 0x07, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1b, 0x0a, 0x09, 0x70,
 	0x61, 0x79, 0x5f, 0x6d, 0x6f, 0x6e, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08,
 	0x70, 0x61, 0x79, 0x4d, 0x6f, 0x6e, 0x65, 0x79, 0x12, 0x1f, 0x0a, 0x0b, 0x6f, 0x72, 0x64, 0x65,
 	0x72, 0x5f, 0x6d, 0x6f, 0x6e, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x6f,
@@ -840,7 +848,7 @@ var file_jyOrder_proto_rawDesc = []byte{
 	0x79, 0x62, 0x61, 0x63, 0x6b, 0x43, 0x6f, 0x6d, 0x70, 0x61, 0x6e, 0x79, 0x18, 0x39, 0x20, 0x01,
 	0x28, 0x09, 0x52, 0x0e, 0x70, 0x61, 0x79, 0x62, 0x61, 0x63, 0x6b, 0x43, 0x6f, 0x6d, 0x70, 0x61,
 	0x6e, 0x79, 0x12, 0x25, 0x0a, 0x0e, 0x73, 0x61, 0x6c, 0x65, 0x73, 0x70, 0x65, 0x72, 0x73, 0x6f,
-	0x6e, 0x5f, 0x69, 0x64, 0x18, 0x3a, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0d, 0x73, 0x61, 0x6c, 0x65,
+	0x6e, 0x5f, 0x69, 0x64, 0x18, 0x3a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x73, 0x61, 0x6c, 0x65,
 	0x73, 0x70, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x23, 0x0a, 0x0d, 0x63, 0x72, 0x65,
 	0x61, 0x74, 0x65, 0x5f, 0x70, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x18, 0x3b, 0x20, 0x01, 0x28, 0x09,
 	0x52, 0x0c, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x50, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x12, 0x2c,
@@ -858,30 +866,32 @@ var file_jyOrder_proto_rawDesc = []byte{
 	0x64, 0x12, 0x1b, 0x0a, 0x09, 0x62, 0x75, 0x79, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x41,
 	0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x62, 0x75, 0x79, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x18,
 	0x0a, 0x07, 0x73, 0x61, 0x6c, 0x65, 0x44, 0x65, 0x70, 0x18, 0x42, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x07, 0x73, 0x61, 0x6c, 0x65, 0x44, 0x65, 0x70, 0x22, 0x4c, 0x0a, 0x08, 0x52, 0x65, 0x73, 0x70,
-	0x6f, 0x6e, 0x73, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x03, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73,
-	0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61,
-	0x67, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03,
-	0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x86, 0x01, 0x0a, 0x0f, 0x52, 0x65, 0x71, 0x75, 0x65,
-	0x73, 0x74, 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x12, 0x19, 0x0a, 0x08, 0x6f, 0x72,
-	0x64, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x6f, 0x72,
-	0x64, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1f, 0x0a, 0x0b, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f,
-	0x6e, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x72, 0x65, 0x6c, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74,
-	0x6f, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74,
-	0x6f, 0x72, 0x12, 0x1b, 0x0a, 0x09, 0x73, 0x61, 0x6c, 0x65, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x18,
-	0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x73, 0x61, 0x6c, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x32,
-	0x85, 0x01, 0x0a, 0x07, 0x4a, 0x79, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x22, 0x0a, 0x0b, 0x43,
-	0x72, 0x65, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x08, 0x2e, 0x52, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 0x1a, 0x09, 0x2e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12,
-	0x32, 0x0a, 0x13, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x44, 0x65,
-	0x74, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x12, 0x10, 0x2e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x1a, 0x09, 0x2e, 0x52, 0x65, 0x73, 0x70, 0x6f,
-	0x6e, 0x73, 0x65, 0x12, 0x22, 0x0a, 0x0b, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x64,
-	0x65, 0x72, 0x12, 0x08, 0x2e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x09, 0x2e, 0x52,
-	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x42, 0x0a, 0x5a, 0x08, 0x6a, 0x79, 0x4f, 0x72, 0x64,
-	0x65, 0x72, 0x2f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x07, 0x73, 0x61, 0x6c, 0x65, 0x44, 0x65, 0x70, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x61, 0x6c, 0x65,
+	0x4d, 0x6f, 0x6e, 0x65, 0x79, 0x18, 0x43, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x61, 0x6c,
+	0x65, 0x4d, 0x6f, 0x6e, 0x65, 0x79, 0x22, 0x4c, 0x0a, 0x08, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
+	0x73, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03,
+	0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67,
+	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65,
+	0x12, 0x12, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x04,
+	0x64, 0x61, 0x74, 0x61, 0x22, 0x86, 0x01, 0x0a, 0x0f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
+	0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x12, 0x19, 0x0a, 0x08, 0x6f, 0x72, 0x64, 0x65,
+	0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x6f, 0x72, 0x64, 0x65,
+	0x72, 0x49, 0x64, 0x12, 0x1f, 0x0a, 0x0b, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f,
+	0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69,
+	0x6f, 0x6e, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72,
+	0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72,
+	0x12, 0x1b, 0x0a, 0x09, 0x73, 0x61, 0x6c, 0x65, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x04, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x08, 0x73, 0x61, 0x6c, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x32, 0x85, 0x01,
+	0x0a, 0x07, 0x4a, 0x79, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x22, 0x0a, 0x0b, 0x43, 0x72, 0x65,
+	0x61, 0x74, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x08, 0x2e, 0x52, 0x65, 0x71, 0x75, 0x65,
+	0x73, 0x74, 0x1a, 0x09, 0x2e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x32, 0x0a,
+	0x13, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x44, 0x65, 0x74, 0x61,
+	0x69, 0x6c, 0x65, 0x64, 0x12, 0x10, 0x2e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x44, 0x65,
+	0x74, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x1a, 0x09, 0x2e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
+	0x65, 0x12, 0x22, 0x0a, 0x0b, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72,
+	0x12, 0x08, 0x2e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x09, 0x2e, 0x52, 0x65, 0x73,
+	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x42, 0x0a, 0x5a, 0x08, 0x6a, 0x79, 0x4f, 0x72, 0x64, 0x65, 0x72,
+	0x2f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (

service/orderService.go

@@ -84,6 +84,7 @@ func (s OrderService) CreateOrder(in *jyOrder.Request) (int64, string, int64) {
 	order["create_person"] = in.CreatePerson
 	order["audit_status"] = in.AuditStatus
 	order["saleDep"] = in.SaleDep
+	order["saleMoney"] = in.SaleMoney
 	if in.OrderChannel == "d03" {
 		delete(order, "return_status")
 	}
@@ -175,6 +176,7 @@ func (s OrderService) UpdateOrder(in *jyOrder.Request) (int64, string) {
 	order["last_update_person"] = in.LastUpdatePerson
 	order["return_status"] = in.ReturnStatus
 	order["saleDep"] = in.SaleDep
+	order["saleMoney"] = in.SaleMoney
 	order["pay_way"] = in.PayWay
 	if in.OrderChannel == "d03" {
 		delete(order, "return_status")