wulin/wl_management
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交修改

Browse Source
This commit is contained in:
quyixiao 2020-08-24 19:58:40 +08:00
commit dea0963688
11 changed files with 65 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/lz/modules/luck/controller/LuckController.java
View File

@ -58,7 +58,7 @@ public class LuckController {
if(luck.getFinish().intValue() == 0){//活动未结束
luckDetailInfoReq.setId(luckId);
luckDetailInfoReq.setName(luck.getName());
List<LuckGoods> luckGoods = luckGoodsService.getByLuckId(luckId);
List<LuckGoods> luckGoods = luckGoodsService.getNoFinishByLuckId(luckId);
if(luckGoods.size() > 0){
List<LuckGoodsReq> luckGoodsReqs = new ArrayList<>();
for (LuckGoods luckGood:luckGoods
@ -71,7 +71,7 @@ public class LuckController {
luckGoodsReqs.add(luckGoodsReq);
}
luckDetailInfoReq.setLuckGoodsReqs(luckGoodsReqs);
List<LuckRecord> luckRecords = luckRecordService.selectLuckRecordByLuckId(String.valueOf(luckId));
List<LuckRecord> luckRecords = luckRecordService.selectNoGoodLuckRecordByLuckId(String.valueOf(luckId));
if(luckRecords.size() > 0){
List<LuckRecordReq> luckRecordReqList = new ArrayList<>();
for (LuckRecord luckRecord:luckRecords
@ -130,11 +130,14 @@ public class LuckController {
luckId = luckRecordReq.getLuckId();
luckRecordService.updateLuckRecordByReqWithId(luckRecordReq);
}
int count0 = luckRecordService.selectCountRecordByLuckId(luckId);
int count = luckRecordService.selectCountGoodLuckRecordByLuckId(luckId);
int count1 = luckGoodsService.selectNumGoodLuckRecordByLuckId(luckId);
if(count < count1){
if(count < count1 && count != count0){
//获取未中奖人列表
return getLuck(luckId);
}else{
//设置中将结束

2
src/main/java/com/lz/modules/luck/dao/LuckGoodsMapper.java
View File

@ -36,4 +36,6 @@ public interface LuckGoodsMapper extends BaseMapper<LuckGoods> {
List<LuckGoods> getByLuckId(@Param("luckId") Long luckId);
int selectNumGoodLuckRecordByLuckId(@Param("luckId") Long luckId);
List<LuckGoods> getNoFinishByLuckId(Long luckId);
}

4
src/main/java/com/lz/modules/luck/dao/LuckRecordMapper.java
View File

@ -43,4 +43,8 @@ public interface LuckRecordMapper extends BaseMapper<LuckRecord> {
List<LuckRecord> selectGoodLuckRecordByLuckId(String luckId);
int selectCountGoodLuckRecordByLuckId(@Param("luckId") Long luckId);
List<LuckRecord> selectNoGoodLuckRecordByLuckId(String luckId);
int selectCountRecordByLuckId(Long luckId);
}

11
src/main/java/com/lz/modules/luck/entity/LuckGoods.java
View File

@ -34,6 +34,8 @@ public class LuckGoods implements java.io.Serializable {
private String remark;
//数量
private Integer counts;
private Integer isFinish;
/**
*
* @return
@ -169,6 +171,14 @@ public class LuckGoods implements java.io.Serializable {
this.counts = counts;
}
public Integer getIsFinish() {
return isFinish;
}
public void setIsFinish(Integer isFinish) {
this.isFinish = isFinish;
}
@Override
public String toString() {
return "LuckGoods{" +
@ -181,6 +191,7 @@ public class LuckGoods implements java.io.Serializable {
",weight=" + weight +
",remark=" + remark +
",counts=" + counts +
",isFinish=" + isFinish +
"}";
}
}

2
src/main/java/com/lz/modules/luck/service/LuckGoodsService.java
View File

@ -36,4 +36,6 @@ public interface LuckGoodsService extends IService<LuckGoods> {
//获取奖品总数
int selectNumGoodLuckRecordByLuckId(Long luckId);
List<LuckGoods> getNoFinishByLuckId(Long luckId);
}

4
src/main/java/com/lz/modules/luck/service/LuckRecordService.java
View File

@ -42,4 +42,8 @@ public interface LuckRecordService extends IService<LuckRecord> {
List<LuckRecord> selectGoodLuckRecordByLuckId(String valueOf);
//获取中奖人数
int selectCountGoodLuckRecordByLuckId(Long luckId);
//获取为未奖人数
List<LuckRecord> selectNoGoodLuckRecordByLuckId(String valueOf);
//获取参与人数
int selectCountRecordByLuckId(Long luckId);
}

5
src/main/java/com/lz/modules/luck/service/impl/LuckGoodsServiceImpl.java
View File

@ -70,4 +70,9 @@ public class LuckGoodsServiceImpl extends ServiceImpl<LuckGoodsMapper, LuckGoods
return luckGoodsMapper.selectNumGoodLuckRecordByLuckId(luckId);
}
@Override
public List<LuckGoods> getNoFinishByLuckId(Long luckId){
return luckGoodsMapper.getNoFinishByLuckId(luckId);
}
}

10
src/main/java/com/lz/modules/luck/service/impl/LuckRecordServiceImpl.java
View File

@ -86,5 +86,15 @@ public class LuckRecordServiceImpl extends ServiceImpl<LuckRecordMapper, LuckRec
return luckRecordMapper.selectCountGoodLuckRecordByLuckId(luckId);
}
@Override
public List<LuckRecord> selectNoGoodLuckRecordByLuckId(String luckId){
return luckRecordMapper.selectNoGoodLuckRecordByLuckId(luckId);
}
@Override
public int selectCountRecordByLuckId(Long luckId){
return luckRecordMapper.selectCountRecordByLuckId(luckId);
}
}

2
src/main/java/com/lz/modules/third/controller/DingTalkLoginController.java
View File

@ -39,7 +39,7 @@ public class DingTalkLoginController {
public R luck(@RequestBody String body){
log.info("luck{}", body);
JSONObject json = JSONObject.parseObject(body);
Luck luck = luckService.selectLuckById(2L);//默认第一个活动
Luck luck = luckService.selectLuckById(1L);//默认第一个活动
if(luck.getStopTime().getTime() > System.currentTimeMillis()){
return dingtalkBusiness.luck(json.getString("code"), appid, luck.getId());
}

15
src/main/resources/mapper/luck/LuckGoodsMapper.xml
View File

@ -13,12 +13,13 @@
<result column="weight" property="weight"/>
<result column="remark" property="remark"/>
<result column="counts" property="counts"/>
<result column="is_finish" property="isFinish"/>
</resultMap>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
id AS id, is_delete AS isDelete, gmt_create AS gmtCreate, gmt_modified AS gmtModified, luck_id AS luckId, name AS name, weight AS weight, remark AS remark, counts AS counts
id AS id, is_delete AS isDelete, gmt_create AS gmtCreate, gmt_modified AS gmtModified, luck_id AS luckId, name AS name, weight AS weight, remark AS remark, counts AS counts, is_finish as isFinish
</sql>
@ -36,6 +37,7 @@
<if test="weight != null">weight, </if>
<if test="remark != null">remark, </if>
<if test="counts != null">counts, </if>
<if test="isFinish != null">is_finish, </if>
is_delete,
gmt_create,
gmt_modified
@ -45,6 +47,7 @@
<if test="weight != null">#{ weight}, </if>
<if test="remark != null">#{ remark}, </if>
<if test="counts != null">#{ counts}, </if>
<if test="isFinish != null">#{ isFinish}, </if>
0,
now(),
now()
@ -62,7 +65,8 @@
<if test="name != null">name = #{name},</if>
<if test="weight != null">weight = #{weight},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="counts != null">counts = #{counts}</if>
<if test="counts != null">counts = #{counts}</if>
<if test="isFinish != null">is_finish = #{isFinish}</if>
</trim>
,gmt_modified = now()
where id = #{id}
@ -79,7 +83,8 @@
name = #{name},
weight = #{weight},
remark = #{remark},
counts = #{counts}
counts = #{counts},
is_finish = #{isFinish},
,gmt_modified = now()
where id = #{id}
</update>
@ -96,5 +101,9 @@
<select id="selectNumGoodLuckRecordByLuckId" parameterType="java.lang.Long" resultType="integer">
select sum(counts) from luck_goods where luck_id=#{luckId} and is_delete = 0
</select>
<select id="getNoFinishByLuckId" resultType="LuckGoods" >
select * from luck_goods where luck_id=#{luckId} and is_delete = 0 and is_finish=0 order by weight desc
</select>
</mapper>

8
src/main/resources/mapper/luck/LuckRecordMapper.xml
View File

@ -137,5 +137,13 @@
select count(1) from luck_record where luck_id=#{luckId} and is_delete = 0 and is_luck=1
</select>
<select id="selectNoGoodLuckRecordByLuckId" resultType="LuckRecord" >
select * from luck_record where luck_id=#{luckId}and is_delete = 0 and is_luck=0 order by is_luck desc
</select>
<select id="selectCountRecordByLuckId" parameterType="java.lang.Long" resultType="integer">
select count(1) from luck_record where luck_id=#{luckId} and is_delete = 0
</select>
</mapper>