product_platform/yxt-yythmall-biz
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
djz236@163.com
2024-01-21 12:44:36 +08:00
parent b7056c361a a093889b0e
commit 6e49464145
22 changed files with 709 additions and 325 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/yxt/yythmall/api/transferrecords/TransferRecordsQuery.java
View File

@@ -18,4 +18,5 @@ public class TransferRecordsQuery implements Query {
private String bankSid;
private String bankName;
private String serialNumber;
private String state;
}

31
src/main/java/com/yxt/yythmall/api/vegereplenish/VegeReplenish.java Normal file
View File

@@ -0,0 +1,31 @@
package com.yxt.yythmall.api.vegereplenish;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import java.util.Date;
import java.util.UUID;
/**
* @author Fan
* @description
* @date 2024/1/21 10:49
*/
@ApiModel(value = "绑卡记录", description = "绑卡记录")
@TableName("vege_replenish")
@Data
public class VegeReplenish {
private String id;
private String sid= UUID.randomUUID().toString();
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date createTime;
private String remarks;
private String customerSid;//客户sid
private String cardCode;//卡编码，个人卡、企业卡是卡编码，转赠记录的是转赠编码
private String cardtype;//0 个人卡 1 企业卡 2 转赠的
}

32
src/main/java/com/yxt/yythmall/api/vegereplenishdetail/VegeReplenishDetail.java Normal file
View File

@@ -0,0 +1,32 @@
package com.yxt.yythmall.api.vegereplenishdetail;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import java.util.Date;
import java.util.UUID;
/**
* @author Fan
* @description
* @date 2024/1/21 10:49
*/
@ApiModel(value = "绑卡记录商品信息", description = "绑卡记录商品信息")
@TableName("vege_replenish_detail")
@Data
public class VegeReplenishDetail {
private String id;
private String sid = UUID.randomUUID().toString();
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createTime;
private String remarks;
private String orderSid;//订单SID
private String goodsSid;//商品Sid
private String goodsName;//商品名称
private Integer goodsNumber;//商品数量
}

135
src/main/java/com/yxt/yythmall/biz/empcard/EmpCardService.java
View File

@@ -42,6 +42,7 @@ import com.yxt.yythmall.biz.lpkgoods.LpkGoodsService;
import com.yxt.yythmall.biz.lpkreserveorder.LpkReserveOrderService;
import com.yxt.yythmall.biz.lpkreserveordergoods.LpkReserveOrderGoodsService;
import com.yxt.yythmall.biz.lpkstore.LpkStoreService;
import com.yxt.yythmall.biz.vegereplenish.VegeReplenishService;
import com.yxt.yythmall.biz.vegetablecellar.VegetableCellarService;
import com.yxt.yythmall.utils.StyleUtils;
import org.apache.poi.ss.usermodel.HorizontalAlignment;
@@ -93,6 +94,8 @@ public class EmpCardService extends MybatisBaseService<EmpCardMapper, EmpCard> {
@Autowired
private VegetableCellarService vegetableCellarService;
@Autowired
private VegeReplenishService vegeReplenishService;
@Autowired
private HttpServletResponse response;
@Value("${image.url.prefix:http://127.0.0.1:8080/upload/}")
private String urlPrefix;
@@ -100,7 +103,6 @@ public class EmpCardService extends MybatisBaseService<EmpCardMapper, EmpCard> {
String qrUrl;
public ResultBean bindCard(EmpCardDto bindCardDto) {
ResultBean rb = new ResultBean().fail();
EmpCard lpkGiftCard = baseMapper.selectOne(new QueryWrapper<EmpCard>().eq("code", bindCardDto.getCode())
@@ -121,6 +123,7 @@ public class EmpCardService extends MybatisBaseService<EmpCardMapper, EmpCard> {
baseMapper.updateById(lpkGiftCard);
return rb.success().setMsg("绑定成功");
}
public ResultBean bindCardA(BindCardDto bindCardDto) {
ResultBean rb = new ResultBean().fail();
EmpCard lpkGiftCard = baseMapper.selectOne(new QueryWrapper<EmpCard>().eq("code", bindCardDto.getCode())
@@ -139,31 +142,33 @@ public class EmpCardService extends MybatisBaseService<EmpCardMapper, EmpCard> {
lpkGiftCard.setState("2");
lpkGiftCard.setBindDate(new Date());
baseMapper.updateById(lpkGiftCard);
List<vegeVo> k=baseMapper.getGoodsList(lpkGiftCard.getSid());
VegetableCellarDto dto=new VegetableCellarDto();
List<vegeVo> k = baseMapper.getGoodsList(lpkGiftCard.getSid());
VegetableCellarDto dto = new VegetableCellarDto();
dto.setCustomerSid(dto.getCustomerSid());
dto.setVos(k);
vegetableCellarService.save1Goods(dto);
vegeReplenishService.saveBindRecord(bindCardDto, "1");
return rb.success().setMsg("绑定成功");
}
public ResultBean updateEmpCardState(String empCardSid) {
ResultBean rb = new ResultBean().fail();
List<EmpCardVo> vos=baseMapper.selEmpCardSid(empCardSid);
int i=0;
for(EmpCardVo vo:vos){
EmpCardGrantLogVo empCardGrantLogVo=empCardGrantLogService.recordGoodsSid(empCardSid,vo.getGoodsSid()).getData();
if(vo.getGoodsNumber()==empCardGrantLogVo.getGoodsNumber()){
List<EmpCardVo> vos = baseMapper.selEmpCardSid(empCardSid);
int i = 0;
for (EmpCardVo vo : vos) {
EmpCardGrantLogVo empCardGrantLogVo = empCardGrantLogService.recordGoodsSid(empCardSid, vo.getGoodsSid()).getData();
if (vo.getGoodsNumber() == empCardGrantLogVo.getGoodsNumber()) {
i++;
}
if(i==vos.size()){
EmpCard empCard=baseMapper.selectOne(new QueryWrapper<EmpCard>().eq("sid",empCardSid));
if (i == vos.size()) {
EmpCard empCard = baseMapper.selectOne(new QueryWrapper<EmpCard>().eq("sid", empCardSid));
empCard.setState("3");
baseMapper.updateById(empCard);
}
}
return rb.success().setMsg("绑定成功");
}
@Transactional(rollbackFor = Exception.class)
public ResultBean generateCard(EmpCardDto dto) {
ResultBean rb = ResultBean.fireFail();
@@ -231,6 +236,7 @@ public class EmpCardService extends MybatisBaseService<EmpCardMapper, EmpCard> {
empCardBuildRecordService.updateById(cardBuildRecord);
return rb.success();
}
public ResultBean<PagerVo<EmpCardVo>> cardList(PagerQuery<EmpCardQuery> pq) {
ResultBean rb = ResultBean.fireFail();
EmpCardQuery query = pq.getParams();
@@ -250,6 +256,7 @@ public class EmpCardService extends MybatisBaseService<EmpCardMapper, EmpCard> {
PagerVo<EmpCardVo> p = PagerUtil.pageToVo(pagging, null);
return rb.success().setData(p);
}
public ResultBean<PagerVo<EmpCardVo>> recordDetails(PagerQuery<EmpCardQuery> pq) {
ResultBean rb = ResultBean.fireFail();
EmpCardQuery query = pq.getParams();
@@ -270,6 +277,7 @@ public class EmpCardService extends MybatisBaseService<EmpCardMapper, EmpCard> {
PagerVo<EmpCardVo> p = PagerUtil.pageToVo(pagging, null);
return rb.success().setData(p);
}
public void exportExcel(LpkGiftCardListQuery query) {
// String finUrl = "https://supervise.yxtsoft.com/lpkapi?qy=";
@@ -307,11 +315,13 @@ public class EmpCardService extends MybatisBaseService<EmpCardMapper, EmpCard> {
ExportExcelUtils.export(fileNameURL, exportList, EmpCardExport.class, response);
}
public ResultBean<Integer> cardGrantCount(String recordSid) {
ResultBean rb = new ResultBean().fail();
Integer i = baseMapper.cardGrantCount(recordSid);
return rb.success().setData(i);
}
public ResultBean getEmpCardByCustomerSid(PagerQuery<EmpCardQuery> pq) {
ResultBean rb = new ResultBean().fail();
EmpCardQuery query = pq.getParams();
@@ -330,13 +340,14 @@ public class EmpCardService extends MybatisBaseService<EmpCardMapper, EmpCard> {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
return rb.success().setData(p);
}
public ResultBean<List<LpkGifGoodsVo>> getEmpCardsBySid(String sid) {
ResultBean rb = new ResultBean().fail();
EmpAppletNewVo vo = baseMapper.getEmpCardsBySid(sid);
List<LpkGifGoodsVo> list=lpkGiftBagGoodsService.getGoodsByEmpGiftSid(sid);
List<LpkGifGoodsVo> list1=new ArrayList<>();
List<LpkGifGoodsVo> list = lpkGiftBagGoodsService.getGoodsByEmpGiftSid(sid);
List<LpkGifGoodsVo> list1 = new ArrayList<>();
list.forEach(s -> {
LpkGifGoodsVo g=new LpkGifGoodsVo();
LpkGifGoodsVo g = new LpkGifGoodsVo();
EmpCardGiftVo goods = empCardGiftService.getEmpCardGoods(vo.getSid(), s.getGoodsSid()).getData();
LpkReserveOrderGoods goodsOne = lpkReserveOrderGoodsService.getReserveByCardSid(vo.getSid(), s.getGoodsSid()).getData();
GoodsVo goodsVo = new GoodsVo();
@@ -346,24 +357,24 @@ public class EmpCardService extends MybatisBaseService<EmpCardMapper, EmpCard> {
goodsVo.setLNum(0);
} else {
if (null != goods && null != goodsOne) {
if ((goods.getGoodsNumber()+goodsOne.getGoodsNumber()) != s.getGoodsNumber()) {
goodsVo.setLNum(s.getGoodsNumber() - goods.getGoodsNumber()- goodsOne.getGoodsNumber());
if ((goods.getGoodsNumber() + goodsOne.getGoodsNumber()) != s.getGoodsNumber()) {
goodsVo.setLNum(s.getGoodsNumber() - goods.getGoodsNumber() - goodsOne.getGoodsNumber());
}
} else if(null != goodsOne){
} else if (null != goodsOne) {
if (goodsOne.getGoodsNumber() != s.getGoodsNumber()) {
goodsVo.setLNum(s.getGoodsNumber()- goodsOne.getGoodsNumber());
goodsVo.setLNum(s.getGoodsNumber() - goodsOne.getGoodsNumber());
}
}else if(null != goods){
} else if (null != goods) {
if (goods.getGoodsNumber() != s.getGoodsNumber()) {
goodsVo.setLNum(s.getGoodsNumber() - goods.getGoodsNumber());
}
}else{
} else {
goodsVo.setLNum(s.getGoodsNumber());
}
if(goodsVo.getLNum()!=0){
if (goodsVo.getLNum() != 0) {
// g.setContent("剩余"+goodsVo.getLNum()+"份/"+"共"+s.getGoodsNumber()+"份");
g.setContent("共"+(int)goodsVo.getLNum()+"份");
g.setRemarks(s.getWeight()+s.getSpecificationUnit()+"/"+s.getUnitName());
g.setContent("共" + (int) goodsVo.getLNum() + "份");
g.setRemarks(s.getWeight() + s.getSpecificationUnit() + "/" + s.getUnitName());
g.setGoodsName(s.getGoodsName());
list1.add(g);
}
@@ -371,6 +382,7 @@ public class EmpCardService extends MybatisBaseService<EmpCardMapper, EmpCard> {
});
return rb.success().setData(list1);
}
public ResultBean<EmpAppletVo> getEmpCardBySid(String sid) {
ResultBean rb = new ResultBean().fail();
EmpAppletVo vo = baseMapper.getEmpCardBySid(sid);
@@ -395,39 +407,39 @@ public class EmpCardService extends MybatisBaseService<EmpCardMapper, EmpCard> {
goodsVos.add(goodsVo);
} else {
if (null != goods && null != goodsOne) {
if ((goods.getGoodsNumber()+goodsOne.getGoodsNumber()) != s.getGoodsNumber()) {
goodsVo.setLNum(s.getGoodsNumber() - goods.getGoodsNumber()- goodsOne.getGoodsNumber());
if ((goods.getGoodsNumber() + goodsOne.getGoodsNumber()) != s.getGoodsNumber()) {
goodsVo.setLNum(s.getGoodsNumber() - goods.getGoodsNumber() - goodsOne.getGoodsNumber());
goodsVo.setSelect(0);
}
} else if(null != goodsOne){
} else if (null != goodsOne) {
if (goodsOne.getGoodsNumber() != s.getGoodsNumber()) {
goodsVo.setLNum(s.getGoodsNumber()- goodsOne.getGoodsNumber());
goodsVo.setLNum(s.getGoodsNumber() - goodsOne.getGoodsNumber());
goodsVo.setSelect(0);
}
}else if(null != goods){
} else if (null != goods) {
if (goods.getGoodsNumber() != s.getGoodsNumber()) {
goodsVo.setLNum(s.getGoodsNumber() - goods.getGoodsNumber());
goodsVo.setSelect(0);
}
}else{
} else {
goodsVo.setLNum(s.getGoodsNumber());
goodsVo.setSelect(0);
}
goodsVos.add(goodsVo);
}
});
List<EmpCardGiftVo> EmpCardGiftVos= empCardGiftService.recordList(vo.getSid()).getData();
EmpCardGiftVos.forEach(s->{
List<EmpCardGiftGoodsVo> l=empCardGiftGoodsService.getGoodsByEmpCardGiftSid(s.getSid()).getData();
if(StringUtils.isNotBlank(s.getCustomerSid())){
EmpCardGift empCardGift=new EmpCardGift();
List<EmpCardGiftVo> EmpCardGiftVos = empCardGiftService.recordList(vo.getSid()).getData();
EmpCardGiftVos.forEach(s -> {
List<EmpCardGiftGoodsVo> l = empCardGiftGoodsService.getGoodsByEmpCardGiftSid(s.getSid()).getData();
if (StringUtils.isNotBlank(s.getCustomerSid())) {
EmpCardGift empCardGift = new EmpCardGift();
// BeanUtil.copyProperties(EmpCardGiftVos, empCardGift, "id", "sid");
s.setShare("3");
// empCardGift.setIsShare("3");
// empCardGiftService.updateById(empCardGift);
}
l.forEach(c->{
if(c.getGoodsNumber()!=0){
l.forEach(c -> {
if (c.getGoodsNumber() != 0) {
if (StringUtils.isBlank(s.getGoods())) {
s.setGoods(c.getName() + "：" + c.getGoodsNumber() + c.getUnitName());
} else {
@@ -441,8 +453,8 @@ public class EmpCardService extends MybatisBaseService<EmpCardMapper, EmpCard> {
String uuid = UniqueIdGenerator.generateUniqueID();
int randomNumber = new Random().nextInt(900000) + 100000;
vo.setGiftCodeKey(String.valueOf(randomNumber));
vo.setGiftCode("99"+uuid.substring(2));
vo.setQrCode(qrUrl+vo.getGiftCode());
vo.setGiftCode("99" + uuid.substring(2));
vo.setQrCode(qrUrl + vo.getGiftCode());
List<LpkReserveOrderCardVo> empReserveOrderCardVos = lpkReserveOrderService.selOrderByCardSid(sid).getData();
for (LpkReserveOrderCardVo vo2 : empReserveOrderCardVos) {
List<LpkReserveOrderGoods> goods = lpkReserveOrderGoodsService.selByOrderSids(vo2.getSid());
@@ -468,6 +480,7 @@ public class EmpCardService extends MybatisBaseService<EmpCardMapper, EmpCard> {
vo.setOrderCardVoList(empReserveOrderCardVos);
return rb.success().setData(vo);
}
public ResultBean changState(String cardSid, String state) {
ResultBean rb = new ResultBean().fail();
EmpCard card = baseMapper.selectOne(new QueryWrapper<EmpCard>().eq("sid", cardSid));
@@ -476,23 +489,24 @@ public class EmpCardService extends MybatisBaseService<EmpCardMapper, EmpCard> {
baseMapper.updateById(card);
return rb.success().setData("成功");
}
public ResultBean<EmpCardVo> getBagGoods(String sid,String goodsSid) {
public ResultBean<EmpCardVo> getBagGoods(String sid, String goodsSid) {
ResultBean rb = new ResultBean().fail();
EmpCardVo card = baseMapper.getBagGoods(sid,goodsSid);
EmpCardVo card = baseMapper.getBagGoods(sid, goodsSid);
return rb.success().setData(card);
}
public void cardStatisticsListExport(EmpCardQuery query) {
ResultBean rb=new ResultBean();
ResultBean rb = new ResultBean();
QueryWrapper<EmpCardQuery> qw = new QueryWrapper<>();
qw.eq("1", "1");
if(StringUtils.isNotBlank(query.getSerialNumber())){
qw.like("a.serialNumber",query.getSerialNumber());
if (StringUtils.isNotBlank(query.getSerialNumber())) {
qw.like("a.serialNumber", query.getSerialNumber());
}
qw.groupBy("a.sid");
qw.orderByDesc("a.createTime");
// qw.groupBy("c.goodsSid");
List<EmpCardStatisticsExportVo> statisticsExportVos=baseMapper.cardStatisticsListExport(qw);
List<EmpCardStatisticsExportVo> statisticsExportVos = baseMapper.cardStatisticsListExport(qw);
// statisticsExportVos.forEach(s->{
// if(s.getIsEnable().equals("2")){
// s.setStateValue("已作废");
@@ -500,9 +514,9 @@ public class EmpCardService extends MybatisBaseService<EmpCardMapper, EmpCard> {
// });
String excelName = "提货卡信息.xlsx";
String fileNameURL = "1";
response.setContentType( "application/vnd.ms-excel");
response.setContentType("application/vnd.ms-excel");
response.setCharacterEncoding("utf8");
response.setHeader("Content-disposition","attachment;filename="+ excelName );
response.setHeader("Content-disposition", "attachment;filename=" + excelName);
ServletOutputStream outputStream = null;
try {
WriteCellStyle headWriteCellStyle = new WriteCellStyle();
@@ -527,13 +541,14 @@ public class EmpCardService extends MybatisBaseService<EmpCardMapper, EmpCard> {
}
}
public ResultBean cardStatisticsList(PagerQuery<EmpCardQuery> pq) {
ResultBean rb=new ResultBean();
ResultBean rb = new ResultBean();
EmpCardQuery query = pq.getParams();
QueryWrapper<EmpCardQuery> qw = new QueryWrapper<>();
qw.eq("1", "1");
if(StringUtils.isNotBlank(query.getSerialNumber())){
qw.like("a.serialNumber",query.getSerialNumber());
if (StringUtils.isNotBlank(query.getSerialNumber())) {
qw.like("a.serialNumber", query.getSerialNumber());
}
qw.groupBy("a.sid");
qw.orderByDesc("a.createTime");
@@ -551,11 +566,11 @@ public class EmpCardService extends MybatisBaseService<EmpCardMapper, EmpCard> {
public ResultBean isSaturAndSun(String cardSid) {
ResultBean rb = new ResultBean().fail();
AppletVo appletVo = baseMapper.getCardBySid(cardSid);
Date date =new Date();
SimpleDateFormat sdf1 =new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String nowDate =sdf1.format(date);
Date date = new Date();
SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String nowDate = sdf1.format(date);
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<>();
// 第一个星期六
LocalDate saturday = now.with(DayOfWeek.SATURDAY);
@@ -587,13 +602,14 @@ public class EmpCardService extends MybatisBaseService<EmpCardMapper, EmpCard> {
}
/**
*是否转赠
* 是否转赠
*
* @param sid
* @return
*/
public ResultBean cardTransfer(String sid ) {
ResultBean rb=new ResultBean();
EmpCard card=baseMapper.selectOne(new QueryWrapper<EmpCard>().eq("sid",sid));
public ResultBean cardTransfer(String sid) {
ResultBean rb = new ResultBean();
EmpCard card = baseMapper.selectOne(new QueryWrapper<EmpCard>().eq("sid", sid));
card.setIsTransfer("1");
card.setIsItInvalid("1");//失效
baseMapper.updateById(card);
@@ -623,7 +639,7 @@ public class EmpCardService extends MybatisBaseService<EmpCardMapper, EmpCard> {
qw.in("card.serialNumber", serialNumbers);
}
}
qw.eq("card.isEnable","1");
qw.eq("card.isEnable", "1");
IPage<LpkGiftCard> page = PagerUtil.queryToPage(pq);
IPage<LpkGiftCardWordVo> pagging = baseMapper.selGiftCard(page, qw);
pagging.getRecords().forEach(s -> {
@@ -634,4 +650,9 @@ public class EmpCardService extends MybatisBaseService<EmpCardMapper, EmpCard> {
// System.out.println(a);
return rb.success().setData(p);
}
public EmpCard selectOneByCodeAndCodeKey(String code, String codeKey) {
return baseMapper.selectOne(new QueryWrapper<EmpCard>().eq("code", code)
.eq("codeKey", codeKey));
}
}

347
src/main/java/com/yxt/yythmall/biz/empcardgift/EmpCardGiftService.java
View File

@@ -47,6 +47,7 @@ import com.yxt.yythmall.biz.lpkreserveordergoods.LpkReserveOrderGoodsService;
import com.yxt.yythmall.biz.lpkstore.LpkStoreService;
import com.yxt.yythmall.biz.ordorder.OrdOrderService;
import com.yxt.yythmall.biz.ordorderdetails.OrdOrderDetailService;
import com.yxt.yythmall.biz.vegereplenish.VegeReplenishService;
import com.yxt.yythmall.biz.vegetablecellar.VegetableCellarService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -72,11 +73,11 @@ public class EmpCardGiftService extends MybatisBaseService<EmpCardGiftMapper, Em
EmpCardService empCardService;
@Autowired
EmpCardGiftGoodsService empCardGiftGoodsService;
// @Autowired
// @Autowired
// EmpReserveOrderGoodsService empReserveOrderGoodsService;
@Autowired
LpkReserveOrderGoodsService lpkReserveOrderGoodsService;
// @Autowired
// @Autowired
// EmpReserveOrderService empReserveOrderService;
@Autowired
LpkReserveOrderService lpkReserveOrderService;
@@ -101,7 +102,8 @@ public class EmpCardGiftService extends MybatisBaseService<EmpCardGiftMapper, Em
OrdOrderDetailService ordOrderDetailsService;
@Autowired
VegetableCellarService vegetableCellarService;
@Autowired
VegeReplenishService vegeReplenishService;
public ResultBean bindCard(BindCardDto bindCardDto) {
ResultBean rb = new ResultBean().fail();
@@ -122,11 +124,12 @@ public class EmpCardGiftService extends MybatisBaseService<EmpCardGiftMapper, Em
empCardGift.setIsShare("3");
empCardGift.setBindDate(new Date());
baseMapper.updateById(empCardGift);
List<vegeVo> k=baseMapper.getGoodsList(empCardGift.getSid());
VegetableCellarDto dto=new VegetableCellarDto();
List<vegeVo> k = baseMapper.getGoodsList(empCardGift.getSid());
VegetableCellarDto dto = new VegetableCellarDto();
dto.setCustomerSid(dto.getCustomerSid());
dto.setVos(k);
vegetableCellarService.save1Goods(dto);
vegeReplenishService.saveBindRecord(bindCardDto,"2");
return rb.success().setMsg("绑定成功");
}
@@ -201,37 +204,37 @@ public class EmpCardGiftService extends MybatisBaseService<EmpCardGiftMapper, Em
public ResultBean<List<LpkGifGoodsVo>> getGifCardsBySid(String sid) {
ResultBean rb = new ResultBean().fail();
EmpGiftAppletNVo vo = baseMapper.getGifCardsBySid(sid);
List<LpkGifGoodsVo> list=empCardGiftGoodsService.getGoodsByGiftSid(sid).getData();
List<LpkGifGoodsVo> list1=new ArrayList<>();
List<LpkGifGoodsVo> list = empCardGiftGoodsService.getGoodsByGiftSid(sid).getData();
List<LpkGifGoodsVo> list1 = new ArrayList<>();
list.forEach(s -> {
LpkGifGoodsVo g=new LpkGifGoodsVo();
LpkGifGoodsVo g = new LpkGifGoodsVo();
LpkReserveOrderGoods goods = lpkReserveOrderGoodsService.getReserveByCardSid(vo.getSid(), s.getGoodsSid()).getData();
EmpCardGiftVo vo1=baseMapper.getEmpCardGoods(vo.getSid(),s.getGoodsSid());
EmpCardGiftVo vo1 = baseMapper.getEmpCardGoods(vo.getSid(), s.getGoodsSid());
GoodsVo goodsVo = new GoodsVo();
if (vo.getState().equals("已过期")) {
goodsVo.setLNum(0);
} else if (!vo.isShowBtn()) {
goodsVo.setLNum(0);
} else {
if (null != goods && null!=vo1) {
if (null != goods && null != vo1) {
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()) {
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()) {
goodsVo.setLNum(s.getGoodsNumber() - goods.getGoodsNumber());
}
} else {
goodsVo.setLNum(s.getGoodsNumber());
}
if(goodsVo.getLNum()!=0){
if (goodsVo.getLNum() != 0) {
// g.setContent("剩余"+goodsVo.getLNum()+"份/"+"共"+s.getGoodsNumber()+"份");
g.setContent("共"+(int)goodsVo.getLNum()+"份");
g.setRemarks(s.getWeight()+s.getSpecificationUnit()+"/"+s.getUnitName());
g.setContent("共" + (int) goodsVo.getLNum() + "份");
g.setRemarks(s.getWeight() + s.getSpecificationUnit() + "/" + s.getUnitName());
g.setGoodsName(s.getGoodsName());
list1.add(g);
}
@@ -239,6 +242,7 @@ public class EmpCardGiftService extends MybatisBaseService<EmpCardGiftMapper, Em
});
return rb.success().setData(list1);
}
public ResultBean<EmpGiftAppletVo> getGifCardBySid(String sid) {
ResultBean rb = new ResultBean().fail();
EmpGiftAppletVo vo = baseMapper.getGifCardBySid(sid);
@@ -247,7 +251,7 @@ public class EmpCardGiftService extends MybatisBaseService<EmpCardGiftMapper, Em
list.forEach(s -> {
// EmpReserveOrderGoods goods = empReserveOrderGoodsService.getReserveByCardSid(vo.getSid(), s.getGoodsSid()).getData();
LpkReserveOrderGoods goods = lpkReserveOrderGoodsService.getReserveByCardSid(vo.getSid(), s.getGoodsSid()).getData();
EmpCardGiftVo vo1=baseMapper.getEmpCardGoods(vo.getSid(),s.getGoodsSid());
EmpCardGiftVo vo1 = baseMapper.getEmpCardGoods(vo.getSid(), s.getGoodsSid());
GoodsVo goodsVo = new GoodsVo();
goodsVo.setGoods(s.getName());
goodsVo.setNum(s.getGoodsNumber());
@@ -262,18 +266,18 @@ public class EmpCardGiftService extends MybatisBaseService<EmpCardGiftMapper, Em
goodsVo.setLNum(0);
goodsVos.add(goodsVo);
} else {
if (null != goods && null!=vo1) {
if (null != goods && null != vo1) {
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(0);
}
}else if(null != vo1){
} else if (null != vo1) {
if (vo1.getGoodsNumber() != s.getGoodsNumber()) {
goodsVo.setLNum(s.getGoodsNumber()- vo1.getGoodsNumber());
goodsVo.setLNum(s.getGoodsNumber() - vo1.getGoodsNumber());
goodsVo.setSelect(0);
}
}else if(null != goods) {
} else if (null != goods) {
if (goods.getGoodsNumber() != s.getGoodsNumber()) {
goodsVo.setLNum(s.getGoodsNumber() - goods.getGoodsNumber());
goodsVo.setSelect(0);
@@ -308,41 +312,44 @@ public class EmpCardGiftService extends MybatisBaseService<EmpCardGiftMapper, Em
vo.setValue(vo2.getSid());
}
}
List<EmpCardGift> empCardGift =baseMapper.selectList(new QueryWrapper<EmpCardGift>().eq("empCardSid",vo.getSid()).eq("cardType","2").orderByDesc("createTime"));
empCardGift.forEach(s->{
List<EmpCardGiftGoods> list1= empCardGiftGoodsService.list(new QueryWrapper<EmpCardGiftGoods>().eq("empCardGiftSid",s.getSid()));
list1.forEach(l->{
LpkGoods goods=lpkGoodsService.getOne(new QueryWrapper<LpkGoods>().eq("sid",l.getGoodsSid()));
if(StringUtils.isBlank(s.getGoods())){
s.setGoods(goods.getName()+":"+l.getGoodsNumber()+"份");
}else{
s.setGoods(s.getGoods()+" "+goods.getName()+":"+l.getGoodsNumber()+"份");
List<EmpCardGift> empCardGift = baseMapper.selectList(new QueryWrapper<EmpCardGift>().eq("empCardSid", vo.getSid()).eq("cardType", "2").orderByDesc("createTime"));
empCardGift.forEach(s -> {
List<EmpCardGiftGoods> list1 = empCardGiftGoodsService.list(new QueryWrapper<EmpCardGiftGoods>().eq("empCardGiftSid", s.getSid()));
list1.forEach(l -> {
LpkGoods goods = lpkGoodsService.getOne(new QueryWrapper<LpkGoods>().eq("sid", l.getGoodsSid()));
if (StringUtils.isBlank(s.getGoods())) {
s.setGoods(goods.getName() + ":" + l.getGoodsNumber() + "份");
} else {
s.setGoods(s.getGoods() + " " + goods.getName() + ":" + l.getGoodsNumber() + "份");
}
});
});
vo.setEmpCardGifts(empCardGift);
vo.setOrderCardVoList(empReserveOrderCardVos);
vo.setGoodsVos(goodsVos);
if(vo.getIsSenior().equals("1")){
if (vo.getIsSenior().equals("1")) {
vo.setPName("家庭菜窖");
}else{
} else {
vo.setPName("亲情菜窖");
}
return rb.success().setData(vo);
}
public ResultBean<List<EmpCardGiftVo>> recordList(String empCardSid) {
ResultBean rb = ResultBean.fireFail();
List<EmpCardGiftVo> pagging = baseMapper.recordList(empCardSid);
return rb.success().setData(pagging);
}
public ResultBean shareEmpCard(String sid) {
public ResultBean shareEmpCard(String sid) {
ResultBean rb = new ResultBean().fail();
EmpCardGift empCardGift=baseMapper.selectOne(new QueryWrapper<EmpCardGift>().eq("sid",sid));
EmpCardGift empCardGift = baseMapper.selectOne(new QueryWrapper<EmpCardGift>().eq("sid", sid));
empCardGift.setIsShare("2");
baseMapper.updateById(empCardGift);
return rb.success().setMsg("成功");
}
//
//
// public ResultBean getReservationBySid(String sid) {
// ResultBean rb = new ResultBean().fail();
// EmpGiftAppletVo vo = baseMapper.getGifCardBySid(sid);
@@ -404,36 +411,36 @@ public class EmpCardGiftService extends MybatisBaseService<EmpCardGiftMapper, Em
@Transactional(rollbackFor = Exception.class)
public ResultBean generateCard(EmpCardGiftDto dto) {
ResultBean rb = ResultBean.fireFail();
if(dto.getCount().contains("-")){
if (dto.getCount().contains("-")) {
return rb.setMsg("卡券数量不能为负数，请重新填写");
}
int count=0;
try{
count=Integer.parseInt(dto.getCount());
}catch (Exception e){
int count = 0;
try {
count = Integer.parseInt(dto.getCount());
} catch (Exception e) {
return rb.setMsg("卡券数量不是数字，请重新填写");
}
if(count==0){
if (count == 0) {
return rb.setMsg("卡券数量不能为0，请重新填写");
}
if (StringUtils.isBlank(dto.getEmpCardSid())) {
return rb.setMsg("请选择企业卡");
}
EmpCard empCard=empCardService.fetchBySid(dto.getEmpCardSid());
if(null==empCard){
EmpCard empCard = empCardService.fetchBySid(dto.getEmpCardSid());
if (null == empCard) {
return rb.setMsg("请选择正确的企业卡");
}
EmpAppletVo empAppletVo =empCardService.getEmpCardBySid(dto.getEmpCardSid()).getData();
for(com.yxt.yythmall.api.lpkgiftcard.GoodsVo goodsVo:empAppletVo.getGoodsVos()){
for(GoodsVo gv :dto.getGoodsVoList()){
if(goodsVo.getGoodsSid().equals(gv.getGoodsSid())){
if(gv.getSelect()*count>goodsVo.getLNum()){
EmpAppletVo empAppletVo = empCardService.getEmpCardBySid(dto.getEmpCardSid()).getData();
for (com.yxt.yythmall.api.lpkgiftcard.GoodsVo goodsVo : empAppletVo.getGoodsVos()) {
for (GoodsVo gv : dto.getGoodsVoList()) {
if (goodsVo.getGoodsSid().equals(gv.getGoodsSid())) {
if (gv.getSelect() * count > goodsVo.getLNum()) {
return rb.setMsg("商品数量不足，请重新选择");
}
}
}
}
LpkGiftBag bag=lpkGiftBagService.getOne(new QueryWrapper<LpkGiftBag>().eq("sid",empCard.getGiftbagSid()));
LpkGiftBag bag = lpkGiftBagService.getOne(new QueryWrapper<LpkGiftBag>().eq("sid", empCard.getGiftbagSid()));
for (int k = 0; k < count; k++) {
EmpCardGrantLog record = new EmpCardGrantLog();
record.setCreateTime(new DateTime());
@@ -454,12 +461,12 @@ public class EmpCardGiftService extends MybatisBaseService<EmpCardGiftMapper, Em
card.setEndDate(bag.getDateEnd());
card.setStartDate(bag.getDateStart());
String cardArea="9";
String cardArea = "9";
String maxSerNum = baseMapper.selctMaxSerNum(cardArea);
String uuid = UniqueIdGenerator.generateUniqueID();
int randomNumber = new Random().nextInt(900000) + 100000;
card.setCodeKey(String.valueOf(randomNumber));
card.setCode("99"+uuid.substring(2));
card.setCode("99" + uuid.substring(2));
if (StringUtils.isBlank(maxSerNum)) {
card.setSerialNumber(cardArea + "0000001");
} else {
@@ -475,9 +482,9 @@ public class EmpCardGiftService extends MybatisBaseService<EmpCardGiftMapper, Em
card.setSerialNumber(cardArea + num);
}
baseMapper.insert(card);
for(GoodsVo vo:dto.getGoodsVoList()){
if(vo.getSelect()!=0){
EmpCardGiftGoodsDto dto1=new EmpCardGiftGoodsDto();
for (GoodsVo vo : dto.getGoodsVoList()) {
if (vo.getSelect() != 0) {
EmpCardGiftGoodsDto dto1 = new EmpCardGiftGoodsDto();
dto1.setEmpCardGiftSid(card.getSid());
dto1.setGoodsSid(vo.getGoodsSid());
dto1.setGoodsNumber(vo.getSelect());
@@ -493,18 +500,18 @@ public class EmpCardGiftService extends MybatisBaseService<EmpCardGiftMapper, Em
for (com.yxt.yythmall.api.lpkgiftcard.GoodsVo vo1 : empAppletVo.getGoodsVos()) {
EmpCardGrantLogVo goods1 = empCardGrantLogService.recordListGoods(dto.getEmpCardSid(), vo1.getGoodsSid()).getData();
LpkReserveOrderGoods goods2 = lpkReserveOrderGoodsMapper.getReserveByCardSid(empCard.getSid(), vo1.getGoodsSid());
double c=0;
if(goods1==null){
if(goods2==null){
c=0;
}else{
c=goods2.getGoodsNumber();
double c = 0;
if (goods1 == null) {
if (goods2 == null) {
c = 0;
} else {
c = goods2.getGoodsNumber();
}
}else{
if(goods2==null){
c=goods1.getGoodsNumber();
}else{
c=goods2.getGoodsNumber()+goods1.getGoodsNumber();
} else {
if (goods2 == null) {
c = goods1.getGoodsNumber();
} else {
c = goods2.getGoodsNumber() + goods1.getGoodsNumber();
}
}
if (vo1.getNum() <= c) {
@@ -512,11 +519,11 @@ public class EmpCardGiftService extends MybatisBaseService<EmpCardGiftMapper, Em
}
}
if (empAppletVo.getGoodsVos().size() == i) {
int i1=lpkReserveOrderGoodsMapper.selectCount(new QueryWrapper<LpkReserveOrderGoods>().eq("cardSid",empCard.getSid()));
if(i1==0){
int i1 = lpkReserveOrderGoodsMapper.selectCount(new QueryWrapper<LpkReserveOrderGoods>().eq("cardSid", empCard.getSid()));
if (i1 == 0) {
//如果没有预约记录 直接改转赠状态
empCardService.cardTransfer(dto.getEmpCardSid());
}else{
} else {
empCardService.changState(empCard.getSid(), "5");
}
}
@@ -530,13 +537,13 @@ public class EmpCardGiftService extends MybatisBaseService<EmpCardGiftMapper, Em
if (StringUtils.isBlank(dto.getEmpCardSid())) {
return rb.setMsg("请选择提货卡");
}
int count=0;
try{
count=Integer.parseInt(dto.getCount());
}catch (Exception e){
int count = 0;
try {
count = Integer.parseInt(dto.getCount());
} catch (Exception e) {
return rb.setMsg("卡券数量不是数字，请重新填写");
}
if(count==0){
if (count == 0) {
return rb.setMsg("卡券数量不能为0，请重新填写");
}
LpkGiftCard empCard = lpkGiftCardService.fetchBySid(dto.getEmpCardSid());
@@ -544,17 +551,17 @@ public class EmpCardGiftService extends MybatisBaseService<EmpCardGiftMapper, Em
return rb.setMsg("请选择正确的提货卡");
}
// EmpAppletVo empAppletVo =empCardService.getEmpCardBySid(dto.getEmpCardSid()).getData();
AppletVo empAppletVo =lpkGiftCardService.getGifCardBySid(dto.getEmpCardSid()).getData();
for(com.yxt.yythmall.api.lpkgiftcard.GoodsVo goodsVo:empAppletVo.getGoodsVos()){
for(GoodsVo gv :dto.getGoodsVoList()){
if(goodsVo.getGoodsSid().equals(gv.getGoodsSid())){
if(gv.getSelect()*count>goodsVo.getLNum()){
AppletVo empAppletVo = lpkGiftCardService.getGifCardBySid(dto.getEmpCardSid()).getData();
for (com.yxt.yythmall.api.lpkgiftcard.GoodsVo goodsVo : empAppletVo.getGoodsVos()) {
for (GoodsVo gv : dto.getGoodsVoList()) {
if (goodsVo.getGoodsSid().equals(gv.getGoodsSid())) {
if (gv.getSelect() * count > goodsVo.getLNum()) {
return rb.setMsg("商品数量不足，请重新选择");
}
}
}
}
LpkGiftBag bag=lpkGiftBagService.getOne(new QueryWrapper<LpkGiftBag>().eq("sid",empCard.getGiftbagSid()));
LpkGiftBag bag = lpkGiftBagService.getOne(new QueryWrapper<LpkGiftBag>().eq("sid", empCard.getGiftbagSid()));
for (int k = 0; k < count; k++) {
EmpCardGift card = new EmpCardGift();
card.setCardType("3");
@@ -590,7 +597,7 @@ public class EmpCardGiftService extends MybatisBaseService<EmpCardGiftMapper, Em
}
baseMapper.insert(card);
for (GoodsVo vo : dto.getGoodsVoList()) {
if(vo.getSelect()!=0){
if (vo.getSelect() != 0) {
EmpCardGiftGoodsDto dto1 = new EmpCardGiftGoodsDto();
dto1.setEmpCardGiftSid(card.getSid());
dto1.setGoodsSid(vo.getGoodsSid());
@@ -598,22 +605,22 @@ public class EmpCardGiftService extends MybatisBaseService<EmpCardGiftMapper, Em
empCardGiftGoodsService.save(dto1);
}
}
int i=0;
int i = 0;
for (com.yxt.yythmall.api.lpkgiftcard.GoodsVo vo1 : empAppletVo.getGoodsVos()) {
EmpCardGiftGoodsVo goods1=empCardGiftGoodsService.recordListGoods(dto.getEmpCardSid(),vo1.getGoodsSid()).getData();
EmpCardGiftGoodsVo goods1 = empCardGiftGoodsService.recordListGoods(dto.getEmpCardSid(), vo1.getGoodsSid()).getData();
LpkReserveOrderGoods goods2 = lpkReserveOrderGoodsMapper.getReserveByCardSid(empCard.getSid(), vo1.getGoodsSid());
double c=0;
if(goods1==null){
if(goods2==null){
c=0;
}else{
c=goods2.getGoodsNumber();
double c = 0;
if (goods1 == null) {
if (goods2 == null) {
c = 0;
} else {
c = goods2.getGoodsNumber();
}
}else{
if(goods2==null){
c=goods1.getGoodsNumber();
}else{
c=goods2.getGoodsNumber()+goods1.getGoodsNumber();
} else {
if (goods2 == null) {
c = goods1.getGoodsNumber();
} else {
c = goods2.getGoodsNumber() + goods1.getGoodsNumber();
}
}
if (vo1.getNum() <= c) {
@@ -621,11 +628,11 @@ public class EmpCardGiftService extends MybatisBaseService<EmpCardGiftMapper, Em
}
}
if (empAppletVo.getGoodsVos().size() == i) {
int i1=lpkReserveOrderGoodsMapper.selectCount(new QueryWrapper<LpkReserveOrderGoods>().eq("cardSid",empCard.getSid()));
if(i1==0){
int i1 = lpkReserveOrderGoodsMapper.selectCount(new QueryWrapper<LpkReserveOrderGoods>().eq("cardSid", empCard.getSid()));
if (i1 == 0) {
//如果没有预约记录 直接改转赠状态
lpkGiftCardService.cardTransfer(dto.getEmpCardSid());
}else{
} else {
lpkGiftCardService.changState(empCard.getSid(), "5");
}
}
@@ -639,24 +646,24 @@ public class EmpCardGiftService extends MybatisBaseService<EmpCardGiftMapper, Em
if (StringUtils.isBlank(dto.getEmpCardSid())) {
return rb.setMsg("请选择福礼卡");
}
int count=0;
try{
count=Integer.parseInt(dto.getCount());
}catch (Exception e){
int count = 0;
try {
count = Integer.parseInt(dto.getCount());
} catch (Exception e) {
return rb.setMsg("卡券数量不是数字，请重新填写");
}
if(count==0){
if (count == 0) {
return rb.setMsg("卡券数量不能为0，请重新填写");
}
EmpCardGift empCard=baseMapper.selectOne(new QueryWrapper<EmpCardGift>().eq("sid",dto.getEmpCardSid()));
EmpCardGift empCard = baseMapper.selectOne(new QueryWrapper<EmpCardGift>().eq("sid", dto.getEmpCardSid()));
if (null == empCard) {
return rb.setMsg("请选择正确的福礼卡");
}
EmpGiftAppletVo empAppletVo =getGifCardBySid(dto.getEmpCardSid()).getData();
for(GoodsVo goodsVo:empAppletVo.getGoodsVos()){
for(GoodsVo gv :dto.getGoodsVoList()){
if(goodsVo.getGoodsSid().equals(gv.getGoodsSid())){
if(gv.getSelect()*count>goodsVo.getLNum()){
EmpGiftAppletVo empAppletVo = getGifCardBySid(dto.getEmpCardSid()).getData();
for (GoodsVo goodsVo : empAppletVo.getGoodsVos()) {
for (GoodsVo gv : dto.getGoodsVoList()) {
if (goodsVo.getGoodsSid().equals(gv.getGoodsSid())) {
if (gv.getSelect() * count > goodsVo.getLNum()) {
return rb.setMsg("商品数量不足，请重新选择");
}
}
@@ -697,7 +704,7 @@ public class EmpCardGiftService extends MybatisBaseService<EmpCardGiftMapper, Em
}
baseMapper.insert(card);
for (GoodsVo vo : dto.getGoodsVoList()) {
if(vo.getSelect()!=0){
if (vo.getSelect() != 0) {
EmpCardGiftGoodsDto dto1 = new EmpCardGiftGoodsDto();
dto1.setEmpCardGiftSid(card.getSid());
dto1.setGoodsSid(vo.getGoodsSid());
@@ -705,22 +712,22 @@ public class EmpCardGiftService extends MybatisBaseService<EmpCardGiftMapper, Em
empCardGiftGoodsService.save(dto1);
}
}
int i=0;
int i = 0;
for (GoodsVo vo1 : empAppletVo.getGoodsVos()) {
EmpCardGiftGoodsVo goods1=empCardGiftGoodsService.recordListGoods(dto.getEmpCardSid(),vo1.getGoodsSid()).getData();
EmpCardGiftGoodsVo goods1 = empCardGiftGoodsService.recordListGoods(dto.getEmpCardSid(), vo1.getGoodsSid()).getData();
LpkReserveOrderGoods goods2 = lpkReserveOrderGoodsMapper.getReserveByCardSid(empCard.getSid(), vo1.getGoodsSid());
double c=0;
if(goods1==null){
if(goods2==null){
c=0;
}else{
c=goods2.getGoodsNumber();
double c = 0;
if (goods1 == null) {
if (goods2 == null) {
c = 0;
} else {
c = goods2.getGoodsNumber();
}
}else{
if(goods2==null){
c=goods1.getGoodsNumber();
}else{
c=goods2.getGoodsNumber()+goods1.getGoodsNumber();
} else {
if (goods2 == null) {
c = goods1.getGoodsNumber();
} else {
c = goods2.getGoodsNumber() + goods1.getGoodsNumber();
}
}
if (vo1.getNum() <= c) {
@@ -728,11 +735,11 @@ public class EmpCardGiftService extends MybatisBaseService<EmpCardGiftMapper, Em
}
}
if (empAppletVo.getGoodsVos().size() == i) {
int i1=lpkReserveOrderGoodsMapper.selectCount(new QueryWrapper<LpkReserveOrderGoods>().eq("cardSid",empCard.getSid()));
if(i1==0){
int i1 = lpkReserveOrderGoodsMapper.selectCount(new QueryWrapper<LpkReserveOrderGoods>().eq("cardSid", empCard.getSid()));
if (i1 == 0) {
//如果没有预约记录 直接改转赠状态
cardTransfer(dto.getEmpCardSid());
}else{
} else {
changState(empCard.getSid(), "5");
}
}
@@ -740,24 +747,28 @@ public class EmpCardGiftService extends MybatisBaseService<EmpCardGiftMapper, Em
// cardTransfer(dto.getEmpCardSid());
return rb.success();
}
/**
*是否转赠
* 是否转赠
*
* @param sid
* @return
*/
public ResultBean cardTransfer(String sid ) {
ResultBean rb=new ResultBean();
EmpCardGift card=baseMapper.selectOne(new QueryWrapper<EmpCardGift>().eq("sid",sid));
public ResultBean cardTransfer(String sid) {
ResultBean rb = new ResultBean();
EmpCardGift card = baseMapper.selectOne(new QueryWrapper<EmpCardGift>().eq("sid", sid));
card.setIsTransfer("1");
card.setIsItInvalid("1");
baseMapper.updateById(card);
return rb.success().setData("成功");
}
public ResultBean<EmpCardGiftVo> getEmpCardGoods(String empCardSid, String goodsSid) {
ResultBean rb = ResultBean.fireFail();
return rb.success().setData(baseMapper.getEmpCardGoods(empCardSid,goodsSid));
return rb.success().setData(baseMapper.getEmpCardGoods(empCardSid, goodsSid));
}
//
//
// public ResultBean<PagerVo<EmpCardGiftListVo>> cardList(PagerQuery<EmpCardGiftListQuery> pq) {
// ResultBean rb = ResultBean.fireFail();
// EmpCardGiftListQuery query = pq.getParams();
@@ -903,7 +914,8 @@ public class EmpCardGiftService extends MybatisBaseService<EmpCardGiftMapper, Em
baseMapper.updateById(card);
return rb.success().setData("成功");
}
//
//
// public void exportExcel(EmpCardGiftListQuery query) {
//
// String finUrl = "https://supervise.yxtsoft.com/lpkapi?code=";
@@ -982,8 +994,8 @@ public class EmpCardGiftService extends MybatisBaseService<EmpCardGiftMapper, Em
//
public ResultBean<Object> isSaturAndSun(String cardSid) {
ResultBean rb = new ResultBean().fail();
EmpCardGift empCardGift=baseMapper.selectOne(new QueryWrapper<EmpCardGift>().eq("sid",cardSid));
SimpleDateFormat sdf1 =new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
EmpCardGift empCardGift = baseMapper.selectOne(new QueryWrapper<EmpCardGift>().eq("sid", cardSid));
SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
// LocalDate now = DateUtil.parse(sdf1.format(empCardGift.getStartDate())).toSqlDate().toLocalDate();
LocalDate now = DateUtil.parse(sdf1.format(new Date())).toSqlDate().toLocalDate();
LocalDate endD = DateUtil.parse(sdf1.format(empCardGift.getEndDate())).toSqlDate().toLocalDate();
@@ -1025,13 +1037,13 @@ public class EmpCardGiftService extends MybatisBaseService<EmpCardGiftMapper, Em
EmpCardGiftStatisticsQuery params = query.getParams();
QueryWrapper<EmpCardGift> qw = new QueryWrapper<>();
qw.eq("1", "1");
if(StringUtils.isNotBlank(params.getSerialNumber())){
qw.like("a.serialNumber",params.getSerialNumber());
if (StringUtils.isNotBlank(params.getSerialNumber())) {
qw.like("a.serialNumber", params.getSerialNumber());
}
qw.groupBy("a.sid");
qw.orderByDesc("a.createTime");
IPage<EmpCardGiftStatisticsQuery> page = PagerUtil.queryToPage(query);
IPage<EmpCardGiftStatisticsVo> pagging = baseMapper.empCardGiftStatisticsList(page,qw);
IPage<EmpCardGiftStatisticsVo> pagging = baseMapper.empCardGiftStatisticsList(page, qw);
return rb.success().setData(pagging);
}
//
@@ -1073,8 +1085,8 @@ public class EmpCardGiftService extends MybatisBaseService<EmpCardGiftMapper, Em
public EmpGiftAppletVo getDate(EmpGiftAppletVo vo) {
SimpleDateFormat sdf =new SimpleDateFormat("yyyy-MM-dd");
SimpleDateFormat sdf1 =new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
LocalDate today = LocalDate.now(); // 获取今天的日期
LocalTime timeOfDay = LocalTime.of(15, 0); // 设置下午3点的小时数为15，分钟数为0
LocalDateTime dateAndTime = LocalDateTime.of(today, timeOfDay); // 将日期和时间合并成完整的日期时间对象
@@ -1083,42 +1095,43 @@ public class EmpCardGiftService extends MybatisBaseService<EmpCardGiftMapper, Em
Date date = Date.from(dateAndTime.atZone(zoneId).toInstant());
// System.out.println(date);
//1>2 1 、1<2 -1 、1=2 0
int k=DateUtil.parse(sdf1.format(DateUtil.parse(sdf1.format(new Date())))).compareTo(DateUtil.parse(sdf1.format(DateUtil.parse(sdf1.format(date)))));
if(String.valueOf(k).equals("1")){
vo.setStart(sdf.format(DateUtil.offsetDay(new Date(),+2)));
}else{
vo.setStart(sdf.format(DateUtil.offsetDay(new Date(),+1)));
int k = DateUtil.parse(sdf1.format(DateUtil.parse(sdf1.format(new Date())))).compareTo(DateUtil.parse(sdf1.format(DateUtil.parse(sdf1.format(date)))));
if (String.valueOf(k).equals("1")) {
vo.setStart(sdf.format(DateUtil.offsetDay(new Date(), +2)));
} else {
vo.setStart(sdf.format(DateUtil.offsetDay(new Date(), +1)));
}
if(StringUtils.isNotBlank(vo.getDateStart())){
int i=DateUtil.parse(sdf.format(DateUtil.parse(vo.getStart()))).compareTo(DateUtil.parse(sdf.format(DateUtil.parse(vo.getDateEnd()))));
if(String.valueOf(i).equals("-1")){
long o=DateUtil.between(DateUtil.parse(vo.getStart()),DateUtil.parse(vo.getDateEnd()), DateUnit.DAY);
if(o<10){
vo.setEnd(sdf.format(DateUtil.offsetDay(DateUtil.parse(vo.getDateEnd()),10)));
}else{
if (StringUtils.isNotBlank(vo.getDateStart())) {
int i = DateUtil.parse(sdf.format(DateUtil.parse(vo.getStart()))).compareTo(DateUtil.parse(sdf.format(DateUtil.parse(vo.getDateEnd()))));
if (String.valueOf(i).equals("-1")) {
long o = DateUtil.between(DateUtil.parse(vo.getStart()), DateUtil.parse(vo.getDateEnd()), DateUnit.DAY);
if (o < 10) {
vo.setEnd(sdf.format(DateUtil.offsetDay(DateUtil.parse(vo.getDateEnd()), 10)));
} else {
// end=sdf.format(DateUtil.parse(dateEnd));
vo.setEnd(sdf.format(DateUtil.offsetDay(DateUtil.parse(vo.getStart()),4)));
vo.setEnd(sdf.format(DateUtil.offsetDay(DateUtil.parse(vo.getStart()), 4)));
}
}else{
if(String.valueOf(k).equals("1")){
vo.setEnd(sdf.format(DateUtil.offsetDay(DateUtil.parse(vo.getDateEnd()),2)));
}else{
vo.setEnd(sdf.format(DateUtil.offsetDay(DateUtil.parse(vo.getDateEnd()),1)));
} else {
if (String.valueOf(k).equals("1")) {
vo.setEnd(sdf.format(DateUtil.offsetDay(DateUtil.parse(vo.getDateEnd()), 2)));
} else {
vo.setEnd(sdf.format(DateUtil.offsetDay(DateUtil.parse(vo.getDateEnd()), 1)));
}
}
}
vo.setReserveDate(vo.getStart());
return vo;
}
@Transactional(rollbackFor = Exception.class)
public ResultBean generateTopEmpCard(String mainSid) {
ResultBean rb = ResultBean.fireFail();
int count=0;
OrdOrder order=ordOrderService.getOne(new QueryWrapper<OrdOrder>().eq("mainSid",mainSid));
count=order.getCardNumber();
List<OrdOrderDetail> list=ordOrderDetailsService.list(new QueryWrapper<OrdOrderDetail>().eq("orderSid",order.getSid()));
int count = 0;
OrdOrder order = ordOrderService.getOne(new QueryWrapper<OrdOrder>().eq("mainSid", mainSid));
count = order.getCardNumber();
List<OrdOrderDetail> list = ordOrderDetailsService.list(new QueryWrapper<OrdOrderDetail>().eq("orderSid", order.getSid()));
for (int k = 0; k < count; k++) {
EmpCardGift card = new EmpCardGift();
card.setCardType("3");
@@ -1153,19 +1166,23 @@ public class EmpCardGiftService extends MybatisBaseService<EmpCardGiftMapper, Em
}
baseMapper.insert(card);
for (OrdOrderDetail vo : list) {
if(vo.getPartNumber()!=0){
if (vo.getPartNumber() != 0) {
EmpCardGiftGoodsDto dto1 = new EmpCardGiftGoodsDto();
dto1.setEmpCardGiftSid(card.getSid());
dto1.setGoodsSid(vo.getGoodsSid());
dto1.setGoodsNumber(vo.getPartNumber()/count);
dto1.setGoodsNumber(vo.getPartNumber() / count);
empCardGiftGoodsService.save(dto1);
}
}
}
return rb.success();
}
public EmpCardGift selectOneByCodeAndCodeKey(String code, String codeKey) {
return baseMapper.selectOne(new QueryWrapper<EmpCardGift>().eq("code", code)
.eq("codeKey", codeKey));
}
///
}

2
src/main/java/com/yxt/yythmall/biz/empcardgiftgoods/EmpCardGiftGoodsMapper.java
View File

@@ -33,4 +33,6 @@ public interface EmpCardGiftGoodsMapper extends BaseMapper<EmpCardGiftGoods> {
"WHERE\n" +
"\tg.sid =#{sid}")
List<LpkGifGoodsVo> getGoodsByGiftSid(String sid);
List<EmpCardGiftGoodsVo> getGoodsDetailsByEmpCardGiftSid(@Param("empCardGiftSid") String empCardGiftSid);
}

24
src/main/java/com/yxt/yythmall/biz/empcardgiftgoods/EmpCardGiftGoodsMapper.xml
View File

@@ -4,16 +4,22 @@
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="getGoodsByEmpCardGiftSid" resultType="com.yxt.yythmall.api.empcardgiftgoods.EmpCardGiftGoodsVo">
select gg.*,goods.name as name,goods.unitName as unitName,goods.picUrl as picUrl
from emp_card_gift_goods gg left join lpk_goods goods on gg.goodsSid=goods.sid
where gg.empCardGiftSid =#{empCardGiftSid}
select gg.*, goods.name as name, goods.unitName as unitName, goods.picUrl as picUrl
from emp_card_gift_goods gg
left join lpk_goods goods on gg.goodsSid = goods.sid
where gg.empCardGiftSid = #{empCardGiftSid}
</select>
<select id="recordListGoods" resultType="com.yxt.yythmall.api.empcardgiftgoods.EmpCardGiftGoodsVo">
SELECT
sum(goodsNumber) as goodsNumber
FROM
emp_card_gift card
LEFT JOIN emp_card_gift_goods goods ON goods.empCardGiftSid = card.sid
where card.empCardSid =#{empCardSid} and goods.goodsSid =#{goodsSid}
SELECT sum(goodsNumber) as goodsNumber
FROM emp_card_gift card
LEFT JOIN emp_card_gift_goods goods ON goods.empCardGiftSid = card.sid
where card.empCardSid = #{empCardSid}
and goods.goodsSid = #{goodsSid}
</select>
<select id="getGoodsDetailsByEmpCardGiftSid"
resultType="com.yxt.yythmall.api.empcardgiftgoods.EmpCardGiftGoodsVo">
select gg.*
from emp_card_gift_goods gg
where gg.empCardGiftSid = #{empCardGiftSid}
</select>
</mapper>

5
src/main/java/com/yxt/yythmall/biz/empcardgiftgoods/EmpCardGiftGoodsService.java
View File

@@ -47,4 +47,9 @@ public class EmpCardGiftGoodsService extends MybatisBaseService<EmpCardGiftGoods
List<LpkGifGoodsVo> list= baseMapper.getGoodsByGiftSid(sid);
return rb.success().setData(list);
}
public ResultBean<List<EmpCardGiftGoodsVo>> getGoodsDetailsByEmpCardGiftSid(String empCardGiftSid) {
ResultBean rb = ResultBean.fireFail();
List<EmpCardGiftGoodsVo> list= baseMapper.getGoodsDetailsByEmpCardGiftSid(empCardGiftSid);
return rb.success().setData(list);
}
}

3
src/main/java/com/yxt/yythmall/biz/lpkgiftbag/LpkGiftBagRest.java
View File

@@ -4,6 +4,7 @@ import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.yythmall.api.lpkgiftbag.LpkGiftBagDto;
import com.yxt.yythmall.api.lpkgiftbag.LpkGiftBagInitVo;
import com.yxt.yythmall.api.lpkgiftbag.LpkGiftBagQuery;
import com.yxt.yythmall.api.lpkgiftbag.LpkGiftBagVo;
import io.swagger.annotations.Api;
@@ -39,7 +40,7 @@ public class LpkGiftBagRest {
@ApiOperation("礼包初始化")
@GetMapping("/giftBagInit/{sid}")
public ResultBean giftBagInit(@PathVariable String sid) {
public ResultBean<LpkGiftBagInitVo> giftBagInit(@PathVariable String sid) {
return lpkGiftBagService.giftBagInit(sid);
}

2
src/main/java/com/yxt/yythmall/biz/lpkgiftbag/LpkGiftBagService.java
View File

@@ -117,7 +117,7 @@ public class LpkGiftBagService extends MybatisBaseService<LpkGiftBagMapper, LpkG
return rb.success().setData(sid);
}
public ResultBean giftBagInit(String sid) {
public ResultBean<LpkGiftBagInitVo> giftBagInit(String sid) {
ResultBean rb = ResultBean.fireFail();
LpkGiftBagInitVo vo = new LpkGiftBagInitVo();
LpkGiftBag entity = fetchBySid(sid);

197
src/main/java/com/yxt/yythmall/biz/lpkgiftcard/LpkGiftCardService.java
View File

@@ -64,6 +64,7 @@ import com.yxt.yythmall.biz.lpkreserveorder.LpkReserveOrderService;
import com.yxt.yythmall.biz.lpkreserveordergoods.LpkReserveOrderGoodsService;
import com.yxt.yythmall.biz.lpkstore.LpkStoreService;
import com.yxt.yythmall.biz.shoppingcart.ShoppingCartService;
import com.yxt.yythmall.biz.vegereplenish.VegeReplenishService;
import com.yxt.yythmall.biz.vegetablecellar.VegetableCellarService;
import com.yxt.yythmall.utils.StyleUtils;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
@@ -127,6 +128,8 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
EmpCardService empCardService;
@Autowired
ShoppingCartService shoppingCartService;
@Autowired
private VegeReplenishService vegeReplenishService;
public ResultBean bindCard(BindCardDto bindCardDto) {
ResultBean rb = new ResultBean().fail();
@@ -159,15 +162,16 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
}
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) {
ResultBean rb = new ResultBean().fail();
if(bindCardDto.getCode().substring(0,2).equals("99")){
ResultBean rb2=empCardGiftService.bindCard(bindCardDto);
if (bindCardDto.getCode().substring(0, 2).equals("99")) {
ResultBean rb2 = empCardGiftService.bindCard(bindCardDto);
return rb2;
}
LpkGiftCard lpkGiftCard1 = baseMapper.selectOne(new QueryWrapper<LpkGiftCard>().eq("code", bindCardDto.getCode()));
@@ -195,16 +199,18 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
lpkGiftCard.setState("3");
lpkGiftCard.setBindDate(new Date());
baseMapper.updateById(lpkGiftCard);
List<vegeVo> k=baseMapper.getGoodsList(lpkGiftCard.getSid());
VegetableCellarDto dto=new VegetableCellarDto();
List<vegeVo> k = baseMapper.getGoodsList(lpkGiftCard.getSid());
VegetableCellarDto dto = new VegetableCellarDto();
//生成绑卡流水
//加入菜窖
dto.setCustomerSid(dto.getCustomerSid());
dto.setVos(k);
vegetableCellarService.save1Goods(dto);
vegeReplenishService.saveBindRecord(bindCardDto, "0");
return rb.success().setMsg("绑定成功");
}
public ResultBean getGifCardByCustomerSid(PagerQuery<LpkGiftCardQuery> pq) {
ResultBean rb = new ResultBean().fail();
LpkGiftCardQuery query = pq.getParams();
@@ -221,6 +227,7 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
return rb.success().setData(p);
}
public ResultBean getGifCardsByCustomerSid(PagerQuery<LpkGiftCardQuery> pq) {
ResultBean rb = new ResultBean().fail();
LpkGiftCardQuery query = pq.getParams();
@@ -234,18 +241,18 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
System.out.println(query.getCustomerSid());
IPage<LpkGiftCard> page = PagerUtil.queryToPage(pq);
IPage<AppletVo> list = baseMapper.getGifCardsByCustomerSid(page, query.getCustomerSid());
list.getRecords().forEach(s->{
if(s.getLogo().equals("1")){
list.getRecords().forEach(s -> {
if (s.getLogo().equals("1")) {
//家庭卡
List<LpkGifGoodsVo> vo= getGifCardsBySid(s.getSid()).getData();
List<LpkGifGoodsVo> vo = getGifCardsBySid(s.getSid()).getData();
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);
} 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);
}
});
@@ -253,41 +260,42 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
return rb.success().setData(p);
}
public ResultBean<List<LpkGifGoodsVo>> getGifCardsBySid(String sid) {
ResultBean rb = new ResultBean().fail();
AppletNewVo vo = baseMapper.getGifCardsBySid(sid);
List<LpkGifGoodsVo> list=LpkGiftBagGoodsService.getGoodsByGiftSid(sid);
List<LpkGifGoodsVo> list1=new ArrayList<>();
List<LpkGifGoodsVo> list = LpkGiftBagGoodsService.getGoodsByGiftSid(sid);
List<LpkGifGoodsVo> list1 = new ArrayList<>();
List<GoodsVo> goodsVos = new ArrayList<>();
list.forEach(s -> {
LpkGifGoodsVo g=new LpkGifGoodsVo();
LpkGifGoodsVo g = new LpkGifGoodsVo();
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();
if (vo.getState().equals("已过期")) {
goodsVo.setLNum(0);
} else if (!vo.isShowBtn()) {
goodsVo.setLNum(0);
} else {
if (null != goods && null!=vo1) {
if (null != goods && null != vo1) {
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()) {
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()) {
goodsVo.setLNum(s.getGoodsNumber() - goods.getGoodsNumber());
}
}else {
} else {
goodsVo.setLNum(s.getGoodsNumber());
}
if(goodsVo.getLNum()!=0){
if (goodsVo.getLNum() != 0) {
// g.setContent("剩余"+goodsVo.getLNum()+"份/"+"共"+s.getGoodsNumber()+"份");
g.setContent("共"+(int)goodsVo.getLNum()+"份");
g.setRemarks(s.getWeight()+s.getSpecificationUnit()+"/"+s.getUnitName());
g.setContent("共" + (int) goodsVo.getLNum() + "份");
g.setRemarks(s.getWeight() + s.getSpecificationUnit() + "/" + s.getUnitName());
g.setGoodsName(s.getGoodsName());
list1.add(g);
}
@@ -296,6 +304,7 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
});
return rb.success().setData(list1);
}
public ResultBean<AppletVo> getGifCardBySid(String sid) {
ResultBean rb = new ResultBean().fail();
AppletVo vo = baseMapper.getGifCardBySid(sid);
@@ -303,7 +312,7 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
List<GoodsVo> goodsVos = new ArrayList<>();
list.forEach(s -> {
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.setGoods(s.getGoodsName());
goodsVo.setNum(s.getGoodsNumber());
@@ -318,23 +327,23 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
goodsVo.setLNum(0);
goodsVos.add(goodsVo);
} else {
if (null != goods && null!=vo1) {
if (null != goods && null != vo1) {
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(0);
}
} else if(null != vo1){
} else if (null != vo1) {
if (vo1.getGoodsNumber() != s.getGoodsNumber()) {
goodsVo.setLNum(s.getGoodsNumber()- vo1.getGoodsNumber());
goodsVo.setLNum(s.getGoodsNumber() - vo1.getGoodsNumber());
goodsVo.setSelect(0);
}
}else if(null != goods) {
} else if (null != goods) {
if (goods.getGoodsNumber() != s.getGoodsNumber()) {
goodsVo.setLNum(s.getGoodsNumber() - goods.getGoodsNumber());
goodsVo.setSelect(0);
}
}else {
} else {
goodsVo.setLNum(s.getGoodsNumber());
// goodsVo.setSelect(s.getGoodsNumber());
goodsVo.setSelect(0);
@@ -362,15 +371,15 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
vo.setValue(vo2.getSid());
}
}
List<EmpCardGift> empCardGift =empCardGiftService.list(new QueryWrapper<EmpCardGift>().eq("empCardSid",vo.getSid()).eq("cardType","3").orderByDesc("createTime"));
empCardGift.forEach(s->{
List<EmpCardGiftGoods> list1= empCardGiftGoodsService.list(new QueryWrapper<EmpCardGiftGoods>().eq("empCardGiftSid",s.getSid()));
list1.forEach(l->{
LpkGoods goods=lpkGoodsService.getOne(new QueryWrapper<LpkGoods>().eq("sid",l.getGoodsSid()));
if(StringUtils.isBlank(s.getGoods())){
s.setGoods(goods.getName()+":"+l.getGoodsNumber()+"份");
}else{
s.setGoods(s.getGoods()+" "+goods.getName()+":"+l.getGoodsNumber()+"份");
List<EmpCardGift> empCardGift = empCardGiftService.list(new QueryWrapper<EmpCardGift>().eq("empCardSid", vo.getSid()).eq("cardType", "3").orderByDesc("createTime"));
empCardGift.forEach(s -> {
List<EmpCardGiftGoods> list1 = empCardGiftGoodsService.list(new QueryWrapper<EmpCardGiftGoods>().eq("empCardGiftSid", s.getSid()));
list1.forEach(l -> {
LpkGoods goods = lpkGoodsService.getOne(new QueryWrapper<LpkGoods>().eq("sid", l.getGoodsSid()));
if (StringUtils.isBlank(s.getGoods())) {
s.setGoods(goods.getName() + ":" + l.getGoodsNumber() + "份");
} else {
s.setGoods(s.getGoods() + " " + goods.getName() + ":" + l.getGoodsNumber() + "份");
}
});
});
@@ -600,7 +609,7 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
qw.in("card.serialNumber", serialNumbers);
}
}
qw.eq("card.isEnable","1");
qw.eq("card.isEnable", "1");
IPage<LpkGiftCard> page = PagerUtil.queryToPage(pq);
IPage<LpkGiftCardWordVo> pagging = baseMapper.selGiftCard(page, qw);
pagging.getRecords().forEach(s -> {
@@ -650,8 +659,8 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
IPage<LpkGiftCard> page = PagerUtil.queryToPage(pq);
IPage<LpkGiftCardListVo> pagging = baseMapper.recordDetails(page, qw);
PagerVo<LpkGiftCardListVo> p = PagerUtil.pageToVo(pagging, null);
p.getRecords().forEach(s->{
if(s.getIsEnable().equals("2")){
p.getRecords().forEach(s -> {
if (s.getIsEnable().equals("2")) {
s.setState("已作废");
}
@@ -748,13 +757,13 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
public ResultBean<Object> isSaturAndSun(String cardSid) {
ResultBean rb = new ResultBean().fail();
AppletVo appletVo = baseMapper.getGifCardBySid(cardSid);
Date date =new Date();
SimpleDateFormat sdf1 =new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String nowDate =sdf1.format(date);
Date date = new Date();
SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String nowDate = sdf1.format(date);
// AppletVo vo = getGifCardBySid(cardSid).getData();
// LocalDate now = DateUtil.parse(sdf1.format(DateUtil.parse(appletVo.getStart()))).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<>();
@@ -1570,26 +1579,26 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
// }
public void cardStatisticsListExport(LpkGiftCardListQuery query) {
ResultBean rb=new ResultBean();
ResultBean rb = new ResultBean();
QueryWrapper<LpkGiftCardListQuery> qw = new QueryWrapper<>();
qw.eq("1", "1");
if(StringUtils.isNotBlank(query.getSerialNumber())){
qw.like("a.serialNumber",query.getSerialNumber());
if (StringUtils.isNotBlank(query.getSerialNumber())) {
qw.like("a.serialNumber", query.getSerialNumber());
}
qw.groupBy("a.sid");
qw.orderByDesc("a.createTime");
// qw.groupBy("c.goodsSid");
List<CardStatisticsExportVo> statisticsExportVos=baseMapper.cardStatisticsListExport(qw);
statisticsExportVos.forEach(s->{
if(s.getIsEnable().equals("2")){
List<CardStatisticsExportVo> statisticsExportVos = baseMapper.cardStatisticsListExport(qw);
statisticsExportVos.forEach(s -> {
if (s.getIsEnable().equals("2")) {
s.setStateValue("已作废");
}
});
String excelName = "提货卡信息.xlsx";
String fileNameURL = "1";
response.setContentType( "application/vnd.ms-excel");
response.setContentType("application/vnd.ms-excel");
response.setCharacterEncoding("utf8");
response.setHeader("Content-disposition","attachment;filename="+ excelName );
response.setHeader("Content-disposition", "attachment;filename=" + excelName);
ServletOutputStream outputStream = null;
try {
WriteCellStyle headWriteCellStyle = new WriteCellStyle();
@@ -1614,76 +1623,80 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
}
}
public ResultBean cardStatisticsList(PagerQuery<LpkReserveOrderQuery> pq) {
ResultBean rb=new ResultBean();
ResultBean rb = new ResultBean();
LpkReserveOrderQuery query = pq.getParams();
QueryWrapper<LpkGiftCardListQuery> qw = new QueryWrapper<>();
qw.eq("1", "1");
if(StringUtils.isNotBlank(query.getSerialNumber())){
qw.like("a.serialNumber",query.getSerialNumber());
if (StringUtils.isNotBlank(query.getSerialNumber())) {
qw.like("a.serialNumber", query.getSerialNumber());
}
qw.groupBy("a.sid");
qw.orderByDesc("a.createTime");
// qw.groupBy("c.goodsSid");
IPage<LpkGiftCardListQuery> page = PagerUtil.queryToPage(pq);
IPage<LpkGiftCardVo> pagging = baseMapper.cardStatisticsList(page, qw);
pagging.getRecords().forEach(s->{
if(s.getIsEnable().equals("2")){
pagging.getRecords().forEach(s -> {
if (s.getIsEnable().equals("2")) {
s.setStateValue("已作废");
}
});
return rb.success().setData(pagging);
}
public ResultBean isEnable(String sid ) {
ResultBean rb=new ResultBean();
LpkGiftCard card=baseMapper.selectOne(new QueryWrapper<LpkGiftCard>().eq("sid",sid));
public ResultBean isEnable(String sid) {
ResultBean rb = new ResultBean();
LpkGiftCard card = baseMapper.selectOne(new QueryWrapper<LpkGiftCard>().eq("sid", sid));
card.setIsEnable("2");
baseMapper.updateById(card);
return rb.success().setData("成功");
}
/**
*是否转赠
* 是否转赠
*
* @param sid
* @return
*/
public ResultBean cardTransfer(String sid ) {
ResultBean rb=new ResultBean();
LpkGiftCard card=baseMapper.selectOne(new QueryWrapper<LpkGiftCard>().eq("sid",sid));
public ResultBean cardTransfer(String sid) {
ResultBean rb = new ResultBean();
LpkGiftCard card = baseMapper.selectOne(new QueryWrapper<LpkGiftCard>().eq("sid", sid));
card.setIsTransfer("1");
card.setIsItInvalid("1");//失效
baseMapper.updateById(card);
return rb.success().setData("成功");
}
/**
*共享家庭卡详情
* 共享家庭卡详情
*
* @param sid
* @return
*/
public ResultBean cardShareDetail(String sid ) {
ResultBean rb=new ResultBean().fail();
CardShareDetailVo vo=new CardShareDetailVo();
public ResultBean cardShareDetail(String sid) {
ResultBean rb = new ResultBean().fail();
CardShareDetailVo vo = new CardShareDetailVo();
vo.setCode("11111111111111111111");
vo.setPeriodValidity(vo.getStartDate()+"~"+vo.getEndDate());
vo.setPeriodValidity(vo.getStartDate() + "~" + vo.getEndDate());
vo.setCount("6种蔬菜");
List<ShareUserVo> list=new ArrayList<>();
ShareUserVo vo1=new ShareUserVo();
List<ShareUserVo> list = new ArrayList<>();
ShareUserVo vo1 = new ShareUserVo();
vo1.setName("测试一");
vo1.setIconUrl("");
ShareUserVo vo2=new ShareUserVo();
ShareUserVo vo2 = new ShareUserVo();
vo1.setName("测试二");
vo1.setIconUrl("");
list.add(vo1);
list.add(vo2);
List<ShareRecord> v=new ArrayList<>();
ShareRecord record=new ShareRecord();
List<ShareRecord> v = new ArrayList<>();
ShareRecord record = new ShareRecord();
record.setDate("2023-12-25 09:30");
record.setOperate("xx接受共享邀请");
ShareRecord record1=new ShareRecord();
ShareRecord record1 = new ShareRecord();
record1.setDate("2023-12-27 10:10");
record1.setOperate("xx接受共享邀请");
ShareRecord record2=new ShareRecord();
ShareRecord record2 = new ShareRecord();
record2.setDate("2023-12-28 12:30");
record2.setOperate("xx接受共享邀请");
v.add(record);
@@ -1693,13 +1706,14 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
vo.setShareRecordList(v);
return rb.success().setData(vo);
}
public ResultBean cardShareGoodsDetail(String sid ) {
ResultBean rb=new ResultBean().fail();
CardShareDetailVo vo=new CardShareDetailVo();
public ResultBean cardShareGoodsDetail(String sid) {
ResultBean rb = new ResultBean().fail();
CardShareDetailVo vo = new CardShareDetailVo();
vo.setCode("11111111111111111111");
vo.setPeriodValidity(vo.getStartDate()+"~"+vo.getEndDate());
List<com.yxt.yythmall.api.appletgiftbag.GiftBagGoods> goods=new ArrayList<>();
com.yxt.yythmall.api.appletgiftbag.GiftBagGoods goodss=new com.yxt.yythmall.api.appletgiftbag.GiftBagGoods();
vo.setPeriodValidity(vo.getStartDate() + "~" + vo.getEndDate());
List<com.yxt.yythmall.api.appletgiftbag.GiftBagGoods> goods = new ArrayList<>();
com.yxt.yythmall.api.appletgiftbag.GiftBagGoods goodss = new com.yxt.yythmall.api.appletgiftbag.GiftBagGoods();
goodss.setRemark("富含蛋白顾、钙、铁、硒等有益元素。");
goodss.setName("西瓜红密薯");
goodss.setUnitName("份");
@@ -1708,7 +1722,7 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
goodss.setJPrice("1.5");
goodss.setSpecificationUnit("斤");
goodss.setWeight("7");
com.yxt.yythmall.api.appletgiftbag.GiftBagGoods goods1=new com.yxt.yythmall.api.appletgiftbag.GiftBagGoods();
com.yxt.yythmall.api.appletgiftbag.GiftBagGoods goods1 = new com.yxt.yythmall.api.appletgiftbag.GiftBagGoods();
goods1.setRemark("北方大白菜打过霜后，口感发甜，更加可口");
goods1.setName("北方大白菜");
goods1.setUnitName("份");
@@ -1718,7 +1732,7 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
goods1.setSpecificationUnit("斤");
goods1.setWeight("15");
com.yxt.yythmall.api.appletgiftbag.GiftBagGoods goods2=new com.yxt.yythmall.api.appletgiftbag.GiftBagGoods();
com.yxt.yythmall.api.appletgiftbag.GiftBagGoods goods2 = new com.yxt.yythmall.api.appletgiftbag.GiftBagGoods();
goods2.setRemark("淀粉含量较高，口感更粉、更紧实");
goods2.setName("张北土豆");
goods2.setUnitName("份");
@@ -1727,7 +1741,7 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
goods2.setJPrice("1");
goods2.setSpecificationUnit("斤");
goods2.setWeight("5");
com.yxt.yythmall.api.appletgiftbag.GiftBagGoods goods3=new com.yxt.yythmall.api.appletgiftbag.GiftBagGoods();
com.yxt.yythmall.api.appletgiftbag.GiftBagGoods goods3 = new com.yxt.yythmall.api.appletgiftbag.GiftBagGoods();
goods3.setRemark("原料纯正，只有红薯粉，没有其他添加剂");
goods3.setName("纯红薯粉条");
goods3.setUnitName("份");
@@ -1744,6 +1758,11 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
return rb.success().setData(vo);
}
public LpkGiftCard selectOneByCodeAndCodeKey(String code, String codeKey) {
return baseMapper.selectOne(new QueryWrapper<LpkGiftCard>().eq("code", code)
.eq("codeKey", codeKey));
}
// public ResultBean getGoodsByTypeSid(LpkGiftCardQuery query) {
// ResultBean rb=new ResultBean().fail();
// List<GiftBagGoodss> giftBagGoodss=lpkGoodsService.getAllGoodsApplets(query).getData();

1
src/main/java/com/yxt/yythmall/biz/transferrecords/TransferRecordsMapper.java
View File

@@ -33,4 +33,5 @@ public interface TransferRecordsMapper extends BaseMapper<TransferRecords> {
List<TransferRecords> selByOrderSids(String orderSid);
IPage<TransferRecordsVo> orderListByUserSid(IPage<TransferRecords> page, @Param("query") TransferRecordsQuery query);
IPage<TransferRecordsVo> orderListByUserSid1(IPage<TransferRecords> page, @Param("query") TransferRecordsQuery query);
}

6
src/main/java/com/yxt/yythmall/biz/transferrecords/TransferRecordsMapper.xml
View File

@@ -19,7 +19,10 @@
transfer_records
WHERE
customerSid=#{query.customerSid}
UNION
</select>
<select id="orderListByUserSid1" resultType="com.yxt.yythmall.api.transferrecords.TransferRecordsVo">
SELECT
sid,
'领取' as type,
@@ -37,5 +40,4 @@
</select>
</mapper>

8
src/main/java/com/yxt/yythmall/biz/transferrecords/TransferRecordsService.java
View File

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateTime;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.base.utils.StringUtils;
@@ -71,8 +72,13 @@ public class TransferRecordsService extends MybatisBaseService<TransferRecordsMa
QueryWrapper<VegeCellarReserveOrder> qw = new QueryWrapper<>();
qw.eq("o.customerSid", query.getCustomerSid());
IPage<TransferRecords> page = PagerUtil.queryToPage(pq);
IPage<TransferRecordsVo> pagging =new Page<>();
if(query.getState().equals("1")){
pagging = baseMapper.orderListByUserSid(page, query);
}else{
pagging = baseMapper.orderListByUserSid1(page, query);
}
IPage<TransferRecordsVo> pagging = baseMapper.orderListByUserSid(page, query);
List<OrderGoodsVo> goodsVo = new ArrayList<>();
for(TransferRecordsVo vo:pagging.getRecords()){
List<TransferRecordsGoodsDetails> goods =transferRecordsGoodsDetailsService.selByOrderSids(vo.getSid());

19
src/main/java/com/yxt/yythmall/biz/vegereplenish/VegeReplenishMapper.java Normal file
View File

@@ -0,0 +1,19 @@
package com.yxt.yythmall.biz.vegereplenish;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yxt.yythmall.api.vegecallerreservedetails.VegeCellarReserveDetails;
import com.yxt.yythmall.api.vegereplenish.VegeReplenish;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import java.util.List;
/**
* @author wangpengfei
* @date 2023/11/23 10:36
*/
@Mapper
public interface VegeReplenishMapper extends BaseMapper<VegeReplenish> {
}

8
src/main/java/com/yxt/yythmall/biz/vegereplenish/VegeReplenishMapper.xml Normal file
View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yxt.yythmall.biz.vegereplenish.VegeReplenishMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
</mapper>

27
src/main/java/com/yxt/yythmall/biz/vegereplenish/VegeReplenishRest.java Normal file
View File

@@ -0,0 +1,27 @@
package com.yxt.yythmall.biz.vegereplenish;
import com.yxt.common.core.result.ResultBean;
import com.yxt.yythmall.api.lpkgiftcard.BindCardDto;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
/**
* @author wangpengfei
* @date 2023/11/23 10:35
*/
@Api(tags = "绑卡记录")
@RestController
@RequestMapping("vegereplenish")
public class VegeReplenishRest {
@Autowired
VegeReplenishService vegeReplenishService;
@ApiOperation("保存")
@PostMapping("/saveBindRecord")
public ResultBean<String> saveBindRecord(@RequestBody BindCardDto dto, @RequestParam("type") String type) {
return vegeReplenishService.saveBindRecord(dto,type);
}
}

129
src/main/java/com/yxt/yythmall/biz/vegereplenish/VegeReplenishService.java Normal file
View File

@@ -0,0 +1,129 @@
package com.yxt.yythmall.biz.vegereplenish;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateTime;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.core.result.ResultBean;
import com.yxt.yythmall.api.customerstore.CustomerStoreDto;
import com.yxt.yythmall.api.empcard.EmpCard;
import com.yxt.yythmall.api.empcardgift.EmpCardGift;
import com.yxt.yythmall.api.empcardgiftgoods.EmpCardGiftGoodsVo;
import com.yxt.yythmall.api.lpkgiftbag.GiftBagGoods;
import com.yxt.yythmall.api.lpkgiftbag.LpkGiftBagInitVo;
import com.yxt.yythmall.api.lpkgiftcard.BindCardDto;
import com.yxt.yythmall.api.lpkgiftcard.GoodsVo;
import com.yxt.yythmall.api.lpkgiftcard.LpkGiftCard;
import com.yxt.yythmall.api.lpkgoods.LpkGoods;
import com.yxt.yythmall.api.vegecallerreservedetails.VegeCellarReserveDetails;
import com.yxt.yythmall.api.vegecallerreserveorder.VegeCellarReserveOrderDto;
import com.yxt.yythmall.api.vegereplenish.VegeReplenish;
import com.yxt.yythmall.api.vegereplenishdetail.VegeReplenishDetail;
import com.yxt.yythmall.api.vegetablecellar.VegetableCellar;
import com.yxt.yythmall.biz.customerstore.CustomerStoreService;
import com.yxt.yythmall.biz.empcard.EmpCardService;
import com.yxt.yythmall.biz.empcardgift.EmpCardGiftService;
import com.yxt.yythmall.biz.empcardgiftgoods.EmpCardGiftGoodsService;
import com.yxt.yythmall.biz.lpkgiftbag.LpkGiftBagService;
import com.yxt.yythmall.biz.lpkgiftcard.LpkGiftCardService;
import com.yxt.yythmall.biz.lpkgoods.LpkGoodsService;
import com.yxt.yythmall.biz.vegereplenishdetail.VegeReplenishDetailService;
import com.yxt.yythmall.biz.vegetablecellar.VegetableCellarService;
import com.yxt.yythmall.mallplus.biz.util.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
/**
* @author wangpengfei
* @date 2023/11/23 10:36
*/
@Service
public class VegeReplenishService extends MybatisBaseService<VegeReplenishMapper, VegeReplenish> {
@Autowired
private VegeReplenishDetailService vegeReplenishDetailService;
@Autowired
private LpkGiftCardService lpkGiftCardService;
@Autowired
private LpkGiftBagService lpkGiftBagService;
@Autowired
private EmpCardService empCardService;
@Autowired
private EmpCardGiftService empCardGiftService;
@Autowired
private EmpCardGiftGoodsService empCardGiftGoodsService;
@Transactional(rollbackFor = Exception.class)
public ResultBean<String> saveBindRecord(BindCardDto dto, String type) {
ResultBean rb = new ResultBean().fail();
VegeReplenish entity = new VegeReplenish();
if (StringUtils.isNotBlank(dto.getCustomerSid())) {
entity.setCustomerSid(dto.getCustomerSid());
}
if (StringUtils.isNotBlank(dto.getCode())) {
entity.setCardCode(dto.getCode());
}
entity.setCreateTime(new DateTime());
entity.setCardtype(type);
baseMapper.insert(entity);
if (type.equals("0")) {
//个人卡
LpkGiftCard card = lpkGiftCardService.selectOneByCodeAndCodeKey(dto.getCode(), dto.getCodeKey());
if (null != card) {
LpkGiftBagInitVo giftBagInitVo = lpkGiftBagService.giftBagInit(card.getGiftbagSid()).getData();
if (null != giftBagInitVo) {
List<GiftBagGoods> goods = giftBagInitVo.getGoods();
if (!goods.isEmpty()) {
goods.stream().forEach(g -> {
VegeReplenishDetail detail = new VegeReplenishDetail();
detail.setGoodsSid(g.getGoodsSid());
detail.setGoodsNumber(Integer.parseInt(g.getGoodsNumber()));
detail.setOrderSid(entity.getSid());
detail.setCreateTime(new DateTime());
vegeReplenishDetailService.insert(detail);
});
}
}
}
} else if (type.equals("1")) {
//企业卡
EmpCard card = empCardService.selectOneByCodeAndCodeKey(dto.getCode(), dto.getCodeKey());
if (null != card) {
LpkGiftBagInitVo giftBagInitVo = lpkGiftBagService.giftBagInit(card.getGiftbagSid()).getData();
if (null != giftBagInitVo) {
List<GiftBagGoods> goods = giftBagInitVo.getGoods();
if (!goods.isEmpty()) {
goods.stream().forEach(g -> {
VegeReplenishDetail detail = new VegeReplenishDetail();
detail.setGoodsSid(g.getGoodsSid());
detail.setGoodsNumber(Integer.parseInt(g.getGoodsNumber()));
detail.setOrderSid(entity.getSid());
detail.setCreateTime(new DateTime());
vegeReplenishDetailService.insert(detail);
});
}
}
}
} else if (type.equals("2")) {
//转赠卡
EmpCardGift card = empCardGiftService.selectOneByCodeAndCodeKey(dto.getCode(), dto.getCodeKey());
if (null != card) {
List<EmpCardGiftGoodsVo> goods = empCardGiftGoodsService.getGoodsDetailsByEmpCardGiftSid(card.getSid()).getData();
if (!goods.isEmpty()) {
goods.stream().forEach(g -> {
VegeReplenishDetail detail = new VegeReplenishDetail();
detail.setGoodsSid(g.getGoodsSid());
detail.setGoodsNumber(g.getGoodsNumber());
detail.setOrderSid(entity.getSid());
detail.setCreateTime(new DateTime());
vegeReplenishDetailService.insert(detail);
});
}
}
}
return rb.success();
}
}

15
src/main/java/com/yxt/yythmall/biz/vegereplenishdetail/VegeReplenishDetailMapper.java Normal file
View File

@@ -0,0 +1,15 @@
package com.yxt.yythmall.biz.vegereplenishdetail;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yxt.yythmall.api.vegereplenish.VegeReplenish;
import com.yxt.yythmall.api.vegereplenishdetail.VegeReplenishDetail;
import org.apache.ibatis.annotations.Mapper;
/**
* @author wangpengfei
* @date 2023/11/23 10:36
*/
@Mapper
public interface VegeReplenishDetailMapper extends BaseMapper<VegeReplenishDetail> {
}

8
src/main/java/com/yxt/yythmall/biz/vegereplenishdetail/VegeReplenishDetailMapper.xml Normal file
View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yxt.yythmall.biz.vegereplenishdetail.VegeReplenishDetailMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
</mapper>

19
src/main/java/com/yxt/yythmall/biz/vegereplenishdetail/VegeReplenishDetailRest.java Normal file
View File

@@ -0,0 +1,19 @@
package com.yxt.yythmall.biz.vegereplenishdetail;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* @author wangpengfei
* @date 2023/11/23 10:35
*/
@Api(tags = "绑卡记录详情")
@RestController
@RequestMapping("vegereplenishdetail")
public class VegeReplenishDetailRest {
@Autowired
VegeReplenishDetailService vegeReplenishDetailService;
}

15
src/main/java/com/yxt/yythmall/biz/vegereplenishdetail/VegeReplenishDetailService.java Normal file
View File

@@ -0,0 +1,15 @@
package com.yxt.yythmall.biz.vegereplenishdetail;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.yythmall.api.vegereplenish.VegeReplenish;
import com.yxt.yythmall.api.vegereplenishdetail.VegeReplenishDetail;
import org.springframework.stereotype.Service;
/**
* @author wangpengfei
* @date 2023/11/23 10:36
*/
@Service
public class VegeReplenishDetailService extends MybatisBaseService<VegeReplenishDetailMapper, VegeReplenishDetail> {
}