|
|
@ -151,7 +151,7 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp |
|
|
|
|
|
|
|
public ResultBean generateCard(LpkGiftCardDto dto) { |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
if (StringUtils.isBlank(dto.getGiftbagSid())) { |
|
|
|
if (StringUtils.isBlank(dto.getBagSid())) { |
|
|
|
return rb.setMsg("请添加礼包"); |
|
|
|
} |
|
|
|
if (StringUtils.isBlank(dto.getNum())) { |
|
|
@ -162,18 +162,12 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp |
|
|
|
LpkGiftCard card = new LpkGiftCard(); |
|
|
|
card.setState("1"); |
|
|
|
card.setCreateTime(new DateTime()); |
|
|
|
card.setGiftbagSid(dto.getGiftbagSid()); |
|
|
|
card.setGiftbagSid(dto.getBagSid()); |
|
|
|
String uuid = UniqueIdGenerator.generateUniqueID(); |
|
|
|
int randomNumber = new Random().nextInt(900000) + 100000; |
|
|
|
card.setCodeKey(String.valueOf(randomNumber)); |
|
|
|
card.setCode(uuid); |
|
|
|
String maxSerNum = baseMapper.selctMaxSerNum(); |
|
|
|
try { |
|
|
|
String s = genarateQRCode(uuid); |
|
|
|
card.setPicUrl(s); |
|
|
|
} catch (IOException e) { |
|
|
|
e.printStackTrace(); |
|
|
|
} |
|
|
|
if (StringUtils.isBlank(maxSerNum)) { |
|
|
|
card.setSerialNumber("00000001"); |
|
|
|
} else { |
|
|
@ -208,14 +202,6 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp |
|
|
|
qw.orderByDesc("id"); |
|
|
|
IPage<LpkGiftCard> page = PagerUtil.queryToPage(pq); |
|
|
|
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); |
|
|
|
return rb.success().setData(p); |
|
|
|
} |
|
|
|