记得上下班打卡 | git大法好,push需谨慎
Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
liquidnet-bus-v1
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
董敬伟
liquidnet-bus-v1
Commits
195dd9ad
Commit
195dd9ad
authored
Nov 17, 2021
by
Tice
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update
parent
23dedf23
Changes
15
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
570 additions
and
452 deletions
+570
-452
IMerchantFieldAppliesService.java
...ervice/merchant/service/IMerchantFieldAppliesService.java
+14
-0
IMerchantFieldsService.java
...dnet/service/merchant/service/IMerchantFieldsService.java
+0
-7
IMerchantSponsorAppliesService.java
...vice/merchant/service/IMerchantSponsorAppliesService.java
+14
-0
IMerchantSponsorsService.java
...et/service/merchant/service/IMerchantSponsorsService.java
+0
-6
IMerchantFieldCheckersAdminService.java
.../merchant/service/IMerchantFieldCheckersAdminService.java
+7
-0
MerchantAuthorizationRecordsAdminServiceImpl.java
...ce/impl/MerchantAuthorizationRecordsAdminServiceImpl.java
+50
-33
MerchantFieldCheckersAdminServiceImpl.java
...t/service/impl/MerchantFieldCheckersAdminServiceImpl.java
+13
-0
MerchantFieldCheckers.java
...uidnet/service/merchant/entity/MerchantFieldCheckers.java
+1
-1
db_merchant.sql
...hant/liquidnet-service-merchant-impl/docu/db_merchant.sql
+1
-1
MerchantFieldsController.java
...service/merchant/controller/MerchantFieldsController.java
+7
-3
MerchantSponsorsController.java
...rvice/merchant/controller/MerchantSponsorsController.java
+7
-3
MerchantFieldAppliesServiceImpl.java
...erchant/service/impl/MerchantFieldAppliesServiceImpl.java
+245
-0
MerchantFieldsServiceImpl.java
...vice/merchant/service/impl/MerchantFieldsServiceImpl.java
+0
-205
MerchantSponsorAppliesServiceImpl.java
...chant/service/impl/MerchantSponsorAppliesServiceImpl.java
+211
-0
MerchantSponsorsServiceImpl.java
...ce/merchant/service/impl/MerchantSponsorsServiceImpl.java
+0
-193
No files found.
liquidnet-bus-api/liquidnet-service-merchant-api/src/main/java/com/liquidnet/service/merchant/service/IMerchantFieldAppliesService.java
0 → 100644
View file @
195dd9ad
package
com
.
liquidnet
.
service
.
merchant
.
service
;
import
com.liquidnet.service.merchant.dto.param.MerchantFieldApplyParam
;
import
com.liquidnet.service.merchant.dto.vo.MerchantFieldAppliesVo
;
public
interface
IMerchantFieldAppliesService
{
String
apply
(
String
uid
,
MerchantFieldApplyParam
parameter
);
void
applyDel
(
String
uid
,
String
fieldApplyId
);
MerchantFieldAppliesVo
applyInfo
(
String
uid
,
String
fieldApplyId
);
}
liquidnet-bus-api/liquidnet-service-merchant-api/src/main/java/com/liquidnet/service/merchant/service/IMerchantFieldsService.java
View file @
195dd9ad
...
@@ -12,13 +12,6 @@ public interface IMerchantFieldsService {
...
@@ -12,13 +12,6 @@ public interface IMerchantFieldsService {
PagedResult
<
MerchantFieldsVo
>
search
(
String
name
,
int
page
,
int
size
);
PagedResult
<
MerchantFieldsVo
>
search
(
String
name
,
int
page
,
int
size
);
String
apply
(
String
uid
,
MerchantFieldApplyParam
parameter
);
void
applyDel
(
String
uid
,
String
fieldApplyId
);
MerchantFieldAppliesVo
applyInfo
(
String
uid
,
String
fieldApplyId
);
void
editIsCheck
(
String
uid
,
String
fieldId
,
int
isCheck
);
void
editIsCheck
(
String
uid
,
String
fieldId
,
int
isCheck
);
...
...
liquidnet-bus-api/liquidnet-service-merchant-api/src/main/java/com/liquidnet/service/merchant/service/IMerchantSponsorAppliesService.java
0 → 100644
View file @
195dd9ad
package
com
.
liquidnet
.
service
.
merchant
.
service
;
import
com.liquidnet.service.merchant.dto.param.MerchantSponsorApplyParam
;
import
com.liquidnet.service.merchant.dto.vo.MerchantSponsorAppliesVo
;
public
interface
IMerchantSponsorAppliesService
{
String
apply
(
String
uid
,
MerchantSponsorApplyParam
parameter
);
void
applyDel
(
String
uid
,
String
sponsorApplyId
);
MerchantSponsorAppliesVo
applyInfo
(
String
uid
,
String
sponsorApplyId
);
}
liquidnet-bus-api/liquidnet-service-merchant-api/src/main/java/com/liquidnet/service/merchant/service/IMerchantSponsorsService.java
View file @
195dd9ad
...
@@ -7,10 +7,4 @@ import com.liquidnet.service.merchant.dto.vo.MerchantSponsorsVo;
...
@@ -7,10 +7,4 @@ import com.liquidnet.service.merchant.dto.vo.MerchantSponsorsVo;
public
interface
IMerchantSponsorsService
{
public
interface
IMerchantSponsorsService
{
PagedResult
<
MerchantSponsorsVo
>
search
(
String
name
,
int
page
,
int
size
);
PagedResult
<
MerchantSponsorsVo
>
search
(
String
name
,
int
page
,
int
size
);
String
apply
(
String
uid
,
MerchantSponsorApplyParam
parameter
);
void
applyDel
(
String
uid
,
String
sponsorApplyId
);
MerchantSponsorAppliesVo
applyInfo
(
String
uid
,
String
sponsorApplyId
);
}
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/merchant/service/IMerchantFieldCheckersAdminService.java
0 → 100644
View file @
195dd9ad
package
com
.
liquidnet
.
client
.
admin
.
zhengzai
.
merchant
.
service
;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.liquidnet.service.merchant.entity.MerchantFieldCheckers
;
public
interface
IMerchantFieldCheckersAdminService
extends
IService
<
MerchantFieldCheckers
>
{
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/merchant/service/impl/MerchantAuthorizationRecordsAdminServiceImpl.java
View file @
195dd9ad
This diff is collapsed.
Click to expand it.
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/merchant/service/impl/MerchantFieldCheckersAdminServiceImpl.java
0 → 100644
View file @
195dd9ad
package
com
.
liquidnet
.
client
.
admin
.
zhengzai
.
merchant
.
service
.
impl
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.liquidnet.client.admin.zhengzai.merchant.service.IMerchantFieldCheckersAdminService
;
import
com.liquidnet.service.merchant.entity.MerchantFieldCheckers
;
import
com.liquidnet.service.merchant.mapper.MerchantFieldCheckersMapper
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.stereotype.Service
;
@Slf4j
@Service
public
class
MerchantFieldCheckersAdminServiceImpl
extends
ServiceImpl
<
MerchantFieldCheckersMapper
,
MerchantFieldCheckers
>
implements
IMerchantFieldCheckersAdminService
{
}
liquidnet-bus-do/liquidnet-service-merchant-do/src/main/java/com/liquidnet/service/merchant/entity/MerchantFieldCheckers.java
View file @
195dd9ad
...
@@ -30,7 +30,7 @@ public class MerchantFieldCheckers implements Serializable {
...
@@ -30,7 +30,7 @@ public class MerchantFieldCheckers implements Serializable {
private
String
fieldCheckerId
;
private
String
fieldCheckerId
;
/**
/**
*
要认领的或创建的
场地ID
* 场地ID
*/
*/
private
String
fieldId
;
private
String
fieldId
;
...
...
liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/docu/db_merchant.sql
View file @
195dd9ad
...
@@ -44,7 +44,7 @@ create table merchant_field_checkers
...
@@ -44,7 +44,7 @@ create table merchant_field_checkers
(
(
mid
bigint
unsigned
auto_increment
primary
key
,
mid
bigint
unsigned
auto_increment
primary
key
,
field_checker_id
varchar
(
64
)
not
null
comment
'field_apply_id'
,
field_checker_id
varchar
(
64
)
not
null
comment
'field_apply_id'
,
field_id
varchar
(
64
)
default
''
not
null
comment
'
要认领的或创建的
场地ID'
,
field_id
varchar
(
64
)
default
''
not
null
comment
'场地ID'
,
uid
varchar
(
64
)
default
''
not
null
comment
'验票员账号'
,
uid
varchar
(
64
)
default
''
not
null
comment
'验票员账号'
,
mobile
varchar
(
255
)
default
''
not
null
comment
'手机号'
,
mobile
varchar
(
255
)
default
''
not
null
comment
'手机号'
,
name
varchar
(
255
)
default
''
not
null
comment
'姓名'
,
name
varchar
(
255
)
default
''
not
null
comment
'姓名'
,
...
...
liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/java/com/liquidnet/service/merchant/controller/MerchantFieldsController.java
View file @
195dd9ad
...
@@ -9,6 +9,7 @@ import com.liquidnet.service.merchant.dto.param.MerchantFieldApplyParam;
...
@@ -9,6 +9,7 @@ import com.liquidnet.service.merchant.dto.param.MerchantFieldApplyParam;
import
com.liquidnet.service.merchant.dto.vo.MerchantFieldAppliesVo
;
import
com.liquidnet.service.merchant.dto.vo.MerchantFieldAppliesVo
;
import
com.liquidnet.service.merchant.dto.vo.MerchantFieldCheckersVo
;
import
com.liquidnet.service.merchant.dto.vo.MerchantFieldCheckersVo
;
import
com.liquidnet.service.merchant.dto.vo.MerchantFieldsVo
;
import
com.liquidnet.service.merchant.dto.vo.MerchantFieldsVo
;
import
com.liquidnet.service.merchant.service.IMerchantFieldAppliesService
;
import
com.liquidnet.service.merchant.service.IMerchantFieldsService
;
import
com.liquidnet.service.merchant.service.IMerchantFieldsService
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiOperation
;
import
io.swagger.annotations.ApiOperation
;
...
@@ -39,6 +40,9 @@ public class MerchantFieldsController {
...
@@ -39,6 +40,9 @@ public class MerchantFieldsController {
@Autowired
@Autowired
IMerchantFieldsService
merchantFieldsService
;
IMerchantFieldsService
merchantFieldsService
;
@Autowired
IMerchantFieldAppliesService
merchantFieldAppliesService
;
@ApiOperationSupport
(
order
=
10
)
@ApiOperationSupport
(
order
=
10
)
@ApiOperation
(
value
=
"场地搜索"
)
@ApiOperation
(
value
=
"场地搜索"
)
@GetMapping
(
"search"
)
@GetMapping
(
"search"
)
...
@@ -54,7 +58,7 @@ public class MerchantFieldsController {
...
@@ -54,7 +58,7 @@ public class MerchantFieldsController {
public
ResponseDto
<
Object
>
apply
(
@Valid
@RequestBody
MerchantFieldApplyParam
parameter
)
{
public
ResponseDto
<
Object
>
apply
(
@Valid
@RequestBody
MerchantFieldApplyParam
parameter
)
{
String
currentUid
=
CurrentUtil
.
getCurrentUid
();
String
currentUid
=
CurrentUtil
.
getCurrentUid
();
return
ResponseDto
.
success
(
merchantFieldsService
.
apply
(
currentUid
,
parameter
));
return
ResponseDto
.
success
(
merchantField
Applie
sService
.
apply
(
currentUid
,
parameter
));
}
}
@ApiOperationSupport
(
order
=
12
)
@ApiOperationSupport
(
order
=
12
)
...
@@ -63,7 +67,7 @@ public class MerchantFieldsController {
...
@@ -63,7 +67,7 @@ public class MerchantFieldsController {
public
ResponseDto
<
Object
>
applyDel
(
@RequestParam
(
required
=
true
)
String
fieldApplyId
)
{
public
ResponseDto
<
Object
>
applyDel
(
@RequestParam
(
required
=
true
)
String
fieldApplyId
)
{
String
currentUid
=
CurrentUtil
.
getCurrentUid
();
String
currentUid
=
CurrentUtil
.
getCurrentUid
();
merchantFieldsService
.
applyDel
(
currentUid
,
fieldApplyId
);
merchantField
Applie
sService
.
applyDel
(
currentUid
,
fieldApplyId
);
return
ResponseDto
.
success
();
return
ResponseDto
.
success
();
}
}
...
@@ -74,7 +78,7 @@ public class MerchantFieldsController {
...
@@ -74,7 +78,7 @@ public class MerchantFieldsController {
public
ResponseDto
<
MerchantFieldAppliesVo
>
applyInfo
(
@RequestParam
(
required
=
true
)
String
fieldApplyId
)
{
public
ResponseDto
<
MerchantFieldAppliesVo
>
applyInfo
(
@RequestParam
(
required
=
true
)
String
fieldApplyId
)
{
String
currentUid
=
CurrentUtil
.
getCurrentUid
();
String
currentUid
=
CurrentUtil
.
getCurrentUid
();
return
ResponseDto
.
success
(
merchantFieldsService
.
applyInfo
(
currentUid
,
fieldApplyId
));
return
ResponseDto
.
success
(
merchantField
Applie
sService
.
applyInfo
(
currentUid
,
fieldApplyId
));
}
}
@ApiOperationSupport
(
order
=
21
)
@ApiOperationSupport
(
order
=
21
)
...
...
liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/java/com/liquidnet/service/merchant/controller/MerchantSponsorsController.java
View file @
195dd9ad
...
@@ -8,6 +8,7 @@ import com.liquidnet.service.base.ResponseDto;
...
@@ -8,6 +8,7 @@ import com.liquidnet.service.base.ResponseDto;
import
com.liquidnet.service.merchant.dto.param.MerchantSponsorApplyParam
;
import
com.liquidnet.service.merchant.dto.param.MerchantSponsorApplyParam
;
import
com.liquidnet.service.merchant.dto.vo.MerchantSponsorsVo
;
import
com.liquidnet.service.merchant.dto.vo.MerchantSponsorsVo
;
import
com.liquidnet.service.merchant.dto.vo.MerchantSponsorAppliesVo
;
import
com.liquidnet.service.merchant.dto.vo.MerchantSponsorAppliesVo
;
import
com.liquidnet.service.merchant.service.IMerchantSponsorAppliesService
;
import
com.liquidnet.service.merchant.service.IMerchantSponsorsService
;
import
com.liquidnet.service.merchant.service.IMerchantSponsorsService
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiOperation
;
import
io.swagger.annotations.ApiOperation
;
...
@@ -37,6 +38,9 @@ public class MerchantSponsorsController {
...
@@ -37,6 +38,9 @@ public class MerchantSponsorsController {
@Autowired
@Autowired
IMerchantSponsorsService
merchantSponsorsService
;
IMerchantSponsorsService
merchantSponsorsService
;
@Autowired
IMerchantSponsorAppliesService
merchantSponsorAppliesService
;
@ApiOperationSupport
(
order
=
10
)
@ApiOperationSupport
(
order
=
10
)
@ApiOperation
(
value
=
"主办搜索"
)
@ApiOperation
(
value
=
"主办搜索"
)
@GetMapping
(
"search"
)
@GetMapping
(
"search"
)
...
@@ -52,7 +56,7 @@ public class MerchantSponsorsController {
...
@@ -52,7 +56,7 @@ public class MerchantSponsorsController {
public
ResponseDto
<
Object
>
apply
(
@Valid
@RequestBody
MerchantSponsorApplyParam
parameter
)
{
public
ResponseDto
<
Object
>
apply
(
@Valid
@RequestBody
MerchantSponsorApplyParam
parameter
)
{
String
currentUid
=
CurrentUtil
.
getCurrentUid
();
String
currentUid
=
CurrentUtil
.
getCurrentUid
();
return
ResponseDto
.
success
(
merchantSponsorsService
.
apply
(
currentUid
,
parameter
));
return
ResponseDto
.
success
(
merchantSponsor
Applie
sService
.
apply
(
currentUid
,
parameter
));
}
}
@ApiOperationSupport
(
order
=
12
)
@ApiOperationSupport
(
order
=
12
)
...
@@ -61,7 +65,7 @@ public class MerchantSponsorsController {
...
@@ -61,7 +65,7 @@ public class MerchantSponsorsController {
public
ResponseDto
<
Object
>
applyDel
(
@RequestParam
(
required
=
true
)
String
sponsorApplyId
)
{
public
ResponseDto
<
Object
>
applyDel
(
@RequestParam
(
required
=
true
)
String
sponsorApplyId
)
{
String
currentUid
=
CurrentUtil
.
getCurrentUid
();
String
currentUid
=
CurrentUtil
.
getCurrentUid
();
merchantSponsorsService
.
applyDel
(
currentUid
,
sponsorApplyId
);
merchantSponsor
Applie
sService
.
applyDel
(
currentUid
,
sponsorApplyId
);
return
ResponseDto
.
success
();
return
ResponseDto
.
success
();
}
}
...
@@ -72,6 +76,6 @@ public class MerchantSponsorsController {
...
@@ -72,6 +76,6 @@ public class MerchantSponsorsController {
public
ResponseDto
<
MerchantSponsorAppliesVo
>
applyInfo
(
@RequestParam
(
required
=
true
)
String
sponsorApplyId
)
{
public
ResponseDto
<
MerchantSponsorAppliesVo
>
applyInfo
(
@RequestParam
(
required
=
true
)
String
sponsorApplyId
)
{
String
currentUid
=
CurrentUtil
.
getCurrentUid
();
String
currentUid
=
CurrentUtil
.
getCurrentUid
();
return
ResponseDto
.
success
(
merchantSponsorsService
.
applyInfo
(
currentUid
,
sponsorApplyId
));
return
ResponseDto
.
success
(
merchantSponsor
Applie
sService
.
applyInfo
(
currentUid
,
sponsorApplyId
));
}
}
}
}
liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/java/com/liquidnet/service/merchant/service/impl/MerchantFieldAppliesServiceImpl.java
0 → 100644
View file @
195dd9ad
This diff is collapsed.
Click to expand it.
liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/java/com/liquidnet/service/merchant/service/impl/MerchantFieldsServiceImpl.java
View file @
195dd9ad
This diff is collapsed.
Click to expand it.
liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/java/com/liquidnet/service/merchant/service/impl/MerchantSponsorAppliesServiceImpl.java
0 → 100644
View file @
195dd9ad
This diff is collapsed.
Click to expand it.
liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/java/com/liquidnet/service/merchant/service/impl/MerchantSponsorsServiceImpl.java
View file @
195dd9ad
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment