记得上下班打卡 | 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
6606d29c
Commit
6606d29c
authored
Nov 24, 2021
by
Tice
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加主办和场地编辑接口
parent
1e3be563
Changes
19
Hide whitespace changes
Inline
Side-by-side
Showing
19 changed files
with
301 additions
and
20 deletions
+301
-20
MerchantFieldEditParam.java
...et/service/merchant/dto/param/MerchantFieldEditParam.java
+72
-0
MerchantSponsorApplyParam.java
...service/merchant/dto/param/MerchantSponsorApplyParam.java
+1
-1
MerchantSponsorEditParam.java
.../service/merchant/dto/param/MerchantSponsorEditParam.java
+36
-0
MerchantFieldListParam.java
...vice/merchant/dto/param/admin/MerchantFieldListParam.java
+13
-1
MerchantSponsorListParam.java
...ce/merchant/dto/param/admin/MerchantSponsorListParam.java
+9
-1
IMerchantFieldsService.java
...dnet/service/merchant/service/IMerchantFieldsService.java
+3
-0
IMerchantSponsorsService.java
...et/service/merchant/service/IMerchantSponsorsService.java
+3
-0
MerchantFieldsController.java
...ontroller/zhengzai/merchant/MerchantFieldsController.java
+2
-2
MerchantSponsorsController.java
...troller/zhengzai/merchant/MerchantSponsorsController.java
+2
-2
applyList.html
...n/resources/templates/zhengzai/kylin/field/applyList.html
+1
-1
list.html
...c/main/resources/templates/zhengzai/kylin/field/list.html
+2
-2
applyList.html
...resources/templates/zhengzai/kylin/sponsor/applyList.html
+1
-1
list.html
...main/resources/templates/zhengzai/kylin/sponsor/list.html
+3
-3
MerchantFieldsController.java
...service/merchant/controller/MerchantFieldsController.java
+17
-3
MerchantSponsorsController.java
...rvice/merchant/controller/MerchantSponsorsController.java
+13
-0
MerchantMongoService.java
...uidnet/service/merchant/service/MerchantMongoService.java
+20
-2
MerchantFieldsServiceImpl.java
...vice/merchant/service/impl/MerchantFieldsServiceImpl.java
+45
-0
MerchantSponsorsServiceImpl.java
...ce/merchant/service/impl/MerchantSponsorsServiceImpl.java
+55
-1
sqlmap.properties
...ervice-merchant-impl/src/main/resources/sqlmap.properties
+3
-0
No files found.
liquidnet-bus-api/liquidnet-service-merchant-api/src/main/java/com/liquidnet/service/merchant/dto/param/MerchantFieldEditParam.java
0 → 100644
View file @
6606d29c
package
com
.
liquidnet
.
service
.
merchant
.
dto
.
param
;
import
com.liquidnet.commons.lang.constant.LnsRegex
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
javax.validation.constraints.NotBlank
;
import
javax.validation.constraints.NotNull
;
import
javax.validation.constraints.Pattern
;
import
javax.validation.constraints.Size
;
@ApiModel
(
value
=
"MerchantFieldEditParam"
,
description
=
"编辑场地入参"
)
@Data
public
class
MerchantFieldEditParam
implements
java
.
io
.
Serializable
{
private
static
final
long
serialVersionUID
=
7831800656130696525L
;
@ApiModelProperty
(
position
=
10
,
required
=
true
,
value
=
"场地ID"
)
@NotBlank
(
message
=
"场地ID不能为空"
)
private
String
fieldId
;
@ApiModelProperty
(
position
=
11
,
required
=
true
,
value
=
"场地名称[30]"
,
example
=
"测试"
)
@Size
(
max
=
30
,
message
=
"场地长度限制1-30位"
)
@NotBlank
(
message
=
"名称不能为空"
)
private
String
name
;
@ApiModelProperty
(
position
=
12
,
required
=
true
,
value
=
"logo图"
,
example
=
"https://img.zhengzai.tv/partner/2019/05/14/5cda2d0520177.png"
)
@NotBlank
(
message
=
"logo图不能为空"
)
private
String
logo
;
@ApiModelProperty
(
position
=
13
,
required
=
true
,
value
=
"背景图"
,
example
=
"https://img.zhengzai.tv/partner/2019/05/14/5cda2d0520177.png"
)
@NotBlank
(
message
=
"背景图不能为空"
)
private
String
background
;
@ApiModelProperty
(
position
=
14
,
required
=
true
,
value
=
"介绍[1000]"
,
example
=
"这是一段介绍文字"
)
private
String
description
;
@ApiModelProperty
(
position
=
15
,
required
=
true
,
value
=
"建立日期[yyyy-MM-dd]"
,
example
=
"2021-05-17"
)
@Pattern
(
regexp
=
LnsRegex
.
Valid
.
DATETIME_YMD
,
message
=
"建立日期格式有误"
)
private
String
builtDate
;
@ApiModelProperty
(
position
=
16
,
required
=
true
,
value
=
"省id"
)
@NotNull
(
message
=
"省id不能为null"
)
private
String
provinceId
;
@ApiModelProperty
(
position
=
17
,
required
=
true
,
value
=
"省名称"
)
@NotNull
(
message
=
"省名称不能为null"
)
private
String
provinceName
;
@ApiModelProperty
(
position
=
18
,
required
=
true
,
value
=
"城市id"
)
@NotNull
(
message
=
"城市id不能为null"
)
private
String
cityId
;
@ApiModelProperty
(
position
=
19
,
required
=
true
,
value
=
"城市名称"
)
@NotNull
(
message
=
"城市名称不能为null"
)
private
String
cityName
;
@ApiModelProperty
(
position
=
20
,
required
=
true
,
value
=
"县id"
)
@NotNull
(
message
=
"县id不能为null"
)
private
String
districtId
;
@ApiModelProperty
(
position
=
21
,
required
=
true
,
value
=
"县名称"
)
@NotNull
(
message
=
"县名称不能为null"
)
private
String
districtName
;
@ApiModelProperty
(
position
=
22
,
required
=
true
,
value
=
"详细地址[100]"
,
example
=
"广渠路1号创1958园区"
)
@Size
(
max
=
100
,
message
=
"已超出详细地址长度限制"
)
private
String
address
;
@ApiModelProperty
(
position
=
23
,
required
=
true
,
value
=
"经度"
)
@NotNull
()
private
String
longitude
;
@ApiModelProperty
(
position
=
24
,
required
=
true
,
value
=
"纬度"
)
@NotNull
()
private
String
latitude
;
@ApiModelProperty
(
position
=
25
,
required
=
true
,
value
=
"联系人姓名"
,
example
=
"张三"
)
@NotNull
()
private
String
contactName
;
@ApiModelProperty
(
position
=
26
,
required
=
true
,
value
=
"联系人邮箱"
,
example
=
"zhangsan@zhengzai.tv"
)
@NotNull
()
private
String
contactEmail
;
}
liquidnet-bus-api/liquidnet-service-merchant-api/src/main/java/com/liquidnet/service/merchant/dto/param/MerchantSponsorApplyParam.java
View file @
6606d29c
...
@@ -13,7 +13,7 @@ import javax.validation.constraints.Size;
...
@@ -13,7 +13,7 @@ import javax.validation.constraints.Size;
@ApiModel
(
value
=
"MerchantSponsorApplyParam"
,
description
=
"创建主办入参"
)
@ApiModel
(
value
=
"MerchantSponsorApplyParam"
,
description
=
"创建主办入参"
)
@Data
@Data
public
class
MerchantSponsorApplyParam
implements
java
.
io
.
Serializable
{
public
class
MerchantSponsorApplyParam
implements
java
.
io
.
Serializable
{
private
static
final
long
serialVersionUID
=
5869673418720222889L
;
private
static
final
long
serialVersionUID
=
5869673418720222889L
;
@ApiModelProperty
(
position
=
10
,
required
=
true
,
value
=
"是否跳过企业信息 0不跳过 1跳过"
)
@ApiModelProperty
(
position
=
10
,
required
=
true
,
value
=
"是否跳过企业信息 0不跳过 1跳过"
)
...
...
liquidnet-bus-api/liquidnet-service-merchant-api/src/main/java/com/liquidnet/service/merchant/dto/param/MerchantSponsorEditParam.java
0 → 100644
View file @
6606d29c
package
com
.
liquidnet
.
service
.
merchant
.
dto
.
param
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
javax.validation.constraints.NotBlank
;
import
javax.validation.constraints.NotNull
;
import
javax.validation.constraints.Size
;
@ApiModel
(
value
=
"MerchantSponsorEditParam"
,
description
=
"编辑主办入参"
)
@Data
public
class
MerchantSponsorEditParam
implements
java
.
io
.
Serializable
{
private
static
final
long
serialVersionUID
=
-
2088609830098635915L
;
@ApiModelProperty
(
position
=
10
,
required
=
true
,
value
=
"主办ID"
)
@NotBlank
(
message
=
"主办ID不能为空"
)
private
String
sponsorId
;
@ApiModelProperty
(
position
=
11
,
required
=
true
,
value
=
"主办名称[30]"
,
example
=
"测试"
)
@Size
(
max
=
30
,
message
=
"主办名称长度限制1-30位"
)
@NotBlank
(
message
=
"名称不能为空"
)
private
String
name
;
@ApiModelProperty
(
position
=
12
,
required
=
true
,
value
=
"logo图"
,
example
=
"https://img.zhengzai.tv/partner/2019/05/14/5cda2d0520177.png"
)
@NotBlank
(
message
=
"logo图不能为空"
)
private
String
logo
;
@ApiModelProperty
(
position
=
13
,
required
=
true
,
value
=
"背景图"
,
example
=
"https://img.zhengzai.tv/partner/2019/05/14/5cda2d0520177.png"
)
@NotBlank
(
message
=
"背景图不能为空"
)
private
String
background
;
@ApiModelProperty
(
position
=
14
,
required
=
true
,
value
=
"介绍[1000]"
,
example
=
"这是一段介绍文字"
)
private
String
description
;
@ApiModelProperty
(
position
=
19
,
required
=
true
,
value
=
"联系人邮箱"
,
example
=
"zhangsan@zhengzai.tv"
)
@NotNull
private
String
contactEmail
;
}
liquidnet-bus-api/liquidnet-service-merchant-api/src/main/java/com/liquidnet/service/merchant/dto/param/admin/MerchantField
s
ListParam.java
→
liquidnet-bus-api/liquidnet-service-merchant-api/src/main/java/com/liquidnet/service/merchant/dto/param/admin/MerchantFieldListParam.java
View file @
6606d29c
package
com
.
liquidnet
.
service
.
merchant
.
dto
.
param
.
admin
;
package
com
.
liquidnet
.
service
.
merchant
.
dto
.
param
.
admin
;
public
class
MerchantField
s
ListParam
{
public
class
MerchantFieldListParam
{
/**
/**
* 场地Id
* 场地Id
...
@@ -23,11 +23,23 @@ public class MerchantFieldsListParam {
...
@@ -23,11 +23,23 @@ public class MerchantFieldsListParam {
return
fieldId
;
return
fieldId
;
}
}
public
void
setFieldId
(
String
fieldId
)
{
this
.
fieldId
=
fieldId
;
}
public
Integer
getIsOnline
()
{
public
Integer
getIsOnline
()
{
return
isOnline
;
return
isOnline
;
}
}
public
void
setIsOnline
(
Integer
isOnline
)
{
this
.
isOnline
=
isOnline
;
}
public
Integer
getClaimStatus
()
{
public
Integer
getClaimStatus
()
{
return
claimStatus
;
return
claimStatus
;
}
}
public
void
setClaimStatus
(
Integer
claimStatus
)
{
this
.
claimStatus
=
claimStatus
;
}
}
}
liquidnet-bus-api/liquidnet-service-merchant-api/src/main/java/com/liquidnet/service/merchant/dto/param/admin/MerchantSponsor
s
ListParam.java
→
liquidnet-bus-api/liquidnet-service-merchant-api/src/main/java/com/liquidnet/service/merchant/dto/param/admin/MerchantSponsorListParam.java
View file @
6606d29c
package
com
.
liquidnet
.
service
.
merchant
.
dto
.
param
.
admin
;
package
com
.
liquidnet
.
service
.
merchant
.
dto
.
param
.
admin
;
public
class
MerchantSponsor
s
ListParam
{
public
class
MerchantSponsorListParam
{
/**
/**
* sponsor_id
* sponsor_id
...
@@ -17,7 +17,15 @@ public class MerchantSponsorsListParam {
...
@@ -17,7 +17,15 @@ public class MerchantSponsorsListParam {
return
sponsorId
;
return
sponsorId
;
}
}
public
void
setSponsorId
(
String
sponsorId
)
{
this
.
sponsorId
=
sponsorId
;
}
public
Integer
getIsOnline
()
{
public
Integer
getIsOnline
()
{
return
isOnline
;
return
isOnline
;
}
}
public
void
setIsOnline
(
Integer
isOnline
)
{
this
.
isOnline
=
isOnline
;
}
}
}
liquidnet-bus-api/liquidnet-service-merchant-api/src/main/java/com/liquidnet/service/merchant/service/IMerchantFieldsService.java
View file @
6606d29c
package
com
.
liquidnet
.
service
.
merchant
.
service
;
package
com
.
liquidnet
.
service
.
merchant
.
service
;
import
com.liquidnet.service.base.PagedResult
;
import
com.liquidnet.service.base.PagedResult
;
import
com.liquidnet.service.merchant.dto.param.MerchantFieldEditParam
;
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
;
...
@@ -11,6 +12,8 @@ public interface IMerchantFieldsService {
...
@@ -11,6 +12,8 @@ public interface IMerchantFieldsService {
MerchantFieldsVo
fieldInfo
(
String
uid
,
String
fieldId
);
MerchantFieldsVo
fieldInfo
(
String
uid
,
String
fieldId
);
void
editBaseInfo
(
String
uid
,
MerchantFieldEditParam
parameter
);
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/IMerchantSponsorsService.java
View file @
6606d29c
package
com
.
liquidnet
.
service
.
merchant
.
service
;
package
com
.
liquidnet
.
service
.
merchant
.
service
;
import
com.liquidnet.service.base.PagedResult
;
import
com.liquidnet.service.base.PagedResult
;
import
com.liquidnet.service.merchant.dto.param.MerchantSponsorEditParam
;
import
com.liquidnet.service.merchant.dto.vo.MerchantSponsorsVo
;
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
);
MerchantSponsorsVo
sponsorInfo
(
String
uid
,
String
sponsorId
);
MerchantSponsorsVo
sponsorInfo
(
String
uid
,
String
sponsorId
);
void
editBaseInfo
(
String
uid
,
MerchantSponsorEditParam
parameter
);
}
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/merchant/MerchantFieldsController.java
View file @
6606d29c
...
@@ -11,7 +11,7 @@ import com.liquidnet.client.admin.common.utils.ShiroUtils;
...
@@ -11,7 +11,7 @@ import com.liquidnet.client.admin.common.utils.ShiroUtils;
import
com.liquidnet.client.admin.zhengzai.merchant.service.IMerchantCompaniesAdminService
;
import
com.liquidnet.client.admin.zhengzai.merchant.service.IMerchantCompaniesAdminService
;
import
com.liquidnet.client.admin.zhengzai.merchant.service.IMerchantFieldsAdminService
;
import
com.liquidnet.client.admin.zhengzai.merchant.service.IMerchantFieldsAdminService
;
import
com.liquidnet.client.admin.zhengzai.merchant.utils.MerchantMongoUtil
;
import
com.liquidnet.client.admin.zhengzai.merchant.utils.MerchantMongoUtil
;
import
com.liquidnet.service.merchant.dto.param.admin.MerchantField
s
ListParam
;
import
com.liquidnet.service.merchant.dto.param.admin.MerchantFieldListParam
;
import
com.liquidnet.service.merchant.dto.vo.MerchantCompaniesVo
;
import
com.liquidnet.service.merchant.dto.vo.MerchantCompaniesVo
;
import
com.liquidnet.service.merchant.dto.vo.MerchantFieldsVo
;
import
com.liquidnet.service.merchant.dto.vo.MerchantFieldsVo
;
import
com.liquidnet.service.merchant.entity.MerchantCompanies
;
import
com.liquidnet.service.merchant.entity.MerchantCompanies
;
...
@@ -54,7 +54,7 @@ public class MerchantFieldsController extends BaseController {
...
@@ -54,7 +54,7 @@ public class MerchantFieldsController extends BaseController {
@RequiresPermissions
(
"merchant:field:list"
)
@RequiresPermissions
(
"merchant:field:list"
)
@PostMapping
(
"/list"
)
@PostMapping
(
"/list"
)
@ResponseBody
@ResponseBody
public
TableDataInfo
list
(
MerchantField
s
ListParam
param
)
{
public
TableDataInfo
list
(
MerchantFieldListParam
param
)
{
startPage
();
startPage
();
return
getDataTable
(
merchantFieldsAdminService
.
list
(
return
getDataTable
(
merchantFieldsAdminService
.
list
(
Wrappers
.
lambdaQuery
(
MerchantFields
.
class
)
Wrappers
.
lambdaQuery
(
MerchantFields
.
class
)
...
...
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/merchant/MerchantSponsorsController.java
View file @
6606d29c
...
@@ -7,7 +7,7 @@ import com.liquidnet.client.admin.common.core.controller.BaseController;
...
@@ -7,7 +7,7 @@ import com.liquidnet.client.admin.common.core.controller.BaseController;
import
com.liquidnet.client.admin.common.core.page.TableDataInfo
;
import
com.liquidnet.client.admin.common.core.page.TableDataInfo
;
import
com.liquidnet.client.admin.common.enums.BusinessType
;
import
com.liquidnet.client.admin.common.enums.BusinessType
;
import
com.liquidnet.client.admin.zhengzai.merchant.service.IMerchantSponsorsAdminService
;
import
com.liquidnet.client.admin.zhengzai.merchant.service.IMerchantSponsorsAdminService
;
import
com.liquidnet.service.merchant.dto.param.admin.MerchantSponsor
s
ListParam
;
import
com.liquidnet.service.merchant.dto.param.admin.MerchantSponsorListParam
;
import
com.liquidnet.service.merchant.dto.vo.MerchantSponsorsVo
;
import
com.liquidnet.service.merchant.dto.vo.MerchantSponsorsVo
;
import
com.liquidnet.service.merchant.entity.MerchantSponsors
;
import
com.liquidnet.service.merchant.entity.MerchantSponsors
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.Api
;
...
@@ -39,7 +39,7 @@ public class MerchantSponsorsController extends BaseController {
...
@@ -39,7 +39,7 @@ public class MerchantSponsorsController extends BaseController {
@RequiresPermissions
(
"merchant:sponsor:list"
)
@RequiresPermissions
(
"merchant:sponsor:list"
)
@PostMapping
(
"/list"
)
@PostMapping
(
"/list"
)
@ResponseBody
@ResponseBody
public
TableDataInfo
list
(
MerchantSponsor
s
ListParam
param
)
{
public
TableDataInfo
list
(
MerchantSponsorListParam
param
)
{
startPage
();
startPage
();
return
getDataTable
(
merchantSponsorsAdminService
.
list
(
return
getDataTable
(
merchantSponsorsAdminService
.
list
(
Wrappers
.
lambdaQuery
(
MerchantSponsors
.
class
)
Wrappers
.
lambdaQuery
(
MerchantSponsors
.
class
)
...
...
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/field/applyList.html
View file @
6606d29c
...
@@ -92,7 +92,7 @@
...
@@ -92,7 +92,7 @@
title
:
'申请时间'
,
title
:
'申请时间'
,
sortable
:
true
,
sortable
:
true
,
formatter
:
function
(
value
,
row
,
index
)
{
formatter
:
function
(
value
,
row
,
index
)
{
return
$
.
common
.
sprintf
(
"<span>%s</span>"
,
null
!=
value
?
value
.
substring
(
0
,
19
)
:
value
);
return
$
.
common
.
sprintf
(
"<span>%s</span>"
,
null
!=
value
?
value
.
replace
(
"T"
,
" "
).
substring
(
0
,
19
)
:
value
);
}
}
},
},
{
{
...
...
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/field/list.html
View file @
6606d29c
...
@@ -16,7 +16,7 @@
...
@@ -16,7 +16,7 @@
</li>
</li>
<li>
<li>
上线状态:
<select
name=
"isOnline"
th:with=
"type=${@dict.getType('zhengzai_field_is_online')}"
>
上线状态:
<select
name=
"isOnline"
th:with=
"type=${@dict.getType('zhengzai_field_is_online')}"
>
<option
value=
"
all
"
>
所有
</option>
<option
value=
"
-1
"
>
所有
</option>
<option
th:each=
"dict : ${type}"
th:text=
"${dict.dictLabel}"
th:value=
"${dict.dictValue}"
></option>
<option
th:each=
"dict : ${type}"
th:text=
"${dict.dictLabel}"
th:value=
"${dict.dictValue}"
></option>
</select>
</select>
</li>
</li>
...
@@ -89,7 +89,7 @@
...
@@ -89,7 +89,7 @@
title
:
'创建时间'
,
title
:
'创建时间'
,
sortable
:
true
,
sortable
:
true
,
formatter
:
function
(
value
,
row
,
index
)
{
formatter
:
function
(
value
,
row
,
index
)
{
return
$
.
common
.
sprintf
(
"<span>%s</span>"
,
null
!=
value
?
value
.
substring
(
0
,
19
)
:
value
);
return
$
.
common
.
sprintf
(
"<span>%s</span>"
,
null
!=
value
?
value
.
replace
(
"T"
,
" "
).
substring
(
0
,
19
)
:
value
);
}
}
},
},
{
{
...
...
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/sponsor/applyList.html
View file @
6606d29c
...
@@ -73,7 +73,7 @@
...
@@ -73,7 +73,7 @@
title
:
'申请时间'
,
title
:
'申请时间'
,
sortable
:
true
,
sortable
:
true
,
formatter
:
function
(
value
,
row
,
index
)
{
formatter
:
function
(
value
,
row
,
index
)
{
return
$
.
common
.
sprintf
(
"<span>%s</span>"
,
null
!=
value
?
value
.
substring
(
0
,
19
)
:
value
);
return
$
.
common
.
sprintf
(
"<span>%s</span>"
,
null
!=
value
?
value
.
replace
(
"T"
,
" "
).
substring
(
0
,
19
)
:
value
);
}
}
},
},
{
{
...
...
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/sponsor/list.html
View file @
6606d29c
...
@@ -12,11 +12,11 @@
...
@@ -12,11 +12,11 @@
<ul>
<ul>
<li>
<li>
<label>
主办Id:
</label>
<label>
主办Id:
</label>
<input
type=
"text"
name=
"
field
Id"
/>
<input
type=
"text"
name=
"
sponsor
Id"
/>
</li>
</li>
<li>
<li>
上线状态:
<select
name=
"isOnline"
th:with=
"type=${@dict.getType('zhengzai_sponsor_is_online')}"
>
上线状态:
<select
name=
"isOnline"
th:with=
"type=${@dict.getType('zhengzai_sponsor_is_online')}"
>
<option
value=
"
all
"
>
所有
</option>
<option
value=
"
-1
"
>
所有
</option>
<option
th:each=
"dict : ${type}"
th:text=
"${dict.dictLabel}"
th:value=
"${dict.dictValue}"
></option>
<option
th:each=
"dict : ${type}"
th:text=
"${dict.dictLabel}"
th:value=
"${dict.dictValue}"
></option>
</select>
</select>
</li>
</li>
...
@@ -75,7 +75,7 @@
...
@@ -75,7 +75,7 @@
title
:
'创建时间'
,
title
:
'创建时间'
,
sortable
:
true
,
sortable
:
true
,
formatter
:
function
(
value
,
row
,
index
)
{
formatter
:
function
(
value
,
row
,
index
)
{
return
$
.
common
.
sprintf
(
"<span>%s</span>"
,
null
!=
value
?
value
.
substring
(
0
,
19
)
:
value
);
return
$
.
common
.
sprintf
(
"<span>%s</span>"
,
null
!=
value
?
value
.
replace
(
"T"
,
" "
).
substring
(
0
,
19
)
:
value
);
}
}
},
},
{
{
...
...
liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/java/com/liquidnet/service/merchant/controller/MerchantFieldsController.java
View file @
6606d29c
...
@@ -6,6 +6,7 @@ import com.liquidnet.commons.lang.util.CurrentUtil;
...
@@ -6,6 +6,7 @@ import com.liquidnet.commons.lang.util.CurrentUtil;
import
com.liquidnet.service.base.PagedResult
;
import
com.liquidnet.service.base.PagedResult
;
import
com.liquidnet.service.base.ResponseDto
;
import
com.liquidnet.service.base.ResponseDto
;
import
com.liquidnet.service.merchant.dto.param.MerchantFieldApplyParam
;
import
com.liquidnet.service.merchant.dto.param.MerchantFieldApplyParam
;
import
com.liquidnet.service.merchant.dto.param.MerchantFieldEditParam
;
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
;
...
@@ -81,6 +82,7 @@ public class MerchantFieldsController {
...
@@ -81,6 +82,7 @@ public class MerchantFieldsController {
return
ResponseDto
.
success
(
merchantFieldAppliesService
.
applyInfo
(
currentUid
,
fieldApplyId
));
return
ResponseDto
.
success
(
merchantFieldAppliesService
.
applyInfo
(
currentUid
,
fieldApplyId
));
}
}
@ApiOperationSupport
(
order
=
20
)
@ApiOperationSupport
(
order
=
20
)
@ApiOperation
(
value
=
"场地详情"
)
@ApiOperation
(
value
=
"场地详情"
)
@GetMapping
(
"info"
)
@GetMapping
(
"info"
)
...
@@ -91,6 +93,17 @@ public class MerchantFieldsController {
...
@@ -91,6 +93,17 @@ public class MerchantFieldsController {
}
}
@ApiOperationSupport
(
order
=
21
)
@ApiOperationSupport
(
order
=
21
)
@ApiOperation
(
value
=
"场地更改基础信息"
)
@PostMapping
(
"editBaseInfo"
)
public
ResponseDto
<
Object
>
editBaseInfo
(
@Valid
@RequestBody
MerchantFieldEditParam
parameter
)
{
String
currentUid
=
CurrentUtil
.
getCurrentUid
();
merchantFieldsService
.
editBaseInfo
(
currentUid
,
parameter
);
return
ResponseDto
.
success
();
}
@ApiOperationSupport
(
order
=
22
)
@ApiOperation
(
value
=
"场地更改是否审核演出"
)
@ApiOperation
(
value
=
"场地更改是否审核演出"
)
@PostMapping
(
"editIsCheck"
)
@PostMapping
(
"editIsCheck"
)
public
ResponseDto
<
Object
>
editIsCheck
(
@RequestParam
(
required
=
true
)
String
fieldId
,
public
ResponseDto
<
Object
>
editIsCheck
(
@RequestParam
(
required
=
true
)
String
fieldId
,
...
@@ -102,7 +115,8 @@ public class MerchantFieldsController {
...
@@ -102,7 +115,8 @@ public class MerchantFieldsController {
return
ResponseDto
.
success
();
return
ResponseDto
.
success
();
}
}
@ApiOperationSupport
(
order
=
22
)
@ApiOperationSupport
(
order
=
30
)
@ApiOperation
(
value
=
"场地默认验票员列表"
)
@ApiOperation
(
value
=
"场地默认验票员列表"
)
@GetMapping
(
"checkers"
)
@GetMapping
(
"checkers"
)
public
ResponseDto
<
List
<
MerchantFieldCheckersVo
>>
checkers
(
@RequestParam
(
required
=
true
)
String
fieldId
)
{
public
ResponseDto
<
List
<
MerchantFieldCheckersVo
>>
checkers
(
@RequestParam
(
required
=
true
)
String
fieldId
)
{
...
@@ -111,7 +125,7 @@ public class MerchantFieldsController {
...
@@ -111,7 +125,7 @@ public class MerchantFieldsController {
return
ResponseDto
.
success
(
merchantFieldsService
.
checkers
(
currentUid
,
fieldId
));
return
ResponseDto
.
success
(
merchantFieldsService
.
checkers
(
currentUid
,
fieldId
));
}
}
@ApiOperationSupport
(
order
=
23
)
@ApiOperationSupport
(
order
=
31
)
@ApiOperation
(
value
=
"场地添加默认验票员"
)
@ApiOperation
(
value
=
"场地添加默认验票员"
)
@PostMapping
(
"checker/add"
)
@PostMapping
(
"checker/add"
)
public
ResponseDto
<
Object
>
checkerAdd
(
@RequestParam
(
required
=
true
)
String
fieldId
,
public
ResponseDto
<
Object
>
checkerAdd
(
@RequestParam
(
required
=
true
)
String
fieldId
,
...
@@ -125,7 +139,7 @@ public class MerchantFieldsController {
...
@@ -125,7 +139,7 @@ public class MerchantFieldsController {
return
ResponseDto
.
success
();
return
ResponseDto
.
success
();
}
}
@ApiOperationSupport
(
order
=
24
)
@ApiOperationSupport
(
order
=
32
)
@ApiOperation
(
value
=
"场地移除默认验票员"
)
@ApiOperation
(
value
=
"场地移除默认验票员"
)
@PostMapping
(
"checker/del"
)
@PostMapping
(
"checker/del"
)
public
ResponseDto
<
Object
>
checkerDel
(
@RequestParam
(
required
=
true
)
String
fieldId
,
public
ResponseDto
<
Object
>
checkerDel
(
@RequestParam
(
required
=
true
)
String
fieldId
,
...
...
liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/java/com/liquidnet/service/merchant/controller/MerchantSponsorsController.java
View file @
6606d29c
...
@@ -5,6 +5,7 @@ import com.github.xiaoymin.knife4j.annotations.ApiSupport;
...
@@ -5,6 +5,7 @@ import com.github.xiaoymin.knife4j.annotations.ApiSupport;
import
com.liquidnet.commons.lang.util.CurrentUtil
;
import
com.liquidnet.commons.lang.util.CurrentUtil
;
import
com.liquidnet.service.base.PagedResult
;
import
com.liquidnet.service.base.PagedResult
;
import
com.liquidnet.service.base.ResponseDto
;
import
com.liquidnet.service.base.ResponseDto
;
import
com.liquidnet.service.merchant.dto.param.MerchantSponsorEditParam
;
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
;
...
@@ -79,6 +80,7 @@ public class MerchantSponsorsController {
...
@@ -79,6 +80,7 @@ public class MerchantSponsorsController {
return
ResponseDto
.
success
(
merchantSponsorAppliesService
.
applyInfo
(
currentUid
,
sponsorApplyId
));
return
ResponseDto
.
success
(
merchantSponsorAppliesService
.
applyInfo
(
currentUid
,
sponsorApplyId
));
}
}
@ApiOperationSupport
(
order
=
20
)
@ApiOperationSupport
(
order
=
20
)
@ApiOperation
(
value
=
"主办详情"
)
@ApiOperation
(
value
=
"主办详情"
)
@GetMapping
(
"info"
)
@GetMapping
(
"info"
)
...
@@ -87,4 +89,15 @@ public class MerchantSponsorsController {
...
@@ -87,4 +89,15 @@ public class MerchantSponsorsController {
return
ResponseDto
.
success
(
merchantSponsorsService
.
sponsorInfo
(
currentUid
,
sponsorId
));
return
ResponseDto
.
success
(
merchantSponsorsService
.
sponsorInfo
(
currentUid
,
sponsorId
));
}
}
@ApiOperationSupport
(
order
=
21
)
@ApiOperation
(
value
=
"主办更改基础信息"
)
@PostMapping
(
"editBaseInfo"
)
public
ResponseDto
<
Object
>
editBaseInfo
(
@Valid
@RequestBody
MerchantSponsorEditParam
parameter
)
{
String
currentUid
=
CurrentUtil
.
getCurrentUid
();
merchantSponsorsService
.
editBaseInfo
(
currentUid
,
parameter
);
return
ResponseDto
.
success
();
}
}
}
liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/java/com/liquidnet/service/merchant/service/MerchantMongoService.java
View file @
6606d29c
...
@@ -27,14 +27,26 @@ public class MerchantMongoService {
...
@@ -27,14 +27,26 @@ public class MerchantMongoService {
return
mongoTemplate
.
findOne
(
Query
.
query
(
Criteria
.
where
(
"fieldId"
).
is
(
fieldId
)),
MerchantFieldsVo
.
class
,
MerchantFieldsVo
.
class
.
getSimpleName
());
return
mongoTemplate
.
findOne
(
Query
.
query
(
Criteria
.
where
(
"fieldId"
).
is
(
fieldId
)),
MerchantFieldsVo
.
class
,
MerchantFieldsVo
.
class
.
getSimpleName
());
}
}
public
List
<
MerchantFieldAppliesVo
>
getFieldAppliesVosByUid
(
String
uid
)
{
public
void
setFieldsVoByFieldId
(
String
fieldId
,
MerchantFieldsVo
vo
)
{
return
mongoTemplate
.
find
(
Query
.
query
(
Criteria
.
where
(
"uid"
).
is
(
uid
).
and
(
"deletedAt"
).
is
(
null
)),
MerchantFieldAppliesVo
.
class
,
MerchantFieldAppliesVo
.
class
.
getSimpleName
());
Query
query
=
Query
.
query
(
Criteria
.
where
(
"fieldId"
).
is
(
fieldId
));
Document
document
=
(
Document
)
mongoConverter
.
convertToMongoType
(
vo
);
Update
update
=
Update
.
fromDocument
(
document
);
mongoTemplate
.
upsert
(
query
,
update
,
MerchantFieldsVo
.
class
,
MerchantFieldsVo
.
class
.
getSimpleName
());
}
}
public
MerchantSponsorsVo
getSponsorsVoBySponsorId
(
String
sponsorId
)
{
public
MerchantSponsorsVo
getSponsorsVoBySponsorId
(
String
sponsorId
)
{
return
mongoTemplate
.
findOne
(
Query
.
query
(
Criteria
.
where
(
"sponsorId"
).
is
(
sponsorId
)),
MerchantSponsorsVo
.
class
,
MerchantSponsorsVo
.
class
.
getSimpleName
());
return
mongoTemplate
.
findOne
(
Query
.
query
(
Criteria
.
where
(
"sponsorId"
).
is
(
sponsorId
)),
MerchantSponsorsVo
.
class
,
MerchantSponsorsVo
.
class
.
getSimpleName
());
}
}
public
void
setSponsorsVoBySponsorId
(
String
sponsorId
,
MerchantSponsorsVo
vo
)
{
Query
query
=
Query
.
query
(
Criteria
.
where
(
"sponsorId"
).
is
(
sponsorId
));
Document
document
=
(
Document
)
mongoConverter
.
convertToMongoType
(
vo
);
Update
update
=
Update
.
fromDocument
(
document
);
mongoTemplate
.
upsert
(
query
,
update
,
MerchantSponsorsVo
.
class
,
MerchantSponsorsVo
.
class
.
getSimpleName
());
}
public
MerchantAuthorizationPerformanceVo
getAuthorizationPerformanceVo
(
String
performanceId
,
String
uid
)
{
public
MerchantAuthorizationPerformanceVo
getAuthorizationPerformanceVo
(
String
performanceId
,
String
uid
)
{
return
mongoTemplate
.
findOne
(
Query
.
query
(
Criteria
.
where
(
"performanceId"
).
is
(
performanceId
).
and
(
"uid"
).
is
(
uid
)),
MerchantAuthorizationPerformanceVo
.
class
,
MerchantAuthorizationPerformanceVo
.
class
.
getSimpleName
());
return
mongoTemplate
.
findOne
(
Query
.
query
(
Criteria
.
where
(
"performanceId"
).
is
(
performanceId
).
and
(
"uid"
).
is
(
uid
)),
MerchantAuthorizationPerformanceVo
.
class
,
MerchantAuthorizationPerformanceVo
.
class
.
getSimpleName
());
}
}
...
@@ -66,10 +78,16 @@ public class MerchantMongoService {
...
@@ -66,10 +78,16 @@ public class MerchantMongoService {
mongoTemplate
.
upsert
(
query
,
update
,
MerchantAuthorizationPerformanceVo
.
class
,
MerchantAuthorizationPerformanceVo
.
class
.
getSimpleName
());
mongoTemplate
.
upsert
(
query
,
update
,
MerchantAuthorizationPerformanceVo
.
class
,
MerchantAuthorizationPerformanceVo
.
class
.
getSimpleName
());
}
}
public
List
<
MerchantFieldAppliesVo
>
getFieldAppliesVosByUid
(
String
uid
)
{
return
mongoTemplate
.
find
(
Query
.
query
(
Criteria
.
where
(
"uid"
).
is
(
uid
).
and
(
"deletedAt"
).
is
(
null
)),
MerchantFieldAppliesVo
.
class
,
MerchantFieldAppliesVo
.
class
.
getSimpleName
());
}
public
List
<
MerchantSponsorAppliesVo
>
getSponsorAppliesVosByUid
(
String
uid
)
{
public
List
<
MerchantSponsorAppliesVo
>
getSponsorAppliesVosByUid
(
String
uid
)
{
return
mongoTemplate
.
find
(
Query
.
query
(
Criteria
.
where
(
"uid"
).
is
(
uid
).
and
(
"deletedAt"
).
is
(
null
)),
MerchantSponsorAppliesVo
.
class
,
MerchantSponsorAppliesVo
.
class
.
getSimpleName
());
return
mongoTemplate
.
find
(
Query
.
query
(
Criteria
.
where
(
"uid"
).
is
(
uid
).
and
(
"deletedAt"
).
is
(
null
)),
MerchantSponsorAppliesVo
.
class
,
MerchantSponsorAppliesVo
.
class
.
getSimpleName
());
}
}
public
MerchantAuthorizationRecordsVo
getAuthorizationRecordsVoByAuthorizationRecordId
(
String
authorizationRecordId
)
{
public
MerchantAuthorizationRecordsVo
getAuthorizationRecordsVoByAuthorizationRecordId
(
String
authorizationRecordId
)
{
return
mongoTemplate
.
findOne
(
Query
.
query
(
Criteria
.
where
(
"authorizationRecordId"
).
is
(
authorizationRecordId
).
and
(
"deletedAt"
).
is
(
null
)),
MerchantAuthorizationRecordsVo
.
class
,
MerchantAuthorizationRecordsVo
.
class
.
getSimpleName
());
return
mongoTemplate
.
findOne
(
Query
.
query
(
Criteria
.
where
(
"authorizationRecordId"
).
is
(
authorizationRecordId
).
and
(
"deletedAt"
).
is
(
null
)),
MerchantAuthorizationRecordsVo
.
class
,
MerchantAuthorizationRecordsVo
.
class
.
getSimpleName
());
}
}
...
...
liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/java/com/liquidnet/service/merchant/service/impl/MerchantFieldsServiceImpl.java
View file @
6606d29c
...
@@ -7,13 +7,16 @@ import com.liquidnet.service.base.ErrorMapping;
...
@@ -7,13 +7,16 @@ 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
;
import
com.liquidnet.service.base.constant.MQConst
;
import
com.liquidnet.service.base.constant.MQConst
;
import
com.liquidnet.service.merchant.dto.param.MerchantFieldEditParam
;
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.IMerchantFieldsService
;
import
com.liquidnet.service.merchant.service.IMerchantFieldsService
;
import
com.liquidnet.service.merchant.service.MerchantMongoService
;
import
com.liquidnet.service.merchant.service.MerchantRdmService
;
import
com.liquidnet.service.merchant.service.MerchantRdmService
;
import
com.liquidnet.service.merchant.util.ObjectUtil
;
import
com.liquidnet.service.merchant.util.ObjectUtil
;
import
com.liquidnet.service.merchant.util.QueueUtil
;
import
com.liquidnet.service.merchant.util.QueueUtil
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.beans.BeanUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.data.domain.PageRequest
;
import
org.springframework.data.domain.PageRequest
;
import
org.springframework.data.domain.Pageable
;
import
org.springframework.data.domain.Pageable
;
...
@@ -38,6 +41,9 @@ public class MerchantFieldsServiceImpl implements IMerchantFieldsService {
...
@@ -38,6 +41,9 @@ public class MerchantFieldsServiceImpl implements IMerchantFieldsService {
@Autowired
@Autowired
MerchantRdmService
merchantRdmService
;
MerchantRdmService
merchantRdmService
;
@Autowired
MerchantMongoService
merchantMongoService
;
@Autowired
@Autowired
MongoTemplate
mongoTemplate
;
MongoTemplate
mongoTemplate
;
...
@@ -95,6 +101,45 @@ public class MerchantFieldsServiceImpl implements IMerchantFieldsService {
...
@@ -95,6 +101,45 @@ public class MerchantFieldsServiceImpl implements IMerchantFieldsService {
return
fieldsVo
;
return
fieldsVo
;
}
}
@Override
public
void
editBaseInfo
(
String
uid
,
MerchantFieldEditParam
parameter
)
{
// 当前用户是否管理该场地
MerchantFieldsVo
fieldsVo
=
this
.
checkFieldAccount
(
uid
,
parameter
.
getFieldId
());
LocalDateTime
now
=
LocalDateTime
.
now
();
BeanUtils
.
copyProperties
(
parameter
,
fieldsVo
);
fieldsVo
.
setUpdatedAt
(
now
);
// 场地 redis
long
s
=
System
.
currentTimeMillis
();
merchantRdmService
.
setFieldsVoByFieldId
(
fieldsVo
.
getFieldId
(),
fieldsVo
);
log
.
debug
(
"#RDS耗时:{}ms"
,
System
.
currentTimeMillis
()
-
s
);
// 场地 mongo
s
=
System
.
currentTimeMillis
();
merchantMongoService
.
setFieldsVoByFieldId
(
fieldsVo
.
getFieldId
(),
fieldsVo
);
log
.
debug
(
"#MONGO耗时:{}ms"
,
System
.
currentTimeMillis
()
-
s
);
LinkedList
<
String
>
toMqSqls
=
CollectionUtil
.
linkedListString
();
LinkedList
<
Object
[]>
fieldUpdateObjs
=
CollectionUtil
.
linkedListObjectArr
();
// 场地 sql
toMqSqls
.
add
(
SqlMapping
.
get
(
"merchant_fields.update_base_info"
));
fieldUpdateObjs
.
add
(
new
Object
[]{
fieldsVo
.
getName
(),
fieldsVo
.
getLogo
(),
fieldsVo
.
getBackground
(),
fieldsVo
.
getDescription
(),
fieldsVo
.
getBuiltDate
(),
fieldsVo
.
getProvinceId
(),
fieldsVo
.
getProvinceName
(),
fieldsVo
.
getCityId
(),
fieldsVo
.
getCityName
(),
fieldsVo
.
getDistrictId
(),
fieldsVo
.
getDistrictName
(),
fieldsVo
.
getAddress
(),
fieldsVo
.
getLongitude
(),
fieldsVo
.
getLatitude
(),
fieldsVo
.
getContactName
(),
fieldsVo
.
getContactEmail
(),
fieldsVo
.
getUpdatedAt
(),
fieldsVo
.
getFieldId
()
});
// mq
s
=
System
.
currentTimeMillis
();
queueUtils
.
sendMsgByRedis
(
MQConst
.
MerchantQueue
.
SQL_MERCHANT_FIELD
.
getKey
(),
SqlMapping
.
gets
(
toMqSqls
,
fieldUpdateObjs
)
);
log
.
debug
(
"#MQ耗时:{}ms"
,
System
.
currentTimeMillis
()
-
s
);
}
@Override
@Override
public
void
editIsCheck
(
String
uid
,
String
fieldId
,
int
isCheck
)
{
public
void
editIsCheck
(
String
uid
,
String
fieldId
,
int
isCheck
)
{
// 当前用户是否管理该场地
// 当前用户是否管理该场地
...
...
liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/java/com/liquidnet/service/merchant/service/impl/MerchantSponsorsServiceImpl.java
View file @
6606d29c
package
com
.
liquidnet
.
service
.
merchant
.
service
.
impl
;
package
com
.
liquidnet
.
service
.
merchant
.
service
.
impl
;
import
com.liquidnet.common.exception.LiquidnetServiceException
;
import
com.liquidnet.common.exception.LiquidnetServiceException
;
import
com.liquidnet.commons.lang.util.CollectionUtil
;
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.constant.MQConst
;
import
com.liquidnet.service.merchant.dto.param.MerchantSponsorEditParam
;
import
com.liquidnet.service.merchant.dto.vo.MerchantSponsorsVo
;
import
com.liquidnet.service.merchant.dto.vo.MerchantSponsorsVo
;
import
com.liquidnet.service.merchant.service.IMerchantSponsorsService
;
import
com.liquidnet.service.merchant.service.IMerchantSponsorsService
;
import
com.liquidnet.service.merchant.service.MerchantMongoService
;
import
com.liquidnet.service.merchant.service.MerchantRdmService
;
import
com.liquidnet.service.merchant.service.MerchantRdmService
;
import
com.liquidnet.service.merchant.util.ObjectUtil
;
import
com.liquidnet.service.merchant.util.ObjectUtil
;
import
com.liquidnet.service.merchant.util.QueueUtil
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.beans.BeanUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.data.domain.PageRequest
;
import
org.springframework.data.domain.PageRequest
;
import
org.springframework.data.domain.Pageable
;
import
org.springframework.data.domain.Pageable
;
...
@@ -17,17 +24,26 @@ import org.springframework.data.mongodb.core.query.Criteria;
...
@@ -17,17 +24,26 @@ import org.springframework.data.mongodb.core.query.Criteria;
import
org.springframework.data.mongodb.core.query.Query
;
import
org.springframework.data.mongodb.core.query.Query
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
java.time.LocalDateTime
;
import
java.util.LinkedList
;
import
java.util.List
;
import
java.util.List
;
import
java.util.regex.Pattern
;
import
java.util.regex.Pattern
;
@Slf4j
@Slf4j
@Service
@Service
public
class
MerchantSponsorsServiceImpl
implements
IMerchantSponsorsService
{
public
class
MerchantSponsorsServiceImpl
implements
IMerchantSponsorsService
{
@Autowired
MerchantRdmService
merchantRdmService
;
@Autowired
MerchantMongoService
merchantMongoService
;
@Autowired
@Autowired
MongoTemplate
mongoTemplate
;
MongoTemplate
mongoTemplate
;
@Autowired
@Autowired
MerchantRdmService
merchantRdmService
;
QueueUtil
queueUtils
;
@Override
@Override
public
PagedResult
<
MerchantSponsorsVo
>
search
(
String
name
,
int
page
,
int
size
)
{
public
PagedResult
<
MerchantSponsorsVo
>
search
(
String
name
,
int
page
,
int
size
)
{
...
@@ -71,6 +87,44 @@ public class MerchantSponsorsServiceImpl implements IMerchantSponsorsService {
...
@@ -71,6 +87,44 @@ public class MerchantSponsorsServiceImpl implements IMerchantSponsorsService {
return
sponsorsVo
;
return
sponsorsVo
;
}
}
@Override
public
void
editBaseInfo
(
String
uid
,
MerchantSponsorEditParam
parameter
)
{
// 当前用户是否管理该主办
MerchantSponsorsVo
sponsorsVo
=
this
.
checkSponsorAccount
(
uid
,
parameter
.
getSponsorId
());
LocalDateTime
now
=
LocalDateTime
.
now
();
BeanUtils
.
copyProperties
(
parameter
,
sponsorsVo
);
sponsorsVo
.
setUpdatedAt
(
now
);
// 主办 redis
long
s
=
System
.
currentTimeMillis
();
merchantRdmService
.
setSponsorsVoBySponsorId
(
sponsorsVo
.
getSponsorId
(),
sponsorsVo
);
log
.
debug
(
"#RDS耗时:{}ms"
,
System
.
currentTimeMillis
()
-
s
);
// 主办 mongo
s
=
System
.
currentTimeMillis
();
merchantMongoService
.
setSponsorsVoBySponsorId
(
sponsorsVo
.
getSponsorId
(),
sponsorsVo
);
log
.
debug
(
"#MONGO耗时:{}ms"
,
System
.
currentTimeMillis
()
-
s
);
LinkedList
<
String
>
toMqSqls
=
CollectionUtil
.
linkedListString
();
LinkedList
<
Object
[]>
sponsorUpdateObjs
=
CollectionUtil
.
linkedListObjectArr
();
// 主办 sql
toMqSqls
.
add
(
SqlMapping
.
get
(
"merchant_sponsors.update_base_info"
));
sponsorUpdateObjs
.
add
(
new
Object
[]{
sponsorsVo
.
getName
(),
sponsorsVo
.
getLogo
(),
sponsorsVo
.
getBackground
(),
sponsorsVo
.
getDescription
(),
sponsorsVo
.
getContactEmail
(),
sponsorsVo
.
getUpdatedAt
(),
sponsorsVo
.
getSponsorId
()
});
// mq
s
=
System
.
currentTimeMillis
();
queueUtils
.
sendMsgByRedis
(
MQConst
.
MerchantQueue
.
SQL_MERCHANT_SPONSOR
.
getKey
(),
SqlMapping
.
gets
(
toMqSqls
,
sponsorUpdateObjs
)
);
log
.
debug
(
"#MQ耗时:{}ms"
,
System
.
currentTimeMillis
()
-
s
);
}
private
MerchantSponsorsVo
checkSponsorAccount
(
String
uid
,
String
sponsorId
)
{
private
MerchantSponsorsVo
checkSponsorAccount
(
String
uid
,
String
sponsorId
)
{
// 当前用户是否管理该主办
// 当前用户是否管理该主办
MerchantSponsorsVo
sponsorsVo
=
merchantRdmService
.
getSponsorsVoBySponsorId
(
sponsorId
);
MerchantSponsorsVo
sponsorsVo
=
merchantRdmService
.
getSponsorsVoBySponsorId
(
sponsorId
);
...
...
liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/resources/sqlmap.properties
View file @
6606d29c
# ---------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------
merchant_fields.update_claim_status_and_uid
=
UPDATE merchant_fields SET claim_status = ?, updated_at = ? WHERE field_id = ?
merchant_fields.update_claim_status_and_uid
=
UPDATE merchant_fields SET claim_status = ?, updated_at = ? WHERE field_id = ?
merchant_fields.update_is_check
=
UPDATE merchant_fields SET is_check = ?, updated_at = ? WHERE field_id = ?
merchant_fields.update_is_check
=
UPDATE merchant_fields SET is_check = ?, updated_at = ? WHERE field_id = ?
merchant_fields.update_base_info
=
UPDATE merchant_fields SET name = ?, logo = ?, background = ?, description = ?, built_date = ?, province_id = ?, province_name = ?, city_id = ?, city_name = ?, district_id = ?, district_name = ?, address = ?, longitude = ?, latitude = ?, contact_name = ?, contact_email = ?, updated_at = ? WHERE field_id = ?
# ---------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------
merchant_field_applies.insert
=
INSERT INTO merchant_field_applies (field_apply_id, apply_status, apply_type, reject, uid, field_id, name, logo, background, description, built_date, province_id, province_name, city_id, city_name, district_id, district_name, address, longitude, latitude, contact_name, contact_email, company_name, license_code, license_img, legal_name, legal_identity, legal_identity_obverse, legal_identity_reverse, created_at) VALUE (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
merchant_field_applies.insert
=
INSERT INTO merchant_field_applies (field_apply_id, apply_status, apply_type, reject, uid, field_id, name, logo, background, description, built_date, province_id, province_name, city_id, city_name, district_id, district_name, address, longitude, latitude, contact_name, contact_email, company_name, license_code, license_img, legal_name, legal_identity, legal_identity_obverse, legal_identity_reverse, created_at) VALUE (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
merchant_field_applies.update
=
UPDATE merchant_field_applies SET updated_at = ?, delete_at = ? WHERE field_apply_id = ?
merchant_field_applies.update
=
UPDATE merchant_field_applies SET updated_at = ?, delete_at = ? WHERE field_apply_id = ?
...
@@ -8,6 +9,8 @@ merchant_field_applies.update=UPDATE merchant_field_applies SET updated_at = ?,
...
@@ -8,6 +9,8 @@ merchant_field_applies.update=UPDATE merchant_field_applies SET updated_at = ?,
merchant_field_checkers.insert
=
INSERT INTO merchant_field_checkers (field_checker_id, field_id, uid, mobile, name, cuid, created_at) VALUE (?, ?, ?, ?, ?, ?, ?)
merchant_field_checkers.insert
=
INSERT INTO merchant_field_checkers (field_checker_id, field_id, uid, mobile, name, cuid, created_at) VALUE (?, ?, ?, ?, ?, ?, ?)
merchant_field_checkers.update
=
UPDATE merchant_field_checkers SET cuid = ?, updated_at = ?, delete_at = ? WHERE field_checker_id = ?
merchant_field_checkers.update
=
UPDATE merchant_field_checkers SET cuid = ?, updated_at = ?, delete_at = ? WHERE field_checker_id = ?
# ---------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------
merchant_sponsors.update_base_info
=
UPDATE merchant_sponsors SET name = ?, logo = ?, background = ?, description = ?, contact_email = ?, updated_at = ? WHERE sponsor_id = ?
# ---------------------------------------------------------------------------------------------------------------------
merchant_sponsor_applies.insert
=
INSERT INTO merchant_sponsor_applies (sponsor_apply_id, apply_status, apply_type, reject, uid, name, logo, background, description, contact_name, contact_identity, contact_identity_obverse, contact_identity_reverse, contact_email, company_name, license_code, license_img, legal_name, legal_identity, legal_identity_obverse, legal_identity_reverse, created_at) VALUE (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
merchant_sponsor_applies.insert
=
INSERT INTO merchant_sponsor_applies (sponsor_apply_id, apply_status, apply_type, reject, uid, name, logo, background, description, contact_name, contact_identity, contact_identity_obverse, contact_identity_reverse, contact_email, company_name, license_code, license_img, legal_name, legal_identity, legal_identity_obverse, legal_identity_reverse, created_at) VALUE (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
merchant_sponsor_applies.update
=
UPDATE merchant_sponsor_applies SET updated_at = ?, delete_at = ? WHERE sponsor_apply_id = ?
merchant_sponsor_applies.update
=
UPDATE merchant_sponsor_applies SET updated_at = ?, delete_at = ? WHERE sponsor_apply_id = ?
# ---------------------------------------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------
...
...
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