Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
answer-backend
Overview
Overview
Details
Activity
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
answer
answer-backend
Commits
769c29ea
Commit
769c29ea
authored
Aug 16, 2022
by
唐聪
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改部分代码
parent
3bd3d553
Show whitespace changes
Inline
Side-by-side
Showing
17 changed files
with
340 additions
and
53 deletions
+340
-53
api-server/src/main/java/com/zq/api/feign/UserFeign.java
+9
-0
api-server/src/main/java/com/zq/api/service/IApiLogic.java
+27
-0
api-server/src/main/java/com/zq/api/service/impl/ApiV100Logic.java
+30
-0
user-server/src/main/java/com/zq/user/controller/LotteryInfoController.java
+32
-2
user-server/src/main/java/com/zq/user/controller/PrizeController.java
+0
-1
user-server/src/main/java/com/zq/user/controller/QuestionController.java
+5
-5
user-server/src/main/java/com/zq/user/controller/api/AddressApi.java
+5
-1
user-server/src/main/java/com/zq/user/controller/api/QuestionApi.java
+6
-4
user-server/src/main/java/com/zq/user/controller/api/lotteryInfoApi.java
+140
-0
user-server/src/main/java/com/zq/user/entity/Address.java
+5
-3
user-server/src/main/java/com/zq/user/entity/AnswerRec.java
+10
-0
user-server/src/main/java/com/zq/user/entity/Question.java
+13
-0
user-server/src/main/java/com/zq/user/service/AddressService.java
+4
-5
user-server/src/main/java/com/zq/user/service/LotteryInfoService.java
+15
-29
user-server/src/main/java/com/zq/user/service/QuestionService.java
+25
-3
user-server/src/main/java/com/zq/user/vo/AnswerRecVo.java
+5
-0
user-server/src/main/java/com/zq/user/vo/QuestionFindVo.java
+9
-0
No files found.
api-server/src/main/java/com/zq/api/feign/UserFeign.java
View file @
769c29ea
...
@@ -56,4 +56,13 @@ public interface UserFeign {
...
@@ -56,4 +56,13 @@ public interface UserFeign {
@GetMapping
(
value
=
"/api/address/getAddress/{addressId}"
)
@GetMapping
(
value
=
"/api/address/getAddress/{addressId}"
)
ResultVo
getAddress
(
@PathVariable
String
addressId
);
ResultVo
getAddress
(
@PathVariable
String
addressId
);
@GetMapping
(
value
=
"/api/address/getDefaultAddress/{userId}"
)
ResultVo
getDefaultAddress
(
@PathVariable
String
userId
);
@PostMapping
(
value
=
"/api/lotteryInfo/getIsOpen"
)
ResultVo
getIsOpen
(
@RequestBody
Map
<
String
,
Object
>
paramsMap
);
@PostMapping
(
value
=
"/api/question/getAnswerRecs"
)
ResultVo
getAnswerRecs
(
@RequestBody
Map
<
String
,
Object
>
paramsMap
);
}
}
api-server/src/main/java/com/zq/api/service/IApiLogic.java
View file @
769c29ea
...
@@ -106,4 +106,31 @@ public interface IApiLogic extends IApiCommon {
...
@@ -106,4 +106,31 @@ public interface IApiLogic extends IApiCommon {
*/
*/
ApiResp
getAddress
(
ApiForm
form
);
ApiResp
getAddress
(
ApiForm
form
);
/**
* 查看活动介绍
*
* @param form
* @return
*/
ApiResp
getIsOpen
(
ApiForm
form
);
/**
* 获取答题记录
*
* @param form
* @return
*/
ApiResp
getAnswerRecs
(
ApiForm
form
);
/**
* 获取默认地址
*
* @param form
* @return
*/
ApiResp
getDefaultAddress
(
ApiForm
form
);
}
}
api-server/src/main/java/com/zq/api/service/impl/ApiV100Logic.java
View file @
769c29ea
...
@@ -114,4 +114,34 @@ public class ApiV100Logic extends BaseApiLogic implements IApiLogic {
...
@@ -114,4 +114,34 @@ public class ApiV100Logic extends BaseApiLogic implements IApiLogic {
return
ApiUtils
.
toApiResp
(
form
,
userFeign
.
getAddress
(
form
.
getString
(
"addressId"
)));
return
ApiUtils
.
toApiResp
(
form
,
userFeign
.
getAddress
(
form
.
getString
(
"addressId"
)));
}
}
/**
* 查看启用的活动
* @param form
* @return
*/
@Override
public
ApiResp
getIsOpen
(
ApiForm
form
)
{
return
ApiUtils
.
toApiResp
(
form
,
userFeign
.
getIsOpen
(
form
.
getParamsMap
()));
}
/**
* 获取答题记录
* @param form
* @return
*/
@Override
public
ApiResp
getAnswerRecs
(
ApiForm
form
)
{
return
ApiUtils
.
toApiResp
(
form
,
userFeign
.
getAnswerRecs
(
form
.
getParamsMap
()));
}
/**
* 获取默认地址
* @param form
* @return
*/
@Override
public
ApiResp
getDefaultAddress
(
ApiForm
form
)
{
return
ApiUtils
.
toApiResp
(
form
,
userFeign
.
getDefaultAddress
(
form
.
getString
(
"userId"
)));
}
}
}
user-server/src/main/java/com/zq/user/controller/LotteryInfoController.java
View file @
769c29ea
...
@@ -7,7 +7,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
...
@@ -7,7 +7,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import
com.zq.common.utils.AssertUtils
;
import
com.zq.common.utils.AssertUtils
;
import
com.zq.common.vo.ResultVo
;
import
com.zq.common.vo.ResultVo
;
import
com.zq.user.dao.LotteryInfoDao
;
import
com.zq.user.dao.LotteryInfoDao
;
import
com.zq.user.dao.LotteryPrizeDao
;
import
com.zq.user.entity.LotteryInfo
;
import
com.zq.user.entity.LotteryInfo
;
import
com.zq.user.entity.LotteryPrize
;
import
com.zq.user.entity.PrizeType
;
import
com.zq.user.entity.PrizeType
;
import
com.zq.user.service.LotteryInfoService
;
import
com.zq.user.service.LotteryInfoService
;
import
com.zq.user.vo.LotteryInfoVo
;
import
com.zq.user.vo.LotteryInfoVo
;
...
@@ -34,7 +36,7 @@ import java.util.List;
...
@@ -34,7 +36,7 @@ import java.util.List;
public
class
LotteryInfoController
{
public
class
LotteryInfoController
{
private
final
LotteryInfoDao
lotteryInfoDao
;
private
final
LotteryInfoDao
lotteryInfoDao
;
private
final
LotteryPrizeDao
lotteryPrizeDao
;
/**
/**
* 服务对象
* 服务对象
...
@@ -111,11 +113,39 @@ public class LotteryInfoController {
...
@@ -111,11 +113,39 @@ public class LotteryInfoController {
@PostMapping
(
value
=
"/isOpen"
)
@PostMapping
(
value
=
"/isOpen"
)
public
ResultVo
isOpen
(
@RequestBody
LotteryInfoVo
vo
)
{
public
ResultVo
isOpen
(
@RequestBody
LotteryInfoVo
vo
)
{
AssertUtils
.
isTrue
(
vo
.
getIsOpen
()
!=
null
,
"传入开关状态为空"
);
AssertUtils
.
isTrue
(
vo
.
getIsOpen
()
!=
null
,
"传入开关状态为空"
);
AssertUtils
.
isTrue
(
lotteryInfoDao
.
selectList
(
new
QueryWrapper
<
LotteryInfo
>().
eq
(
"is
O
pen"
,
1
))
!=
null
,
"已经存在一个开启的活动"
);
AssertUtils
.
isTrue
(
lotteryInfoDao
.
selectList
(
new
QueryWrapper
<
LotteryInfo
>().
eq
(
"is
_o
pen"
,
1
))
!=
null
,
"已经存在一个开启的活动"
);
lotteryInfoService
.
isOpen
(
vo
);
lotteryInfoService
.
isOpen
(
vo
);
return
ResultVo
.
success
(
"操作成功"
);
return
ResultVo
.
success
(
"操作成功"
);
}
}
/**
* 返回已经启动的活动
*
* @return
*/
@ApiOperation
(
"返回已经启动的活动详情"
)
@PostMapping
(
value
=
"/getIsOpen"
)
public
ResultVo
getIsOpen
(
@RequestBody
LotteryInfoVo
vo
)
{
LotteryInfo
lotteryInfo
=
lotteryInfoDao
.
selectOne
(
new
QueryWrapper
<
LotteryInfo
>().
eq
(
"is_open"
,
1
));
if
(
lotteryInfo
==
null
)
{
ResultVo
.
fail
(
"不存在开启成功的抽奖活动"
);
}
return
ResultVo
.
success
(
lotteryInfo
);
}
/**
* 删除该活动
*
* @return
*/
@ApiOperation
(
"删除该活动"
)
@PostMapping
(
value
=
"/delete"
)
public
ResultVo
delete
(
@RequestBody
LotteryInfoVo
vo
)
{
AssertUtils
.
isTrue
(
vo
.
getId
()
!=
null
,
"传入开关状态为空"
);
lotteryInfoService
.
delete
(
vo
);
return
ResultVo
.
success
(
"操作成功"
);
}
}
}
user-server/src/main/java/com/zq/user/controller/PrizeController.java
View file @
769c29ea
...
@@ -130,7 +130,6 @@ public class PrizeController {
...
@@ -130,7 +130,6 @@ public class PrizeController {
@PutMapping
(
value
=
"/confirmAward"
)
@PutMapping
(
value
=
"/confirmAward"
)
public
ResultVo
confirmAward
(
Long
lotteryRecId
)
{
public
ResultVo
confirmAward
(
Long
lotteryRecId
)
{
AssertUtils
.
notNull
(
lotteryRecId
,
"中奖记录ID"
);
AssertUtils
.
notNull
(
lotteryRecId
,
"中奖记录ID"
);
prizeService
.
confirmAward
(
lotteryRecId
);
prizeService
.
confirmAward
(
lotteryRecId
);
return
ResultVo
.
success
();
return
ResultVo
.
success
();
}
}
...
...
user-server/src/main/java/com/zq/user/controller/QuestionController.java
View file @
769c29ea
...
@@ -72,10 +72,10 @@ public class QuestionController {
...
@@ -72,10 +72,10 @@ public class QuestionController {
return
ResultVo
.
success
(
questionService
.
getQuestion
(
questionId
));
return
ResultVo
.
success
(
questionService
.
getQuestion
(
questionId
));
}
}
@ApiOperation
(
"获取答题记录"
)
@GetMapping
(
value
=
"/getAnswerRecs"
)
public
ResultVo
getAnswerRecs
(
@RequestBody
AnswerRec
answerRec
)
{
return
ResultVo
.
success
(
questionService
.
getAnswerRec
(
answerRec
));
}
// @ApiOperation("获取答题记录")
// @GetMapping(value = "/getAnswerRecs")
// public ResultVo getAnswerRecs( ) {
// return ResultVo.success(questionService.getQuestion(questionId));
// }
}
}
user-server/src/main/java/com/zq/user/controller/api/AddressApi.java
View file @
769c29ea
...
@@ -33,7 +33,6 @@ public class AddressApi {
...
@@ -33,7 +33,6 @@ public class AddressApi {
@ApiOperation
(
"添加地址"
)
@ApiOperation
(
"添加地址"
)
@PostMapping
(
value
=
"/addAddress"
)
@PostMapping
(
value
=
"/addAddress"
)
public
ResultVo
addAddress
(
@RequestBody
Address
vo
)
{
public
ResultVo
addAddress
(
@RequestBody
Address
vo
)
{
addressService
.
addAddress
(
vo
);
addressService
.
addAddress
(
vo
);
return
ResultVo
.
success
();
return
ResultVo
.
success
();
}
}
...
@@ -62,4 +61,9 @@ public class AddressApi {
...
@@ -62,4 +61,9 @@ public class AddressApi {
return
ResultVo
.
success
(
addressService
.
getAddress
(
addressId
));
return
ResultVo
.
success
(
addressService
.
getAddress
(
addressId
));
}
}
@ApiOperation
(
"获取默认地址"
)
@GetMapping
(
value
=
"/getDefaultAddress/{userId}"
)
public
ResultVo
getDefaultAddress
(
@PathVariable
String
userId
)
{
return
ResultVo
.
success
(
addressService
.
getDefaultAddress
(
userId
));
}
}
}
user-server/src/main/java/com/zq/user/controller/api/QuestionApi.java
View file @
769c29ea
...
@@ -8,10 +8,7 @@ import com.zq.user.vo.QuestionFindVo;
...
@@ -8,10 +8,7 @@ import com.zq.user.vo.QuestionFindVo;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiOperation
;
import
io.swagger.annotations.ApiOperation
;
import
lombok.RequiredArgsConstructor
;
import
lombok.RequiredArgsConstructor
;
import
org.springframework.web.bind.annotation.PostMapping
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.bind.annotation.RequestBody
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
/**
/**
* @author wilmiam
* @author wilmiam
...
@@ -40,4 +37,9 @@ public class QuestionApi {
...
@@ -40,4 +37,9 @@ public class QuestionApi {
return
ResultVo
.
success
(
questionService
.
answer
(
vo
));
return
ResultVo
.
success
(
questionService
.
answer
(
vo
));
}
}
@ApiOperation
(
"获取答题记录"
)
@PostMapping
(
value
=
"/getAnswerRecs"
)
public
ResultVo
getAnswerRecs
(
@RequestBody
AnswerRec
answerRec
)
{
return
ResultVo
.
success
(
questionService
.
getAnswerRec
(
answerRec
));
}
}
}
user-server/src/main/java/com/zq/user/controller/api/lotteryInfoApi.java
0 → 100644
View file @
769c29ea
package
com
.
zq
.
user
.
controller
.
api
;
import
com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
;
import
com.zq.common.utils.AssertUtils
;
import
com.zq.common.vo.ResultVo
;
import
com.zq.user.dao.LotteryInfoDao
;
import
com.zq.user.dao.LotteryPrizeDao
;
import
com.zq.user.entity.LotteryInfo
;
import
com.zq.user.entity.LotteryPrize
;
import
com.zq.user.service.LotteryInfoService
;
import
com.zq.user.vo.LotteryInfoVo
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiOperation
;
import
lombok.RequiredArgsConstructor
;
import
org.springframework.web.bind.annotation.*
;
import
javax.annotation.Resource
;
/**
* @Author: jcm
* @Date: 2022-8-15 19:06
*/
@Api
(
tags
=
"活动介绍相关接口"
)
@RequiredArgsConstructor
@RestController
@RequestMapping
(
value
=
"/user/api/lotteryInfo"
)
public
class
lotteryInfoApi
{
private
final
LotteryInfoDao
lotteryInfoDao
;
private
final
LotteryPrizeDao
lotteryPrizeDao
;
/**
* 服务对象
*/
@Resource
private
LotteryInfoService
lotteryInfoService
;
/**
* 分页查询所有数据
*
* @return 所有数据
*/
@ApiOperation
(
"获取所有活动介绍列表"
)
@PostMapping
(
value
=
"/getAllLotteryInfo"
)
public
ResultVo
getAllLotteryInfo
(
@RequestBody
LotteryInfoVo
vo
)
{
return
ResultVo
.
success
(
lotteryInfoService
.
getLotteryInfo
(
vo
));
}
/**
* 查询开启的抽奖
*
* @return 所有数据
*/
@ApiOperation
(
"查询开启的抽奖"
)
@PostMapping
(
value
=
"/getLotteryInfoIsOpen"
)
public
ResultVo
getLotteryInfoIsOpen
(
@RequestBody
LotteryInfoVo
vo
)
{
return
ResultVo
.
success
(
lotteryInfoService
.
getLotteryInfo
(
vo
));
}
/**
* 添加活动介绍
*
* @return 添加活动介绍
*/
@ApiOperation
(
"添加活动介绍"
)
@PostMapping
(
value
=
"/addAllLotteryInfo"
)
public
ResultVo
addAllLotteryInfo
(
@RequestBody
LotteryInfoVo
vo
)
{
AssertUtils
.
isTrue
(
vo
!=
null
,
"传入信息为空"
);
lotteryInfoService
.
addLotteryInfo
(
vo
);
return
ResultVo
.
success
(
"成功添加数据"
);
}
/**
* 查看活动介绍
*
* @return 查看活动介绍
*/
@ApiOperation
(
"查看活动介绍"
)
@PostMapping
(
value
=
"/getLotteryInfo"
)
public
ResultVo
getLotteryInfo
(
@RequestBody
LotteryInfoVo
vo
)
{
AssertUtils
.
isTrue
(
vo
.
getId
()
!=
null
,
"传入id为空"
);
return
ResultVo
.
success
(
lotteryInfoService
.
getLotteryInfoByOne
(
vo
));
}
/**
* 修改活动介绍
*
* @return 修改活动介绍
*/
@ApiOperation
(
"修改活动介绍"
)
@PutMapping
(
value
=
"/update"
)
public
ResultVo
updateLotteryInfo
(
@RequestBody
LotteryInfoVo
vo
)
{
AssertUtils
.
isTrue
(
vo
.
getId
()
!=
null
,
"传入id为空"
);
lotteryInfoService
.
updateLotteryInfo
(
vo
);
return
ResultVo
.
success
();
}
/**
* 是否开启活动
*
* @return
*/
@ApiOperation
(
"是否开启活动"
)
@PostMapping
(
value
=
"/isOpen"
)
public
ResultVo
isOpen
(
@RequestBody
LotteryInfoVo
vo
)
{
AssertUtils
.
isTrue
(
vo
.
getIsOpen
()
!=
null
,
"传入开关状态为空"
);
AssertUtils
.
isTrue
(
lotteryInfoDao
.
selectList
(
new
QueryWrapper
<
LotteryInfo
>().
eq
(
"is_open"
,
1
))
!=
null
,
"已经存在一个开启的活动"
);
lotteryInfoService
.
isOpen
(
vo
);
return
ResultVo
.
success
(
"操作成功"
);
}
/**
* 返回已经启动的活动
*
* @return
*/
@ApiOperation
(
"返回已经启动的活动详情"
)
@PostMapping
(
value
=
"/getIsOpen"
)
public
ResultVo
getIsOpen
(
@RequestBody
LotteryInfoVo
vo
)
{
LotteryInfo
lotteryInfo
=
lotteryInfoDao
.
selectOne
(
new
QueryWrapper
<
LotteryInfo
>().
eq
(
"is_open"
,
1
));
if
(
lotteryInfo
==
null
)
{
ResultVo
.
fail
(
"不存在开启成功的抽奖活动"
);
}
return
ResultVo
.
success
(
lotteryInfo
);
}
/**
* 删除该活动
*
* @return
*/
@ApiOperation
(
"删除该活动"
)
@PostMapping
(
value
=
"/delete"
)
public
ResultVo
delete
(
@RequestBody
LotteryInfoVo
vo
)
{
AssertUtils
.
isTrue
(
vo
.
getId
()
!=
null
,
"传入开关状态为空"
);
lotteryInfoService
.
delete
(
vo
);
return
ResultVo
.
success
(
"操作成功"
);
}
}
user-server/src/main/java/com/zq/user/entity/Address.java
View file @
769c29ea
...
@@ -44,6 +44,9 @@ public class Address {
...
@@ -44,6 +44,9 @@ public class Address {
@ApiModelProperty
(
"收货人"
)
@ApiModelProperty
(
"收货人"
)
private
String
consignee
;
private
String
consignee
;
@ApiModelProperty
(
"用户昵称"
)
private
String
nickName
;
/**
/**
* 收货人手机号
* 收货人手机号
*/
*/
...
@@ -80,8 +83,7 @@ public class Address {
...
@@ -80,8 +83,7 @@ public class Address {
@ApiModelProperty
(
"更新时间"
)
@ApiModelProperty
(
"更新时间"
)
private
Date
updateTime
;
private
Date
updateTime
;
@ApiModelProperty
(
"用户昵称"
)
@TableField
(
exist
=
false
)
private
String
nickname
;
}
}
user-server/src/main/java/com/zq/user/entity/AnswerRec.java
View file @
769c29ea
...
@@ -55,4 +55,14 @@ public class AnswerRec {
...
@@ -55,4 +55,14 @@ public class AnswerRec {
@ApiModelProperty
(
"得分"
)
@ApiModelProperty
(
"得分"
)
private
Float
score
;
private
Float
score
;
/**
* 抽奖活动ID
*/
private
Integer
lotteryId
;
/**
* 抽奖活动名
*/
private
String
lotteryName
;
}
}
user-server/src/main/java/com/zq/user/entity/Question.java
View file @
769c29ea
...
@@ -138,4 +138,17 @@ public class Question {
...
@@ -138,4 +138,17 @@ public class Question {
@TableField
(
exist
=
false
)
@TableField
(
exist
=
false
)
private
String
questionTypeName
;
private
String
questionTypeName
;
/**
* 抽奖活动id
*
*/
@ApiModelProperty
(
"抽奖活动id"
)
private
Integer
lotteryId
;
/**
* 抽奖活动名称
*
*/
@ApiModelProperty
(
"抽奖活动名称"
)
private
String
lotteryInfoName
;
}
}
user-server/src/main/java/com/zq/user/service/AddressService.java
View file @
769c29ea
...
@@ -31,16 +31,17 @@ public class AddressService {
...
@@ -31,16 +31,17 @@ public class AddressService {
public
PageVo
<
Address
>
getAddressList
(
AddressFindVo
vo
)
{
public
PageVo
<
Address
>
getAddressList
(
AddressFindVo
vo
)
{
PageVo
<
Address
>
paging
=
PagingUtils
.
paging
(
vo
,
addressDao
,
Address
.
class
);
PageVo
<
Address
>
paging
=
PagingUtils
.
paging
(
vo
,
addressDao
,
Address
.
class
);
return
paging
;
return
paging
;
}
}
public
void
addAddress
(
Address
vo
)
{
public
void
addAddress
(
Address
vo
)
{
System
.
out
.
println
(
vo
);
vo
.
setCreateTime
(
DateUtil
.
date
());
vo
.
setCreateTime
(
DateUtil
.
date
());
vo
.
setUpdateTime
(
DateUtil
.
date
());
vo
.
setUpdateTime
(
DateUtil
.
date
());
addressDao
.
insert
(
vo
);
addressDao
.
insert
(
vo
);
if
(
vo
.
getIsDefault
())
{
if
(
vo
.
getIsDefault
())
{
addressDao
.
update
(
Address
.
builder
().
isDefault
(
false
).
updateTime
(
DateUtil
.
date
()).
build
(),
addressDao
.
update
(
Address
.
builder
().
isDefault
(
false
).
updateTime
(
DateUtil
.
date
()).
build
(),
Wrappers
.
lambdaUpdate
(
Address
.
class
)
Wrappers
.
lambdaUpdate
(
Address
.
class
)
...
@@ -48,7 +49,6 @@ public class AddressService {
...
@@ -48,7 +49,6 @@ public class AddressService {
.
notIn
(
Address:
:
getId
,
vo
.
getId
()));
.
notIn
(
Address:
:
getId
,
vo
.
getId
()));
}
}
}
}
public
void
editAddress
(
Address
vo
)
{
public
void
editAddress
(
Address
vo
)
{
Address
address
=
addressDao
.
selectById
(
vo
.
getId
());
Address
address
=
addressDao
.
selectById
(
vo
.
getId
());
AssertUtils
.
notNull
(
address
,
"地址ID不存在"
);
AssertUtils
.
notNull
(
address
,
"地址ID不存在"
);
...
@@ -77,13 +77,12 @@ public class AddressService {
...
@@ -77,13 +77,12 @@ public class AddressService {
AssertUtils
.
notNull
(
address
,
"地址不存在"
);
AssertUtils
.
notNull
(
address
,
"地址不存在"
);
WxUser
wxUser
=
wxUserDao
.
selectById
(
address
.
getUserId
());
WxUser
wxUser
=
wxUserDao
.
selectById
(
address
.
getUserId
());
address
.
setNick
n
ame
(
wxUser
.
getNickname
());
address
.
setNick
N
ame
(
wxUser
.
getNickname
());
return
address
;
return
address
;
}
}
public
Address
getDefaultAddress
(
String
userId
)
{
public
Address
getDefaultAddress
(
String
userId
)
{
return
addressDao
.
selectOne
(
Wrappers
.
lambdaQuery
(
Address
.
builder
().
userId
(
userId
).
isDefault
(
true
).
isDel
(
false
).
build
()));
return
addressDao
.
selectOne
(
Wrappers
.
lambdaQuery
(
Address
.
builder
().
userId
(
userId
).
isDefault
(
true
).
isDel
(
false
).
build
()));
}
}
}
}
user-server/src/main/java/com/zq/user/service/LotteryInfoService.java
View file @
769c29ea
...
@@ -128,14 +128,17 @@ public class LotteryInfoService {
...
@@ -128,14 +128,17 @@ public class LotteryInfoService {
}
}
public
void
isOpen
(
LotteryInfoVo
vo
)
{
public
void
isOpen
(
LotteryInfoVo
vo
)
{
AssertUtils
.
isTrue
(
lotteryInfoDao
.
selectList
(
new
QueryWrapper
<
LotteryInfo
>().
eq
(
"isOpen"
,
1
))
!=
null
,
"已经存在一个开启的活动"
);
System
.
out
.
println
(
vo
);
Integer
id
=
vo
.
getId
();
System
.
out
.
println
(
id
);
LotteryInfo
info
=
new
LotteryInfo
();
info
.
setId
(
id
);
if
(
vo
.
getIsOpen
()
!=
null
)
{
if
(
vo
.
getIsOpen
()
!=
null
)
{
if
(
vo
.
getIsOpen
()
==
2
)
{
if
(
vo
.
getIsOpen
()
==
2
)
{
LotteryInfo
info
=
new
LotteryInfo
();
info
.
setIsOpen
(
2
);
info
.
setIsOpen
(
2
);
lotteryInfoDao
.
updateById
(
info
);
lotteryInfoDao
.
updateById
(
info
);
}
else
if
(
vo
.
getIsOpen
()
==
1
)
{
}
else
if
(
vo
.
getIsOpen
()
==
1
)
{
LotteryInfo
info
=
new
LotteryInfo
();
info
.
setIsOpen
(
1
);
info
.
setIsOpen
(
1
);
lotteryInfoDao
.
updateById
(
info
);
lotteryInfoDao
.
updateById
(
info
);
}
}
...
@@ -168,21 +171,12 @@ public class LotteryInfoService {
...
@@ -168,21 +171,12 @@ public class LotteryInfoService {
public
void
updateLotteryInfo
(
LotteryInfoVo
vo
)
{
public
void
updateLotteryInfo
(
LotteryInfoVo
vo
)
{
// 修改对应的奖品,通过传进来的idlist全部删除礼品表中活动对应的礼品,然后重新添加
//
// 修改对应的奖品,通过传进来的idlist全部删除礼品表中活动对应的礼品,然后重新添加
List
<
Integer
>
idList
=
vo
.
getListId
();
List
<
Integer
>
idList
=
vo
.
getListId
();
// 修改lotteryInfo
LotteryInfo
lotteryInfo
=
new
LotteryInfo
();
BeanUtil
.
copyProperties
(
vo
,
lotteryInfo
);
lotteryInfoDao
.
updateById
(
lotteryInfo
);
System
.
out
.
println
(
idList
);
lotteryPrizeDao
.
delete
(
new
QueryWrapper
<
LotteryPrize
>().
eq
(
"lottery_info_id"
,
vo
.
getId
()));
for
(
Integer
prizeId
:
idList
)
{
for
(
Integer
prizeId
:
idList
)
{
// 删除礼品表中活动对应的礼品
if
(
new
QueryWrapper
<
LotteryPrize
>().
eq
(
"lottery_info_id"
,
vo
.
getId
()).
eq
(
"prize_type_id"
,
prizeId
)
!=
null
)
{
// 数据库中已存在,且关联该活动的则保留
continue
;
}
else
if
(
new
QueryWrapper
<
LotteryPrize
>().
eq
(
"lottery_info_id"
,
vo
.
getId
()).
eq
(
"prize_type_id"
,
prizeId
)
==
null
)
{
// 查出传入vo中存在,但是数据库中不存在的添加
Prize
type
=
prizeDao
.
selectById
(
prizeId
);
Prize
type
=
prizeDao
.
selectById
(
prizeId
);
LotteryPrize
lotteryPrize
=
LotteryPrize
LotteryPrize
lotteryPrize
=
LotteryPrize
.
builder
()
.
builder
()
...
@@ -192,22 +186,14 @@ public class LotteryInfoService {
...
@@ -192,22 +186,14 @@ public class LotteryInfoService {
.
createTime
(
DateUtil
.
date
())
.
createTime
(
DateUtil
.
date
())
.
build
();
.
build
();
lotteryPrizeDao
.
insert
(
lotteryPrize
);
lotteryPrizeDao
.
insert
(
lotteryPrize
);
}
else
{
// 查出传入vo中不存在,但是数据库中存在的删除
lotteryPrizeDao
.
delete
(
new
QueryWrapper
<
LotteryPrize
>().
eq
(
"lottery_info_id"
,
vo
.
getId
()));
}
}
}
}
// lotteryPrizeDao.delete(new QueryWrapper<LotteryPrize>().eq("lottery_info_id", vo.getId()).eq("prize_type_id", prizeId));
// Prize type = prizeDao.selectById(prizeId);
// LotteryPrize lotteryPrize = LotteryPrize
public
void
delete
(
LotteryInfoVo
vo
)
{
// .builder()
lotteryInfoDao
.
delete
(
new
QueryWrapper
<
LotteryInfo
>().
eq
(
"id"
,
vo
.
getId
()));
// .lotteryInfoId(vo.getId())
lotteryPrizeDao
.
deleteBatchIds
(
lotteryPrizeDao
.
selectList
(
new
QueryWrapper
<
LotteryPrize
>().
eq
(
"lottery_info_id"
,
vo
.
getId
())));
// .prizeTypeId(type.getPrizeTypeId())
// .prizeName(type.getPrizeName())
// .createTime(DateUtil.date())
// .build();
// lotteryPrizeDao.insert(lotteryPrize);
// }
}
}
}
}
user-server/src/main/java/com/zq/user/service/QuestionService.java
View file @
769c29ea
...
@@ -8,16 +8,20 @@ import cn.hutool.json.JSONArray;
...
@@ -8,16 +8,20 @@ import cn.hutool.json.JSONArray;
import
cn.hutool.json.JSONObject
;
import
cn.hutool.json.JSONObject
;
import
cn.hutool.json.JSONUtil
;
import
cn.hutool.json.JSONUtil
;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
;
import
com.baomidou.mybatisplus.core.toolkit.Wrappers
;
import
com.baomidou.mybatisplus.core.toolkit.Wrappers
;
import
com.zq.common.utils.AssertUtils
;
import
com.zq.common.utils.AssertUtils
;
import
com.zq.common.utils.PagingUtils
;
import
com.zq.common.utils.PagingUtils
;
import
com.zq.common.vo.PageVo
;
import
com.zq.common.vo.PageVo
;
import
com.zq.user.dao.AnswerRecDao
;
import
com.zq.user.dao.AnswerRecDao
;
import
com.zq.user.dao.LotteryInfoDao
;
import
com.zq.user.dao.QuestionDao
;
import
com.zq.user.dao.QuestionDao
;
import
com.zq.user.dao.QuestionTypeDao
;
import
com.zq.user.dao.QuestionTypeDao
;
import
com.zq.user.entity.AnswerRec
;
import
com.zq.user.entity.AnswerRec
;
import
com.zq.user.entity.LotteryInfo
;
import
com.zq.user.entity.Question
;
import
com.zq.user.entity.Question
;
import
com.zq.user.entity.QuestionType
;
import
com.zq.user.entity.QuestionType
;
import
com.zq.user.vo.AnswerRecVo
;
import
com.zq.user.vo.QuestionFindVo
;
import
com.zq.user.vo.QuestionFindVo
;
import
lombok.RequiredArgsConstructor
;
import
lombok.RequiredArgsConstructor
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
...
@@ -39,6 +43,7 @@ public class QuestionService {
...
@@ -39,6 +43,7 @@ public class QuestionService {
private
final
QuestionDao
questionDao
;
private
final
QuestionDao
questionDao
;
private
final
QuestionTypeDao
questionTypeDao
;
private
final
QuestionTypeDao
questionTypeDao
;
private
final
AnswerRecDao
answerRecDao
;
private
final
AnswerRecDao
answerRecDao
;
private
final
LotteryInfoDao
lotteryInfoDao
;
public
Object
questionList
(
QuestionFindVo
vo
)
{
public
Object
questionList
(
QuestionFindVo
vo
)
{
LambdaQueryWrapper
<
Question
>
lambdaQuery
=
Wrappers
.
lambdaQuery
(
Question
.
class
);
LambdaQueryWrapper
<
Question
>
lambdaQuery
=
Wrappers
.
lambdaQuery
(
Question
.
class
);
...
@@ -46,7 +51,7 @@ public class QuestionService {
...
@@ -46,7 +51,7 @@ public class QuestionService {
lambdaQuery
.
eq
(
Question:
:
getGroupId
,
vo
.
getGroupId
());
lambdaQuery
.
eq
(
Question:
:
getGroupId
,
vo
.
getGroupId
());
}
}
lambdaQuery
.
orderByAsc
(
Question:
:
getId
);
lambdaQuery
.
orderByAsc
(
Question:
:
getId
);
lambdaQuery
.
eq
(
Question:
:
getLotteryId
,
vo
.
getLotteryId
());
return
questionDao
.
selectList
(
lambdaQuery
);
return
questionDao
.
selectList
(
lambdaQuery
);
}
}
...
@@ -73,7 +78,9 @@ public class QuestionService {
...
@@ -73,7 +78,9 @@ public class QuestionService {
public
void
addQuestion
(
Question
vo
)
{
public
void
addQuestion
(
Question
vo
)
{
vo
.
setCreateTime
(
DateUtil
.
date
());
vo
.
setCreateTime
(
DateUtil
.
date
());
if
(
vo
.
getLotteryId
()
!=
null
)
{
vo
.
setLotteryInfoName
(
lotteryInfoDao
.
selectById
(
vo
.
getLotteryId
()).
getLotteryInfoName
());
}
questionDao
.
insert
(
vo
);
questionDao
.
insert
(
vo
);
}
}
...
@@ -86,8 +93,10 @@ public class QuestionService {
...
@@ -86,8 +93,10 @@ public class QuestionService {
question
.
setAnalysis
(
vo
.
getAnalysis
());
question
.
setAnalysis
(
vo
.
getAnalysis
());
question
.
setAnswer
(
vo
.
getAnswer
());
question
.
setAnswer
(
vo
.
getAnswer
());
question
.
setQuestionTypeId
(
vo
.
getQuestionTypeId
());
question
.
setQuestionTypeId
(
vo
.
getQuestionTypeId
());
question
.
setLotteryInfoName
(
lotteryInfoDao
.
selectById
(
vo
.
getLotteryId
()).
getLotteryInfoName
());
question
.
setLotteryId
(
vo
.
getLotteryId
());
questionDao
.
updateById
(
question
);
questionDao
.
updateById
(
question
);
}
}
public
void
delQuestion
(
Set
<
String
>
ids
)
{
public
void
delQuestion
(
Set
<
String
>
ids
)
{
...
@@ -169,5 +178,18 @@ public class QuestionService {
...
@@ -169,5 +178,18 @@ public class QuestionService {
}
}
public
List
<
AnswerRec
>
getAnswerRec
(
AnswerRec
answerRec
)
{
LambdaQueryWrapper
<
AnswerRec
>
wrapper
=
new
LambdaQueryWrapper
<
AnswerRec
>();
List
<
LotteryInfo
>
infos
=
lotteryInfoDao
.
selectList
(
new
QueryWrapper
<
LotteryInfo
>());
System
.
out
.
println
(
"info="
+
infos
);
List
<
AnswerRec
>
recs
=
new
ArrayList
<>();
for
(
LotteryInfo
info
:
infos
)
{
wrapper
.
eq
(
AnswerRec:
:
getLotteryId
,
info
.
getId
()).
eq
(
AnswerRec:
:
getUserId
,
answerRec
.
getUserId
()).
orderByDesc
(
AnswerRec:
:
getScore
).
last
(
"limit 1"
);
AnswerRec
rec
=
answerRecDao
.
selectOne
(
wrapper
);
recs
.
add
(
rec
);
}
AssertUtils
.
isTrue
(
recs
!=
null
,
"没有历史答题记录,请先完成答题"
);
return
recs
;
}
}
}
user-server/src/main/java/com/zq/user/vo/AnswerRecVo.java
View file @
769c29ea
...
@@ -50,4 +50,9 @@ public class AnswerRecVo extends PageReqVo {
...
@@ -50,4 +50,9 @@ public class AnswerRecVo extends PageReqVo {
*/
*/
@ApiModelProperty
(
"得分"
)
@ApiModelProperty
(
"得分"
)
private
Float
score
;
private
Float
score
;
/**
* 抽奖活动名
*/
private
String
lotteryName
;
}
}
user-server/src/main/java/com/zq/user/vo/QuestionFindVo.java
View file @
769c29ea
...
@@ -121,4 +121,13 @@ public class QuestionFindVo extends PageReqVo {
...
@@ -121,4 +121,13 @@ public class QuestionFindVo extends PageReqVo {
*/
*/
private
String
keyword
;
private
String
keyword
;
/**
* 抽奖活动ID
*/
private
Integer
lotteryId
;
/**
* 抽奖活动名
*/
private
String
lotteryName
;
}
}
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