12/4
This commit is contained in:
@@ -111,7 +111,8 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
|
||||
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
|
||||
return rb.success().setData(p);
|
||||
}
|
||||
// public ResultBean updateIsItInvalid() {
|
||||
|
||||
// public ResultBean updateIsItInvalid() {
|
||||
// ResultBean rb = new ResultBean();
|
||||
// SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
|
||||
// List<LpkGiftBag> lpkGiftBags = lpkGiftBagService.list(new QueryWrapper<LpkGiftBag>().lt("dateEnd", sdf.format(new Date())));
|
||||
@@ -126,22 +127,22 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
|
||||
public ResultBean updateIsItInvalid(String customerSid) {
|
||||
ResultBean rb = new ResultBean();
|
||||
List<LpkGiftBag> lpkGiftBags = lpkGiftBagService.list(new QueryWrapper<LpkGiftBag>());
|
||||
SimpleDateFormat sdf =new SimpleDateFormat("yyyy-MM-dd");
|
||||
for(LpkGiftBag lpkGiftBag : lpkGiftBags){
|
||||
int in= DateUtil.parse(sdf.format(lpkGiftBag.getDateEnd())).compareTo(DateUtil.parse(sdf.format(new Date())));
|
||||
if(String.valueOf(in).equals("-1")){
|
||||
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
|
||||
for (LpkGiftBag lpkGiftBag : lpkGiftBags) {
|
||||
int in = DateUtil.parse(sdf.format(lpkGiftBag.getDateEnd())).compareTo(DateUtil.parse(sdf.format(new Date())));
|
||||
if (String.valueOf(in).equals("-1")) {
|
||||
Integer i = baseMapper.selectCount(new QueryWrapper<LpkGiftCard>().eq("giftbagSid", lpkGiftBag.getSid()).ne("state", "5"));
|
||||
if (i != 0) {
|
||||
baseMapper.updateIsItInvalid(lpkGiftBag.getSid(), "5");
|
||||
}
|
||||
}else{
|
||||
List<LpkGiftCard>list= baseMapper.selectList(new QueryWrapper<LpkGiftCard>().eq("customerSid",customerSid).eq("giftbagSid",lpkGiftBag.getSid()));
|
||||
for (LpkGiftCard card:list){
|
||||
LpkReserveOrderVo LpkReserveOrderVo=lpkReserveOrderService.selByCardSid(card.getSid()).getData();
|
||||
if(null!=LpkReserveOrderVo){
|
||||
int c= DateUtil.parse(sdf.format(LpkReserveOrderVo.getReserveDate())).compareTo(DateUtil.parse(sdf.format(new Date())));
|
||||
LpkGiftCard card1= baseMapper.selectOne(new QueryWrapper<LpkGiftCard>().eq("sid",card.getSid()));
|
||||
if(String.valueOf(c).equals("-1")){
|
||||
} else {
|
||||
List<LpkGiftCard> list = baseMapper.selectList(new QueryWrapper<LpkGiftCard>().eq("customerSid", customerSid).eq("giftbagSid", lpkGiftBag.getSid()));
|
||||
for (LpkGiftCard card : list) {
|
||||
LpkReserveOrderVo LpkReserveOrderVo = lpkReserveOrderService.selByCardSid(card.getSid()).getData();
|
||||
if (null != LpkReserveOrderVo) {
|
||||
int c = DateUtil.parse(sdf.format(LpkReserveOrderVo.getReserveDate())).compareTo(DateUtil.parse(sdf.format(new Date())));
|
||||
LpkGiftCard card1 = baseMapper.selectOne(new QueryWrapper<LpkGiftCard>().eq("sid", card.getSid()));
|
||||
if (String.valueOf(c).equals("-1")) {
|
||||
card1.setIsReservation("1");
|
||||
baseMapper.updateById(card1);
|
||||
}
|
||||
@@ -173,6 +174,7 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
|
||||
goodsVo.setNum(s.getGoodsNumber());
|
||||
goodsVo.setGoodsSid(s.getGoodsSid());
|
||||
goodsVo.setRemarks(s.getRemarks());
|
||||
goodsVo.setUnitName(s.getUnitName());
|
||||
goodsVo.setPic(urlPrefix + s.getPicUrl());
|
||||
if (vo.getState().equals("已过期")) {
|
||||
goodsVo.setLNum(0);
|
||||
@@ -193,18 +195,26 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
|
||||
goodsVos.add(goodsVo);
|
||||
}
|
||||
});
|
||||
List<LpkReserveOrderCardVo>lpkReserveOrderCardVos=lpkReserveOrderService.selOrderByCardSid(sid).getData();
|
||||
for(LpkReserveOrderCardVo vo2:lpkReserveOrderCardVos){
|
||||
List<LpkReserveOrderGoods> goods =lpkReserveOrderGoodsService.selByOrderSids(vo2.getSid());
|
||||
for(LpkReserveOrderGoods goods1:goods){
|
||||
LpkGoods lpkGoods=lpkGoodsService.getOne(new QueryWrapper<LpkGoods>().eq("sid",goods1.getGoodsSid()));
|
||||
if(StringUtils.isBlank(vo2.getGoods())){
|
||||
vo2.setGoods(lpkGoods.getName()+":"+goods1.getNum()+lpkGoods.getUnitName());
|
||||
}else{
|
||||
vo2.setGoods(vo2.getGoods()+" "+lpkGoods.getName()+":"+goods1.getNum()+lpkGoods.getUnitName());
|
||||
List<LpkReserveOrderCardVo> lpkReserveOrderCardVos = lpkReserveOrderService.selOrderByCardSid(sid).getData();
|
||||
for (LpkReserveOrderCardVo vo2 : lpkReserveOrderCardVos) {
|
||||
List<LpkReserveOrderGoods> goods = lpkReserveOrderGoodsService.selByOrderSids(vo2.getSid());
|
||||
for (LpkReserveOrderGoods goods1 : goods) {
|
||||
LpkGoods lpkGoods = lpkGoodsService.getOne(new QueryWrapper<LpkGoods>().eq("sid", goods1.getGoodsSid()));
|
||||
if (StringUtils.isBlank(vo2.getGoods())) {
|
||||
vo2.setGoods(lpkGoods.getName() + ":" + goods1.getNum() + lpkGoods.getUnitName());
|
||||
} else {
|
||||
vo2.setGoods(vo2.getGoods() + " " + lpkGoods.getName() + ":" + goods1.getNum() + lpkGoods.getUnitName());
|
||||
}
|
||||
}
|
||||
}
|
||||
LpkReserveOrderVo vo1 = lpkReserveOrderService.getStoreByCustomerSid(vo.getCustomerSid()).getData();
|
||||
if (null != vo1) {
|
||||
LpkStoreDetailsVo vo2 = lpkStoreService.storeInit(vo1.getStoreSid()).getData();
|
||||
if (null != vo2) {
|
||||
vo.setAddressName(vo2.getName());
|
||||
vo.setValue(vo2.getSid());
|
||||
}
|
||||
}
|
||||
vo.setOrderCardVoList(lpkReserveOrderCardVos);
|
||||
vo.setGoodsVos(goodsVos);
|
||||
return rb.success().setData(vo);
|
||||
@@ -246,12 +256,25 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
|
||||
vo.setSelect(l);
|
||||
LpkReserveOrderVo vo1 = lpkReserveOrderService.getStoreByCustomerSid(vo.getCustomerSid()).getData();
|
||||
if (null != vo1) {
|
||||
LpkStoreDetailsVo vo2= lpkStoreService.storeInit(vo1.getStoreSid()).getData();
|
||||
if(null!=vo2){
|
||||
LpkStoreDetailsVo vo2 = lpkStoreService.storeInit(vo1.getStoreSid()).getData();
|
||||
if (null != vo2) {
|
||||
vo.setAddressName(vo2.getName());
|
||||
vo.setValue(vo2.getSid());
|
||||
}
|
||||
}
|
||||
List<LpkReserveOrderCardVo> lpkReserveOrderCardVos = lpkReserveOrderService.selOrderByCardSid(sid).getData();
|
||||
for (LpkReserveOrderCardVo vo2 : lpkReserveOrderCardVos) {
|
||||
List<LpkReserveOrderGoods> goods = lpkReserveOrderGoodsService.selByOrderSids(vo2.getSid());
|
||||
for (LpkReserveOrderGoods goods1 : goods) {
|
||||
LpkGoods lpkGoods = lpkGoodsService.getOne(new QueryWrapper<LpkGoods>().eq("sid", goods1.getGoodsSid()));
|
||||
if (StringUtils.isBlank(vo2.getGoods())) {
|
||||
vo2.setGoods(lpkGoods.getName() + ":" + goods1.getNum() + lpkGoods.getUnitName());
|
||||
} else {
|
||||
vo2.setGoods(vo2.getGoods() + " " + lpkGoods.getName() + ":" + goods1.getNum() + lpkGoods.getUnitName());
|
||||
}
|
||||
}
|
||||
}
|
||||
vo.setOrderCardVoList(lpkReserveOrderCardVos);
|
||||
return rb.success().setData(vo);
|
||||
}
|
||||
|
||||
@@ -418,7 +441,7 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
|
||||
for (LpkGiftCardExport lpkGiftCardExport : exportList) {
|
||||
if (StringUtils.isNotBlank(lpkGiftCardExport.getCode())) {
|
||||
lpkGiftCardExport.setPic(finUrl + lpkGiftCardExport.getCode());
|
||||
lpkGiftCardExport.setCode1(lpkGiftCardExport.getCode().substring(0,10));
|
||||
lpkGiftCardExport.setCode1(lpkGiftCardExport.getCode().substring(0, 10));
|
||||
lpkGiftCardExport.setCode2(lpkGiftCardExport.getCode().substring(lpkGiftCardExport.getCode().length() - 10));
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user