完善批量导入
This commit is contained in:
@@ -19,6 +19,7 @@ import cn.hutool.extra.qrcode.QrCodeUtil;
|
|||||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
|
import com.google.common.util.concurrent.ThreadFactoryBuilder;
|
||||||
import com.yxt.common.base.config.component.FileUploadComponent;
|
import com.yxt.common.base.config.component.FileUploadComponent;
|
||||||
import com.yxt.common.base.service.MybatisBaseService;
|
import com.yxt.common.base.service.MybatisBaseService;
|
||||||
import com.yxt.common.base.utils.ExportExcelUtils;
|
import com.yxt.common.base.utils.ExportExcelUtils;
|
||||||
@@ -50,6 +51,7 @@ import com.yxt.yyth.api.lpkreserveorder.*;
|
|||||||
import com.yxt.yyth.api.lpkreserveordergoods.LpkReserveOrderGoods;
|
import com.yxt.yyth.api.lpkreserveordergoods.LpkReserveOrderGoods;
|
||||||
import com.yxt.yyth.api.lpkstore.LpkStoreDetailsVo;
|
import com.yxt.yyth.api.lpkstore.LpkStoreDetailsVo;
|
||||||
import com.yxt.yyth.api.lpkstore.StoreSelect;
|
import com.yxt.yyth.api.lpkstore.StoreSelect;
|
||||||
|
import com.yxt.yyth.api.sysuser.SysUserVo;
|
||||||
import com.yxt.yyth.biz.customerstore.CustomerStoreService;
|
import com.yxt.yyth.biz.customerstore.CustomerStoreService;
|
||||||
import com.yxt.yyth.biz.empcard.EmpCardService;
|
import com.yxt.yyth.biz.empcard.EmpCardService;
|
||||||
import com.yxt.yyth.biz.empcardgift.EmpCardGiftService;
|
import com.yxt.yyth.biz.empcardgift.EmpCardGiftService;
|
||||||
@@ -67,6 +69,8 @@ import com.yxt.yyth.utils.StyleUtils;
|
|||||||
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
|
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
|
||||||
import org.apache.poi.ss.usermodel.*;
|
import org.apache.poi.ss.usermodel.*;
|
||||||
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
|
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
|
||||||
|
import org.apache.tomcat.util.threads.ThreadPoolExecutor;
|
||||||
|
import org.junit.Test;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.beans.factory.annotation.Value;
|
import org.springframework.beans.factory.annotation.Value;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
@@ -80,6 +84,7 @@ import java.awt.image.BufferedImage;
|
|||||||
import java.text.SimpleDateFormat;
|
import java.text.SimpleDateFormat;
|
||||||
import java.time.LocalDate;
|
import java.time.LocalDate;
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
|
import java.util.concurrent.*;
|
||||||
import java.util.regex.Matcher;
|
import java.util.regex.Matcher;
|
||||||
import java.util.regex.Pattern;
|
import java.util.regex.Pattern;
|
||||||
|
|
||||||
@@ -155,15 +160,16 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static void main(String[] args) {
|
public static void main(String[] args) {
|
||||||
String a="99231229101555309170";
|
String a = "99231229101555309170";
|
||||||
;
|
;
|
||||||
System.out.println(a.substring(0,2));
|
System.out.println(a.substring(0, 2));
|
||||||
}
|
}
|
||||||
|
|
||||||
public ResultBean bindAllCard(BindCardDto bindCardDto) {
|
public ResultBean bindAllCard(BindCardDto bindCardDto) {
|
||||||
ResultBean rb = new ResultBean().fail();
|
ResultBean rb = new ResultBean().fail();
|
||||||
|
|
||||||
if(bindCardDto.getCode().substring(0,2).equals("99")){
|
if (bindCardDto.getCode().substring(0, 2).equals("99")) {
|
||||||
ResultBean rb2=empCardGiftService.bindCard(bindCardDto);
|
ResultBean rb2 = empCardGiftService.bindCard(bindCardDto);
|
||||||
return rb2;
|
return rb2;
|
||||||
}
|
}
|
||||||
LpkGiftCard lpkGiftCard1 = baseMapper.selectOne(new QueryWrapper<LpkGiftCard>().eq("code", bindCardDto.getCode()));
|
LpkGiftCard lpkGiftCard1 = baseMapper.selectOne(new QueryWrapper<LpkGiftCard>().eq("code", bindCardDto.getCode()));
|
||||||
@@ -193,6 +199,7 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
|
|||||||
baseMapper.updateById(lpkGiftCard);
|
baseMapper.updateById(lpkGiftCard);
|
||||||
return rb.success().setMsg("绑定成功");
|
return rb.success().setMsg("绑定成功");
|
||||||
}
|
}
|
||||||
|
|
||||||
public ResultBean getGifCardByCustomerSid(PagerQuery<LpkGiftCardQuery> pq) {
|
public ResultBean getGifCardByCustomerSid(PagerQuery<LpkGiftCardQuery> pq) {
|
||||||
ResultBean rb = new ResultBean().fail();
|
ResultBean rb = new ResultBean().fail();
|
||||||
LpkGiftCardQuery query = pq.getParams();
|
LpkGiftCardQuery query = pq.getParams();
|
||||||
@@ -209,6 +216,7 @@ 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 getGifCardsByCustomerSid(PagerQuery<LpkGiftCardQuery> pq) {
|
public ResultBean getGifCardsByCustomerSid(PagerQuery<LpkGiftCardQuery> pq) {
|
||||||
ResultBean rb = new ResultBean().fail();
|
ResultBean rb = new ResultBean().fail();
|
||||||
LpkGiftCardQuery query = pq.getParams();
|
LpkGiftCardQuery query = pq.getParams();
|
||||||
@@ -222,18 +230,18 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
|
|||||||
System.out.println(query.getCustomerSid());
|
System.out.println(query.getCustomerSid());
|
||||||
IPage<LpkGiftCard> page = PagerUtil.queryToPage(pq);
|
IPage<LpkGiftCard> page = PagerUtil.queryToPage(pq);
|
||||||
IPage<AppletVo> list = baseMapper.getGifCardsByCustomerSid(page, query.getCustomerSid());
|
IPage<AppletVo> list = baseMapper.getGifCardsByCustomerSid(page, query.getCustomerSid());
|
||||||
list.getRecords().forEach(s->{
|
list.getRecords().forEach(s -> {
|
||||||
if(s.getLogo().equals("1")){
|
if (s.getLogo().equals("1")) {
|
||||||
//家庭卡
|
//家庭卡
|
||||||
List<LpkGifGoodsVo> vo= getGifCardsBySid(s.getSid()).getData();
|
List<LpkGifGoodsVo> vo = getGifCardsBySid(s.getSid()).getData();
|
||||||
s.setList(vo);
|
s.setList(vo);
|
||||||
}else if(s.getLogo().equals("2")){
|
} else if (s.getLogo().equals("2")) {
|
||||||
//亲情卡
|
//亲情卡
|
||||||
List<LpkGifGoodsVo> vo= empCardGiftService.getGifCardsBySid(s.getSid()).getData();
|
List<LpkGifGoodsVo> vo = empCardGiftService.getGifCardsBySid(s.getSid()).getData();
|
||||||
s.setList(vo);
|
s.setList(vo);
|
||||||
} else if (s.getLogo().equals("3")) {
|
} else if (s.getLogo().equals("3")) {
|
||||||
//企业卡
|
//企业卡
|
||||||
List<LpkGifGoodsVo> list1=empCardService.getEmpCardsBySid(s.getSid()).getData();
|
List<LpkGifGoodsVo> list1 = empCardService.getEmpCardsBySid(s.getSid()).getData();
|
||||||
s.setList(list1);
|
s.setList(list1);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@@ -241,41 +249,42 @@ 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<List<LpkGifGoodsVo>> getGifCardsBySid(String sid) {
|
public ResultBean<List<LpkGifGoodsVo>> getGifCardsBySid(String sid) {
|
||||||
ResultBean rb = new ResultBean().fail();
|
ResultBean rb = new ResultBean().fail();
|
||||||
AppletNewVo vo = baseMapper.getGifCardsBySid(sid);
|
AppletNewVo vo = baseMapper.getGifCardsBySid(sid);
|
||||||
List<LpkGifGoodsVo> list=LpkGiftBagGoodsService.getGoodsByGiftSid(sid);
|
List<LpkGifGoodsVo> list = LpkGiftBagGoodsService.getGoodsByGiftSid(sid);
|
||||||
List<LpkGifGoodsVo> list1=new ArrayList<>();
|
List<LpkGifGoodsVo> list1 = new ArrayList<>();
|
||||||
List<GoodsVo> goodsVos = new ArrayList<>();
|
List<GoodsVo> goodsVos = new ArrayList<>();
|
||||||
list.forEach(s -> {
|
list.forEach(s -> {
|
||||||
LpkGifGoodsVo g=new LpkGifGoodsVo();
|
LpkGifGoodsVo g = new LpkGifGoodsVo();
|
||||||
LpkReserveOrderGoods goods = lpkReserveOrderGoodsService.getReserveByCardSid(vo.getSid(), s.getGoodsSid()).getData();
|
LpkReserveOrderGoods goods = lpkReserveOrderGoodsService.getReserveByCardSid(vo.getSid(), s.getGoodsSid()).getData();
|
||||||
EmpCardGiftVo vo1=empCardGiftService.getEmpCardGoods(vo.getSid(),s.getGoodsSid()).getData();
|
EmpCardGiftVo vo1 = empCardGiftService.getEmpCardGoods(vo.getSid(), s.getGoodsSid()).getData();
|
||||||
GoodsVo goodsVo = new GoodsVo();
|
GoodsVo goodsVo = new GoodsVo();
|
||||||
if (vo.getState().equals("已过期")) {
|
if (vo.getState().equals("已过期")) {
|
||||||
goodsVo.setLNum(0);
|
goodsVo.setLNum(0);
|
||||||
} else if (!vo.isShowBtn()) {
|
} else if (!vo.isShowBtn()) {
|
||||||
goodsVo.setLNum(0);
|
goodsVo.setLNum(0);
|
||||||
} else {
|
} else {
|
||||||
if (null != goods && null!=vo1) {
|
if (null != goods && null != vo1) {
|
||||||
if (goods.getGoodsNumber() != s.getGoodsNumber()) {
|
if (goods.getGoodsNumber() != s.getGoodsNumber()) {
|
||||||
goodsVo.setLNum(s.getGoodsNumber() - goods.getGoodsNumber()-vo1.getGoodsNumber());
|
goodsVo.setLNum(s.getGoodsNumber() - goods.getGoodsNumber() - vo1.getGoodsNumber());
|
||||||
}
|
}
|
||||||
} else if(null != vo1){
|
} else if (null != vo1) {
|
||||||
if (vo1.getGoodsNumber() != s.getGoodsNumber()) {
|
if (vo1.getGoodsNumber() != s.getGoodsNumber()) {
|
||||||
goodsVo.setLNum(s.getGoodsNumber()- vo1.getGoodsNumber());
|
goodsVo.setLNum(s.getGoodsNumber() - vo1.getGoodsNumber());
|
||||||
}
|
}
|
||||||
}else if(null != goods) {
|
} else if (null != goods) {
|
||||||
if (goods.getGoodsNumber() != s.getGoodsNumber()) {
|
if (goods.getGoodsNumber() != s.getGoodsNumber()) {
|
||||||
goodsVo.setLNum(s.getGoodsNumber() - goods.getGoodsNumber());
|
goodsVo.setLNum(s.getGoodsNumber() - goods.getGoodsNumber());
|
||||||
}
|
}
|
||||||
}else {
|
} else {
|
||||||
goodsVo.setLNum(s.getGoodsNumber());
|
goodsVo.setLNum(s.getGoodsNumber());
|
||||||
}
|
}
|
||||||
if(goodsVo.getLNum()!=0){
|
if (goodsVo.getLNum() != 0) {
|
||||||
// g.setContent("剩余"+goodsVo.getLNum()+"份/"+"共"+s.getGoodsNumber()+"份");
|
// g.setContent("剩余"+goodsVo.getLNum()+"份/"+"共"+s.getGoodsNumber()+"份");
|
||||||
g.setContent("共"+(int)goodsVo.getLNum()+"份");
|
g.setContent("共" + (int) goodsVo.getLNum() + "份");
|
||||||
g.setRemarks(s.getWeight()+s.getSpecificationUnit()+"/"+s.getUnitName());
|
g.setRemarks(s.getWeight() + s.getSpecificationUnit() + "/" + s.getUnitName());
|
||||||
g.setGoodsName(s.getGoodsName());
|
g.setGoodsName(s.getGoodsName());
|
||||||
list1.add(g);
|
list1.add(g);
|
||||||
}
|
}
|
||||||
@@ -284,6 +293,7 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
|
|||||||
});
|
});
|
||||||
return rb.success().setData(list1);
|
return rb.success().setData(list1);
|
||||||
}
|
}
|
||||||
|
|
||||||
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);
|
||||||
@@ -291,7 +301,7 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
|
|||||||
List<GoodsVo> goodsVos = new ArrayList<>();
|
List<GoodsVo> goodsVos = new ArrayList<>();
|
||||||
list.forEach(s -> {
|
list.forEach(s -> {
|
||||||
LpkReserveOrderGoods goods = lpkReserveOrderGoodsService.getReserveByCardSid(vo.getSid(), s.getGoodsSid()).getData();
|
LpkReserveOrderGoods goods = lpkReserveOrderGoodsService.getReserveByCardSid(vo.getSid(), s.getGoodsSid()).getData();
|
||||||
EmpCardGiftVo vo1=empCardGiftService.getEmpCardGoods(vo.getSid(),s.getGoodsSid()).getData();
|
EmpCardGiftVo vo1 = empCardGiftService.getEmpCardGoods(vo.getSid(), s.getGoodsSid()).getData();
|
||||||
GoodsVo goodsVo = new GoodsVo();
|
GoodsVo goodsVo = new GoodsVo();
|
||||||
goodsVo.setGoods(s.getGoodsName());
|
goodsVo.setGoods(s.getGoodsName());
|
||||||
goodsVo.setNum(s.getGoodsNumber());
|
goodsVo.setNum(s.getGoodsNumber());
|
||||||
@@ -306,23 +316,23 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
|
|||||||
goodsVo.setLNum(0);
|
goodsVo.setLNum(0);
|
||||||
goodsVos.add(goodsVo);
|
goodsVos.add(goodsVo);
|
||||||
} else {
|
} else {
|
||||||
if (null != goods && null!=vo1) {
|
if (null != goods && null != vo1) {
|
||||||
if (goods.getGoodsNumber() != s.getGoodsNumber()) {
|
if (goods.getGoodsNumber() != s.getGoodsNumber()) {
|
||||||
goodsVo.setLNum(s.getGoodsNumber() - goods.getGoodsNumber()-vo1.getGoodsNumber());
|
goodsVo.setLNum(s.getGoodsNumber() - goods.getGoodsNumber() - vo1.getGoodsNumber());
|
||||||
// goodsVo.setSelect(s.getGoodsNumber() - goods.getGoodsNumber());
|
// goodsVo.setSelect(s.getGoodsNumber() - goods.getGoodsNumber());
|
||||||
goodsVo.setSelect(0);
|
goodsVo.setSelect(0);
|
||||||
}
|
}
|
||||||
} else if(null != vo1){
|
} else if (null != vo1) {
|
||||||
if (vo1.getGoodsNumber() != s.getGoodsNumber()) {
|
if (vo1.getGoodsNumber() != s.getGoodsNumber()) {
|
||||||
goodsVo.setLNum(s.getGoodsNumber()- vo1.getGoodsNumber());
|
goodsVo.setLNum(s.getGoodsNumber() - vo1.getGoodsNumber());
|
||||||
goodsVo.setSelect(0);
|
goodsVo.setSelect(0);
|
||||||
}
|
}
|
||||||
}else if(null != goods) {
|
} else if (null != goods) {
|
||||||
if (goods.getGoodsNumber() != s.getGoodsNumber()) {
|
if (goods.getGoodsNumber() != s.getGoodsNumber()) {
|
||||||
goodsVo.setLNum(s.getGoodsNumber() - goods.getGoodsNumber());
|
goodsVo.setLNum(s.getGoodsNumber() - goods.getGoodsNumber());
|
||||||
goodsVo.setSelect(0);
|
goodsVo.setSelect(0);
|
||||||
}
|
}
|
||||||
}else {
|
} else {
|
||||||
goodsVo.setLNum(s.getGoodsNumber());
|
goodsVo.setLNum(s.getGoodsNumber());
|
||||||
// goodsVo.setSelect(s.getGoodsNumber());
|
// goodsVo.setSelect(s.getGoodsNumber());
|
||||||
goodsVo.setSelect(0);
|
goodsVo.setSelect(0);
|
||||||
@@ -342,8 +352,8 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
CustomerStoreVo customerStoreVo=customerStoreService.getStoreBySid(vo.getCustomerSid()).getData();
|
CustomerStoreVo customerStoreVo = customerStoreService.getStoreBySid(vo.getCustomerSid()).getData();
|
||||||
if(null!=customerStoreVo){
|
if (null != customerStoreVo) {
|
||||||
vo.setAddressName(customerStoreVo.getStoreName());
|
vo.setAddressName(customerStoreVo.getStoreName());
|
||||||
vo.setValue(customerStoreVo.getStoreSid());
|
vo.setValue(customerStoreVo.getStoreSid());
|
||||||
vo.setCustomerName(customerStoreVo.getName());
|
vo.setCustomerName(customerStoreVo.getName());
|
||||||
@@ -357,15 +367,15 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
|
|||||||
// vo.setValue(vo2.getSid());
|
// vo.setValue(vo2.getSid());
|
||||||
// }
|
// }
|
||||||
// }
|
// }
|
||||||
List<EmpCardGift> empCardGift =empCardGiftService.list(new QueryWrapper<EmpCardGift>().eq("empCardSid",vo.getSid()).eq("cardType","3").orderByDesc("createTime"));
|
List<EmpCardGift> empCardGift = empCardGiftService.list(new QueryWrapper<EmpCardGift>().eq("empCardSid", vo.getSid()).eq("cardType", "3").orderByDesc("createTime"));
|
||||||
empCardGift.forEach(s->{
|
empCardGift.forEach(s -> {
|
||||||
List<EmpCardGiftGoods> list1= empCardGiftGoodsService.list(new QueryWrapper<EmpCardGiftGoods>().eq("empCardGiftSid",s.getSid()));
|
List<EmpCardGiftGoods> list1 = empCardGiftGoodsService.list(new QueryWrapper<EmpCardGiftGoods>().eq("empCardGiftSid", s.getSid()));
|
||||||
list1.forEach(l->{
|
list1.forEach(l -> {
|
||||||
LpkGoods goods=lpkGoodsService.getOne(new QueryWrapper<LpkGoods>().eq("sid",l.getGoodsSid()));
|
LpkGoods goods = lpkGoodsService.getOne(new QueryWrapper<LpkGoods>().eq("sid", l.getGoodsSid()));
|
||||||
if(StringUtils.isBlank(s.getGoods())){
|
if (StringUtils.isBlank(s.getGoods())) {
|
||||||
s.setGoods(goods.getName()+":"+l.getGoodsNumber()+"份");
|
s.setGoods(goods.getName() + ":" + l.getGoodsNumber() + "份");
|
||||||
}else{
|
} else {
|
||||||
s.setGoods(s.getGoods()+" "+goods.getName()+":"+l.getGoodsNumber()+"份");
|
s.setGoods(s.getGoods() + " " + goods.getName() + ":" + l.getGoodsNumber() + "份");
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
@@ -595,7 +605,7 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
|
|||||||
qw.in("card.serialNumber", serialNumbers);
|
qw.in("card.serialNumber", serialNumbers);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
qw.eq("card.isEnable","1");
|
qw.eq("card.isEnable", "1");
|
||||||
IPage<LpkGiftCard> page = PagerUtil.queryToPage(pq);
|
IPage<LpkGiftCard> page = PagerUtil.queryToPage(pq);
|
||||||
IPage<LpkGiftCardWordVo> pagging = baseMapper.selGiftCard(page, qw);
|
IPage<LpkGiftCardWordVo> pagging = baseMapper.selGiftCard(page, qw);
|
||||||
pagging.getRecords().forEach(s -> {
|
pagging.getRecords().forEach(s -> {
|
||||||
@@ -645,8 +655,8 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
|
|||||||
IPage<LpkGiftCard> page = PagerUtil.queryToPage(pq);
|
IPage<LpkGiftCard> page = PagerUtil.queryToPage(pq);
|
||||||
IPage<LpkGiftCardListVo> pagging = baseMapper.recordDetails(page, qw);
|
IPage<LpkGiftCardListVo> pagging = baseMapper.recordDetails(page, qw);
|
||||||
PagerVo<LpkGiftCardListVo> p = PagerUtil.pageToVo(pagging, null);
|
PagerVo<LpkGiftCardListVo> p = PagerUtil.pageToVo(pagging, null);
|
||||||
p.getRecords().forEach(s->{
|
p.getRecords().forEach(s -> {
|
||||||
if(s.getIsEnable().equals("2")){
|
if (s.getIsEnable().equals("2")) {
|
||||||
s.setState("已作废");
|
s.setState("已作废");
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -743,13 +753,13 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
|
|||||||
public ResultBean<Object> isSaturAndSun(String cardSid) {
|
public ResultBean<Object> isSaturAndSun(String cardSid) {
|
||||||
ResultBean rb = new ResultBean().fail();
|
ResultBean rb = new ResultBean().fail();
|
||||||
AppletVo appletVo = baseMapper.getGifCardBySid(cardSid);
|
AppletVo appletVo = baseMapper.getGifCardBySid(cardSid);
|
||||||
Date date =new Date();
|
Date date = new Date();
|
||||||
SimpleDateFormat sdf1 =new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
||||||
String nowDate =sdf1.format(date);
|
String nowDate = sdf1.format(date);
|
||||||
// AppletVo vo = getGifCardBySid(cardSid).getData();
|
// AppletVo vo = getGifCardBySid(cardSid).getData();
|
||||||
// LocalDate now = DateUtil.parse(sdf1.format(DateUtil.parse(appletVo.getStart()))).toSqlDate().toLocalDate();
|
// LocalDate now = DateUtil.parse(sdf1.format(DateUtil.parse(appletVo.getStart()))).toSqlDate().toLocalDate();
|
||||||
LocalDate now = DateUtil.parse(nowDate).toSqlDate().toLocalDate();
|
LocalDate now = DateUtil.parse(nowDate).toSqlDate().toLocalDate();
|
||||||
LocalDate endD = DateUtil.parse(appletVo.getDateEnd()).toSqlDate().toLocalDate();
|
LocalDate endD = DateUtil.parse(appletVo.getDateEnd()).toSqlDate().toLocalDate();
|
||||||
|
|
||||||
|
|
||||||
List<String> weekMap = new ArrayList<>();
|
List<String> weekMap = new ArrayList<>();
|
||||||
@@ -1294,7 +1304,7 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Transactional(rollbackFor = Exception.class)
|
@Transactional(rollbackFor = Exception.class)
|
||||||
public ResultBean getExcelInfo3(String startDate, String endDate, MultipartFile file, HttpServletRequest request, HttpServletResponse response) throws IOException {
|
public synchronized ResultBean getExcelInfo3(String startDate, String endDate, MultipartFile file, HttpServletRequest request, HttpServletResponse response) throws IOException {
|
||||||
ResultBean rb = ResultBean.fireFail();
|
ResultBean rb = ResultBean.fireFail();
|
||||||
try {
|
try {
|
||||||
String temp = request.getSession().getServletContext().getRealPath(File.separator) + "temp";// 临时目录
|
String temp = request.getSession().getServletContext().getRealPath(File.separator) + "temp";// 临时目录
|
||||||
@@ -1341,6 +1351,11 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
|
|||||||
List<LpkCardBuildRecord> records = new ArrayList<>(); //二维码
|
List<LpkCardBuildRecord> records = new ArrayList<>(); //二维码
|
||||||
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
|
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
|
||||||
int cardSerNum = 0;
|
int cardSerNum = 0;
|
||||||
|
String serNum = baseMapper.selctMaxSerNumForExport(); //取当前最大流水号
|
||||||
|
int serNumInt = 70000000; //默认为初始值-1
|
||||||
|
if (StringUtils.isNotBlank(serNum)) { //如果当前礼品卡中存在流水号,则使用当前最大流水号进行计算
|
||||||
|
serNumInt = Integer.parseInt(serNum);
|
||||||
|
}
|
||||||
//生成卡包
|
//生成卡包
|
||||||
if (!importReturn.isEmpty()) {
|
if (!importReturn.isEmpty()) {
|
||||||
for (int i = 0; i < importReturn.size(); i++) {
|
for (int i = 0; i < importReturn.size(); i++) {
|
||||||
@@ -1349,7 +1364,6 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
|
|||||||
LpkGiftBag bag = new LpkGiftBag();
|
LpkGiftBag bag = new LpkGiftBag();
|
||||||
LpkCardQrcode code = new LpkCardQrcode();
|
LpkCardQrcode code = new LpkCardQrcode();
|
||||||
LpkCardBuildRecord record = new LpkCardBuildRecord();
|
LpkCardBuildRecord record = new LpkCardBuildRecord();
|
||||||
String serNum = baseMapper.selctMaxSerNumForExport();
|
|
||||||
card.setCreateTime(new DateTime());//卡片生成时间
|
card.setCreateTime(new DateTime());//卡片生成时间
|
||||||
bag.setCreateTime(new DateTime());//礼包生成时间
|
bag.setCreateTime(new DateTime());//礼包生成时间
|
||||||
code.setCreateTime(new DateTime());//二维码生成时间
|
code.setCreateTime(new DateTime());//二维码生成时间
|
||||||
@@ -1357,7 +1371,7 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
|
|||||||
record.setBuildDate(new DateTime());//礼包记录生成时间
|
record.setBuildDate(new DateTime());//礼包记录生成时间
|
||||||
record.setGiftbagSid(bag.getSid());
|
record.setGiftbagSid(bag.getSid());
|
||||||
record.setCountNumber("1");
|
record.setCountNumber("1");
|
||||||
if (StringUtils.isNotBlank(serNum)) {
|
/*if (StringUtils.isNotBlank(serNum)) {
|
||||||
int serNumInt = Integer.parseInt(serNum);
|
int serNumInt = Integer.parseInt(serNum);
|
||||||
if (i == 0) {
|
if (i == 0) {
|
||||||
cardSerNum = serNumInt + 1;
|
cardSerNum = serNumInt + 1;
|
||||||
@@ -1366,6 +1380,9 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
|
|||||||
if (cardSerNum == 0) {
|
if (cardSerNum == 0) {
|
||||||
cardSerNum = 70000001;
|
cardSerNum = 70000001;
|
||||||
}
|
}
|
||||||
|
}*/
|
||||||
|
if (i == 0) {
|
||||||
|
cardSerNum = serNumInt + 1;
|
||||||
}
|
}
|
||||||
card.setSerialNumber(String.valueOf(cardSerNum));
|
card.setSerialNumber(String.valueOf(cardSerNum));
|
||||||
record.setStartNumber(String.valueOf(cardSerNum));
|
record.setStartNumber(String.valueOf(cardSerNum));
|
||||||
@@ -1565,26 +1582,26 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
|
|||||||
// }
|
// }
|
||||||
|
|
||||||
public void cardStatisticsListExport(LpkGiftCardListQuery query) {
|
public void cardStatisticsListExport(LpkGiftCardListQuery query) {
|
||||||
ResultBean rb=new ResultBean();
|
ResultBean rb = new ResultBean();
|
||||||
QueryWrapper<LpkGiftCardListQuery> qw = new QueryWrapper<>();
|
QueryWrapper<LpkGiftCardListQuery> qw = new QueryWrapper<>();
|
||||||
qw.eq("1", "1");
|
qw.eq("1", "1");
|
||||||
if(StringUtils.isNotBlank(query.getSerialNumber())){
|
if (StringUtils.isNotBlank(query.getSerialNumber())) {
|
||||||
qw.like("a.serialNumber",query.getSerialNumber());
|
qw.like("a.serialNumber", query.getSerialNumber());
|
||||||
}
|
}
|
||||||
qw.groupBy("a.sid");
|
qw.groupBy("a.sid");
|
||||||
qw.orderByDesc("a.createTime");
|
qw.orderByDesc("a.createTime");
|
||||||
// qw.groupBy("c.goodsSid");
|
// qw.groupBy("c.goodsSid");
|
||||||
List<CardStatisticsExportVo> statisticsExportVos=baseMapper.cardStatisticsListExport(qw);
|
List<CardStatisticsExportVo> statisticsExportVos = baseMapper.cardStatisticsListExport(qw);
|
||||||
statisticsExportVos.forEach(s->{
|
statisticsExportVos.forEach(s -> {
|
||||||
if(s.getIsEnable().equals("2")){
|
if (s.getIsEnable().equals("2")) {
|
||||||
s.setStateValue("已作废");
|
s.setStateValue("已作废");
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
String excelName = "提货卡信息.xlsx";
|
String excelName = "提货卡信息.xlsx";
|
||||||
String fileNameURL = "1";
|
String fileNameURL = "1";
|
||||||
response.setContentType( "application/vnd.ms-excel");
|
response.setContentType("application/vnd.ms-excel");
|
||||||
response.setCharacterEncoding("utf8");
|
response.setCharacterEncoding("utf8");
|
||||||
response.setHeader("Content-disposition","attachment;filename="+ excelName );
|
response.setHeader("Content-disposition", "attachment;filename=" + excelName);
|
||||||
ServletOutputStream outputStream = null;
|
ServletOutputStream outputStream = null;
|
||||||
try {
|
try {
|
||||||
WriteCellStyle headWriteCellStyle = new WriteCellStyle();
|
WriteCellStyle headWriteCellStyle = new WriteCellStyle();
|
||||||
@@ -1609,76 +1626,80 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public ResultBean cardStatisticsList(PagerQuery<LpkReserveOrderQuery> pq) {
|
public ResultBean cardStatisticsList(PagerQuery<LpkReserveOrderQuery> pq) {
|
||||||
ResultBean rb=new ResultBean();
|
ResultBean rb = new ResultBean();
|
||||||
LpkReserveOrderQuery query = pq.getParams();
|
LpkReserveOrderQuery query = pq.getParams();
|
||||||
QueryWrapper<LpkGiftCardListQuery> qw = new QueryWrapper<>();
|
QueryWrapper<LpkGiftCardListQuery> qw = new QueryWrapper<>();
|
||||||
qw.eq("1", "1");
|
qw.eq("1", "1");
|
||||||
if(StringUtils.isNotBlank(query.getSerialNumber())){
|
if (StringUtils.isNotBlank(query.getSerialNumber())) {
|
||||||
qw.like("a.serialNumber",query.getSerialNumber());
|
qw.like("a.serialNumber", query.getSerialNumber());
|
||||||
}
|
}
|
||||||
qw.groupBy("a.sid");
|
qw.groupBy("a.sid");
|
||||||
qw.orderByDesc("a.createTime");
|
qw.orderByDesc("a.createTime");
|
||||||
// qw.groupBy("c.goodsSid");
|
// qw.groupBy("c.goodsSid");
|
||||||
IPage<LpkGiftCardListQuery> page = PagerUtil.queryToPage(pq);
|
IPage<LpkGiftCardListQuery> page = PagerUtil.queryToPage(pq);
|
||||||
IPage<LpkGiftCardVo> pagging = baseMapper.cardStatisticsList(page, qw);
|
IPage<LpkGiftCardVo> pagging = baseMapper.cardStatisticsList(page, qw);
|
||||||
pagging.getRecords().forEach(s->{
|
pagging.getRecords().forEach(s -> {
|
||||||
if(s.getIsEnable().equals("2")){
|
if (s.getIsEnable().equals("2")) {
|
||||||
s.setStateValue("已作废");
|
s.setStateValue("已作废");
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
return rb.success().setData(pagging);
|
return rb.success().setData(pagging);
|
||||||
}
|
}
|
||||||
|
|
||||||
public ResultBean isEnable(String sid ) {
|
public ResultBean isEnable(String sid) {
|
||||||
ResultBean rb=new ResultBean();
|
ResultBean rb = new ResultBean();
|
||||||
LpkGiftCard card=baseMapper.selectOne(new QueryWrapper<LpkGiftCard>().eq("sid",sid));
|
LpkGiftCard card = baseMapper.selectOne(new QueryWrapper<LpkGiftCard>().eq("sid", sid));
|
||||||
card.setIsEnable("2");
|
card.setIsEnable("2");
|
||||||
baseMapper.updateById(card);
|
baseMapper.updateById(card);
|
||||||
return rb.success().setData("成功");
|
return rb.success().setData("成功");
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*是否转赠
|
* 是否转赠
|
||||||
|
*
|
||||||
* @param sid
|
* @param sid
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public ResultBean cardTransfer(String sid ) {
|
public ResultBean cardTransfer(String sid) {
|
||||||
ResultBean rb=new ResultBean();
|
ResultBean rb = new ResultBean();
|
||||||
LpkGiftCard card=baseMapper.selectOne(new QueryWrapper<LpkGiftCard>().eq("sid",sid));
|
LpkGiftCard card = baseMapper.selectOne(new QueryWrapper<LpkGiftCard>().eq("sid", sid));
|
||||||
card.setIsTransfer("1");
|
card.setIsTransfer("1");
|
||||||
card.setIsItInvalid("1");//失效
|
card.setIsItInvalid("1");//失效
|
||||||
baseMapper.updateById(card);
|
baseMapper.updateById(card);
|
||||||
return rb.success().setData("成功");
|
return rb.success().setData("成功");
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*共享家庭卡详情
|
* 共享家庭卡详情
|
||||||
|
*
|
||||||
* @param sid
|
* @param sid
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public ResultBean cardShareDetail(String sid ) {
|
public ResultBean cardShareDetail(String sid) {
|
||||||
ResultBean rb=new ResultBean().fail();
|
ResultBean rb = new ResultBean().fail();
|
||||||
CardShareDetailVo vo=new CardShareDetailVo();
|
CardShareDetailVo vo = new CardShareDetailVo();
|
||||||
vo.setCode("11111111111111111111");
|
vo.setCode("11111111111111111111");
|
||||||
vo.setPeriodValidity(vo.getStartDate()+"~"+vo.getEndDate());
|
vo.setPeriodValidity(vo.getStartDate() + "~" + vo.getEndDate());
|
||||||
vo.setCount("6种蔬菜");
|
vo.setCount("6种蔬菜");
|
||||||
List<ShareUserVo> list=new ArrayList<>();
|
List<ShareUserVo> list = new ArrayList<>();
|
||||||
ShareUserVo vo1=new ShareUserVo();
|
ShareUserVo vo1 = new ShareUserVo();
|
||||||
vo1.setName("测试一");
|
vo1.setName("测试一");
|
||||||
vo1.setIconUrl("");
|
vo1.setIconUrl("");
|
||||||
ShareUserVo vo2=new ShareUserVo();
|
ShareUserVo vo2 = new ShareUserVo();
|
||||||
vo1.setName("测试二");
|
vo1.setName("测试二");
|
||||||
vo1.setIconUrl("");
|
vo1.setIconUrl("");
|
||||||
list.add(vo1);
|
list.add(vo1);
|
||||||
list.add(vo2);
|
list.add(vo2);
|
||||||
List<ShareRecord> v=new ArrayList<>();
|
List<ShareRecord> v = new ArrayList<>();
|
||||||
ShareRecord record=new ShareRecord();
|
ShareRecord record = new ShareRecord();
|
||||||
record.setDate("2023-12-25 09:30");
|
record.setDate("2023-12-25 09:30");
|
||||||
record.setOperate("xx接受共享邀请");
|
record.setOperate("xx接受共享邀请");
|
||||||
ShareRecord record1=new ShareRecord();
|
ShareRecord record1 = new ShareRecord();
|
||||||
record1.setDate("2023-12-27 10:10");
|
record1.setDate("2023-12-27 10:10");
|
||||||
record1.setOperate("xx接受共享邀请");
|
record1.setOperate("xx接受共享邀请");
|
||||||
ShareRecord record2=new ShareRecord();
|
ShareRecord record2 = new ShareRecord();
|
||||||
record2.setDate("2023-12-28 12:30");
|
record2.setDate("2023-12-28 12:30");
|
||||||
record2.setOperate("xx接受共享邀请");
|
record2.setOperate("xx接受共享邀请");
|
||||||
v.add(record);
|
v.add(record);
|
||||||
@@ -1688,13 +1709,14 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
|
|||||||
vo.setShareRecordList(v);
|
vo.setShareRecordList(v);
|
||||||
return rb.success().setData(vo);
|
return rb.success().setData(vo);
|
||||||
}
|
}
|
||||||
public ResultBean cardShareGoodsDetail(String sid ) {
|
|
||||||
ResultBean rb=new ResultBean().fail();
|
public ResultBean cardShareGoodsDetail(String sid) {
|
||||||
CardShareDetailVo vo=new CardShareDetailVo();
|
ResultBean rb = new ResultBean().fail();
|
||||||
|
CardShareDetailVo vo = new CardShareDetailVo();
|
||||||
vo.setCode("11111111111111111111");
|
vo.setCode("11111111111111111111");
|
||||||
vo.setPeriodValidity(vo.getStartDate()+"~"+vo.getEndDate());
|
vo.setPeriodValidity(vo.getStartDate() + "~" + vo.getEndDate());
|
||||||
List<com.yxt.yyth.api.appletgiftbag.GiftBagGoods> goods=new ArrayList<>();
|
List<com.yxt.yyth.api.appletgiftbag.GiftBagGoods> goods = new ArrayList<>();
|
||||||
com.yxt.yyth.api.appletgiftbag.GiftBagGoods goodss=new com.yxt.yyth.api.appletgiftbag.GiftBagGoods();
|
com.yxt.yyth.api.appletgiftbag.GiftBagGoods goodss = new com.yxt.yyth.api.appletgiftbag.GiftBagGoods();
|
||||||
goodss.setRemark("富含蛋白顾、钙、铁、硒等有益元素。");
|
goodss.setRemark("富含蛋白顾、钙、铁、硒等有益元素。");
|
||||||
goodss.setName("西瓜红密薯");
|
goodss.setName("西瓜红密薯");
|
||||||
goodss.setUnitName("份");
|
goodss.setUnitName("份");
|
||||||
@@ -1703,7 +1725,7 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
|
|||||||
goodss.setJPrice("1.5");
|
goodss.setJPrice("1.5");
|
||||||
goodss.setSpecificationUnit("斤");
|
goodss.setSpecificationUnit("斤");
|
||||||
goodss.setWeight("7");
|
goodss.setWeight("7");
|
||||||
com.yxt.yyth.api.appletgiftbag.GiftBagGoods goods1=new com.yxt.yyth.api.appletgiftbag.GiftBagGoods();
|
com.yxt.yyth.api.appletgiftbag.GiftBagGoods goods1 = new com.yxt.yyth.api.appletgiftbag.GiftBagGoods();
|
||||||
goods1.setRemark("北方大白菜打过霜后,口感发甜,更加可口");
|
goods1.setRemark("北方大白菜打过霜后,口感发甜,更加可口");
|
||||||
goods1.setName("北方大白菜");
|
goods1.setName("北方大白菜");
|
||||||
goods1.setUnitName("份");
|
goods1.setUnitName("份");
|
||||||
@@ -1713,7 +1735,7 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
|
|||||||
goods1.setSpecificationUnit("斤");
|
goods1.setSpecificationUnit("斤");
|
||||||
goods1.setWeight("15");
|
goods1.setWeight("15");
|
||||||
|
|
||||||
com.yxt.yyth.api.appletgiftbag.GiftBagGoods goods2=new com.yxt.yyth.api.appletgiftbag.GiftBagGoods();
|
com.yxt.yyth.api.appletgiftbag.GiftBagGoods goods2 = new com.yxt.yyth.api.appletgiftbag.GiftBagGoods();
|
||||||
goods2.setRemark("淀粉含量较高,口感更粉、更紧实");
|
goods2.setRemark("淀粉含量较高,口感更粉、更紧实");
|
||||||
goods2.setName("张北土豆");
|
goods2.setName("张北土豆");
|
||||||
goods2.setUnitName("份");
|
goods2.setUnitName("份");
|
||||||
@@ -1722,7 +1744,7 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
|
|||||||
goods2.setJPrice("1");
|
goods2.setJPrice("1");
|
||||||
goods2.setSpecificationUnit("斤");
|
goods2.setSpecificationUnit("斤");
|
||||||
goods2.setWeight("5");
|
goods2.setWeight("5");
|
||||||
com.yxt.yyth.api.appletgiftbag.GiftBagGoods goods3=new com.yxt.yyth.api.appletgiftbag.GiftBagGoods();
|
com.yxt.yyth.api.appletgiftbag.GiftBagGoods goods3 = new com.yxt.yyth.api.appletgiftbag.GiftBagGoods();
|
||||||
goods3.setRemark("原料纯正,只有红薯粉,没有其他添加剂");
|
goods3.setRemark("原料纯正,只有红薯粉,没有其他添加剂");
|
||||||
goods3.setName("纯红薯粉条");
|
goods3.setName("纯红薯粉条");
|
||||||
goods3.setUnitName("份");
|
goods3.setUnitName("份");
|
||||||
|
|||||||
Reference in New Issue
Block a user