From 8f1672bf14ce3ead7998a8259c0cab22405aa958 Mon Sep 17 00:00:00 2001 From: wangpengfei <274878379@qq.com> Date: 星期四, 20 七月 2023 16:28:40 +0800 Subject: [PATCH] fix --- api/v1/serviceFeeManage.go | 1 model/request/serviceFeeManage.go | 6 docs/swagger.yaml | 202 +++++++++----- docs/docs.go | 265 ++++++++++++------- api/v1/serviceFollowup.go | 2 docs/swagger.json | 265 ++++++++++++------- service/serviceFeeManage.go | 15 + 7 files changed, 472 insertions(+), 284 deletions(-) diff --git a/api/v1/serviceFeeManage.go b/api/v1/serviceFeeManage.go index 43fba1f..9771dc9 100644 --- a/api/v1/serviceFeeManage.go +++ b/api/v1/serviceFeeManage.go @@ -145,7 +145,6 @@ } result = model.ServiceFeeManage{ - ClientId: serviceFeeManage.ClientId, MemberId: serviceFeeManage.MemberId, Remark: serviceFeeManage.Remark, LatestDate: t, diff --git a/api/v1/serviceFollowup.go b/api/v1/serviceFollowup.go index 0a74b42..d39f3b5 100644 --- a/api/v1/serviceFollowup.go +++ b/api/v1/serviceFollowup.go @@ -87,6 +87,8 @@ return } + serviceFollowup.Id = params.Id + errCode = serviceFollowupService.UpdateServiceFollowup(&serviceFollowup) if errCode != ecode.OK { ctx.Fail(errCode) diff --git a/docs/docs.go b/docs/docs.go index 294d119..5f12fa8 100644 --- a/docs/docs.go +++ b/docs/docs.go @@ -7160,20 +7160,102 @@ "request.AddServiceFeeManage": { "type": "object", "properties": { - "client_id": { + "business_scope": { + "description": "缁忚惀鑼冨洿", + "type": "string" + }, + "city_id": { + "type": "integer" + }, + "client_level_id": { + "description": "瀹㈡埛绛夌骇ID", + "type": "integer" + }, + "client_origin_id": { + "description": "瀹㈡埛鏉ユ簮ID", + "type": "integer" + }, + "client_status_id": { + "description": "瀹㈡埛鐘舵�両D", + "type": "integer" + }, + "client_type_id": { + "description": "瀹㈡埛绫诲瀷ID", + "type": "integer" + }, + "contact": { + "$ref": "#/definitions/request.Contact" + }, + "country_id": { + "type": "integer" + }, + "detail_address": { + "description": "璇︾粏鍦板潃", + "type": "string" + }, + "enterprise_nature_id": { + "description": "浼佷笟鎬ц川", + "type": "integer" + }, + "enterprise_scale_id": { + "description": "浼佷笟瑙勬ā", "type": "integer" }, "file": { "type": "string" }, + "industry_id": { + "description": "鎵�灞炶涓�", + "type": "integer" + }, "latest_date": { "type": "string" }, + "latest_service_time": { + "description": "鏈�鏅氭湇鍔℃椂闂�", + "type": "string" + }, "member_id": { + "description": "閿�鍞礋璐d汉ID", "type": "integer" }, - "remark": { + "name": { + "description": "鍏徃鍚嶇О", "type": "string" + }, + "next_visit_time": { + "description": "涓嬫鍥炶鏃堕棿", + "type": "string" + }, + "number": { + "description": "鍏徃缂栧彿", + "type": "string" + }, + "province_id": { + "type": "integer" + }, + "region_id": { + "type": "integer" + }, + "registered_capital_id": { + "description": "娉ㄥ唽璧勯噾", + "type": "integer" + }, + "registration_time": { + "description": "娉ㄥ唽鏃堕棿", + "type": "string" + }, + "remark": { + "description": "澶囨敞", + "type": "string" + }, + "representative": { + "description": "娉曚汉浠h〃", + "type": "string" + }, + "service_member_id": { + "description": "鏈嶅姟璐熻矗浜篒D", + "type": "integer" } } }, @@ -7334,102 +7416,6 @@ "pos": { "description": "鐢ㄦ埛宀椾綅", "type": "string" - } - } - }, - "request.Client": { - "type": "object", - "properties": { - "business_scope": { - "description": "缁忚惀鑼冨洿", - "type": "string" - }, - "city_id": { - "type": "integer" - }, - "client_level_id": { - "description": "瀹㈡埛绛夌骇ID", - "type": "integer" - }, - "client_origin_id": { - "description": "瀹㈡埛鏉ユ簮ID", - "type": "integer" - }, - "client_status_id": { - "description": "瀹㈡埛鐘舵�両D", - "type": "integer" - }, - "client_type_id": { - "description": "瀹㈡埛绫诲瀷ID", - "type": "integer" - }, - "contact": { - "$ref": "#/definitions/request.Contact" - }, - "country_id": { - "type": "integer" - }, - "detail_address": { - "description": "璇︾粏鍦板潃", - "type": "string" - }, - "enterprise_nature_id": { - "description": "浼佷笟鎬ц川", - "type": "integer" - }, - "enterprise_scale_id": { - "description": "浼佷笟瑙勬ā", - "type": "integer" - }, - "industry_id": { - "description": "鎵�灞炶涓�", - "type": "integer" - }, - "latest_service_time": { - "description": "鏈�鏅氭湇鍔℃椂闂�", - "type": "string" - }, - "member_id": { - "description": "閿�鍞礋璐d汉ID", - "type": "integer" - }, - "name": { - "description": "鍏徃鍚嶇О", - "type": "string" - }, - "next_visit_time": { - "description": "涓嬫鍥炶鏃堕棿", - "type": "string" - }, - "number": { - "description": "鍏徃缂栧彿", - "type": "string" - }, - "province_id": { - "type": "integer" - }, - "region_id": { - "type": "integer" - }, - "registered_capital_id": { - "description": "娉ㄥ唽璧勯噾", - "type": "integer" - }, - "registration_time": { - "description": "娉ㄥ唽鏃堕棿", - "type": "string" - }, - "remark": { - "description": "澶囨敞", - "type": "string" - }, - "representative": { - "description": "娉曚汉浠h〃", - "type": "string" - }, - "service_member_id": { - "description": "鏈嶅姟璐熻矗浜篒D", - "type": "integer" } } }, @@ -8933,10 +8919,45 @@ "request.UpdateServiceFeeManage": { "type": "object", "properties": { - "client": { - "$ref": "#/definitions/request.Client" + "business_scope": { + "description": "缁忚惀鑼冨洿", + "type": "string" }, - "client_id": { + "city_id": { + "type": "integer" + }, + "client_level_id": { + "description": "瀹㈡埛绛夌骇ID", + "type": "integer" + }, + "client_origin_id": { + "description": "瀹㈡埛鏉ユ簮ID", + "type": "integer" + }, + "client_status_id": { + "description": "瀹㈡埛鐘舵�両D", + "type": "integer" + }, + "client_type_id": { + "description": "瀹㈡埛绫诲瀷ID", + "type": "integer" + }, + "contact": { + "$ref": "#/definitions/request.Contact" + }, + "country_id": { + "type": "integer" + }, + "detail_address": { + "description": "璇︾粏鍦板潃", + "type": "string" + }, + "enterprise_nature_id": { + "description": "浼佷笟鎬ц川", + "type": "integer" + }, + "enterprise_scale_id": { + "description": "浼佷笟瑙勬ā", "type": "integer" }, "file": { @@ -8945,14 +8966,56 @@ "id": { "type": "integer" }, + "industry_id": { + "description": "鎵�灞炶涓�", + "type": "integer" + }, "latest_date": { + "type": "string" + }, + "latest_service_time": { + "description": "鏈�鏅氭湇鍔℃椂闂�", "type": "string" }, "member_id": { "type": "integer" }, + "name": { + "description": "鍏徃鍚嶇О", + "type": "string" + }, + "next_visit_time": { + "description": "涓嬫鍥炶鏃堕棿", + "type": "string" + }, + "number": { + "description": "鍏徃缂栧彿", + "type": "string" + }, + "province_id": { + "type": "integer" + }, + "region_id": { + "type": "integer" + }, + "registered_capital_id": { + "description": "娉ㄥ唽璧勯噾", + "type": "integer" + }, + "registration_time": { + "description": "娉ㄥ唽鏃堕棿", + "type": "string" + }, "remark": { "type": "string" + }, + "representative": { + "description": "娉曚汉浠h〃", + "type": "string" + }, + "service_member_id": { + "description": "鏈嶅姟璐熻矗浜篒D", + "type": "integer" } } }, diff --git a/docs/swagger.json b/docs/swagger.json index f952311..e3d258e 100644 --- a/docs/swagger.json +++ b/docs/swagger.json @@ -7148,20 +7148,102 @@ "request.AddServiceFeeManage": { "type": "object", "properties": { - "client_id": { + "business_scope": { + "description": "缁忚惀鑼冨洿", + "type": "string" + }, + "city_id": { + "type": "integer" + }, + "client_level_id": { + "description": "瀹㈡埛绛夌骇ID", + "type": "integer" + }, + "client_origin_id": { + "description": "瀹㈡埛鏉ユ簮ID", + "type": "integer" + }, + "client_status_id": { + "description": "瀹㈡埛鐘舵�両D", + "type": "integer" + }, + "client_type_id": { + "description": "瀹㈡埛绫诲瀷ID", + "type": "integer" + }, + "contact": { + "$ref": "#/definitions/request.Contact" + }, + "country_id": { + "type": "integer" + }, + "detail_address": { + "description": "璇︾粏鍦板潃", + "type": "string" + }, + "enterprise_nature_id": { + "description": "浼佷笟鎬ц川", + "type": "integer" + }, + "enterprise_scale_id": { + "description": "浼佷笟瑙勬ā", "type": "integer" }, "file": { "type": "string" }, + "industry_id": { + "description": "鎵�灞炶涓�", + "type": "integer" + }, "latest_date": { "type": "string" }, + "latest_service_time": { + "description": "鏈�鏅氭湇鍔℃椂闂�", + "type": "string" + }, "member_id": { + "description": "閿�鍞礋璐d汉ID", "type": "integer" }, - "remark": { + "name": { + "description": "鍏徃鍚嶇О", "type": "string" + }, + "next_visit_time": { + "description": "涓嬫鍥炶鏃堕棿", + "type": "string" + }, + "number": { + "description": "鍏徃缂栧彿", + "type": "string" + }, + "province_id": { + "type": "integer" + }, + "region_id": { + "type": "integer" + }, + "registered_capital_id": { + "description": "娉ㄥ唽璧勯噾", + "type": "integer" + }, + "registration_time": { + "description": "娉ㄥ唽鏃堕棿", + "type": "string" + }, + "remark": { + "description": "澶囨敞", + "type": "string" + }, + "representative": { + "description": "娉曚汉浠h〃", + "type": "string" + }, + "service_member_id": { + "description": "鏈嶅姟璐熻矗浜篒D", + "type": "integer" } } }, @@ -7322,102 +7404,6 @@ "pos": { "description": "鐢ㄦ埛宀椾綅", "type": "string" - } - } - }, - "request.Client": { - "type": "object", - "properties": { - "business_scope": { - "description": "缁忚惀鑼冨洿", - "type": "string" - }, - "city_id": { - "type": "integer" - }, - "client_level_id": { - "description": "瀹㈡埛绛夌骇ID", - "type": "integer" - }, - "client_origin_id": { - "description": "瀹㈡埛鏉ユ簮ID", - "type": "integer" - }, - "client_status_id": { - "description": "瀹㈡埛鐘舵�両D", - "type": "integer" - }, - "client_type_id": { - "description": "瀹㈡埛绫诲瀷ID", - "type": "integer" - }, - "contact": { - "$ref": "#/definitions/request.Contact" - }, - "country_id": { - "type": "integer" - }, - "detail_address": { - "description": "璇︾粏鍦板潃", - "type": "string" - }, - "enterprise_nature_id": { - "description": "浼佷笟鎬ц川", - "type": "integer" - }, - "enterprise_scale_id": { - "description": "浼佷笟瑙勬ā", - "type": "integer" - }, - "industry_id": { - "description": "鎵�灞炶涓�", - "type": "integer" - }, - "latest_service_time": { - "description": "鏈�鏅氭湇鍔℃椂闂�", - "type": "string" - }, - "member_id": { - "description": "閿�鍞礋璐d汉ID", - "type": "integer" - }, - "name": { - "description": "鍏徃鍚嶇О", - "type": "string" - }, - "next_visit_time": { - "description": "涓嬫鍥炶鏃堕棿", - "type": "string" - }, - "number": { - "description": "鍏徃缂栧彿", - "type": "string" - }, - "province_id": { - "type": "integer" - }, - "region_id": { - "type": "integer" - }, - "registered_capital_id": { - "description": "娉ㄥ唽璧勯噾", - "type": "integer" - }, - "registration_time": { - "description": "娉ㄥ唽鏃堕棿", - "type": "string" - }, - "remark": { - "description": "澶囨敞", - "type": "string" - }, - "representative": { - "description": "娉曚汉浠h〃", - "type": "string" - }, - "service_member_id": { - "description": "鏈嶅姟璐熻矗浜篒D", - "type": "integer" } } }, @@ -8921,10 +8907,45 @@ "request.UpdateServiceFeeManage": { "type": "object", "properties": { - "client": { - "$ref": "#/definitions/request.Client" + "business_scope": { + "description": "缁忚惀鑼冨洿", + "type": "string" }, - "client_id": { + "city_id": { + "type": "integer" + }, + "client_level_id": { + "description": "瀹㈡埛绛夌骇ID", + "type": "integer" + }, + "client_origin_id": { + "description": "瀹㈡埛鏉ユ簮ID", + "type": "integer" + }, + "client_status_id": { + "description": "瀹㈡埛鐘舵�両D", + "type": "integer" + }, + "client_type_id": { + "description": "瀹㈡埛绫诲瀷ID", + "type": "integer" + }, + "contact": { + "$ref": "#/definitions/request.Contact" + }, + "country_id": { + "type": "integer" + }, + "detail_address": { + "description": "璇︾粏鍦板潃", + "type": "string" + }, + "enterprise_nature_id": { + "description": "浼佷笟鎬ц川", + "type": "integer" + }, + "enterprise_scale_id": { + "description": "浼佷笟瑙勬ā", "type": "integer" }, "file": { @@ -8933,14 +8954,56 @@ "id": { "type": "integer" }, + "industry_id": { + "description": "鎵�灞炶涓�", + "type": "integer" + }, "latest_date": { + "type": "string" + }, + "latest_service_time": { + "description": "鏈�鏅氭湇鍔℃椂闂�", "type": "string" }, "member_id": { "type": "integer" }, + "name": { + "description": "鍏徃鍚嶇О", + "type": "string" + }, + "next_visit_time": { + "description": "涓嬫鍥炶鏃堕棿", + "type": "string" + }, + "number": { + "description": "鍏徃缂栧彿", + "type": "string" + }, + "province_id": { + "type": "integer" + }, + "region_id": { + "type": "integer" + }, + "registered_capital_id": { + "description": "娉ㄥ唽璧勯噾", + "type": "integer" + }, + "registration_time": { + "description": "娉ㄥ唽鏃堕棿", + "type": "string" + }, "remark": { "type": "string" + }, + "representative": { + "description": "娉曚汉浠h〃", + "type": "string" + }, + "service_member_id": { + "description": "鏈嶅姟璐熻矗浜篒D", + "type": "integer" } } }, diff --git a/docs/swagger.yaml b/docs/swagger.yaml index 3d51f94..afe66fa 100644 --- a/docs/swagger.yaml +++ b/docs/swagger.yaml @@ -1422,16 +1422,77 @@ type: object request.AddServiceFeeManage: properties: - client_id: + business_scope: + description: 缁忚惀鑼冨洿 + type: string + city_id: + type: integer + client_level_id: + description: 瀹㈡埛绛夌骇ID + type: integer + client_origin_id: + description: 瀹㈡埛鏉ユ簮ID + type: integer + client_status_id: + description: 瀹㈡埛鐘舵�両D + type: integer + client_type_id: + description: 瀹㈡埛绫诲瀷ID + type: integer + contact: + $ref: '#/definitions/request.Contact' + country_id: + type: integer + detail_address: + description: 璇︾粏鍦板潃 + type: string + enterprise_nature_id: + description: 浼佷笟鎬ц川 + type: integer + enterprise_scale_id: + description: 浼佷笟瑙勬ā type: integer file: type: string + industry_id: + description: 鎵�灞炶涓� + type: integer latest_date: type: string - member_id: - type: integer - remark: + latest_service_time: + description: 鏈�鏅氭湇鍔℃椂闂� type: string + member_id: + description: 閿�鍞礋璐d汉ID + type: integer + name: + description: 鍏徃鍚嶇О + type: string + next_visit_time: + description: 涓嬫鍥炶鏃堕棿 + type: string + number: + description: 鍏徃缂栧彿 + type: string + province_id: + type: integer + region_id: + type: integer + registered_capital_id: + description: 娉ㄥ唽璧勯噾 + type: integer + registration_time: + description: 娉ㄥ唽鏃堕棿 + type: string + remark: + description: 澶囨敞 + type: string + representative: + description: 娉曚汉浠h〃 + type: string + service_member_id: + description: 鏈嶅姟璐熻矗浜篒D + type: integer type: object request.AddServiceFollowup: properties: @@ -1541,76 +1602,6 @@ pos: description: 鐢ㄦ埛宀椾綅 type: string - type: object - request.Client: - properties: - business_scope: - description: 缁忚惀鑼冨洿 - type: string - city_id: - type: integer - client_level_id: - description: 瀹㈡埛绛夌骇ID - type: integer - client_origin_id: - description: 瀹㈡埛鏉ユ簮ID - type: integer - client_status_id: - description: 瀹㈡埛鐘舵�両D - type: integer - client_type_id: - description: 瀹㈡埛绫诲瀷ID - type: integer - contact: - $ref: '#/definitions/request.Contact' - country_id: - type: integer - detail_address: - description: 璇︾粏鍦板潃 - type: string - enterprise_nature_id: - description: 浼佷笟鎬ц川 - type: integer - enterprise_scale_id: - description: 浼佷笟瑙勬ā - type: integer - industry_id: - description: 鎵�灞炶涓� - type: integer - latest_service_time: - description: 鏈�鏅氭湇鍔℃椂闂� - type: string - member_id: - description: 閿�鍞礋璐d汉ID - type: integer - name: - description: 鍏徃鍚嶇О - type: string - next_visit_time: - description: 涓嬫鍥炶鏃堕棿 - type: string - number: - description: 鍏徃缂栧彿 - type: string - province_id: - type: integer - region_id: - type: integer - registered_capital_id: - description: 娉ㄥ唽璧勯噾 - type: integer - registration_time: - description: 娉ㄥ唽鏃堕棿 - type: string - remark: - description: 澶囨敞 - type: string - representative: - description: 娉曚汉浠h〃 - type: string - service_member_id: - description: 鏈嶅姟璐熻矗浜篒D - type: integer type: object request.Contact: properties: @@ -2624,20 +2615,77 @@ type: object request.UpdateServiceFeeManage: properties: - client: - $ref: '#/definitions/request.Client' - client_id: + business_scope: + description: 缁忚惀鑼冨洿 + type: string + city_id: + type: integer + client_level_id: + description: 瀹㈡埛绛夌骇ID + type: integer + client_origin_id: + description: 瀹㈡埛鏉ユ簮ID + type: integer + client_status_id: + description: 瀹㈡埛鐘舵�両D + type: integer + client_type_id: + description: 瀹㈡埛绫诲瀷ID + type: integer + contact: + $ref: '#/definitions/request.Contact' + country_id: + type: integer + detail_address: + description: 璇︾粏鍦板潃 + type: string + enterprise_nature_id: + description: 浼佷笟鎬ц川 + type: integer + enterprise_scale_id: + description: 浼佷笟瑙勬ā type: integer file: type: string id: type: integer + industry_id: + description: 鎵�灞炶涓� + type: integer latest_date: + type: string + latest_service_time: + description: 鏈�鏅氭湇鍔℃椂闂� type: string member_id: type: integer + name: + description: 鍏徃鍚嶇О + type: string + next_visit_time: + description: 涓嬫鍥炶鏃堕棿 + type: string + number: + description: 鍏徃缂栧彿 + type: string + province_id: + type: integer + region_id: + type: integer + registered_capital_id: + description: 娉ㄥ唽璧勯噾 + type: integer + registration_time: + description: 娉ㄥ唽鏃堕棿 + type: string remark: type: string + representative: + description: 娉曚汉浠h〃 + type: string + service_member_id: + description: 鏈嶅姟璐熻矗浜篒D + type: integer type: object request.UpdateServiceFollowup: properties: diff --git a/model/request/serviceFeeManage.go b/model/request/serviceFeeManage.go index 2972640..b525ae9 100644 --- a/model/request/serviceFeeManage.go +++ b/model/request/serviceFeeManage.go @@ -2,10 +2,10 @@ type AddServiceFeeManage struct { ServiceFeeManage + Client } type ServiceFeeManage struct { - ClientId int `json:"client_id"` MemberId int `json:"member_id"` LatestDate string `json:"latest_date"` Remark string `json:"remark"` @@ -13,7 +13,7 @@ } type UpdateServiceFeeManage struct { - Id int `json:"id"` - Client Client `json:"client"` + Id int `json:"id"` + Client ServiceFeeManage } diff --git a/service/serviceFeeManage.go b/service/serviceFeeManage.go index a52e8c6..837ff59 100644 --- a/service/serviceFeeManage.go +++ b/service/serviceFeeManage.go @@ -8,11 +8,24 @@ type FeeManageService struct{} func (FeeManageService) AddServiceFeeManage(serviceFeeManage *model.ServiceFeeManage) int { - err := model.NewServiceFeeManageSearch(nil).Create(serviceFeeManage) + + tx := model.NewContactSearch().Orm.Begin() + + err := model.NewClientSearch(tx).Create(serviceFeeManage.Client) if err != nil { + tx.Rollback() + return ecode.ClientExist + } + + serviceFeeManage.ClientId = serviceFeeManage.Client.Id + err = model.NewServiceFeeManageSearch(tx).Create(serviceFeeManage) + if err != nil { + tx.Rollback() return ecode.ServiceFeeManageExist } + tx.Commit() + return ecode.OK } -- Gitblit v1.8.0