礼品卡列表完善
This commit is contained in:
@@ -32,7 +32,6 @@ public class LpkGiftCard {
|
|||||||
private Date grantDate;
|
private Date grantDate;
|
||||||
private String customerMobile;
|
private String customerMobile;
|
||||||
private String customerSid;
|
private String customerSid;
|
||||||
private String picUrl;
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -11,6 +11,6 @@ import lombok.Data;
|
|||||||
@ApiModel(value = "礼品卡信息 数据传输对象", description = "礼品卡信息 数据传输对象")
|
@ApiModel(value = "礼品卡信息 数据传输对象", description = "礼品卡信息 数据传输对象")
|
||||||
@Data
|
@Data
|
||||||
public class LpkGiftCardDto implements Dto {
|
public class LpkGiftCardDto implements Dto {
|
||||||
private String giftbagSid;
|
private String bagSid;
|
||||||
private String num;
|
private String num;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -25,5 +25,5 @@ public class LpkGiftCardListVo implements Vo {
|
|||||||
private String grantDate;
|
private String grantDate;
|
||||||
private String customerMobile;
|
private String customerMobile;
|
||||||
private String customerSid;
|
private String customerSid;
|
||||||
private String picUrl;
|
// private String picUrl;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -42,8 +42,7 @@
|
|||||||
grantName,
|
grantName,
|
||||||
date_format(grantDate, '%Y-%m-%d') as grantDate,
|
date_format(grantDate, '%Y-%m-%d') as grantDate,
|
||||||
customerMobile,
|
customerMobile,
|
||||||
customerSid,
|
customerSid
|
||||||
picUrl
|
|
||||||
FROM
|
FROM
|
||||||
lpk_giftcard
|
lpk_giftcard
|
||||||
<where>
|
<where>
|
||||||
|
|||||||
@@ -151,7 +151,7 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
|
|||||||
|
|
||||||
public ResultBean generateCard(LpkGiftCardDto dto) {
|
public ResultBean generateCard(LpkGiftCardDto dto) {
|
||||||
ResultBean rb = ResultBean.fireFail();
|
ResultBean rb = ResultBean.fireFail();
|
||||||
if (StringUtils.isBlank(dto.getGiftbagSid())) {
|
if (StringUtils.isBlank(dto.getBagSid())) {
|
||||||
return rb.setMsg("请添加礼包");
|
return rb.setMsg("请添加礼包");
|
||||||
}
|
}
|
||||||
if (StringUtils.isBlank(dto.getNum())) {
|
if (StringUtils.isBlank(dto.getNum())) {
|
||||||
@@ -162,18 +162,12 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
|
|||||||
LpkGiftCard card = new LpkGiftCard();
|
LpkGiftCard card = new LpkGiftCard();
|
||||||
card.setState("1");
|
card.setState("1");
|
||||||
card.setCreateTime(new DateTime());
|
card.setCreateTime(new DateTime());
|
||||||
card.setGiftbagSid(dto.getGiftbagSid());
|
card.setGiftbagSid(dto.getBagSid());
|
||||||
String uuid = UniqueIdGenerator.generateUniqueID();
|
String uuid = UniqueIdGenerator.generateUniqueID();
|
||||||
int randomNumber = new Random().nextInt(900000) + 100000;
|
int randomNumber = new Random().nextInt(900000) + 100000;
|
||||||
card.setCodeKey(String.valueOf(randomNumber));
|
card.setCodeKey(String.valueOf(randomNumber));
|
||||||
card.setCode(uuid);
|
card.setCode(uuid);
|
||||||
String maxSerNum = baseMapper.selctMaxSerNum();
|
String maxSerNum = baseMapper.selctMaxSerNum();
|
||||||
try {
|
|
||||||
String s = genarateQRCode(uuid);
|
|
||||||
card.setPicUrl(s);
|
|
||||||
} catch (IOException e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
if (StringUtils.isBlank(maxSerNum)) {
|
if (StringUtils.isBlank(maxSerNum)) {
|
||||||
card.setSerialNumber("00000001");
|
card.setSerialNumber("00000001");
|
||||||
} else {
|
} else {
|
||||||
@@ -208,14 +202,6 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
|
|||||||
qw.orderByDesc("id");
|
qw.orderByDesc("id");
|
||||||
IPage<LpkGiftCard> page = PagerUtil.queryToPage(pq);
|
IPage<LpkGiftCard> page = PagerUtil.queryToPage(pq);
|
||||||
IPage<LpkGiftCardListVo> pagging = baseMapper.cardList(page, qw);
|
IPage<LpkGiftCardListVo> pagging = baseMapper.cardList(page, qw);
|
||||||
List<LpkGiftCardListVo> records = pagging.getRecords();
|
|
||||||
if (!records.isEmpty()) {
|
|
||||||
for (LpkGiftCardListVo record : records) {
|
|
||||||
if (StringUtils.isNotBlank(record.getPicUrl())) {
|
|
||||||
record.setPicUrl(fileUploadComponent.getUrlPrefix() + record.getPicUrl());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
PagerVo<LpkGiftCardListVo> p = PagerUtil.pageToVo(pagging, null);
|
PagerVo<LpkGiftCardListVo> p = PagerUtil.pageToVo(pagging, null);
|
||||||
return rb.success().setData(p);
|
return rb.success().setData(p);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user