记得上下班打卡 | 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
9d71a883
Commit
9d71a883
authored
Dec 28, 2021
by
胡佳晨
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
正在下单 admin配置
parent
39c4ad8c
Changes
15
Hide whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
335 additions
and
113 deletions
+335
-113
GoblinRedisConst.java
...m/liquidnet/service/goblin/constant/GoblinRedisConst.java
+1
-0
GoblinMarketingZhengzaiRelationVo.java
...vice/goblin/dto/vo/GoblinMarketingZhengzaiRelationVo.java
+41
-0
GoblinSelfMarketingVo.java
...iquidnet/service/goblin/dto/vo/GoblinSelfMarketingVo.java
+9
-37
GoblinSelfZhengzaiController.java
...troller/zhengzai/goblin/GoblinSelfZhengzaiController.java
+42
-23
IGoblinZhengzaiMarketService.java
...zhengzai/goblin/service/IGoblinZhengzaiMarketService.java
+10
-1
GoblinZhengzaiMarketServiceImpl.java
...i/goblin/service/imp/GoblinZhengzaiMarketServiceImpl.java
+54
-13
GoblinMongoUtils.java
.../client/admin/zhengzai/goblin/utils/GoblinMongoUtils.java
+18
-0
GoblinRedisUtils.java
.../client/admin/zhengzai/goblin/utils/GoblinRedisUtils.java
+19
-1
GoblinZhengzaiStoreDetailsDto.java
...net/service/goblin/dto/GoblinZhengzaiStoreDetailsDto.java
+19
-0
GoblinMarketingZhengzaiRelation.java
...ervice/goblin/entity/GoblinMarketingZhengzaiRelation.java
+64
-0
GoblinMarketingZhengzaiRelationMapper.java
.../goblin/mapper/GoblinMarketingZhengzaiRelationMapper.java
+16
-0
GoblinSelfMarketingMapper.java
...dnet/service/goblin/mapper/GoblinSelfMarketingMapper.java
+2
-0
GoblinMarketingZhengzaiRelationMapper.xml
...e.goblin.mapper/GoblinMarketingZhengzaiRelationMapper.xml
+5
-0
GoblinSelfMarketingMapper.xml
...idnet.service.goblin.mapper/GoblinSelfMarketingMapper.xml
+33
-4
MybatisPlusCodeGenerator.java
.../java/com/liquidnet/service/MybatisPlusCodeGenerator.java
+2
-34
No files found.
liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/constant/GoblinRedisConst.java
View file @
9d71a883
...
...
@@ -9,6 +9,7 @@ public class GoblinRedisConst {
/* ----------------------------------------------------------------- */
public
static
final
String
REDIS_GOBLIN_SELF_MARKET
=
PREFIX
.
concat
(
"self:market:"
);
public
static
final
String
REDIS_GOBLIN_ZHENGZAI_RELATION
=
PREFIX
.
concat
(
"zhengzai:market:"
);
/* ----------------------------------------------------------------- */
...
...
liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinMarketingZhengzaiRelationVo.java
0 → 100644
View file @
9d71a883
package
com
.
liquidnet
.
service
.
goblin
.
dto
.
vo
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
import
java.io.Serializable
;
import
java.time.LocalDateTime
;
/**
* <p>
* 可参加官方活动的店铺表
* </p>
*
* @author liquidnet
* @since 2021-12-28
*/
@Data
@EqualsAndHashCode
(
callSuper
=
false
)
public
class
GoblinMarketingZhengzaiRelationVo
implements
Serializable
,
Cloneable
{
@ApiModelProperty
(
value
=
"官方营销表id"
)
private
String
selfMarketId
;
@ApiModelProperty
(
value
=
"商铺id"
)
private
String
storeId
;
@ApiModelProperty
(
value
=
"可显示时间"
)
private
String
showTime
;
@ApiModelProperty
(
value
=
"创建时间"
)
private
String
createdAt
;
private
static
final
GoblinMarketingZhengzaiRelationVo
obj
=
new
GoblinMarketingZhengzaiRelationVo
();
public
static
GoblinMarketingZhengzaiRelationVo
getNew
()
{
try
{
return
(
GoblinMarketingZhengzaiRelationVo
)
obj
.
clone
();
}
catch
(
CloneNotSupportedException
e
)
{
return
new
GoblinMarketingZhengzaiRelationVo
();
}
}
}
liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinSelfMarketingVo.java
View file @
9d71a883
...
...
@@ -2,6 +2,7 @@ package com.liquidnet.service.goblin.dto.vo;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
...
...
@@ -21,52 +22,23 @@ import java.time.LocalDateTime;
public
class
GoblinSelfMarketingVo
implements
Serializable
,
Cloneable
{
private
static
final
long
serialVersionUID
=
1L
;
/**
* 官方营销表id
*/
@ApiModelProperty
(
value
=
"官方营销表id"
)
private
String
selfMarketId
;
/**
* 营销名称
*/
@ApiModelProperty
(
value
=
"营销名称"
)
private
String
name
;
/**
* 营销类型[1-正在下单]
*/
@ApiModelProperty
(
value
=
"营销类型[1-正在下单]"
)
private
Integer
type
;
/**
* 活动状态[-1-全部|0-等待开始|1-活动中|2-活动结束|7-停用]
*/
@ApiModelProperty
(
value
=
"活动状态[-1-全部|0-等待开始|1-活动中|2-活动结束|7-停用]"
)
private
Integer
status
;
/**
* 营销描述
*/
@ApiModelProperty
(
value
=
"营销描述"
)
private
String
desc
;
/**
* 营销开始时间
*/
@ApiModelProperty
(
value
=
"营销开始时间"
)
private
String
startTime
;
/**
* 营销结束时间营销为定金预售的时候,该时间也是第二阶段付款的时间营销为全款预售的时候,该时间也是发货时间
*/
@ApiModelProperty
(
value
=
"营销结束时间营销为定金预售的时候,该时间也是第二阶段付款的时间营销为全款预售的时候,该时间也是发货时间"
)
private
String
endTime
;
/**
* 删除标记[0-未删除|1-删除]
*/
private
Integer
delFlag
;
@ApiModelProperty
(
value
=
"创建时间"
)
private
String
createdAt
;
private
String
comment
;
private
static
final
GoblinSelfMarketingVo
obj
=
new
GoblinSelfMarketingVo
();
public
static
GoblinSelfMarketingVo
getNew
()
{
...
...
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/goblin/GoblinSelfZhengzaiController.java
View file @
9d71a883
...
...
@@ -102,44 +102,38 @@ public class GoblinSelfZhengzaiController extends BaseController {
return
goblinZhengzaiMarketService
.
zhengzaiDetails
(
marketId
);
}
@GetMapping
(
"zhengzai/sku"
)
@ApiOperation
(
"活动详情-正在下单-店铺sku列表"
)
@ApiResponse
(
code
=
200
,
message
=
"接口返回对象参数"
)
@ApiImplicitParams
({
@ApiImplicitParam
(
type
=
"form"
,
required
=
true
,
dataType
=
"String"
,
name
=
"marketId"
,
value
=
"活动id"
,
example
=
"1"
),
@ApiImplicitParam
(
type
=
"form"
,
required
=
true
,
dataType
=
"String"
,
name
=
"storeId"
,
value
=
"页数"
,
example
=
"1"
),
})
public
ResponseDto
<
String
>
purchasingSkuList
(
@RequestParam
(
"marketId"
)
@Valid
String
marketId
,
@RequestParam
(
"storeId"
)
@Valid
String
storeId
)
{
return
goblinZhengzaiMarketService
.
zhengzaiSkuList
(
marketId
,
storeId
);
}
@
DeleteMapping
(
"zhengzai/sku
"
)
@ApiOperation
(
"活动详情-正在下单-
店铺sku删除
"
)
@
PostMapping
(
"zhengzai/store
"
)
@ApiOperation
(
"活动详情-正在下单-
配置店铺
"
)
@ApiResponse
(
code
=
200
,
message
=
"接口返回对象参数"
)
@ApiImplicitParams
({
@ApiImplicitParam
(
type
=
"form"
,
required
=
true
,
dataType
=
"String"
,
name
=
"marketId"
,
value
=
"活动id"
,
example
=
"1"
),
@ApiImplicitParam
(
type
=
"form"
,
required
=
true
,
dataType
=
"String"
,
name
=
"skuId"
,
value
=
"skuId"
,
example
=
"1"
),
@ApiImplicitParam
(
type
=
"form"
,
required
=
true
,
dataType
=
"String"
,
name
=
"storeId"
,
value
=
"商铺id"
,
example
=
"1"
),
@ApiImplicitParam
(
type
=
"form"
,
required
=
true
,
dataType
=
"String"
,
name
=
"showTime"
,
value
=
"显示时间"
,
example
=
"0"
),
})
public
ResponseDto
<
Boolean
>
purchasingSkuDel
(
@RequestParam
(
"marketId"
)
@Valid
String
marketId
,
@RequestParam
(
"skuId"
)
@Valid
String
skuId
)
{
return
goblinZhengzaiMarketService
.
zhengzaiSkuDel
(
marketId
,
skuId
);
public
ResponseDto
<
Boolean
>
purchasingStore
(
@RequestParam
(
"marketId"
)
@Valid
String
marketId
,
@RequestParam
(
"storeId"
)
@Valid
String
storeId
,
@RequestParam
(
"showTime"
)
@Valid
String
showTime
)
{
return
goblinZhengzaiMarketService
.
zhengzaiStore
(
marketId
,
storeId
,
showTime
);
}
@P
os
tMapping
(
"zhengzai/store"
)
@P
u
tMapping
(
"zhengzai/store"
)
@ApiOperation
(
"活动详情-正在下单-配置店铺"
)
@ApiResponse
(
code
=
200
,
message
=
"接口返回对象参数"
)
@ApiImplicitParams
({
@ApiImplicitParam
(
type
=
"form"
,
required
=
true
,
dataType
=
"String"
,
name
=
"marketId"
,
value
=
"活动id"
,
example
=
"1"
),
@ApiImplicitParam
(
type
=
"form"
,
required
=
true
,
dataType
=
"String"
,
name
=
"storeId"
,
value
=
"商铺id"
,
example
=
"1"
),
@ApiImplicitParam
(
type
=
"form"
,
required
=
true
,
dataType
=
"Integet"
,
name
=
"delTag"
,
value
=
"删除标记[0-添加|1删除]"
,
example
=
"0"
),
@ApiImplicitParam
(
type
=
"form"
,
required
=
true
,
dataType
=
"String"
,
name
=
"showTime"
,
value
=
"显示时间"
,
example
=
"0"
),
@ApiImplicitParam
(
type
=
"form"
,
required
=
true
,
dataType
=
"Integet"
,
name
=
"delTag"
,
value
=
"是否删除[0-否|1-是]"
,
example
=
"0"
),
})
public
TableDataInfo
purchasingStore
(
@RequestParam
(
"marketId"
)
@Valid
String
marketId
,
@RequestParam
(
"storeId"
)
@Valid
String
storeId
,
@RequestParam
(
"delTag"
)
@Valid
Integer
delTag
)
{
return
null
;
public
ResponseDto
<
Boolean
>
purchasingStore
(
@RequestParam
(
"marketId"
)
@Valid
String
marketId
,
@RequestParam
(
"storeId"
)
@Valid
String
storeId
,
@RequestParam
(
"showTime"
)
@Valid
String
showTime
,
@RequestParam
(
"delTag"
)
@Valid
Integer
delTag
)
{
return
goblinZhengzaiMarketService
.
zhengzaiStore
(
marketId
,
storeId
,
showTime
);
}
@GetMapping
(
"zhengzai/store/list"
)
@ApiOperation
(
"活动详情-正在下单-参加活动店铺列表"
)
@ApiResponse
(
code
=
200
,
message
=
"接口返回对象参数"
)
...
...
@@ -149,4 +143,29 @@ public class GoblinSelfZhengzaiController extends BaseController {
public
ResponseDto
<
List
<
GoblinZhengzaiStoreListVo
>>
purchasingSkuDel
(
@RequestParam
(
"marketId"
)
@Valid
String
marketId
)
{
return
goblinZhengzaiMarketService
.
zhengzaiStoreList
(
marketId
);
}
@GetMapping
(
"zhengzai/sku"
)
@ApiOperation
(
"活动详情-正在下单-店铺sku列表"
)
@ApiResponse
(
code
=
200
,
message
=
"接口返回对象参数"
)
@ApiImplicitParams
({
@ApiImplicitParam
(
type
=
"form"
,
required
=
true
,
dataType
=
"String"
,
name
=
"marketId"
,
value
=
"活动id"
,
example
=
"1"
),
@ApiImplicitParam
(
type
=
"form"
,
required
=
true
,
dataType
=
"String"
,
name
=
"storeId"
,
value
=
"页数"
,
example
=
"1"
),
})
public
ResponseDto
<
String
>
purchasingSkuList
(
@RequestParam
(
"marketId"
)
@Valid
String
marketId
,
@RequestParam
(
"storeId"
)
@Valid
String
storeId
)
{
return
goblinZhengzaiMarketService
.
zhengzaiSkuList
(
marketId
,
storeId
);
}
@DeleteMapping
(
"zhengzai/sku"
)
@ApiOperation
(
"活动详情-正在下单-店铺sku删除"
)
@ApiResponse
(
code
=
200
,
message
=
"接口返回对象参数"
)
@ApiImplicitParams
({
@ApiImplicitParam
(
type
=
"form"
,
required
=
true
,
dataType
=
"String"
,
name
=
"marketId"
,
value
=
"活动id"
,
example
=
"1"
),
@ApiImplicitParam
(
type
=
"form"
,
required
=
true
,
dataType
=
"String"
,
name
=
"skuId"
,
value
=
"skuId"
,
example
=
"1"
),
})
public
ResponseDto
<
Boolean
>
purchasingSkuDel
(
@RequestParam
(
"marketId"
)
@Valid
String
marketId
,
@RequestParam
(
"skuId"
)
@Valid
String
skuId
)
{
return
goblinZhengzaiMarketService
.
zhengzaiSkuDel
(
marketId
,
skuId
);
}
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/goblin/service/IGoblinZhengzaiMarketService.java
View file @
9d71a883
...
...
@@ -88,7 +88,16 @@ public interface IGoblinZhengzaiMarketService {
* @param storeId
* @return
*/
ResponseDto
<
Boolean
>
zhengzaiStore
(
String
marketId
,
String
storeId
,
Integer
delTag
);
ResponseDto
<
Boolean
>
zhengzaiStore
(
String
marketId
,
String
storeId
,
String
showTime
);
/**
* 编辑正在下单 可参与活动店铺
*
* @param marketId
* @param storeId
* @return
*/
ResponseDto
<
Boolean
>
zhengzaiStore
(
String
marketId
,
String
storeId
,
String
showTime
,
Integer
delTag
);
/**
* 查看详情(参加活动的商品列表)
...
...
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/goblin/service/imp/GoblinZhengzaiMarketServiceImpl.java
View file @
9d71a883
...
...
@@ -9,13 +9,15 @@ import com.liquidnet.commons.lang.util.DateUtil;
import
com.liquidnet.commons.lang.util.IDGenerator
;
import
com.liquidnet.service.base.ResponseDto
;
import
com.liquidnet.service.goblin.constant.GoblinStatusConst
;
import
com.liquidnet.service.goblin.dto.GoblinZhengzaiStoreDetailsDto
;
import
com.liquidnet.service.goblin.dto.GoblinZhengzaiStoreListDto
;
import
com.liquidnet.service.goblin.dto.vo.GoblinMarketingZhengzaiRelationVo
;
import
com.liquidnet.service.goblin.dto.vo.GoblinSelfMarketingVo
;
import
com.liquidnet.service.goblin.dto.vo.GoblinZhengzaiStoreListVo
;
import
com.liquidnet.service.goblin.dto.vo.GoblinZhengzaiVo
;
import
com.liquidnet.service.goblin.entity.GoblinMarketingZhengzai
;
import
com.liquidnet.service.goblin.entity.GoblinMarketingZhengzai
Relation
;
import
com.liquidnet.service.goblin.entity.GoblinSelfMarketing
;
import
com.liquidnet.service.goblin.mapper.GoblinMarketingZhengzaiMapper
;
import
com.liquidnet.service.goblin.mapper.GoblinMarketingZhengzai
Relation
Mapper
;
import
com.liquidnet.service.goblin.mapper.GoblinSelfMarketingMapper
;
import
org.springframework.beans.BeanUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
...
@@ -40,7 +42,7 @@ public class GoblinZhengzaiMarketServiceImpl implements IGoblinZhengzaiMarketSer
@Autowired
GoblinSelfMarketingMapper
goblinSelfMarketingMapper
;
@Autowired
GoblinMarketingZhengzai
Mapper
goblinMarketingZhengzai
Mapper
;
GoblinMarketingZhengzai
RelationMapper
goblinMarketingZhengzaiRelation
Mapper
;
@Override
public
ResponseDto
<
List
<
GoblinSelfMarketing
>>
zhengzaiList
(
int
page
,
String
purchaseName
,
int
status
,
String
st
,
String
et
,
String
ct
)
{
...
...
@@ -101,6 +103,7 @@ public class GoblinZhengzaiMarketServiceImpl implements IGoblinZhengzaiMarketSer
BeanUtils
.
copyProperties
(
selfMarketing
,
vo
);
vo
.
setStartTime
(
st
);
vo
.
setEndTime
(
et
);
vo
.
setCreatedAt
(
DateUtil
.
Formatter
.
yyyyMMddHHmmss
.
format
(
selfMarketing
.
getCreatedAt
()));
goblinMongoUtils
.
insertSelfMarket
(
vo
);
//redis
goblinRedisUtils
.
setSelfMarket
(
SelfMarketId
,
vo
);
...
...
@@ -141,16 +144,11 @@ public class GoblinZhengzaiMarketServiceImpl implements IGoblinZhengzaiMarketSer
return
null
;
}
@Override
public
ResponseDto
<
String
>
zhengzaiSkuList
(
String
marketId
,
String
storeId
)
{
return
null
;
}
@Override
public
ResponseDto
<
List
<
GoblinZhengzaiStoreListVo
>>
zhengzaiStoreList
(
String
marketId
)
{
List
<
GoblinZhengzaiStoreListDto
>
dtoList
=
goblinSelfMarketingMapper
.
getZhengzaiStoreList
(
marketId
);
List
<
GoblinZhengzaiStoreListVo
>
voList
=
new
ArrayList
<>();
for
(
GoblinZhengzaiStoreListDto
item
:
dtoList
){
for
(
GoblinZhengzaiStoreListDto
item
:
dtoList
)
{
GoblinZhengzaiStoreListVo
vo
=
GoblinZhengzaiStoreListVo
.
getNew
();
vo
.
setStoreId
(
item
.
getStoreId
());
vo
.
setStoreName
(
item
.
getStoreName
());
...
...
@@ -161,14 +159,57 @@ public class GoblinZhengzaiMarketServiceImpl implements IGoblinZhengzaiMarketSer
}
@Override
public
ResponseDto
<
Boolean
>
zhengzaiSkuDel
(
String
marketId
,
String
skuId
)
{
public
ResponseDto
<
Boolean
>
zhengzaiStore
(
String
marketId
,
String
storeId
,
String
showTime
)
{
GoblinMarketingZhengzaiRelation
entity
=
GoblinMarketingZhengzaiRelation
.
getNew
();
entity
.
setSelfMarketId
(
marketId
);
entity
.
setStoreId
(
storeId
);
entity
.
setShowTime
(
LocalDateTime
.
parse
(
showTime
,
DTF_YMD_HMS
));
//mysql
goblinMarketingZhengzaiRelationMapper
.
insert
(
entity
);
//mongo
GoblinMarketingZhengzaiRelationVo
vo
=
GoblinMarketingZhengzaiRelationVo
.
getNew
();
BeanUtils
.
copyProperties
(
entity
,
vo
);
vo
.
setShowTime
(
showTime
);
vo
.
setCreatedAt
(
DateUtil
.
Formatter
.
yyyyMMddHHmmss
.
format
(
entity
.
getCreatedAt
()));
goblinMongoUtils
.
insertZhengzaiRelation
(
vo
);
//redis
goblinRedisUtils
.
setZhengzaiRelation
(
marketId
,
vo
);
return
ResponseDto
.
success
();
}
@Override
public
ResponseDto
<
Boolean
>
zhengzaiStore
(
String
marketId
,
String
storeId
,
String
showTime
,
Integer
delTag
)
{
if
(
delTag
==
0
)
{
GoblinMarketingZhengzaiRelation
entity
=
GoblinMarketingZhengzaiRelation
.
getNew
();
entity
.
setShowTime
(
LocalDateTime
.
parse
(
showTime
,
DTF_YMD_HMS
));
//mysql
goblinMarketingZhengzaiRelationMapper
.
update
(
entity
,
Wrappers
.
lambdaUpdate
(
GoblinMarketingZhengzaiRelation
.
getNew
()).
eq
(
GoblinMarketingZhengzaiRelation:
:
getSelfMarketId
,
marketId
).
eq
(
GoblinMarketingZhengzaiRelation:
:
getStoreId
,
storeId
));
//mongo
GoblinMarketingZhengzaiRelationVo
vo
=
GoblinMarketingZhengzaiRelationVo
.
getNew
();
BeanUtils
.
copyProperties
(
entity
,
vo
);
vo
.
setShowTime
(
showTime
);
vo
.
setCreatedAt
(
DateUtil
.
Formatter
.
yyyyMMddHHmmss
.
format
(
entity
.
getCreatedAt
()));
goblinMongoUtils
.
updateZhengzaiRelation
(
marketId
,
storeId
,
vo
);
//redis
goblinRedisUtils
.
setZhengzaiRelation
(
marketId
,
vo
);
}
else
if
(
delTag
==
1
)
{
//mongo
goblinMongoUtils
.
delZhengzaiRelation
(
marketId
,
storeId
);
//redis
goblinRedisUtils
.
delZhengzaiRelation
(
marketId
,
storeId
);
}
return
ResponseDto
.
success
();
}
@Override
public
ResponseDto
<
String
>
zhengzaiSkuList
(
String
marketId
,
String
storeId
)
{
List
<
GoblinZhengzaiStoreDetailsDto
>
dtoList
=
goblinSelfMarketingMapper
.
getZhengzaiStoreDetails
(
marketId
,
storeId
);
return
null
;
}
@Override
public
ResponseDto
<
Boolean
>
zhengzaiStore
(
String
marketId
,
String
storeId
,
Integer
delTag
)
{
GoblinMarketingZhengzai
entity
=
GoblinMarketingZhengzai
.
getNew
();
goblinMarketingZhengzaiMapper
.
insert
(
entity
);
public
ResponseDto
<
Boolean
>
zhengzaiSkuDel
(
String
marketId
,
String
skuId
)
{
//调用goblin商铺配置商铺接口
return
null
;
}
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/goblin/utils/GoblinMongoUtils.java
View file @
9d71a883
package
com
.
liquidnet
.
client
.
admin
.
zhengzai
.
goblin
.
utils
;
import
com.liquidnet.service.goblin.dto.vo.GoblinMarketingZhengzaiRelationVo
;
import
com.liquidnet.service.goblin.dto.vo.GoblinSelfMarketingVo
;
import
com.liquidnet.service.goblin.entity.GoblinMarketingZhengzaiRelation
;
import
com.liquidnet.service.goblin.entity.GoblinSelfMarketing
;
import
com.mongodb.BasicDBObject
;
import
com.mongodb.client.result.DeleteResult
;
import
com.mongodb.client.result.UpdateResult
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.data.mongodb.core.MongoTemplate
;
...
...
@@ -30,4 +33,19 @@ public class GoblinMongoUtils {
object
);
}
public
GoblinMarketingZhengzaiRelationVo
insertZhengzaiRelation
(
GoblinMarketingZhengzaiRelationVo
data
)
{
return
mongoTemplate
.
insert
(
data
,
GoblinMarketingZhengzaiRelationVo
.
class
.
getSimpleName
());
}
public
UpdateResult
updateZhengzaiRelation
(
String
selfMarketId
,
String
storeId
,
GoblinMarketingZhengzaiRelationVo
data
)
{
BasicDBObject
object
=
GoblinObjectUtils
.
cloneBasicDBObject
().
append
(
"$set"
,
mongoConverter
.
convertToMongoType
(
data
));
return
mongoTemplate
.
getCollection
(
GoblinMarketingZhengzaiRelationVo
.
class
.
getSimpleName
()).
updateOne
(
Query
.
query
(
Criteria
.
where
(
"selfMarketId"
).
is
(
selfMarketId
).
and
(
"storeId"
).
is
(
storeId
)).
getQueryObject
(),
object
);
}
public
DeleteResult
delZhengzaiRelation
(
String
marketId
,
String
storeId
)
{
return
mongoTemplate
.
remove
(
Query
.
query
(
Criteria
.
where
(
"storeId"
).
is
(
storeId
).
and
(
"selfMarketId"
).
is
(
marketId
)),
GoblinMarketingZhengzaiRelationVo
.
class
.
getSimpleName
());
}
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/goblin/utils/GoblinRedisUtils.java
View file @
9d71a883
...
...
@@ -2,6 +2,7 @@ package com.liquidnet.client.admin.zhengzai.goblin.utils;
import
com.liquidnet.common.cache.redis.util.RedisDataSourceUtil
;
import
com.liquidnet.service.goblin.constant.GoblinRedisConst
;
import
com.liquidnet.service.goblin.dto.vo.GoblinMarketingZhengzaiRelationVo
;
import
com.liquidnet.service.goblin.dto.vo.GoblinSelfMarketingVo
;
import
com.liquidnet.service.goblin.entity.GoblinSelfMarketing
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
...
@@ -13,8 +14,9 @@ public class GoblinRedisUtils {
@Autowired
RedisDataSourceUtil
redisDataSourceUtil
;
/**
* 覆盖
官方
活动
* 覆盖
店铺
活动
*
* @param selfMarketId
* @param data
...
...
@@ -23,4 +25,20 @@ public class GoblinRedisUtils {
String
redisKey
=
GoblinRedisConst
.
REDIS_GOBLIN_SELF_MARKET
.
concat
(
selfMarketId
);
redisDataSourceUtil
.
getRedisGoblinUtil
().
set
(
redisKey
,
data
);
}
/**
* 正在下单 可参加商户
*
* @param selfMarketId
* @param data
*/
public
void
setZhengzaiRelation
(
String
selfMarketId
,
GoblinMarketingZhengzaiRelationVo
data
)
{
String
redisKey
=
GoblinRedisConst
.
REDIS_GOBLIN_ZHENGZAI_RELATION
.
concat
(
selfMarketId
).
concat
(
":store_id:"
+
data
.
getStoreId
());
redisDataSourceUtil
.
getRedisGoblinUtil
().
set
(
redisKey
,
data
);
}
public
boolean
delZhengzaiRelation
(
String
selfMarketId
,
String
storeId
){
String
redisKey
=
GoblinRedisConst
.
REDIS_GOBLIN_ZHENGZAI_RELATION
.
concat
(
selfMarketId
).
concat
(
":store_id:"
+
storeId
);
redisDataSourceUtil
.
getRedisGoblinUtil
().
del
(
redisKey
);
}
}
liquidnet-bus-do/liquidnet-service-goblin-do/src/main/java/com/liquidnet/service/goblin/dto/GoblinZhengzaiStoreDetailsDto.java
0 → 100644
View file @
9d71a883
package
com
.
liquidnet
.
service
.
goblin
.
dto
;
import
lombok.Data
;
import
java.math.BigDecimal
;
@Data
public
class
GoblinZhengzaiStoreDetailsDto
{
String
skuId
;
String
specName
;
String
specVname
;
BigDecimal
price
;
Integer
stock
;
Integer
skuStock
;
BigDecimal
priceMarketing
;
Integer
stockMarketing
;
Integer
buyLimit
;
Integer
buyType
;
}
liquidnet-bus-do/liquidnet-service-goblin-do/src/main/java/com/liquidnet/service/goblin/entity/GoblinMarketingZhengzaiRelation.java
0 → 100644
View file @
9d71a883
package
com
.
liquidnet
.
service
.
goblin
.
entity
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
java.time.LocalDateTime
;
import
java.io.Serializable
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
/**
* <p>
* 可参加官方活动的店铺表
* </p>
*
* @author liquidnet
* @since 2021-12-28
*/
@Data
@EqualsAndHashCode
(
callSuper
=
false
)
public
class
GoblinMarketingZhengzaiRelation
implements
Serializable
,
Cloneable
{
private
static
final
long
serialVersionUID
=
1L
;
@TableId
(
value
=
"mid"
,
type
=
IdType
.
AUTO
)
private
Long
mid
;
/**
* 官方营销表id
*/
private
String
selfMarketId
;
/**
* 商铺id
*/
private
String
storeId
;
/**
* 可显示时间
*/
private
LocalDateTime
showTime
;
/**
* 删除标记[0-未删除|1-删除]
*/
private
Integer
delTag
;
private
LocalDateTime
createdAt
;
private
LocalDateTime
updatedAt
;
private
String
comment
;
private
static
final
GoblinMarketingZhengzaiRelation
obj
=
new
GoblinMarketingZhengzaiRelation
();
public
static
GoblinMarketingZhengzaiRelation
getNew
()
{
try
{
return
(
GoblinMarketingZhengzaiRelation
)
obj
.
clone
();
}
catch
(
CloneNotSupportedException
e
)
{
return
new
GoblinMarketingZhengzaiRelation
();
}
}
}
liquidnet-bus-do/liquidnet-service-goblin-do/src/main/java/com/liquidnet/service/goblin/mapper/GoblinMarketingZhengzaiRelationMapper.java
0 → 100644
View file @
9d71a883
package
com
.
liquidnet
.
service
.
goblin
.
mapper
;
import
com.liquidnet.service.goblin.entity.GoblinMarketingZhengzaiRelation
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
/**
* <p>
* 可参加官方活动的店铺表 Mapper 接口
* </p>
*
* @author liquidnet
* @since 2021-12-28
*/
public
interface
GoblinMarketingZhengzaiRelationMapper
extends
BaseMapper
<
GoblinMarketingZhengzaiRelation
>
{
}
liquidnet-bus-do/liquidnet-service-goblin-do/src/main/java/com/liquidnet/service/goblin/mapper/GoblinSelfMarketingMapper.java
View file @
9d71a883
package
com
.
liquidnet
.
service
.
goblin
.
mapper
;
import
com.liquidnet.service.goblin.dto.GoblinZhengzaiStoreDetailsDto
;
import
com.liquidnet.service.goblin.dto.GoblinZhengzaiStoreListDto
;
import
com.liquidnet.service.goblin.entity.GoblinSelfMarketing
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
...
...
@@ -18,4 +19,5 @@ public interface GoblinSelfMarketingMapper extends BaseMapper<GoblinSelfMarketin
List
<
GoblinZhengzaiStoreListDto
>
getZhengzaiStoreList
(
String
marketId
);
List
<
GoblinZhengzaiStoreDetailsDto
>
getZhengzaiStoreDetails
(
String
marketId
,
String
storeId
);
}
liquidnet-bus-do/liquidnet-service-goblin-do/src/main/resources/com.liquidnet.service.goblin.mapper/GoblinMarketingZhengzaiRelationMapper.xml
0 → 100644
View file @
9d71a883
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper
namespace=
"com.liquidnet.service.goblin.mapper.GoblinMarketingZhengzaiRelationMapper"
>
</mapper>
liquidnet-bus-do/liquidnet-service-goblin-do/src/main/resources/com.liquidnet.service.goblin.mapper/GoblinSelfMarketingMapper.xml
View file @
9d71a883
...
...
@@ -9,10 +9,39 @@
<result
column=
"sku_count"
property=
"skuCount"
/>
</resultMap>
<resultMap
id=
"goblinZhengzaiStoreDetailsDtoResult"
type=
"com.liquidnet.service.goblin.dto.GoblinZhengzaiStoreDetailsDto"
>
<result
column=
"sku_id"
property=
"skuId"
/>
<result
column=
"spec_name"
property=
"specName"
/>
<result
column=
"spec_vname"
property=
"specVname"
/>
<result
column=
"price"
property=
"price"
/>
<result
column=
"stock"
property=
"stock"
/>
<result
column=
"sku_stock"
property=
"skuStock"
/>
<result
column=
"price_marketing"
property=
"priceMarketing"
/>
<result
column=
"stock_marketing"
property=
"stockMarketing"
/>
<result
column=
"buy_limit"
property=
"buyLimit"
/>
<result
column=
"buy_type"
property=
"buyType"
/>
</resultMap>
<select
id=
"getZhengzaiStoreList"
resultMap=
"goblinZhengzaiStoreListDtoResult"
>
select gsz.store_id,gsi.store_name,sum(gsz.spu_id) as 'spu_count',sum(sku_id) as 'sku_count'
from goblin_marketing_zhengzai as gsz
inner join goblin_store_info as gsi on gsi.store_id = gsz.store_id
where gsz.self_market_id = #{marketId} group by gsi.store_id
select gsz.store_id, a.store_name, sum(gsz.spu_id), sum(sku_id)
from goblin_marketing_zhengzai as gsz
inner join (select gsi.store_name, gsi.store_id
from goblin_marketing_zhengzai_relation as gmzr
left join goblin_store_info as gsi on gmzr.store_id = gsi.store_id
where del_tag = 0) as a on gsz.store_id = a.store_id
where gsz.self_market_id = #{marketId}
group by gsz.store_id
</select>
<select
id=
"getZhengzaiStoreDetails"
resultMap=
"goblinZhengzaiStoreDetailsDtoResult"
>
select ggsku.sku_id,price,spec_name, spec_vname, ggsku.stock, ggsku.sku_stock from goblin_goods_sku ggsku
inner join goblin_goods_sku_spec_value ggssv on ggsku.sku_id = ggssv.sku_id
left join (select spec_name, spec_vname, ggs.spec_id
from goblin_goods_spec ggs
inner join goblin_goods_spec_value ggsv on ggsv.spec_id = ggs.spec_id) as a
on a.spec_id = ggssv.spec_id where ggsku.sku_id in (
select sku_id from goblin_marketing_zhengzai where self_market_id = #{marketId} and store_id = #{storeId}
)
</select>
</mapper>
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/MybatisPlusCodeGenerator.java
View file @
9d71a883
...
...
@@ -93,42 +93,10 @@ public class MybatisPlusCodeGenerator {
dsc
.
setUsername
(
"testmall"
);
dsc
.
setPassword
(
"zhengzai!mYT"
);
String
resourcePath
=
"/Users/
zhanggb
/Downloads/tmp"
;
String
resourcePath
=
"/Users/
hujiachen
/Downloads/tmp"
;
String
directory
=
"com.liquidnet.service.goblin"
;
String
[]
dbTableArray
=
new
String
[]{
"goblin_back_order"
,
"goblin_back_order_log"
,
"goblin_front_banner"
,
"goblin_front_hot_word"
,
"goblin_front_navigation"
,
"goblin_front_seckill"
,
"goblin_goods"
,
"goblin_goods_category_spec"
,
"goblin_goods_image"
,
"goblin_goods_service_support"
,
"goblin_goods_sku"
,
"goblin_goods_sku_spec_value"
,
"goblin_goods_spec"
,
"goblin_goods_spec_value"
,
"goblin_goods_spu_spec_value"
,
"goblin_goods_spu_tag"
,
"goblin_marketing_zhengzai"
,
"goblin_order_attr"
,
"goblin_order_operation_log"
,
"goblin_order_sku"
,
"goblin_self_extag"
,
"goblin_self_goods_category"
,
"goblin_self_goods_tag"
,
"goblin_self_marketing"
,
"goblin_service_support"
,
"goblin_shopping_cart"
,
"goblin_store_certification"
,
"goblin_store_config"
,
"goblin_store_goods_category"
,
"goblin_store_info"
,
"goblin_store_market_relation"
,
"goblin_store_marketing"
,
"goblin_store_order"
"goblin_marketing_zhengzai_relation"
};
doGenerator
(
resourcePath
,
dsc
,
directory
,
dbTableArray
);
...
...
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