记得上下班打卡 | 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
b7a5a46e
Commit
b7a5a46e
authored
Nov 09, 2021
by
Tice
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
小站优化
parent
16811f77
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
258 additions
and
31 deletions
+258
-31
MerchantStationsVo.java
...liquidnet/service/merchant/dto/vo/MerchantStationsVo.java
+43
-0
IMerchantStationsService.java
...et/service/merchant/service/IMerchantStationsService.java
+11
-0
MerchantStationsController.java
...rvice/merchant/controller/MerchantStationsController.java
+48
-0
MerchantFieldsServiceImpl.java
...vice/merchant/service/impl/MerchantFieldsServiceImpl.java
+22
-10
MerchantSponsorsServiceImpl.java
...ce/merchant/service/impl/MerchantSponsorsServiceImpl.java
+26
-5
MerchantStationsServiceImpl.java
...ce/merchant/service/impl/MerchantStationsServiceImpl.java
+89
-0
ObjectUtil.java
.../java/com/liquidnet/service/merchant/util/ObjectUtil.java
+6
-4
errors.properties
...ervice-merchant-impl/src/main/resources/errors.properties
+13
-12
No files found.
liquidnet-bus-api/liquidnet-service-merchant-api/src/main/java/com/liquidnet/service/merchant/dto/vo/MerchantStationsVo.java
0 → 100644
View file @
b7a5a46e
package
com
.
liquidnet
.
service
.
merchant
.
dto
.
vo
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.liquidnet.commons.lang.util.DateUtil
;
import
com.liquidnet.service.merchant.entity.MerchantSponsorApplies
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
java.time.LocalDateTime
;
@ApiModel
(
value
=
"MerchantStationsVo"
,
description
=
"小站"
)
@Data
public
class
MerchantStationsVo
{
@ApiModelProperty
(
position
=
10
,
value
=
"申请类型 field-场地、sponsor-主办"
)
private
String
stationType
;
@ApiModelProperty
(
position
=
11
,
value
=
"申请场地vo"
)
private
MerchantFieldAppliesVo
fieldAppliesVo
;
@ApiModelProperty
(
position
=
12
,
value
=
"申请主办vo"
)
private
MerchantSponsorAppliesVo
sponsorAppliesVo
;
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
DateUtil
.
DATE_FULL_STR
)
private
LocalDateTime
createdAt
;
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
DateUtil
.
DATE_FULL_STR
)
private
LocalDateTime
updatedAt
;
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
DateUtil
.
DATE_FULL_STR
)
private
LocalDateTime
deletedAt
;
private
static
final
MerchantStationsVo
obj
=
new
MerchantStationsVo
();
public
static
MerchantStationsVo
getNew
()
{
try
{
return
(
MerchantStationsVo
)
obj
.
clone
();
}
catch
(
CloneNotSupportedException
e
)
{
e
.
printStackTrace
();
}
return
new
MerchantStationsVo
();
}
}
liquidnet-bus-api/liquidnet-service-merchant-api/src/main/java/com/liquidnet/service/merchant/service/IMerchantStationsService.java
0 → 100644
View file @
b7a5a46e
package
com
.
liquidnet
.
service
.
merchant
.
service
;
import
com.liquidnet.service.merchant.dto.vo.MerchantStationsVo
;
import
java.util.List
;
public
interface
IMerchantStationsService
{
List
<
MerchantStationsVo
>
stationsList
(
String
uid
);
}
liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/java/com/liquidnet/service/merchant/controller/MerchantStationsController.java
0 → 100644
View file @
b7a5a46e
package
com
.
liquidnet
.
service
.
merchant
.
controller
;
import
com.github.xiaoymin.knife4j.annotations.ApiOperationSupport
;
import
com.github.xiaoymin.knife4j.annotations.ApiSupport
;
import
com.liquidnet.commons.lang.util.CurrentUtil
;
import
com.liquidnet.service.base.ResponseDto
;
import
com.liquidnet.service.merchant.dto.vo.MerchantFieldCheckersVo
;
import
com.liquidnet.service.merchant.dto.vo.MerchantStationsVo
;
import
com.liquidnet.service.merchant.service.IMerchantStationsService
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiOperation
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.validation.annotation.Validated
;
import
org.springframework.web.bind.annotation.GetMapping
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
import
java.util.List
;
/**
* <p>
* 小站 前端控制器
* </p>
*
* @author liquidnet
* @since 2021-11-01
*/
@ApiSupport
(
order
=
10010
)
@Api
(
tags
=
"小站"
)
@Slf4j
@Validated
@RestController
@RequestMapping
(
"stations"
)
public
class
MerchantStationsController
{
@Autowired
IMerchantStationsService
merchantStationsService
;
@ApiOperationSupport
(
order
=
10
)
@ApiOperation
(
value
=
"默认小站列表"
)
@GetMapping
(
"list"
)
public
ResponseDto
<
List
<
MerchantStationsVo
>>
stationsList
()
{
String
currentUid
=
CurrentUtil
.
getCurrentUid
();
return
ResponseDto
.
success
(
merchantStationsService
.
stationsList
(
currentUid
));
}
}
liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/java/com/liquidnet/service/merchant/service/impl/MerchantFieldsServiceImpl.java
View file @
b7a5a46e
package
com
.
liquidnet
.
service
.
merchant
.
service
.
impl
;
package
com
.
liquidnet
.
service
.
merchant
.
service
.
impl
;
import
com.fasterxml.jackson.databind.JsonNode
;
import
com.liquidnet.common.exception.LiquidnetServiceException
;
import
com.liquidnet.common.exception.LiquidnetServiceException
;
import
com.liquidnet.commons.lang.util.CollectionUtil
;
import
com.liquidnet.commons.lang.util.CollectionUtil
;
import
com.liquidnet.commons.lang.util.IDGenerator
;
import
com.liquidnet.commons.lang.util.IDGenerator
;
import
com.liquidnet.commons.lang.util.IdentityUtils
;
import
com.liquidnet.commons.lang.util.JsonUtils
;
import
com.liquidnet.service.base.ErrorMapping
;
import
com.liquidnet.service.base.ErrorMapping
;
import
com.liquidnet.service.base.PagedResult
;
import
com.liquidnet.service.base.PagedResult
;
import
com.liquidnet.service.base.SqlMapping
;
import
com.liquidnet.service.base.SqlMapping
;
...
@@ -86,11 +89,11 @@ public class MerchantFieldsServiceImpl implements IMerchantFieldsService {
...
@@ -86,11 +89,11 @@ public class MerchantFieldsServiceImpl implements IMerchantFieldsService {
if
(!
parameter
.
getFieldId
().
isEmpty
())
{
if
(!
parameter
.
getFieldId
().
isEmpty
())
{
fieldsVo
=
merchantRdmService
.
getFieldsVoByFieldId
(
parameter
.
getFieldId
());
fieldsVo
=
merchantRdmService
.
getFieldsVoByFieldId
(
parameter
.
getFieldId
());
if
(
null
==
fieldsVo
)
{
if
(
null
==
fieldsVo
)
{
ErrorMapping
.
ErrorMessage
errorMessage
=
ErrorMapping
.
get
(
"13
0
01"
);
ErrorMapping
.
ErrorMessage
errorMessage
=
ErrorMapping
.
get
(
"13
1
01"
);
throw
new
LiquidnetServiceException
(
errorMessage
.
getCode
(),
errorMessage
.
getMessage
());
throw
new
LiquidnetServiceException
(
errorMessage
.
getCode
(),
errorMessage
.
getMessage
());
}
}
if
(
0
!=
fieldsVo
.
getClaimStatus
())
{
if
(
0
!=
fieldsVo
.
getClaimStatus
())
{
ErrorMapping
.
ErrorMessage
errorMessage
=
ErrorMapping
.
get
(
"13
0
02"
);
ErrorMapping
.
ErrorMessage
errorMessage
=
ErrorMapping
.
get
(
"13
1
02"
);
throw
new
LiquidnetServiceException
(
errorMessage
.
getCode
(),
errorMessage
.
getMessage
());
throw
new
LiquidnetServiceException
(
errorMessage
.
getCode
(),
errorMessage
.
getMessage
());
}
}
}
}
...
@@ -99,7 +102,7 @@ public class MerchantFieldsServiceImpl implements IMerchantFieldsService {
...
@@ -99,7 +102,7 @@ public class MerchantFieldsServiceImpl implements IMerchantFieldsService {
List
<
MerchantFieldAppliesVo
>
fieldAppliesVos
=
merchantRdmService
.
getFieldAppliesVosByUid
(
uid
);
List
<
MerchantFieldAppliesVo
>
fieldAppliesVos
=
merchantRdmService
.
getFieldAppliesVosByUid
(
uid
);
if
(!
CollectionUtils
.
isEmpty
(
fieldAppliesVos
))
{
if
(!
CollectionUtils
.
isEmpty
(
fieldAppliesVos
))
{
if
(
fieldAppliesVos
.
size
()
>=
10
)
{
if
(
fieldAppliesVos
.
size
()
>=
10
)
{
ErrorMapping
.
ErrorMessage
errorMessage
=
ErrorMapping
.
get
(
"13
0
03"
);
ErrorMapping
.
ErrorMessage
errorMessage
=
ErrorMapping
.
get
(
"13
1
03"
);
throw
new
LiquidnetServiceException
(
errorMessage
.
getCode
(),
errorMessage
.
getMessage
());
throw
new
LiquidnetServiceException
(
errorMessage
.
getCode
(),
errorMessage
.
getMessage
());
}
}
}
}
...
@@ -130,6 +133,15 @@ public class MerchantFieldsServiceImpl implements IMerchantFieldsService {
...
@@ -130,6 +133,15 @@ public class MerchantFieldsServiceImpl implements IMerchantFieldsService {
fieldAppliesVo
.
setUid
(
uid
);
fieldAppliesVo
.
setUid
(
uid
);
fieldAppliesVo
.
setCreatedAt
(
now
);
fieldAppliesVo
.
setCreatedAt
(
now
);
// 身份证检查
String
respStr
=
IdentityUtils
.
aliThird
(
fieldAppliesVo
.
getLegalName
(),
fieldAppliesVo
.
getLegalIdentity
());;
JsonNode
respJNode
=
JsonUtils
.
fromJson
(
respStr
,
JsonNode
.
class
);
if
(
null
==
respJNode
||
!
"0"
.
equals
(
respJNode
.
get
(
"error_code"
).
asText
()))
{
log
.
info
(
"###实名认证失败[{}]"
,
respStr
);
ErrorMapping
.
ErrorMessage
errorMessage
=
ErrorMapping
.
get
(
"13001"
);
throw
new
LiquidnetServiceException
(
errorMessage
.
getCode
(),
errorMessage
.
getMessage
());
}
// 申请场地 redis
// 申请场地 redis
s
=
System
.
currentTimeMillis
();
s
=
System
.
currentTimeMillis
();
merchantRdmService
.
addFieldAppliesVoByUid
(
uid
,
fieldAppliesVos
,
fieldAppliesVo
);
merchantRdmService
.
addFieldAppliesVoByUid
(
uid
,
fieldAppliesVos
,
fieldAppliesVo
);
...
@@ -176,7 +188,7 @@ public class MerchantFieldsServiceImpl implements IMerchantFieldsService {
...
@@ -176,7 +188,7 @@ public class MerchantFieldsServiceImpl implements IMerchantFieldsService {
// 查找场地申请,是否存在且已经驳回
// 查找场地申请,是否存在且已经驳回
List
<
MerchantFieldAppliesVo
>
fieldAppliesVos
=
merchantRdmService
.
getFieldAppliesVosByUid
(
uid
);
List
<
MerchantFieldAppliesVo
>
fieldAppliesVos
=
merchantRdmService
.
getFieldAppliesVosByUid
(
uid
);
if
(
CollectionUtils
.
isEmpty
(
fieldAppliesVos
))
{
if
(
CollectionUtils
.
isEmpty
(
fieldAppliesVos
))
{
ErrorMapping
.
ErrorMessage
errorMessage
=
ErrorMapping
.
get
(
"13
0
04"
);
ErrorMapping
.
ErrorMessage
errorMessage
=
ErrorMapping
.
get
(
"13
1
04"
);
throw
new
LiquidnetServiceException
(
errorMessage
.
getCode
(),
errorMessage
.
getMessage
());
throw
new
LiquidnetServiceException
(
errorMessage
.
getCode
(),
errorMessage
.
getMessage
());
}
}
int
idx
=
IntStream
.
range
(
0
,
fieldAppliesVos
.
size
())
int
idx
=
IntStream
.
range
(
0
,
fieldAppliesVos
.
size
())
...
@@ -184,12 +196,12 @@ public class MerchantFieldsServiceImpl implements IMerchantFieldsService {
...
@@ -184,12 +196,12 @@ public class MerchantFieldsServiceImpl implements IMerchantFieldsService {
.
findFirst
()
.
findFirst
()
.
orElse
(-
1
);
.
orElse
(-
1
);
if
(
idx
<
0
)
{
if
(
idx
<
0
)
{
ErrorMapping
.
ErrorMessage
errorMessage
=
ErrorMapping
.
get
(
"13
0
04"
);
ErrorMapping
.
ErrorMessage
errorMessage
=
ErrorMapping
.
get
(
"13
1
04"
);
throw
new
LiquidnetServiceException
(
errorMessage
.
getCode
(),
errorMessage
.
getMessage
());
throw
new
LiquidnetServiceException
(
errorMessage
.
getCode
(),
errorMessage
.
getMessage
());
}
}
MerchantFieldAppliesVo
fieldAppliesVo
=
fieldAppliesVos
.
get
(
idx
);
MerchantFieldAppliesVo
fieldAppliesVo
=
fieldAppliesVos
.
get
(
idx
);
if
(
fieldAppliesVo
.
getApplyStatus
()
!=
2
)
{
if
(
fieldAppliesVo
.
getApplyStatus
()
!=
2
)
{
ErrorMapping
.
ErrorMessage
errorMessage
=
ErrorMapping
.
get
(
"13
0
05"
);
ErrorMapping
.
ErrorMessage
errorMessage
=
ErrorMapping
.
get
(
"13
1
05"
);
throw
new
LiquidnetServiceException
(
errorMessage
.
getCode
(),
errorMessage
.
getMessage
());
throw
new
LiquidnetServiceException
(
errorMessage
.
getCode
(),
errorMessage
.
getMessage
());
}
}
...
@@ -277,7 +289,7 @@ public class MerchantFieldsServiceImpl implements IMerchantFieldsService {
...
@@ -277,7 +289,7 @@ public class MerchantFieldsServiceImpl implements IMerchantFieldsService {
if
(!
CollectionUtils
.
isEmpty
(
fieldCheckersVos
))
{
if
(!
CollectionUtils
.
isEmpty
(
fieldCheckersVos
))
{
for
(
MerchantFieldCheckersVo
vo
:
fieldCheckersVos
)
{
for
(
MerchantFieldCheckersVo
vo
:
fieldCheckersVos
)
{
if
(
vo
.
getUid
().
equals
(
uid
))
{
if
(
vo
.
getUid
().
equals
(
uid
))
{
ErrorMapping
.
ErrorMessage
errorMessage
=
ErrorMapping
.
get
(
"13
0
11"
);
ErrorMapping
.
ErrorMessage
errorMessage
=
ErrorMapping
.
get
(
"13
1
11"
);
throw
new
LiquidnetServiceException
(
errorMessage
.
getCode
(),
errorMessage
.
getMessage
());
throw
new
LiquidnetServiceException
(
errorMessage
.
getCode
(),
errorMessage
.
getMessage
());
}
}
}
}
...
@@ -324,7 +336,7 @@ public class MerchantFieldsServiceImpl implements IMerchantFieldsService {
...
@@ -324,7 +336,7 @@ public class MerchantFieldsServiceImpl implements IMerchantFieldsService {
// 查找场地默认验票员,是否已经添加
// 查找场地默认验票员,是否已经添加
List
<
MerchantFieldCheckersVo
>
fieldCheckersVos
=
merchantRdmService
.
getFieldCheckersVosByFieldId
(
fieldId
);
List
<
MerchantFieldCheckersVo
>
fieldCheckersVos
=
merchantRdmService
.
getFieldCheckersVosByFieldId
(
fieldId
);
if
(
CollectionUtils
.
isEmpty
(
fieldCheckersVos
))
{
if
(
CollectionUtils
.
isEmpty
(
fieldCheckersVos
))
{
ErrorMapping
.
ErrorMessage
errorMessage
=
ErrorMapping
.
get
(
"13
0
12"
);
ErrorMapping
.
ErrorMessage
errorMessage
=
ErrorMapping
.
get
(
"13
1
12"
);
throw
new
LiquidnetServiceException
(
errorMessage
.
getCode
(),
errorMessage
.
getMessage
());
throw
new
LiquidnetServiceException
(
errorMessage
.
getCode
(),
errorMessage
.
getMessage
());
}
}
int
idx
=
IntStream
.
range
(
0
,
fieldCheckersVos
.
size
())
int
idx
=
IntStream
.
range
(
0
,
fieldCheckersVos
.
size
())
...
@@ -332,7 +344,7 @@ public class MerchantFieldsServiceImpl implements IMerchantFieldsService {
...
@@ -332,7 +344,7 @@ public class MerchantFieldsServiceImpl implements IMerchantFieldsService {
.
findFirst
()
.
findFirst
()
.
orElse
(-
1
);
.
orElse
(-
1
);
if
(
idx
<
0
)
{
if
(
idx
<
0
)
{
ErrorMapping
.
ErrorMessage
errorMessage
=
ErrorMapping
.
get
(
"13
0
12"
);
ErrorMapping
.
ErrorMessage
errorMessage
=
ErrorMapping
.
get
(
"13
1
12"
);
throw
new
LiquidnetServiceException
(
errorMessage
.
getCode
(),
errorMessage
.
getMessage
());
throw
new
LiquidnetServiceException
(
errorMessage
.
getCode
(),
errorMessage
.
getMessage
());
}
}
...
@@ -369,7 +381,7 @@ public class MerchantFieldsServiceImpl implements IMerchantFieldsService {
...
@@ -369,7 +381,7 @@ public class MerchantFieldsServiceImpl implements IMerchantFieldsService {
// 当前用户是否管理该场地
// 当前用户是否管理该场地
MerchantFieldsVo
fieldsVo
=
merchantRdmService
.
getFieldsVoByFieldId
(
fieldId
);
MerchantFieldsVo
fieldsVo
=
merchantRdmService
.
getFieldsVoByFieldId
(
fieldId
);
if
(
null
==
fieldsVo
||
!
fieldsVo
.
getUid
().
equals
(
uid
))
{
if
(
null
==
fieldsVo
||
!
fieldsVo
.
getUid
().
equals
(
uid
))
{
ErrorMapping
.
ErrorMessage
errorMessage
=
ErrorMapping
.
get
(
"13
0
01"
);
ErrorMapping
.
ErrorMessage
errorMessage
=
ErrorMapping
.
get
(
"13
1
01"
);
throw
new
LiquidnetServiceException
(
errorMessage
.
getCode
(),
errorMessage
.
getMessage
());
throw
new
LiquidnetServiceException
(
errorMessage
.
getCode
(),
errorMessage
.
getMessage
());
}
}
return
fieldsVo
;
return
fieldsVo
;
...
...
liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/java/com/liquidnet/service/merchant/service/impl/MerchantSponsorsServiceImpl.java
View file @
b7a5a46e
package
com
.
liquidnet
.
service
.
merchant
.
service
.
impl
;
package
com
.
liquidnet
.
service
.
merchant
.
service
.
impl
;
import
com.fasterxml.jackson.databind.JsonNode
;
import
com.liquidnet.common.exception.LiquidnetServiceException
;
import
com.liquidnet.common.exception.LiquidnetServiceException
;
import
com.liquidnet.commons.lang.util.CollectionUtil
;
import
com.liquidnet.commons.lang.util.CollectionUtil
;
import
com.liquidnet.commons.lang.util.IDGenerator
;
import
com.liquidnet.commons.lang.util.IDGenerator
;
import
com.liquidnet.commons.lang.util.IdentityUtils
;
import
com.liquidnet.commons.lang.util.JsonUtils
;
import
com.liquidnet.service.base.ErrorMapping
;
import
com.liquidnet.service.base.ErrorMapping
;
import
com.liquidnet.service.base.SqlMapping
;
import
com.liquidnet.service.base.SqlMapping
;
import
com.liquidnet.service.base.constant.MQConst
;
import
com.liquidnet.service.base.constant.MQConst
;
...
@@ -40,7 +43,7 @@ public class MerchantSponsorsServiceImpl implements IMerchantSponsorsService {
...
@@ -40,7 +43,7 @@ public class MerchantSponsorsServiceImpl implements IMerchantSponsorsService {
List
<
MerchantSponsorAppliesVo
>
sponsorAppliesVos
=
merchantRdmService
.
getSponsorAppliesVosByUid
(
uid
);
List
<
MerchantSponsorAppliesVo
>
sponsorAppliesVos
=
merchantRdmService
.
getSponsorAppliesVosByUid
(
uid
);
if
(!
CollectionUtils
.
isEmpty
(
sponsorAppliesVos
))
{
if
(!
CollectionUtils
.
isEmpty
(
sponsorAppliesVos
))
{
if
(
sponsorAppliesVos
.
size
()
>=
10
)
{
if
(
sponsorAppliesVos
.
size
()
>=
10
)
{
ErrorMapping
.
ErrorMessage
errorMessage
=
ErrorMapping
.
get
(
"13
02
1"
);
ErrorMapping
.
ErrorMessage
errorMessage
=
ErrorMapping
.
get
(
"13
20
1"
);
throw
new
LiquidnetServiceException
(
errorMessage
.
getCode
(),
errorMessage
.
getMessage
());
throw
new
LiquidnetServiceException
(
errorMessage
.
getCode
(),
errorMessage
.
getMessage
());
}
}
}
}
...
@@ -72,11 +75,29 @@ public class MerchantSponsorsServiceImpl implements IMerchantSponsorsService {
...
@@ -72,11 +75,29 @@ public class MerchantSponsorsServiceImpl implements IMerchantSponsorsService {
||
sponsorAppliesVo
.
getLegalIdentity
().
isEmpty
()
||
sponsorAppliesVo
.
getLegalIdentity
().
isEmpty
()
||
sponsorAppliesVo
.
getLegalIdentityObverse
().
isEmpty
()
||
sponsorAppliesVo
.
getLegalIdentityObverse
().
isEmpty
()
||
sponsorAppliesVo
.
getLegalIdentityReverse
().
isEmpty
())
{
||
sponsorAppliesVo
.
getLegalIdentityReverse
().
isEmpty
())
{
ErrorMapping
.
ErrorMessage
errorMessage
=
ErrorMapping
.
get
(
"13
02
2"
);
ErrorMapping
.
ErrorMessage
errorMessage
=
ErrorMapping
.
get
(
"13
20
2"
);
throw
new
LiquidnetServiceException
(
errorMessage
.
getCode
(),
errorMessage
.
getMessage
());
throw
new
LiquidnetServiceException
(
errorMessage
.
getCode
(),
errorMessage
.
getMessage
());
}
}
// 身份证检查
// String respStr = IdentityUtils.aliThird(sponsorAppliesVo.getLegalName(), sponsorAppliesVo.getLegalIdentity());;
// JsonNode respJNode = JsonUtils.fromJson(respStr, JsonNode.class);
// if (null == respJNode || !"0".equals(respJNode.get("error_code").asText())) {
// log.info("###法人实名认证失败[{}]", respStr);
// ErrorMapping.ErrorMessage errorMessage = ErrorMapping.get("13001");
// throw new LiquidnetServiceException(errorMessage.getCode(), errorMessage.getMessage());
// }
}
}
// 身份证检查
// String respStr = IdentityUtils.aliThird(sponsorAppliesVo.getContactName(), sponsorAppliesVo.getContactIdentity());;
// JsonNode respJNode = JsonUtils.fromJson(respStr, JsonNode.class);
// if (null == respJNode || !"0".equals(respJNode.get("error_code").asText())) {
// log.info("###联系人实名认证失败[{}]", respStr);
// ErrorMapping.ErrorMessage errorMessage = ErrorMapping.get("13001");
// throw new LiquidnetServiceException(errorMessage.getCode(), errorMessage.getMessage());
// }
// 申请主办 redis
// 申请主办 redis
long
s
=
System
.
currentTimeMillis
();
long
s
=
System
.
currentTimeMillis
();
merchantRdmService
.
addSponsorAppliesVoByUid
(
uid
,
sponsorAppliesVos
,
sponsorAppliesVo
);
merchantRdmService
.
addSponsorAppliesVoByUid
(
uid
,
sponsorAppliesVos
,
sponsorAppliesVo
);
...
@@ -108,7 +129,7 @@ public class MerchantSponsorsServiceImpl implements IMerchantSponsorsService {
...
@@ -108,7 +129,7 @@ public class MerchantSponsorsServiceImpl implements IMerchantSponsorsService {
// 查找场地申请,是否存在且已经驳回
// 查找场地申请,是否存在且已经驳回
List
<
MerchantSponsorAppliesVo
>
sponsorAppliesVos
=
merchantRdmService
.
getSponsorAppliesVosByUid
(
uid
);
List
<
MerchantSponsorAppliesVo
>
sponsorAppliesVos
=
merchantRdmService
.
getSponsorAppliesVosByUid
(
uid
);
if
(
CollectionUtils
.
isEmpty
(
sponsorAppliesVos
))
{
if
(
CollectionUtils
.
isEmpty
(
sponsorAppliesVos
))
{
ErrorMapping
.
ErrorMessage
errorMessage
=
ErrorMapping
.
get
(
"13
02
3"
);
ErrorMapping
.
ErrorMessage
errorMessage
=
ErrorMapping
.
get
(
"13
20
3"
);
throw
new
LiquidnetServiceException
(
errorMessage
.
getCode
(),
errorMessage
.
getMessage
());
throw
new
LiquidnetServiceException
(
errorMessage
.
getCode
(),
errorMessage
.
getMessage
());
}
}
int
idx
=
IntStream
.
range
(
0
,
sponsorAppliesVos
.
size
())
int
idx
=
IntStream
.
range
(
0
,
sponsorAppliesVos
.
size
())
...
@@ -116,12 +137,12 @@ public class MerchantSponsorsServiceImpl implements IMerchantSponsorsService {
...
@@ -116,12 +137,12 @@ public class MerchantSponsorsServiceImpl implements IMerchantSponsorsService {
.
findFirst
()
.
findFirst
()
.
orElse
(-
1
);
.
orElse
(-
1
);
if
(
idx
<
0
)
{
if
(
idx
<
0
)
{
ErrorMapping
.
ErrorMessage
errorMessage
=
ErrorMapping
.
get
(
"13
02
3"
);
ErrorMapping
.
ErrorMessage
errorMessage
=
ErrorMapping
.
get
(
"13
20
3"
);
throw
new
LiquidnetServiceException
(
errorMessage
.
getCode
(),
errorMessage
.
getMessage
());
throw
new
LiquidnetServiceException
(
errorMessage
.
getCode
(),
errorMessage
.
getMessage
());
}
}
MerchantSponsorAppliesVo
sponsorAppliesVo
=
sponsorAppliesVos
.
get
(
idx
);
MerchantSponsorAppliesVo
sponsorAppliesVo
=
sponsorAppliesVos
.
get
(
idx
);
if
(
sponsorAppliesVo
.
getApplyStatus
()
!=
2
)
{
if
(
sponsorAppliesVo
.
getApplyStatus
()
!=
2
)
{
ErrorMapping
.
ErrorMessage
errorMessage
=
ErrorMapping
.
get
(
"13
02
4"
);
ErrorMapping
.
ErrorMessage
errorMessage
=
ErrorMapping
.
get
(
"13
20
4"
);
throw
new
LiquidnetServiceException
(
errorMessage
.
getCode
(),
errorMessage
.
getMessage
());
throw
new
LiquidnetServiceException
(
errorMessage
.
getCode
(),
errorMessage
.
getMessage
());
}
}
...
...
liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/java/com/liquidnet/service/merchant/service/impl/MerchantStationsServiceImpl.java
0 → 100644
View file @
b7a5a46e
package
com
.
liquidnet
.
service
.
merchant
.
service
.
impl
;
import
com.liquidnet.service.merchant.dto.vo.MerchantFieldAppliesVo
;
import
com.liquidnet.service.merchant.dto.vo.MerchantSponsorAppliesVo
;
import
com.liquidnet.service.merchant.dto.vo.MerchantStationsVo
;
import
com.liquidnet.service.merchant.service.IMerchantStationsService
;
import
com.liquidnet.service.merchant.service.MerchantRdmService
;
import
com.liquidnet.service.merchant.util.ObjectUtil
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.util.CollectionUtils
;
import
java.util.Comparator
;
import
java.util.List
;
@Slf4j
@Service
public
class
MerchantStationsServiceImpl
implements
IMerchantStationsService
{
@Autowired
MerchantRdmService
merchantRdmService
;
@Override
public
List
<
MerchantStationsVo
>
stationsList
(
String
uid
)
{
List
<
MerchantStationsVo
>
vos
=
ObjectUtil
.
getMerchantStationsVosArrayList
();
List
<
MerchantFieldAppliesVo
>
fieldAppliesVos
=
merchantRdmService
.
getFieldAppliesVosByUid
(
uid
);
if
(!
CollectionUtils
.
isEmpty
(
fieldAppliesVos
))
{
for
(
MerchantFieldAppliesVo
fieldAppliesVo
:
fieldAppliesVos
)
{
MerchantFieldAppliesVo
appliesVo
=
MerchantFieldAppliesVo
.
getNew
();
appliesVo
.
setFieldApplyId
(
fieldAppliesVo
.
getFieldApplyId
());
appliesVo
.
setApplyStatus
(
fieldAppliesVo
.
getApplyStatus
());
appliesVo
.
setApplyType
(
fieldAppliesVo
.
getApplyType
());
appliesVo
.
setReject
(
fieldAppliesVo
.
getReject
());
appliesVo
.
setUid
(
fieldAppliesVo
.
getUid
());
appliesVo
.
setFieldId
(
fieldAppliesVo
.
getFieldId
());
appliesVo
.
setName
(
fieldAppliesVo
.
getName
());
appliesVo
.
setLogo
(
fieldAppliesVo
.
getLogo
());
appliesVo
.
setBackground
(
fieldAppliesVo
.
getBackground
());
appliesVo
.
setDescription
(
fieldAppliesVo
.
getDescription
());
appliesVo
.
setBuiltDate
(
fieldAppliesVo
.
getBuiltDate
());
appliesVo
.
setCreatedAt
(
fieldAppliesVo
.
getCreatedAt
());
appliesVo
.
setUpdatedAt
(
fieldAppliesVo
.
getUpdatedAt
());
appliesVo
.
setDeletedAt
(
fieldAppliesVo
.
getDeletedAt
());
MerchantStationsVo
vo
=
MerchantStationsVo
.
getNew
();
vo
.
setStationType
(
"field"
);
vo
.
setFieldAppliesVo
(
appliesVo
);
vo
.
setCreatedAt
(
appliesVo
.
getCreatedAt
());
vo
.
setUpdatedAt
(
appliesVo
.
getUpdatedAt
());
vo
.
setDeletedAt
(
appliesVo
.
getDeletedAt
());
vos
.
add
(
vo
);
}
}
List
<
MerchantSponsorAppliesVo
>
sponsorAppliesVos
=
merchantRdmService
.
getSponsorAppliesVosByUid
(
uid
);
if
(!
CollectionUtils
.
isEmpty
(
sponsorAppliesVos
))
{
for
(
MerchantSponsorAppliesVo
sponsorAppliesVo
:
sponsorAppliesVos
)
{
MerchantSponsorAppliesVo
appliesVo
=
MerchantSponsorAppliesVo
.
getNew
();
appliesVo
.
setSponsorApplyId
(
sponsorAppliesVo
.
getSponsorApplyId
());
appliesVo
.
setApplyStatus
(
sponsorAppliesVo
.
getApplyStatus
());
appliesVo
.
setApplyType
(
sponsorAppliesVo
.
getApplyType
());
appliesVo
.
setReject
(
sponsorAppliesVo
.
getReject
());
appliesVo
.
setUid
(
sponsorAppliesVo
.
getUid
());
appliesVo
.
setName
(
sponsorAppliesVo
.
getName
());
appliesVo
.
setLogo
(
sponsorAppliesVo
.
getLogo
());
appliesVo
.
setBackground
(
sponsorAppliesVo
.
getBackground
());
appliesVo
.
setDescription
(
sponsorAppliesVo
.
getDescription
());
appliesVo
.
setCreatedAt
(
sponsorAppliesVo
.
getCreatedAt
());
appliesVo
.
setUpdatedAt
(
sponsorAppliesVo
.
getUpdatedAt
());
appliesVo
.
setDeletedAt
(
sponsorAppliesVo
.
getDeletedAt
());
MerchantStationsVo
vo
=
MerchantStationsVo
.
getNew
();
vo
.
setStationType
(
"sponsor"
);
vo
.
setSponsorAppliesVo
(
appliesVo
);
vo
.
setCreatedAt
(
appliesVo
.
getCreatedAt
());
vo
.
setUpdatedAt
(
appliesVo
.
getUpdatedAt
());
vo
.
setDeletedAt
(
appliesVo
.
getDeletedAt
());
vos
.
add
(
vo
);
}
}
vos
.
sort
(
Comparator
.
comparing
(
MerchantStationsVo:
:
getCreatedAt
).
reversed
());
return
vos
;
}
}
liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/java/com/liquidnet/service/merchant/util/ObjectUtil.java
View file @
b7a5a46e
package
com
.
liquidnet
.
service
.
merchant
.
util
;
package
com
.
liquidnet
.
service
.
merchant
.
util
;
import
com.liquidnet.service.base.PagedResult
;
import
com.liquidnet.service.base.PagedResult
;
import
com.liquidnet.service.merchant.dto.vo.MerchantFieldAppliesVo
;
import
com.liquidnet.service.merchant.dto.vo.*
;
import
com.liquidnet.service.merchant.dto.vo.MerchantFieldCheckersVo
;
import
com.liquidnet.service.merchant.dto.vo.MerchantFieldsVo
;
import
com.liquidnet.service.merchant.dto.vo.MerchantSponsorAppliesVo
;
import
com.mongodb.BasicDBObject
;
import
com.mongodb.BasicDBObject
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
public
class
ObjectUtil
{
public
class
ObjectUtil
{
private
static
final
ArrayList
<
MerchantStationsVo
>
merchantStationsVosArrayList
=
new
ArrayList
<>();
private
static
final
ArrayList
<
MerchantFieldAppliesVo
>
merchantFieldAppliesVoArrayList
=
new
ArrayList
<>();
private
static
final
ArrayList
<
MerchantFieldAppliesVo
>
merchantFieldAppliesVoArrayList
=
new
ArrayList
<>();
private
static
final
ArrayList
<
MerchantFieldCheckersVo
>
merchantFieldCheckersVoArrayList
=
new
ArrayList
<>();
private
static
final
ArrayList
<
MerchantFieldCheckersVo
>
merchantFieldCheckersVoArrayList
=
new
ArrayList
<>();
...
@@ -22,6 +20,10 @@ public class ObjectUtil {
...
@@ -22,6 +20,10 @@ public class ObjectUtil {
private
static
final
BasicDBObject
basicDBObject
=
new
BasicDBObject
();
private
static
final
BasicDBObject
basicDBObject
=
new
BasicDBObject
();
public
static
ArrayList
<
MerchantStationsVo
>
getMerchantStationsVosArrayList
()
{
return
(
ArrayList
<
MerchantStationsVo
>)
merchantStationsVosArrayList
.
clone
();
}
public
static
ArrayList
<
MerchantFieldAppliesVo
>
getMerchantFieldAppliesVoArrayList
()
{
public
static
ArrayList
<
MerchantFieldAppliesVo
>
getMerchantFieldAppliesVoArrayList
()
{
return
(
ArrayList
<
MerchantFieldAppliesVo
>)
merchantFieldAppliesVoArrayList
.
clone
();
return
(
ArrayList
<
MerchantFieldAppliesVo
>)
merchantFieldAppliesVoArrayList
.
clone
();
}
}
...
...
liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/resources/errors.properties
View file @
b7a5a46e
...
@@ -3,19 +3,20 @@
...
@@ -3,19 +3,20 @@
40003
=
登录已过期
40003
=
登录已过期
# ------------------------ 4开头错误码作系统保留
# ------------------------ 4开头错误码作系统保留
13001
=
法人姓名与身份证不匹配
13002
=
联系人姓名与身份证不匹配
13
0
01
=
场地不存在,请核实
13
1
01
=
场地不存在,请核实
13
0
02
=
场地已被认领
13
1
02
=
场地已被认领
13
0
03
=
场地申请已达到上限
13
1
03
=
场地申请已达到上限
13
004
=
场地
申请不存在,请核实
13
104
=
申请不存在,请核实
13
005
=
场地
申请未驳回,不能删除
13
105
=
申请未驳回,不能删除
13111
=
验票员已存在
13112
=
验票员不存在
13011
=
验票员已存在
13012
=
验票员不存在
13201
=
主办申请已经达到上限
13021
=
主办申请已经达到上限
13202
=
主办公司信息不能为空
13022
=
主办公司信息不能为空
13203
=
申请不存在,请核实
13023
=
场地申请不存在,请核实
13204
=
申请未驳回,不能删除
13024
=
场地申请未驳回,不能删除
\ No newline at end of file
\ No newline at end of file
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