完善礼品卡信息导出功能
This commit is contained in:
@@ -12,11 +12,14 @@ import lombok.Data;
|
|||||||
public class LpkGiftCardExport {
|
public class LpkGiftCardExport {
|
||||||
@ExportEntityMap(CnName = "提货二维码", EnName = "pic")
|
@ExportEntityMap(CnName = "提货二维码", EnName = "pic")
|
||||||
private String pic;
|
private String pic;
|
||||||
@ExportEntityMap(CnName = "提货编码", EnName = "code")
|
@ExportEntityMap(CnName = "提货编码第一行", EnName = "code1")
|
||||||
private String code;
|
private String code1;
|
||||||
|
@ExportEntityMap(CnName = "提货编码第二行", EnName = "code2")
|
||||||
|
private String code2;
|
||||||
@ExportEntityMap(CnName = "提货密码", EnName = "codeKey")
|
@ExportEntityMap(CnName = "提货密码", EnName = "codeKey")
|
||||||
private String codeKey;
|
private String codeKey;
|
||||||
@ExportEntityMap(CnName = "序列号", EnName = "serialNumber")
|
@ExportEntityMap(CnName = "序列号", EnName = "serialNumber")
|
||||||
private String serialNumber;
|
private String serialNumber;
|
||||||
|
private String code;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -82,14 +82,14 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
|
|||||||
ResultBean rb = new ResultBean().fail();
|
ResultBean rb = new ResultBean().fail();
|
||||||
LpkGiftCard lpkGiftCard = baseMapper.selectOne(new QueryWrapper<LpkGiftCard>().eq("code", bindCardDto.getCode())
|
LpkGiftCard lpkGiftCard = baseMapper.selectOne(new QueryWrapper<LpkGiftCard>().eq("code", bindCardDto.getCode())
|
||||||
.eq("codeKey", bindCardDto.getCodeKey()));
|
.eq("codeKey", bindCardDto.getCodeKey()));
|
||||||
AppletVo vo=baseMapper.getGifCardBySid(lpkGiftCard.getSid());
|
AppletVo vo = baseMapper.getGifCardBySid(lpkGiftCard.getSid());
|
||||||
if (null == lpkGiftCard) {
|
if (null == lpkGiftCard) {
|
||||||
return rb.setMsg("请核对卡号和密钥");
|
return rb.setMsg("请核对卡号和密钥");
|
||||||
}
|
}
|
||||||
if(vo.getState().equals("失效")){
|
if (vo.getState().equals("失效")) {
|
||||||
return rb.setMsg("该卡已过期");
|
return rb.setMsg("该卡已过期");
|
||||||
}
|
}
|
||||||
if(StringUtils.isNotBlank(lpkGiftCard.getCustomerSid())){
|
if (StringUtils.isNotBlank(lpkGiftCard.getCustomerSid())) {
|
||||||
return rb.setMsg("该卡已绑定");
|
return rb.setMsg("该卡已绑定");
|
||||||
}
|
}
|
||||||
lpkGiftCard.setCustomerSid(bindCardDto.getCustomerSid());
|
lpkGiftCard.setCustomerSid(bindCardDto.getCustomerSid());
|
||||||
@@ -113,18 +113,20 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
|
|||||||
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
|
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
|
||||||
return rb.success().setData(p);
|
return rb.success().setData(p);
|
||||||
}
|
}
|
||||||
|
|
||||||
public ResultBean updateIsItInvalid() {
|
public ResultBean updateIsItInvalid() {
|
||||||
ResultBean rb=new ResultBean();
|
ResultBean rb = new ResultBean();
|
||||||
SimpleDateFormat sdf =new SimpleDateFormat("yyyy-MM-dd");
|
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
|
||||||
List<LpkGiftBag>lpkGiftBags=lpkGiftBagService.list(new QueryWrapper<LpkGiftBag>().lt("dateEnd",sdf.format(new Date())));
|
List<LpkGiftBag> lpkGiftBags = lpkGiftBagService.list(new QueryWrapper<LpkGiftBag>().lt("dateEnd", sdf.format(new Date())));
|
||||||
for(LpkGiftBag lpkGiftBag:lpkGiftBags){
|
for (LpkGiftBag lpkGiftBag : lpkGiftBags) {
|
||||||
Integer i=baseMapper.selectCount(new QueryWrapper<LpkGiftCard>().eq("giftbagSid",lpkGiftBag.getSid()).ne("state","5"));
|
Integer i = baseMapper.selectCount(new QueryWrapper<LpkGiftCard>().eq("giftbagSid", lpkGiftBag.getSid()).ne("state", "5"));
|
||||||
if(i!=0){
|
if (i != 0) {
|
||||||
baseMapper.updateIsItInvalid(lpkGiftBag.getSid(),"5");
|
baseMapper.updateIsItInvalid(lpkGiftBag.getSid(), "5");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return rb.success();
|
return rb.success();
|
||||||
}
|
}
|
||||||
|
|
||||||
public ResultBean<AppletVo> getGifCardBySid(String sid) {
|
public ResultBean<AppletVo> getGifCardBySid(String sid) {
|
||||||
ResultBean rb = new ResultBean().fail();
|
ResultBean rb = new ResultBean().fail();
|
||||||
AppletVo vo = baseMapper.getGifCardBySid(sid);
|
AppletVo vo = baseMapper.getGifCardBySid(sid);
|
||||||
@@ -204,8 +206,8 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
|
|||||||
});
|
});
|
||||||
vo.setGoodsVos(goodsVos);
|
vo.setGoodsVos(goodsVos);
|
||||||
vo.setSelect(l);
|
vo.setSelect(l);
|
||||||
LpkReserveOrderVo vo1 =lpkReserveOrderService.getStoreByCustomerSid(vo.getCustomerSid()).getData();
|
LpkReserveOrderVo vo1 = lpkReserveOrderService.getStoreByCustomerSid(vo.getCustomerSid()).getData();
|
||||||
if(null!=vo1){
|
if (null != vo1) {
|
||||||
vo.setStoreSid(vo1.getStore());
|
vo.setStoreSid(vo1.getStore());
|
||||||
}
|
}
|
||||||
return rb.success().setData(vo);
|
return rb.success().setData(vo);
|
||||||
@@ -373,6 +375,8 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
|
|||||||
for (LpkGiftCardExport lpkGiftCardExport : exportList) {
|
for (LpkGiftCardExport lpkGiftCardExport : exportList) {
|
||||||
if (StringUtils.isNotBlank(lpkGiftCardExport.getCode())) {
|
if (StringUtils.isNotBlank(lpkGiftCardExport.getCode())) {
|
||||||
lpkGiftCardExport.setPic(finUrl + lpkGiftCardExport.getCode());
|
lpkGiftCardExport.setPic(finUrl + lpkGiftCardExport.getCode());
|
||||||
|
lpkGiftCardExport.setCode1(lpkGiftCardExport.getCode().substring(0,10));
|
||||||
|
lpkGiftCardExport.setCode2(lpkGiftCardExport.getCode().substring(lpkGiftCardExport.getCode().length() - 10));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -389,41 +393,43 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
|
|||||||
ExportExcelUtils.export(fileNameURL, exportList, LpkGiftCardExport.class, response);
|
ExportExcelUtils.export(fileNameURL, exportList, LpkGiftCardExport.class, response);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public ResultBean cardGrant(CardGrantDto dto) {
|
public ResultBean cardGrant(CardGrantDto dto) {
|
||||||
ResultBean rb=new ResultBean().fail();
|
ResultBean rb = new ResultBean().fail();
|
||||||
int start=Integer.parseInt(dto.getStart());
|
int start = Integer.parseInt(dto.getStart());
|
||||||
int end=Integer.parseInt(dto.getEnd());
|
int end = Integer.parseInt(dto.getEnd());
|
||||||
List<Integer> serialNumbers=new ArrayList<>();
|
List<Integer> serialNumbers = new ArrayList<>();
|
||||||
if(start>end){
|
if (start > end) {
|
||||||
for (int i=0;end<=start;end++){
|
for (int i = 0; end <= start; end++) {
|
||||||
serialNumbers.add(end);
|
serialNumbers.add(end);
|
||||||
}
|
}
|
||||||
Integer integer=baseMapper.selectCount(new QueryWrapper<LpkGiftCard>().in("serialNumber",serialNumbers).eq("state","2"));
|
Integer integer = baseMapper.selectCount(new QueryWrapper<LpkGiftCard>().in("serialNumber", serialNumbers).eq("state", "2"));
|
||||||
if(integer!=0){
|
if (integer != 0) {
|
||||||
return rb.setMsg("序列号错误");
|
return rb.setMsg("序列号错误");
|
||||||
}
|
}
|
||||||
}else{
|
} else {
|
||||||
for (int i=0;start<=end;start++){
|
for (int i = 0; start <= end; start++) {
|
||||||
serialNumbers.add(start);
|
serialNumbers.add(start);
|
||||||
}
|
}
|
||||||
Integer integer=baseMapper.selectCount(new QueryWrapper<LpkGiftCard>().in("serialNumber",serialNumbers).eq("state","2"));
|
Integer integer = baseMapper.selectCount(new QueryWrapper<LpkGiftCard>().in("serialNumber", serialNumbers).eq("state", "2"));
|
||||||
if(integer!=0){
|
if (integer != 0) {
|
||||||
return rb.setMsg("序列号错误");
|
return rb.setMsg("序列号错误");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
|
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
|
||||||
LpkCardGrantRecordDto d=new LpkCardGrantRecordDto();
|
LpkCardGrantRecordDto d = new LpkCardGrantRecordDto();
|
||||||
d.setBuildDate(new Date());
|
d.setBuildDate(new Date());
|
||||||
d.setEndNumber(dto.getEnd());
|
d.setEndNumber(dto.getEnd());
|
||||||
d.setStartNumber(dto.getStart());
|
d.setStartNumber(dto.getStart());
|
||||||
d.setCountNumber(String.valueOf(serialNumbers.size()));
|
d.setCountNumber(String.valueOf(serialNumbers.size()));
|
||||||
String r=lpkCardGrantRecordService.save(d).getMsg();
|
String r = lpkCardGrantRecordService.save(d).getMsg();
|
||||||
baseMapper.updateState(serialNumbers,"2",dto.getBankSid(),r);
|
baseMapper.updateState(serialNumbers, "2", dto.getBankSid(), r);
|
||||||
return rb.success().setData("成功");
|
return rb.success().setData("成功");
|
||||||
}
|
}
|
||||||
public ResultBean<Integer> cardGrantCount(String recordSid) {
|
|
||||||
ResultBean rb=new ResultBean().fail();
|
public ResultBean<Integer> cardGrantCount(String recordSid) {
|
||||||
Integer i=baseMapper.cardGrantCount(recordSid);
|
ResultBean rb = new ResultBean().fail();
|
||||||
|
Integer i = baseMapper.cardGrantCount(recordSid);
|
||||||
return rb.success().setData(i);
|
return rb.success().setData(i);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user