记得上下班打卡 | 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
c4d4b420
Commit
c4d4b420
authored
Dec 03, 2021
by
jiangxiulong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
积分抽奖relation
parent
f7956b82
Changes
9
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
205 additions
and
93 deletions
+205
-93
SweetIntegralActivityPrizeRelationFormParam.java
...am/admin/SweetIntegralActivityPrizeRelationFormParam.java
+0
-62
IntegralActivityPrizeRelationVo.java
...service/sweet/dto/vo/IntegralActivityPrizeRelationVo.java
+53
-0
IntegralActivityPrizeVo.java
...quidnet/service/sweet/dto/vo/IntegralActivityPrizeVo.java
+75
-0
IntegralActivityVo.java
...om/liquidnet/service/sweet/dto/vo/IntegralActivityVo.java
+1
-6
SweetIntegralActivityPrizeRelationController.java
...i/sweet/SweetIntegralActivityPrizeRelationController.java
+10
-9
ISweetIntegralActivityPrizeRelationService.java
...t/service/ISweetIntegralActivityPrizeRelationService.java
+3
-4
SweetIntegralActivityPrizeRelationServiceImpl.java
...e/impl/SweetIntegralActivityPrizeRelationServiceImpl.java
+28
-10
SweetIntegralActivityServiceImpl.java
.../sweet/service/impl/SweetIntegralActivityServiceImpl.java
+25
-2
SweetObjectAdminUtil.java
...ient/admin/zhengzai/sweet/utils/SweetObjectAdminUtil.java
+10
-0
No files found.
liquidnet-bus-api/liquidnet-service-sweet-api/src/main/java/com/liquidnet/service/sweet/dto/param/admin/SweetIntegralActivityPrizeRelationFormParam.java
deleted
100644 → 0
View file @
f7956b82
package
com
.
liquidnet
.
service
.
sweet
.
dto
.
param
.
admin
;
import
com.liquidnet.service.sweet.entity.SweetIntegralActivityPrizeRelation
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
javax.validation.constraints.NotBlank
;
import
java.io.Serializable
;
/**
* <p>
* SweetIntegralActivityPrizeRelationFormParam
* </p>
*
* @author jiangxiulong
* @since 2021-12-02
*/
@Data
@ApiModel
(
value
=
"SweetIntegralActivityPrizeRelationFormParam"
,
description
=
"积分活动创建奖品入参"
)
public
class
SweetIntegralActivityPrizeRelationFormParam
implements
Serializable
,
Cloneable
{
private
static
final
long
serialVersionUID
=
-
4381851476183020667L
;
@ApiModelProperty
(
value
=
"活动主键id"
,
example
=
"429803743878963206506461"
)
@NotBlank
(
message
=
"integralActivityId不能为空"
)
private
String
integralActivityId
;
@ApiModelProperty
(
value
=
"奖品主键id"
,
example
=
"429803743878963206506461"
)
@NotBlank
(
message
=
"prizeId不能为空"
)
private
String
prizeId
;
@ApiModelProperty
(
value
=
"券id"
,
example
=
"429803743878963206506461"
)
@NotBlank
(
message
=
"couponId不能为空"
)
private
String
couponId
;
@ApiModelProperty
(
value
=
"券名称"
,
example
=
"优惠券"
)
@NotBlank
(
message
=
"couponTitle不能为空"
)
private
String
couponTitle
;
private
static
final
SweetIntegralActivityPrizeRelationFormParam
obj
=
new
SweetIntegralActivityPrizeRelationFormParam
();
public
static
SweetIntegralActivityPrizeRelationFormParam
getNew
()
{
try
{
return
(
SweetIntegralActivityPrizeRelationFormParam
)
obj
.
clone
();
}
catch
(
CloneNotSupportedException
e
)
{
return
new
SweetIntegralActivityPrizeRelationFormParam
();
}
}
public
SweetIntegralActivityPrizeRelation
copy
(
SweetIntegralActivityPrizeRelationFormParam
source
)
{
SweetIntegralActivityPrizeRelation
activityPrizeRelation
=
SweetIntegralActivityPrizeRelation
.
getNew
();
if
(
null
==
source
)
return
null
;
activityPrizeRelation
.
setPrizeId
(
source
.
getPrizeId
());
activityPrizeRelation
.
setCouponId
(
source
.
getCouponId
());
activityPrizeRelation
.
setCouponTitle
(
source
.
getCouponTitle
());
return
activityPrizeRelation
;
}
}
liquidnet-bus-api/liquidnet-service-sweet-api/src/main/java/com/liquidnet/service/sweet/dto/vo/IntegralActivityPrizeRelationVo.java
0 → 100644
View file @
c4d4b420
package
com
.
liquidnet
.
service
.
sweet
.
dto
.
vo
;
import
com.liquidnet.service.sweet.entity.SweetIntegralActivityPrizeRelation
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
java.io.Serializable
;
import
java.time.LocalDateTime
;
@Data
public
class
IntegralActivityPrizeRelationVo
implements
Serializable
,
Cloneable
{
private
static
final
long
serialVersionUID
=
-
303399210433737206L
;
@ApiModelProperty
(
value
=
"prize_relation_id"
)
private
String
prizeRelationId
;
@ApiModelProperty
(
value
=
"prize_id"
)
private
String
prizeId
;
@ApiModelProperty
(
value
=
"券id"
)
private
String
couponId
;
@ApiModelProperty
(
value
=
"券名称"
)
private
String
couponTitle
;
@ApiModelProperty
(
value
=
"创建时间"
)
private
LocalDateTime
createdAt
;
@ApiModelProperty
(
value
=
"更新时间"
)
private
LocalDateTime
updatedAt
;
private
static
final
IntegralActivityPrizeRelationVo
obj
=
new
IntegralActivityPrizeRelationVo
();
public
static
IntegralActivityPrizeRelationVo
getNew
()
{
try
{
return
(
IntegralActivityPrizeRelationVo
)
obj
.
clone
();
}
catch
(
CloneNotSupportedException
e
)
{
return
new
IntegralActivityPrizeRelationVo
();
}
}
public
IntegralActivityPrizeRelationVo
copy
(
SweetIntegralActivityPrizeRelation
source
)
{
if
(
null
==
this
)
return
this
;
this
.
setPrizeRelationId
(
source
.
getPrizeRelationId
());
this
.
setPrizeId
(
source
.
getPrizeId
());
this
.
setCouponId
(
source
.
getCouponId
());
this
.
setCouponTitle
(
source
.
getCouponTitle
());
this
.
setCreatedAt
(
source
.
getCreatedAt
());
this
.
setUpdatedAt
(
source
.
getUpdatedAt
());
return
this
;
}
}
liquidnet-bus-api/liquidnet-service-sweet-api/src/main/java/com/liquidnet/service/sweet/dto/vo/IntegralActivityPrizeVo.java
0 → 100644
View file @
c4d4b420
package
com
.
liquidnet
.
service
.
sweet
.
dto
.
vo
;
import
com.liquidnet.service.sweet.entity.SweetIntegralActivityPrize
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
java.io.Serializable
;
import
java.math.BigDecimal
;
import
java.time.LocalDateTime
;
import
java.util.List
;
@Data
public
class
IntegralActivityPrizeVo
implements
Serializable
,
Cloneable
{
private
static
final
long
serialVersionUID
=
-
303399210433737206L
;
@ApiModelProperty
(
value
=
"奖品id"
)
private
String
prizeId
;
@ApiModelProperty
(
value
=
"关联活动id"
)
private
String
integralActivityId
;
@ApiModelProperty
(
value
=
"奖品名称"
)
private
String
prizeTitle
;
@ApiModelProperty
(
value
=
"奖品描述"
)
private
String
prizeDescribe
;
@ApiModelProperty
(
value
=
"初始展示奖品图片"
)
private
String
prizeImgInit
;
@ApiModelProperty
(
value
=
"中奖选中奖品图片"
)
private
String
prizeImgSelect
;
@ApiModelProperty
(
value
=
"奖品类型 1积分 2优惠券 3实物 4登登登VIP"
)
private
Integer
prizeType
;
@ApiModelProperty
(
value
=
"单次奖励数量如积分 中奖给多少物"
)
private
Integer
prizeTypeNum
;
@ApiModelProperty
(
value
=
"创建时间"
)
private
LocalDateTime
createdAt
;
@ApiModelProperty
(
value
=
"更新时间"
)
private
LocalDateTime
updatedAt
;
@ApiModelProperty
(
value
=
"券列表"
)
private
List
<
IntegralActivityPrizeRelationVo
>
prizeRelationList
;
private
static
final
IntegralActivityPrizeVo
obj
=
new
IntegralActivityPrizeVo
();
public
static
IntegralActivityPrizeVo
getNew
()
{
try
{
return
(
IntegralActivityPrizeVo
)
obj
.
clone
();
}
catch
(
CloneNotSupportedException
e
)
{
return
new
IntegralActivityPrizeVo
();
}
}
public
IntegralActivityPrizeVo
copy
(
SweetIntegralActivityPrize
source
)
{
if
(
null
==
this
)
return
this
;
this
.
setIntegralActivityId
(
source
.
getIntegralActivityId
());
this
.
setPrizeId
(
source
.
getPrizeId
());
this
.
setIntegralActivityId
(
source
.
getIntegralActivityId
());
this
.
setPrizeTitle
(
source
.
getPrizeTitle
());
this
.
setPrizeDescribe
(
source
.
getPrizeDescribe
());
this
.
setPrizeImgInit
(
source
.
getPrizeImgInit
());
this
.
setPrizeImgSelect
(
source
.
getPrizeImgSelect
());
this
.
setPrizeType
(
source
.
getPrizeType
());
this
.
setPrizeTypeNum
(
source
.
getPrizeTypeNum
());
this
.
setCreatedAt
(
source
.
getCreatedAt
());
this
.
setUpdatedAt
(
source
.
getUpdatedAt
());
return
this
;
}
}
liquidnet-bus-api/liquidnet-service-sweet-api/src/main/java/com/liquidnet/service/sweet/dto/vo/IntegralActivityVo.java
View file @
c4d4b420
package
com
.
liquidnet
.
service
.
sweet
.
dto
.
vo
;
package
com
.
liquidnet
.
service
.
sweet
.
dto
.
vo
;
import
com.liquidnet.service.sweet.entity.SweetIntegralActivity
;
import
com.liquidnet.service.sweet.entity.SweetIntegralActivity
;
import
com.liquidnet.service.sweet.entity.SweetIntegralActivityPrize
;
import
io.swagger.annotations.ApiModelProperty
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
lombok.Data
;
...
@@ -29,9 +28,6 @@ public class IntegralActivityVo implements Serializable, Cloneable {
...
@@ -29,9 +28,6 @@ public class IntegralActivityVo implements Serializable, Cloneable {
@ApiModelProperty
(
value
=
"活动玩一次所需积分"
)
@ApiModelProperty
(
value
=
"活动玩一次所需积分"
)
private
Integer
activityNum
;
private
Integer
activityNum
;
@ApiModelProperty
(
value
=
"预估玩此活动的总人数"
)
private
Integer
estimatedNum
;
@ApiModelProperty
(
value
=
"活动时间类型 1长期 2开始结束时间"
)
@ApiModelProperty
(
value
=
"活动时间类型 1长期 2开始结束时间"
)
private
Integer
timeType
;
private
Integer
timeType
;
...
@@ -60,7 +56,7 @@ public class IntegralActivityVo implements Serializable, Cloneable {
...
@@ -60,7 +56,7 @@ public class IntegralActivityVo implements Serializable, Cloneable {
private
LocalDateTime
updatedAt
;
private
LocalDateTime
updatedAt
;
@ApiModelProperty
(
value
=
"奖品列表"
)
@ApiModelProperty
(
value
=
"奖品列表"
)
private
List
<
SweetIntegralActivityPrize
>
prizeList
;
private
List
<
IntegralActivityPrizeVo
>
prizeList
;
private
static
final
IntegralActivityVo
obj
=
new
IntegralActivityVo
();
private
static
final
IntegralActivityVo
obj
=
new
IntegralActivityVo
();
public
static
IntegralActivityVo
getNew
()
{
public
static
IntegralActivityVo
getNew
()
{
...
@@ -78,7 +74,6 @@ public class IntegralActivityVo implements Serializable, Cloneable {
...
@@ -78,7 +74,6 @@ public class IntegralActivityVo implements Serializable, Cloneable {
this
.
setActivityImg
(
source
.
getActivityImg
());
this
.
setActivityImg
(
source
.
getActivityImg
());
this
.
setActivityType
(
source
.
getActivityType
());
this
.
setActivityType
(
source
.
getActivityType
());
this
.
setActivityNum
(
source
.
getActivityNum
());
this
.
setActivityNum
(
source
.
getActivityNum
());
this
.
setEstimatedNum
(
source
.
getEstimatedNum
());
this
.
setTimeType
(
source
.
getTimeType
());
this
.
setTimeType
(
source
.
getTimeType
());
this
.
setStartTime
(
source
.
getStartTime
());
this
.
setStartTime
(
source
.
getStartTime
());
this
.
setEndTime
(
source
.
getEndTime
());
this
.
setEndTime
(
source
.
getEndTime
());
...
...
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/sweet/SweetIntegralActivityPrizeRelationController.java
View file @
c4d4b420
package
com
.
liquidnet
.
client
.
admin
.
web
.
controller
.
zhengzai
.
sweet
;
package
com
.
liquidnet
.
client
.
admin
.
web
.
controller
.
zhengzai
.
sweet
;
import
com.github.pagehelper.PageInfo
;
import
com.liquidnet.client.admin.common.annotation.Log
;
import
com.liquidnet.client.admin.common.annotation.Log
;
import
com.liquidnet.client.admin.common.core.controller.BaseController
;
import
com.liquidnet.client.admin.common.core.controller.BaseController
;
import
com.liquidnet.client.admin.common.core.domain.AjaxResult
;
import
com.liquidnet.client.admin.common.core.domain.AjaxResult
;
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.sweet.service.ISweetIntegralActivityPrizeRelationService
;
import
com.liquidnet.client.admin.zhengzai.sweet.service.ISweetIntegralActivityPrizeRelationService
;
import
com.liquidnet.service.sweet.dto.SweetIntegralActivityDto
;
import
com.liquidnet.service.sweet.dto.param.admin.SweetIntegralActivityListSearchParam
;
import
com.liquidnet.service.sweet.dto.param.admin.SweetIntegralActivityPrizeRelationFormParam
;
import
com.liquidnet.service.sweet.dto.param.admin.SweetIntegralActivityPrizeRelationFormParam
;
import
com.liquidnet.service.sweet.entity.SweetIntegralActivityPrizeRelation
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiImplicitParam
;
import
io.swagger.annotations.ApiImplicitParam
;
import
io.swagger.annotations.ApiImplicitParams
;
import
io.swagger.annotations.ApiImplicitParams
;
...
@@ -21,6 +18,7 @@ import org.springframework.validation.annotation.Validated;
...
@@ -21,6 +18,7 @@ import org.springframework.validation.annotation.Validated;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.bind.annotation.*
;
import
javax.validation.Valid
;
import
javax.validation.Valid
;
import
java.util.List
;
/**
/**
* <p>
* <p>
...
@@ -53,10 +51,10 @@ public class SweetIntegralActivityPrizeRelationController extends BaseController
...
@@ -53,10 +51,10 @@ public class SweetIntegralActivityPrizeRelationController extends BaseController
}
}
}
}
@Log
(
title
=
"积分活动奖品内部关联券等
编辑
"
,
businessType
=
BusinessType
.
UPDATE
)
@Log
(
title
=
"积分活动奖品内部关联券等
删除
"
,
businessType
=
BusinessType
.
UPDATE
)
@RequiresPermissions
(
"sweet:integralActivityPrizeRelation:update"
)
@RequiresPermissions
(
"sweet:integralActivityPrizeRelation:update"
)
@PutMapping
(
"delete"
)
@PutMapping
(
"delete"
)
@ApiOperation
(
value
=
"积分活动奖品内部关联券等
编辑
"
)
@ApiOperation
(
value
=
"积分活动奖品内部关联券等
删除
"
)
@ResponseBody
@ResponseBody
@ApiImplicitParams
({
@ApiImplicitParams
({
@ApiImplicitParam
(
type
=
"form"
,
dataType
=
"String"
,
name
=
"prizeRelationId"
,
value
=
"主键id"
,
required
=
true
),
@ApiImplicitParam
(
type
=
"form"
,
dataType
=
"String"
,
name
=
"prizeRelationId"
,
value
=
"主键id"
,
required
=
true
),
...
@@ -76,9 +74,12 @@ public class SweetIntegralActivityPrizeRelationController extends BaseController
...
@@ -76,9 +74,12 @@ public class SweetIntegralActivityPrizeRelationController extends BaseController
@GetMapping
(
"list"
)
@GetMapping
(
"list"
)
@ApiOperation
(
value
=
"积分活动奖品内部关联券等列表"
)
@ApiOperation
(
value
=
"积分活动奖品内部关联券等列表"
)
@ResponseBody
@ResponseBody
public
TableDataInfo
list
(
SweetIntegralActivityListSearchParam
listParam
)
{
@ApiImplicitParams
({
PageInfo
<
SweetIntegralActivityDto
>
result
=
activityPrizeRelationService
.
list
(
listParam
);
@ApiImplicitParam
(
type
=
"form"
,
dataType
=
"String"
,
name
=
"prizeId"
,
value
=
"奖品主键id"
,
required
=
true
)
return
getDataTable
(
result
.
getList
());
})
public
List
<
SweetIntegralActivityPrizeRelation
>
list
(
@RequestParam
()
String
prizeId
)
{
List
<
SweetIntegralActivityPrizeRelation
>
result
=
activityPrizeRelationService
.
list
(
prizeId
);
return
result
;
}
}
}
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/sweet/service/ISweetIntegralActivityPrizeRelationService.java
View file @
c4d4b420
package
com
.
liquidnet
.
client
.
admin
.
zhengzai
.
sweet
.
service
;
package
com
.
liquidnet
.
client
.
admin
.
zhengzai
.
sweet
.
service
;
import
com.github.pagehelper.PageInfo
;
import
com.liquidnet.service.sweet.dto.SweetIntegralActivityDto
;
import
com.liquidnet.service.sweet.dto.param.admin.SweetIntegralActivityListSearchParam
;
import
com.liquidnet.service.sweet.dto.param.admin.SweetIntegralActivityPrizeRelationFormParam
;
import
com.liquidnet.service.sweet.dto.param.admin.SweetIntegralActivityPrizeRelationFormParam
;
import
com.liquidnet.service.sweet.entity.SweetIntegralActivityPrizeRelation
;
import
com.liquidnet.service.sweet.entity.SweetIntegralActivityPrizeRelation
;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
java.util.List
;
/**
/**
* <p>
* <p>
* 积分活动奖品里关联多奖品表 服务类
* 积分活动奖品里关联多奖品表 服务类
...
@@ -21,6 +20,6 @@ public interface ISweetIntegralActivityPrizeRelationService extends IService<Swe
...
@@ -21,6 +20,6 @@ public interface ISweetIntegralActivityPrizeRelationService extends IService<Swe
Integer
delete
(
String
prizeRelationId
,
String
integralActivityId
);
Integer
delete
(
String
prizeRelationId
,
String
integralActivityId
);
PageInfo
<
SweetIntegralActivityDto
>
list
(
SweetIntegralActivityListSearchParam
listParam
);
List
<
SweetIntegralActivityPrizeRelation
>
list
(
String
prizeId
);
}
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/sweet/service/impl/SweetIntegralActivityPrizeRelationServiceImpl.java
View file @
c4d4b420
...
@@ -2,20 +2,17 @@ package com.liquidnet.client.admin.zhengzai.sweet.service.impl;
...
@@ -2,20 +2,17 @@ package com.liquidnet.client.admin.zhengzai.sweet.service.impl;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
com.baomidou.mybatisplus.core.toolkit.Wrappers
;
import
com.baomidou.mybatisplus.core.toolkit.Wrappers
;
import
com.github.pagehelper.PageHelper
;
import
com.github.pagehelper.PageInfo
;
import
com.liquidnet.client.admin.zhengzai.sweet.service.ISweetIntegralActivityPrizeRelationService
;
import
com.liquidnet.client.admin.zhengzai.sweet.service.ISweetIntegralActivityPrizeRelationService
;
import
com.liquidnet.client.admin.zhengzai.sweet.utils.SweetObjectAdminUtil
;
import
com.liquidnet.client.admin.zhengzai.sweet.utils.SweetObjectAdminUtil
;
import
com.liquidnet.client.admin.zhengzai.sweet.utils.SweetRedisAdminUtils
;
import
com.liquidnet.client.admin.zhengzai.sweet.utils.SweetRedisAdminUtils
;
import
com.liquidnet.commons.lang.util.IDGenerator
;
import
com.liquidnet.commons.lang.util.IDGenerator
;
import
com.liquidnet.service.sweet.dto.SweetIntegralActivityDto
;
import
com.liquidnet.service.sweet.dto.param.admin.SweetIntegralActivityListSearchParam
;
import
com.liquidnet.service.sweet.dto.param.admin.SweetIntegralActivityPrizeRelationFormParam
;
import
com.liquidnet.service.sweet.dto.param.admin.SweetIntegralActivityPrizeRelationFormParam
;
import
com.liquidnet.service.sweet.dto.vo.IntegralActivityPrizeRelationVo
;
import
com.liquidnet.service.sweet.dto.vo.IntegralActivityPrizeVo
;
import
com.liquidnet.service.sweet.dto.vo.IntegralActivityVo
;
import
com.liquidnet.service.sweet.dto.vo.IntegralActivityVo
;
import
com.liquidnet.service.sweet.entity.SweetIntegralActivity
;
import
com.liquidnet.service.sweet.entity.SweetIntegralActivity
;
import
com.liquidnet.service.sweet.entity.SweetIntegralActivityPrize
;
import
com.liquidnet.service.sweet.entity.SweetIntegralActivityPrize
;
import
com.liquidnet.service.sweet.entity.SweetIntegralActivityPrizeRelation
;
import
com.liquidnet.service.sweet.entity.SweetIntegralActivityPrizeRelation
;
import
com.liquidnet.service.sweet.mapper.SweetIntegralActivityDrawMapper
;
import
com.liquidnet.service.sweet.mapper.SweetIntegralActivityMapper
;
import
com.liquidnet.service.sweet.mapper.SweetIntegralActivityMapper
;
import
com.liquidnet.service.sweet.mapper.SweetIntegralActivityPrizeMapper
;
import
com.liquidnet.service.sweet.mapper.SweetIntegralActivityPrizeMapper
;
import
com.liquidnet.service.sweet.mapper.SweetIntegralActivityPrizeRelationMapper
;
import
com.liquidnet.service.sweet.mapper.SweetIntegralActivityPrizeRelationMapper
;
...
@@ -24,6 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired;
...
@@ -24,6 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
java.time.LocalDateTime
;
import
java.time.LocalDateTime
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.List
;
/**
/**
...
@@ -79,10 +77,11 @@ public class SweetIntegralActivityPrizeRelationServiceImpl extends ServiceImpl<S
...
@@ -79,10 +77,11 @@ public class SweetIntegralActivityPrizeRelationServiceImpl extends ServiceImpl<S
}
}
@Override
@Override
public
PageInfo
<
SweetIntegralActivityDto
>
list
(
SweetIntegralActivityListSearchParam
listParam
)
{
public
List
<
SweetIntegralActivityPrizeRelation
>
list
(
String
prizeId
)
{
PageHelper
.
startPage
(
listParam
.
getPageNum
(),
listParam
.
getPageSize
());
List
<
SweetIntegralActivityPrizeRelation
>
prizeRelations
=
relationMapper
.
selectList
(
List
<
SweetIntegralActivityDto
>
voList
=
sweetIntegralActivityMapper
.
searchActivityList
(
listParam
.
getActivityTitle
());
Wrappers
.
lambdaQuery
(
SweetIntegralActivityPrizeRelation
.
class
).
eq
(
SweetIntegralActivityPrizeRelation:
:
getPrizeId
,
prizeId
)
return
new
PageInfo
(
voList
);
);
return
prizeRelations
;
}
}
private
void
integralActivityList
(
String
integralActivityId
)
{
private
void
integralActivityList
(
String
integralActivityId
)
{
...
@@ -97,15 +96,34 @@ public class SweetIntegralActivityPrizeRelationServiceImpl extends ServiceImpl<S
...
@@ -97,15 +96,34 @@ public class SweetIntegralActivityPrizeRelationServiceImpl extends ServiceImpl<S
voList
.
add
(
copy
);
voList
.
add
(
copy
);
});
});
sweetRedisAdminUtils
.
setIntegralActivityList
(
voList
);
sweetRedisAdminUtils
.
setIntegralActivityList
(
voList
);
// 活动详情
// 活动详情
SweetIntegralActivity
sweetIntegralActivity
=
sweetIntegralActivityMapper
.
selectOne
(
SweetIntegralActivity
sweetIntegralActivity
=
sweetIntegralActivityMapper
.
selectOne
(
Wrappers
.
lambdaQuery
(
SweetIntegralActivity
.
class
).
eq
(
SweetIntegralActivity:
:
getIntegralActivityId
,
integralActivityId
)
Wrappers
.
lambdaQuery
(
SweetIntegralActivity
.
class
).
eq
(
SweetIntegralActivity:
:
getIntegralActivityId
,
integralActivityId
)
);
);
IntegralActivityVo
integralActivityVo
=
IntegralActivityVo
.
getNew
().
copy
(
sweetIntegralActivity
);
IntegralActivityVo
integralActivityVo
=
IntegralActivityVo
.
getNew
().
copy
(
sweetIntegralActivity
);
// 详情奖品
List
<
SweetIntegralActivityPrize
>
sweetIntegralActivityPrizes
=
sweetIntegralActivityPrizeMapper
.
selectList
(
List
<
SweetIntegralActivityPrize
>
sweetIntegralActivityPrizes
=
sweetIntegralActivityPrizeMapper
.
selectList
(
Wrappers
.
lambdaQuery
(
SweetIntegralActivityPrize
.
class
).
eq
(
SweetIntegralActivityPrize:
:
getIntegralActivityId
,
integralActivityId
)
Wrappers
.
lambdaQuery
(
SweetIntegralActivityPrize
.
class
).
eq
(
SweetIntegralActivityPrize:
:
getIntegralActivityId
,
integralActivityId
)
);
);
integralActivityVo
.
setPrizeList
(
sweetIntegralActivityPrizes
);
List
<
IntegralActivityPrizeVo
>
prizeList
=
SweetObjectAdminUtil
.
getSweetIntegralActivityPrizeVoList
();
sweetIntegralActivityPrizes
.
forEach
(
r
->
{
IntegralActivityPrizeVo
copy
=
IntegralActivityPrizeVo
.
getNew
().
copy
(
r
);
// 奖品券列表
List
<
SweetIntegralActivityPrizeRelation
>
prizeRelations
=
relationMapper
.
selectList
(
Wrappers
.
lambdaQuery
(
SweetIntegralActivityPrizeRelation
.
class
).
eq
(
SweetIntegralActivityPrizeRelation:
:
getPrizeId
,
copy
.
getPrizeId
())
);
ArrayList
<
IntegralActivityPrizeRelationVo
>
prizeRelationVoList
=
SweetObjectAdminUtil
.
getSweetIntegralActivityPrizeRelationVoList
();
prizeRelations
.
forEach
(
rr
->
{
IntegralActivityPrizeRelationVo
copyR
=
IntegralActivityPrizeRelationVo
.
getNew
().
copy
(
rr
);
prizeRelationVoList
.
add
(
copyR
);
});
copy
.
setPrizeRelationList
(
prizeRelationVoList
);
prizeList
.
add
(
copy
);
});
integralActivityVo
.
setPrizeList
(
prizeList
);
sweetRedisAdminUtils
.
setIntegralActivityInfo
(
integralActivityVo
);
sweetRedisAdminUtils
.
setIntegralActivityInfo
(
integralActivityVo
);
}
}
...
...
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/sweet/service/impl/SweetIntegralActivityServiceImpl.java
View file @
c4d4b420
...
@@ -12,7 +12,8 @@ import com.liquidnet.service.sweet.dto.SweetIntegralActivityDto;
...
@@ -12,7 +12,8 @@ import com.liquidnet.service.sweet.dto.SweetIntegralActivityDto;
import
com.liquidnet.service.sweet.dto.param.admin.SweetIntegralActivityFromParam
;
import
com.liquidnet.service.sweet.dto.param.admin.SweetIntegralActivityFromParam
;
import
com.liquidnet.service.sweet.dto.param.admin.SweetIntegralActivityListSearchParam
;
import
com.liquidnet.service.sweet.dto.param.admin.SweetIntegralActivityListSearchParam
;
import
com.liquidnet.service.sweet.dto.param.admin.SweetIntegralActivityPrizeFormParam
;
import
com.liquidnet.service.sweet.dto.param.admin.SweetIntegralActivityPrizeFormParam
;
import
com.liquidnet.service.sweet.dto.param.admin.SweetIntegralActivityPrizeRelationFormParam
;
import
com.liquidnet.service.sweet.dto.vo.IntegralActivityPrizeRelationVo
;
import
com.liquidnet.service.sweet.dto.vo.IntegralActivityPrizeVo
;
import
com.liquidnet.service.sweet.dto.vo.IntegralActivityVo
;
import
com.liquidnet.service.sweet.dto.vo.IntegralActivityVo
;
import
com.liquidnet.service.sweet.dto.vo.admin.SweetIntegralActivityPrizeVo
;
import
com.liquidnet.service.sweet.dto.vo.admin.SweetIntegralActivityPrizeVo
;
import
com.liquidnet.service.sweet.dto.vo.admin.SweetIntegralActivityVo
;
import
com.liquidnet.service.sweet.dto.vo.admin.SweetIntegralActivityVo
;
...
@@ -24,12 +25,14 @@ import com.liquidnet.service.sweet.mapper.SweetIntegralActivityDrawMapper;
...
@@ -24,12 +25,14 @@ import com.liquidnet.service.sweet.mapper.SweetIntegralActivityDrawMapper;
import
com.liquidnet.service.sweet.mapper.SweetIntegralActivityMapper
;
import
com.liquidnet.service.sweet.mapper.SweetIntegralActivityMapper
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.liquidnet.service.sweet.mapper.SweetIntegralActivityPrizeMapper
;
import
com.liquidnet.service.sweet.mapper.SweetIntegralActivityPrizeMapper
;
import
com.liquidnet.service.sweet.mapper.SweetIntegralActivityPrizeRelationMapper
;
import
com.liquidnet.service.sweet.utils.SweetNewObjectUtil
;
import
com.liquidnet.service.sweet.utils.SweetNewObjectUtil
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
org.springframework.util.CollectionUtils
;
import
org.springframework.util.CollectionUtils
;
import
java.time.LocalDateTime
;
import
java.time.LocalDateTime
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.List
;
/**
/**
...
@@ -49,6 +52,8 @@ public class SweetIntegralActivityServiceImpl extends ServiceImpl<SweetIntegralA
...
@@ -49,6 +52,8 @@ public class SweetIntegralActivityServiceImpl extends ServiceImpl<SweetIntegralA
private
SweetIntegralActivityPrizeMapper
sweetIntegralActivityPrizeMapper
;
private
SweetIntegralActivityPrizeMapper
sweetIntegralActivityPrizeMapper
;
@Autowired
@Autowired
private
SweetIntegralActivityDrawMapper
sweetIntegralActivityDrawMapper
;
private
SweetIntegralActivityDrawMapper
sweetIntegralActivityDrawMapper
;
@Autowired
private
SweetIntegralActivityPrizeRelationMapper
relationMapper
;
@Autowired
@Autowired
private
SweetRedisAdminUtils
sweetRedisAdminUtils
;
private
SweetRedisAdminUtils
sweetRedisAdminUtils
;
...
@@ -189,10 +194,28 @@ public class SweetIntegralActivityServiceImpl extends ServiceImpl<SweetIntegralA
...
@@ -189,10 +194,28 @@ public class SweetIntegralActivityServiceImpl extends ServiceImpl<SweetIntegralA
Wrappers
.
lambdaQuery
(
SweetIntegralActivity
.
class
).
eq
(
SweetIntegralActivity:
:
getIntegralActivityId
,
integralActivityId
)
Wrappers
.
lambdaQuery
(
SweetIntegralActivity
.
class
).
eq
(
SweetIntegralActivity:
:
getIntegralActivityId
,
integralActivityId
)
);
);
IntegralActivityVo
integralActivityVo
=
IntegralActivityVo
.
getNew
().
copy
(
sweetIntegralActivity
);
IntegralActivityVo
integralActivityVo
=
IntegralActivityVo
.
getNew
().
copy
(
sweetIntegralActivity
);
// 详情奖品
List
<
SweetIntegralActivityPrize
>
sweetIntegralActivityPrizes
=
sweetIntegralActivityPrizeMapper
.
selectList
(
List
<
SweetIntegralActivityPrize
>
sweetIntegralActivityPrizes
=
sweetIntegralActivityPrizeMapper
.
selectList
(
Wrappers
.
lambdaQuery
(
SweetIntegralActivityPrize
.
class
).
eq
(
SweetIntegralActivityPrize:
:
getIntegralActivityId
,
integralActivityId
)
Wrappers
.
lambdaQuery
(
SweetIntegralActivityPrize
.
class
).
eq
(
SweetIntegralActivityPrize:
:
getIntegralActivityId
,
integralActivityId
)
);
);
integralActivityVo
.
setPrizeList
(
sweetIntegralActivityPrizes
);
List
<
IntegralActivityPrizeVo
>
prizeList
=
SweetObjectAdminUtil
.
getSweetIntegralActivityPrizeVoList
();
sweetIntegralActivityPrizes
.
forEach
(
r
->
{
IntegralActivityPrizeVo
copy
=
IntegralActivityPrizeVo
.
getNew
().
copy
(
r
);
// 奖品券列表
List
<
SweetIntegralActivityPrizeRelation
>
prizeRelations
=
relationMapper
.
selectList
(
Wrappers
.
lambdaQuery
(
SweetIntegralActivityPrizeRelation
.
class
).
eq
(
SweetIntegralActivityPrizeRelation:
:
getPrizeId
,
copy
.
getPrizeId
())
);
ArrayList
<
IntegralActivityPrizeRelationVo
>
prizeRelationVoList
=
SweetObjectAdminUtil
.
getSweetIntegralActivityPrizeRelationVoList
();
prizeRelations
.
forEach
(
rr
->
{
IntegralActivityPrizeRelationVo
copyR
=
IntegralActivityPrizeRelationVo
.
getNew
().
copy
(
rr
);
prizeRelationVoList
.
add
(
copyR
);
});
copy
.
setPrizeRelationList
(
prizeRelationVoList
);
prizeList
.
add
(
copy
);
});
integralActivityVo
.
setPrizeList
(
prizeList
);
sweetRedisAdminUtils
.
setIntegralActivityInfo
(
integralActivityVo
);
sweetRedisAdminUtils
.
setIntegralActivityInfo
(
integralActivityVo
);
}
}
...
...
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/sweet/utils/SweetObjectAdminUtil.java
View file @
c4d4b420
package
com
.
liquidnet
.
client
.
admin
.
zhengzai
.
sweet
.
utils
;
package
com
.
liquidnet
.
client
.
admin
.
zhengzai
.
sweet
.
utils
;
import
com.liquidnet.service.sweet.dto.vo.IntegralActivityPrizeRelationVo
;
import
com.liquidnet.service.sweet.dto.vo.IntegralActivityPrizeVo
;
import
com.liquidnet.service.sweet.dto.vo.IntegralActivityVo
;
import
com.liquidnet.service.sweet.dto.vo.IntegralActivityVo
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
public
class
SweetObjectAdminUtil
{
public
class
SweetObjectAdminUtil
{
private
static
final
ArrayList
<
IntegralActivityVo
>
sweetIntegralActivityVoList
=
new
ArrayList
<>();
private
static
final
ArrayList
<
IntegralActivityVo
>
sweetIntegralActivityVoList
=
new
ArrayList
<>();
private
static
final
ArrayList
<
IntegralActivityPrizeVo
>
sweetIntegralActivityPrizeVoList
=
new
ArrayList
<>();
private
static
final
ArrayList
<
IntegralActivityPrizeVo
>
sweetIntegralActivityPrizeRelationVoList
=
new
ArrayList
<>();
public
static
ArrayList
<
IntegralActivityVo
>
getSweetIntegralActivityVoList
()
{
public
static
ArrayList
<
IntegralActivityVo
>
getSweetIntegralActivityVoList
()
{
return
(
ArrayList
<
IntegralActivityVo
>)
sweetIntegralActivityVoList
.
clone
();
return
(
ArrayList
<
IntegralActivityVo
>)
sweetIntegralActivityVoList
.
clone
();
}
}
public
static
ArrayList
<
IntegralActivityPrizeVo
>
getSweetIntegralActivityPrizeVoList
()
{
return
(
ArrayList
<
IntegralActivityPrizeVo
>)
sweetIntegralActivityPrizeVoList
.
clone
();
}
public
static
ArrayList
<
IntegralActivityPrizeRelationVo
>
getSweetIntegralActivityPrizeRelationVoList
()
{
return
(
ArrayList
<
IntegralActivityPrizeRelationVo
>)
sweetIntegralActivityPrizeRelationVoList
.
clone
();
}
}
}
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