记得上下班打卡 | git大法好,push需谨慎

Commit 50d9bc92 authored by wangyifan's avatar wangyifan

福袋补充需求:支持二维码展示

parent 070425b7
...@@ -52,6 +52,9 @@ public class KylinLuckyBagVo implements Serializable { ...@@ -52,6 +52,9 @@ public class KylinLuckyBagVo implements Serializable {
@ApiModelProperty(value = "福袋描述") @ApiModelProperty(value = "福袋描述")
private String introduction; private String introduction;
@ApiModelProperty(value = "兑换码显示状态 1:兑换码 2:二维码")
private int codeShowType;
@ApiModelProperty(value = "状态 0:未解锁 1:已解锁") @ApiModelProperty(value = "状态 0:未解锁 1:已解锁")
private int status; private int status;
......
...@@ -58,6 +58,11 @@ public class KylinLuckyBag implements Serializable, Cloneable{ ...@@ -58,6 +58,11 @@ public class KylinLuckyBag implements Serializable, Cloneable{
*/ */
private String ticketsId; private String ticketsId;
/**
* 兑换码显示状态 1:兑换码 2:二维码
*/
private Integer codeShowType;
/** /**
* 状态: 1-可用, 0-不可用 * 状态: 1-可用, 0-不可用
*/ */
......
...@@ -80,7 +80,7 @@ public class KylinLuckyBagServiceImpl implements IKylinLuckyBagService { ...@@ -80,7 +80,7 @@ public class KylinLuckyBagServiceImpl implements IKylinLuckyBagService {
if (activityVos.isEmpty()) { if (activityVos.isEmpty()) {
return KylinLuckyBagVo.of(luckyBagVos, null); return KylinLuckyBagVo.of(luckyBagVos, null);
}else { } else {
return KylinLuckyBagVo.of(luckyBagVos, activityVos.get(0)); return KylinLuckyBagVo.of(luckyBagVos, activityVos.get(0));
} }
...@@ -117,6 +117,7 @@ public class KylinLuckyBagServiceImpl implements IKylinLuckyBagService { ...@@ -117,6 +117,7 @@ public class KylinLuckyBagServiceImpl implements IKylinLuckyBagService {
luckyBagVo.setLuckyBagId(l.getLuckyBagId()); luckyBagVo.setLuckyBagId(l.getLuckyBagId());
luckyBagVo.setName(l.getName()); luckyBagVo.setName(l.getName());
luckyBagVo.setIntroduction(l.getIntroduction()); luckyBagVo.setIntroduction(l.getIntroduction());
luckyBagVo.setCodeShowType(l.getCodeShowType());
final String sendTime = l.getSendTime(); final String sendTime = l.getSendTime();
final String nowTime = DateUtil.getNowTime(); final String nowTime = DateUtil.getNowTime();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment