记得上下班打卡 | 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
09fa22e6
Commit
09fa22e6
authored
Apr 21, 2022
by
wanglele
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
兑换码相关
parent
1e3d5b5b
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
79 additions
and
22 deletions
+79
-22
GoblinNftExActivityVo.java
...iquidnet/service/goblin/dto/vo/GoblinNftExActivityVo.java
+9
-0
GoblinNftExCodeVo.java
...om/liquidnet/service/goblin/dto/vo/GoblinNftExCodeVo.java
+16
-0
GoblinNftExSkuVo.java
...com/liquidnet/service/goblin/dto/vo/GoblinNftExSkuVo.java
+17
-1
GoblinNftExActivityServiceImpl.java
...m/service/impl/goblin/GoblinNftExActivityServiceImpl.java
+1
-13
GoblinNftExSkuServiceImpl.java
...atform/service/impl/goblin/GoblinNftExSkuServiceImpl.java
+12
-8
ObjectUtil.java
...java/com/liquidnet/service/platform/utils/ObjectUtil.java
+24
-0
No files found.
liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinNftExActivityVo.java
View file @
09fa22e6
...
@@ -2,6 +2,7 @@ package com.liquidnet.service.goblin.dto.vo;
...
@@ -2,6 +2,7 @@ package com.liquidnet.service.goblin.dto.vo;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.liquidnet.service.goblin.entity.GoblinNftExActivity
;
import
lombok.Data
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
import
lombok.EqualsAndHashCode
;
...
@@ -71,6 +72,14 @@ public class GoblinNftExActivityVo implements Serializable,Cloneable {
...
@@ -71,6 +72,14 @@ public class GoblinNftExActivityVo implements Serializable,Cloneable {
}
}
}
}
public
GoblinNftExActivityVo
copy
(
GoblinNftExActivity
goblinNftExActivity
){
if
(
null
==
goblinNftExActivity
)
return
this
;
this
.
setActivityId
(
goblinNftExActivity
.
getActivityId
());
this
.
setTitle
(
goblinNftExActivity
.
getTitle
());
this
.
setCreatedAt
(
goblinNftExActivity
.
getCreatedAt
());
this
.
setUpdatedAt
(
goblinNftExActivity
.
getUpdatedAt
());
return
this
;
}
}
}
...
...
liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinNftExCodeVo.java
View file @
09fa22e6
...
@@ -2,6 +2,7 @@ package com.liquidnet.service.goblin.dto.vo;
...
@@ -2,6 +2,7 @@ package com.liquidnet.service.goblin.dto.vo;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.liquidnet.service.goblin.entity.GoblinNftExCode
;
import
lombok.Data
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
import
lombok.EqualsAndHashCode
;
...
@@ -98,5 +99,20 @@ public class GoblinNftExCodeVo implements Serializable, Cloneable {
...
@@ -98,5 +99,20 @@ public class GoblinNftExCodeVo implements Serializable, Cloneable {
}
}
}
}
public
GoblinNftExCodeVo
copy
(
GoblinNftExCode
goblinNftExCode
){
if
(
null
==
goblinNftExCode
)
return
this
;
this
.
setCodeId
(
goblinNftExCode
.
getCodeId
());
this
.
setActivityId
(
goblinNftExCode
.
getActivityId
());
this
.
setCode
(
goblinNftExCode
.
getCode
());
this
.
setSkuId
(
goblinNftExCode
.
getSkuId
());
this
.
setState
(
goblinNftExCode
.
getState
());
this
.
setRedeemUid
(
goblinNftExCode
.
getRedeemUid
());
this
.
setAdminUid
(
goblinNftExCode
.
getAdminUid
());
this
.
setRedeemAt
(
goblinNftExCode
.
getRedeemAt
());
this
.
setCreatedAt
(
goblinNftExCode
.
getCreatedAt
());
this
.
setUpdatedAt
(
goblinNftExCode
.
getUpdatedAt
());
return
this
;
}
}
}
liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinNftExSkuVo.java
View file @
09fa22e6
...
@@ -2,6 +2,7 @@ package com.liquidnet.service.goblin.dto.vo;
...
@@ -2,6 +2,7 @@ package com.liquidnet.service.goblin.dto.vo;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.liquidnet.service.goblin.entity.GoblinNftExSku
;
import
lombok.Data
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
import
lombok.EqualsAndHashCode
;
...
@@ -73,7 +74,6 @@ public class GoblinNftExSkuVo {
...
@@ -73,7 +74,6 @@ public class GoblinNftExSkuVo {
*/
*/
private
LocalDateTime
updatedAt
;
private
LocalDateTime
updatedAt
;
private
static
final
GoblinNftExSkuVo
obj
=
new
GoblinNftExSkuVo
();
private
static
final
GoblinNftExSkuVo
obj
=
new
GoblinNftExSkuVo
();
public
static
GoblinNftExSkuVo
getNew
(){
public
static
GoblinNftExSkuVo
getNew
(){
...
@@ -82,7 +82,22 @@ public class GoblinNftExSkuVo {
...
@@ -82,7 +82,22 @@ public class GoblinNftExSkuVo {
}
catch
(
CloneNotSupportedException
e
){
}
catch
(
CloneNotSupportedException
e
){
return
new
GoblinNftExSkuVo
();
return
new
GoblinNftExSkuVo
();
}
}
}
public
GoblinNftExSkuVo
copy
(
GoblinNftExSku
goblinNftExSku
){
if
(
null
==
goblinNftExSku
)
return
this
;
this
.
setActivityId
(
goblinNftExSku
.
getActivityId
());
this
.
setSpuId
(
goblinNftExSku
.
getSpuId
());
this
.
setSkuId
(
goblinNftExSku
.
getSkuId
());
this
.
setExStock
(
goblinNftExSku
.
getExStock
());
this
.
setExLimit
(
goblinNftExSku
.
getExLimit
());
this
.
setExStartTime
(
goblinNftExSku
.
getExStartTime
());
this
.
setExStopTime
(
goblinNftExSku
.
getExStopTime
());
this
.
setCreatedAt
(
goblinNftExSku
.
getCreatedAt
());
this
.
setUpdatedAt
(
goblinNftExSku
.
getUpdatedAt
());
return
this
;
}
}
...
@@ -97,4 +112,5 @@ public class GoblinNftExSkuVo {
...
@@ -97,4 +112,5 @@ public class GoblinNftExSkuVo {
}
}
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/goblin/GoblinNftExActivityServiceImpl.java
View file @
09fa22e6
...
@@ -4,6 +4,7 @@ import com.github.pagehelper.PageHelper;
...
@@ -4,6 +4,7 @@ import com.github.pagehelper.PageHelper;
import
com.github.pagehelper.PageInfo
;
import
com.github.pagehelper.PageInfo
;
import
com.liquidnet.commons.lang.util.IDGenerator
;
import
com.liquidnet.commons.lang.util.IDGenerator
;
import
com.liquidnet.commons.lang.util.StringUtil
;
import
com.liquidnet.commons.lang.util.StringUtil
;
import
com.liquidnet.service.goblin.dto.vo.GoblinNftExActivityVo
;
import
com.liquidnet.service.goblin.entity.GoblinNftExActivity
;
import
com.liquidnet.service.goblin.entity.GoblinNftExActivity
;
import
com.liquidnet.service.goblin.entity.GoblinNftExCode
;
import
com.liquidnet.service.goblin.entity.GoblinNftExCode
;
import
com.liquidnet.service.goblin.mapper.GoblinNftExActivityMapper
;
import
com.liquidnet.service.goblin.mapper.GoblinNftExActivityMapper
;
...
@@ -33,30 +34,17 @@ public class GoblinNftExActivityServiceImpl implements IGoblinNftExActivityServ
...
@@ -33,30 +34,17 @@ public class GoblinNftExActivityServiceImpl implements IGoblinNftExActivityServ
@Autowired
@Autowired
private
GoblinNftExActivityMapper
goblinNftExActivityMapper
;
private
GoblinNftExActivityMapper
goblinNftExActivityMapper
;
@Autowired
@Autowired
private
GoblinRedisUtils
goblinRedisUtils
;
@Autowired
private
GoblinNftExCodeMapper
goblinNftExCodeMapper
;
private
GoblinNftExCodeMapper
goblinNftExCodeMapper
;
@Override
@Override
public
String
add
(
GoblinNftExActivityParam
goblinNftExActivityParam
)
{
public
String
add
(
GoblinNftExActivityParam
goblinNftExActivityParam
)
{
// 获取活动列表
List
<
GoblinNftExActivity
>
goblinNftExActivities
=
goblinRedisUtils
.
getActivitySku
();
LocalDateTime
now
=
LocalDateTime
.
now
();
LocalDateTime
now
=
LocalDateTime
.
now
();
GoblinNftExActivity
goblinNftExActivity
=
GoblinNftExActivity
.
getNew
();
GoblinNftExActivity
goblinNftExActivity
=
GoblinNftExActivity
.
getNew
();
BeanUtils
.
copyProperties
(
goblinNftExActivityParam
,
goblinNftExActivity
);
BeanUtils
.
copyProperties
(
goblinNftExActivityParam
,
goblinNftExActivity
);
goblinNftExActivity
.
setActivityId
(
IDGenerator
.
nextSnowId
());
goblinNftExActivity
.
setActivityId
(
IDGenerator
.
nextSnowId
());
goblinNftExActivity
.
setCreatedAt
(
now
);
goblinNftExActivity
.
setCreatedAt
(
now
);
// mysql数据
// mysql数据
goblinNftExActivityMapper
.
addGoblinNftExActivity
(
goblinNftExActivity
);
goblinNftExActivityMapper
.
addGoblinNftExActivity
(
goblinNftExActivity
);
// 添加redis数据
// goblinRedisUtils.incrActivitySku(goblinNftExActivities, goblinNftExActivity);
return
goblinNftExActivity
.
getActivityId
();
return
goblinNftExActivity
.
getActivityId
();
}
}
...
...
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/goblin/GoblinNftExSkuServiceImpl.java
View file @
09fa22e6
...
@@ -2,6 +2,9 @@ package com.liquidnet.service.platform.service.impl.goblin;
...
@@ -2,6 +2,9 @@ package com.liquidnet.service.platform.service.impl.goblin;
import
com.liquidnet.commons.lang.util.IDGenerator
;
import
com.liquidnet.commons.lang.util.IDGenerator
;
import
com.liquidnet.commons.lang.util.StringUtil
;
import
com.liquidnet.commons.lang.util.StringUtil
;
import
com.liquidnet.service.goblin.dto.vo.GoblinNftExActivityVo
;
import
com.liquidnet.service.goblin.dto.vo.GoblinNftExCodeVo
;
import
com.liquidnet.service.goblin.dto.vo.GoblinNftExSkuVo
;
import
com.liquidnet.service.goblin.entity.GoblinNftExCode
;
import
com.liquidnet.service.goblin.entity.GoblinNftExCode
;
import
com.liquidnet.service.goblin.entity.GoblinNftExSku
;
import
com.liquidnet.service.goblin.entity.GoblinNftExSku
;
import
com.liquidnet.service.goblin.mapper.GoblinNftExCodeMapper
;
import
com.liquidnet.service.goblin.mapper.GoblinNftExCodeMapper
;
...
@@ -44,8 +47,8 @@ public class GoblinNftExSkuServiceImpl implements IGoblinNftExSkuService {
...
@@ -44,8 +47,8 @@ public class GoblinNftExSkuServiceImpl implements IGoblinNftExSkuService {
LocalDateTime
now
=
LocalDateTime
.
now
();
LocalDateTime
now
=
LocalDateTime
.
now
();
ArrayList
<
GoblinNftExSku
>
goblinNftExSkuArrayList
=
ObjectUtil
.
getGoblinNftExSkuArrayList
();
ArrayList
<
GoblinNftExSku
Vo
>
goblinNftExSkuArrayList
=
ObjectUtil
.
getGoblinNftExSkuArrayList
();
ArrayList
<
GoblinNftExCode
>
goblinNftExCodeArrayList
=
ObjectUtil
.
getGoblinNftExCodeArrayList
();
ArrayList
<
GoblinNftExCode
Vo
>
goblinNftExCodeArrayList
=
ObjectUtil
.
getGoblinNftExCodeArrayList
();
String
activityId
=
""
;
String
activityId
=
""
;
...
@@ -67,24 +70,25 @@ public class GoblinNftExSkuServiceImpl implements IGoblinNftExSkuService {
...
@@ -67,24 +70,25 @@ public class GoblinNftExSkuServiceImpl implements IGoblinNftExSkuService {
goblinNftExCode
.
setSkuId
(
goblinNftExSkuParam
.
getSkuId
());
goblinNftExCode
.
setSkuId
(
goblinNftExSkuParam
.
getSkuId
());
goblinNftExCode
.
setState
(
1
);
goblinNftExCode
.
setState
(
1
);
goblinNftExCode
.
setCreatedAt
(
now
);
goblinNftExCode
.
setCreatedAt
(
now
);
goblinNftExCodeArrayList
.
add
(
goblinNftExCode
);
goblinNftExCodeArrayList
.
add
(
GoblinNftExCodeVo
.
getNew
().
copy
(
goblinNftExCode
));
}
}
goblinNftExSkuArrayList
.
add
(
goblinNftExSku
);
goblinNftExSkuArrayList
.
add
(
GoblinNftExSkuVo
.
getNew
().
copy
(
goblinNftExSku
)
);
}
}
// redis 数据
// redis 数据
// 并联sku信息
// 并联sku信息
List
<
GoblinNftExSku
>
goblinNftExSkusVos
=
goblinRedisUtils
.
getSku
(
activityId
);
/*
List<GoblinNftExSku> goblinNftExSkusVos = goblinRedisUtils.getSku(activityId);
goblinRedisUtils.incrSku(activityId, goblinNftExSkusVos, goblinNftExSkuArrayList);
goblinRedisUtils.incrSku(activityId, goblinNftExSkusVos, goblinNftExSkuArrayList);
// 兑换码信息
// 兑换码信息
List<GoblinNftExCode> goblinNftExCodes = goblinRedisUtils.getCode(activityId);
List<GoblinNftExCode> goblinNftExCodes = goblinRedisUtils.getCode(activityId);
goblinRedisUtils
.
incrCode
(
activityId
,
goblinNftExCodes
,
goblinNftExCodeArrayList
);
goblinRedisUtils.incrCode(activityId, goblinNftExCodes, goblinNftExCodeArrayList);
*/
goblinNftExSkuMapper
.
addGoblinNftExSkus
(
goblinNftExSkuArrayList
);
//
goblinNftExSkuMapper.addGoblinNftExSkus(goblinNftExSkuArrayList);
goblinNftExCodeMapper
.
addGoblinNftExCodes
(
goblinNftExCodeArrayList
);
//
goblinNftExCodeMapper.addGoblinNftExCodes(goblinNftExCodeArrayList);
return
null
;
return
null
;
...
...
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/utils/ObjectUtil.java
View file @
09fa22e6
...
@@ -6,7 +6,13 @@ import com.liquidnet.service.candy.entity.CandyCommonCoupon;
...
@@ -6,7 +6,13 @@ import com.liquidnet.service.candy.entity.CandyCommonCoupon;
import
com.liquidnet.service.candy.entity.CandyCouponCode
;
import
com.liquidnet.service.candy.entity.CandyCouponCode
;
import
com.liquidnet.service.candy.entity.CandyUserCoupon
;
import
com.liquidnet.service.candy.entity.CandyUserCoupon
;
import
com.liquidnet.service.goblin.dto.GoblinStoreMarketDto
;
import
com.liquidnet.service.goblin.dto.GoblinStoreMarketDto
;
import
com.liquidnet.service.goblin.dto.vo.GoblinNftExActivityVo
;
import
com.liquidnet.service.goblin.dto.vo.GoblinNftExCodeVo
;
import
com.liquidnet.service.goblin.dto.vo.GoblinNftExSkuVo
;
import
com.liquidnet.service.goblin.dto.vo.SellDataOneVO
;
import
com.liquidnet.service.goblin.dto.vo.SellDataOneVO
;
import
com.liquidnet.service.goblin.entity.GoblinNftExActivity
;
import
com.liquidnet.service.goblin.entity.GoblinNftExCode
;
import
com.liquidnet.service.goblin.entity.GoblinNftExSku
;
import
com.liquidnet.service.kylin.dto.vo.KylinApiCameraDevicesVo
;
import
com.liquidnet.service.kylin.dto.vo.KylinApiCameraDevicesVo
;
import
com.liquidnet.service.kylin.entity.KylinOrderCoupons
;
import
com.liquidnet.service.kylin.entity.KylinOrderCoupons
;
import
com.mongodb.BasicDBObject
;
import
com.mongodb.BasicDBObject
;
...
@@ -62,6 +68,9 @@ public class ObjectUtil {
...
@@ -62,6 +68,9 @@ public class ObjectUtil {
private
static
final
ArrayList
<
KylinOrderCoupons
>
kylinOrderCouponsArrayList
=
new
ArrayList
<>();
private
static
final
ArrayList
<
KylinOrderCoupons
>
kylinOrderCouponsArrayList
=
new
ArrayList
<>();
private
static
final
ArrayList
<
KylinApiCameraDevicesVo
>
kylinApiCameraDevicesVoArrayList
=
new
ArrayList
<>();
private
static
final
ArrayList
<
KylinApiCameraDevicesVo
>
kylinApiCameraDevicesVoArrayList
=
new
ArrayList
<>();
private
static
final
ArrayList
<
SellDataOneVO
>
sellDataOneVOArrayList
=
new
ArrayList
<>();
private
static
final
ArrayList
<
SellDataOneVO
>
sellDataOneVOArrayList
=
new
ArrayList
<>();
private
static
final
ArrayList
<
GoblinNftExActivityVo
>
GOBLIN_NFT_EX_ACTIVITY_VO_ARRAY_LIST
=
new
ArrayList
<>();
private
static
final
ArrayList
<
GoblinNftExCodeVo
>
GOBLIN_NFT_EX_CODE_VO_ARRAY_LIST
=
new
ArrayList
<>();
private
static
final
ArrayList
<
GoblinNftExSkuVo
>
GOBLIN_NFT_EX_SKU_VO_ARRAY_LIST
=
new
ArrayList
<>();
private
static
final
ArrayList
<
GoblinStoreMarketDto
>
goblinStoreMarketDtoArrayList
=
new
ArrayList
<>();
private
static
final
ArrayList
<
GoblinStoreMarketDto
>
goblinStoreMarketDtoArrayList
=
new
ArrayList
<>();
...
@@ -139,4 +148,19 @@ public class ObjectUtil {
...
@@ -139,4 +148,19 @@ public class ObjectUtil {
public
static
ArrayList
<
KylinApiCameraDevicesVo
>
getKylinApiCameraDevicesVoArrayList
()
{
public
static
ArrayList
<
KylinApiCameraDevicesVo
>
getKylinApiCameraDevicesVoArrayList
()
{
return
(
ArrayList
<
KylinApiCameraDevicesVo
>)
kylinApiCameraDevicesVoArrayList
.
clone
();
return
(
ArrayList
<
KylinApiCameraDevicesVo
>)
kylinApiCameraDevicesVoArrayList
.
clone
();
}
}
public
static
ArrayList
<
GoblinNftExActivityVo
>
getGoblinNftExActivityArrayList
(){
return
(
ArrayList
<
GoblinNftExActivityVo
>)
GOBLIN_NFT_EX_ACTIVITY_VO_ARRAY_LIST
.
clone
();
}
public
static
ArrayList
<
GoblinNftExCodeVo
>
getGoblinNftExCodeArrayList
(){
return
(
ArrayList
<
GoblinNftExCodeVo
>)
GOBLIN_NFT_EX_CODE_VO_ARRAY_LIST
.
clone
();
}
public
static
ArrayList
<
GoblinNftExSkuVo
>
getGoblinNftExSkuArrayList
(){
return
(
ArrayList
<
GoblinNftExSkuVo
>)
GOBLIN_NFT_EX_SKU_VO_ARRAY_LIST
.
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