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

1/3

Browse Source
This commit is contained in:
wangpengfei
2024-01-03 20:19:47 +08:00
parent 9df45dc7f2
commit 2b3fe76740
12 changed files with 350 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/yxt/yyth/api/empcardgift/EmpCardGift.java
View File

@@ -1,5 +1,6 @@
package com.yxt.yyth.api.empcardgift;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
@@ -37,6 +38,8 @@ public class EmpCardGift {
private String isItInvalid;
private String isReservation;
private String isShare;
@TableField(exist = false)
private String goods;
private String cardType; //1企业卡 2 福礼卡 3提货卡
private String isTransfer; //是否转增 0 未转赠 1 转赠
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")

2
src/main/java/com/yxt/yyth/api/empcardgift/EmpGiftAppletVo.java
View File

@@ -48,7 +48,7 @@ public class EmpGiftAppletVo {
private String isReservation;//是否超过预约时间 0 否 1是
private boolean notRese = true; //是否能预约
private List<LpkReserveOrderCardVo> orderCardVoList;
private EmpCardGift empCardGift;
private List<EmpCardGift> empCardGifts;
private String value;
private String serialNumber;
private String isEnable;

3
src/main/java/com/yxt/yyth/api/lpkgiftcard/AppletVo.java
View File

@@ -47,9 +47,10 @@ public class AppletVo {
private String isReservation;//是否超过预约时间 0 否 1是
private boolean notRese=true; //是否能预约
private List<LpkReserveOrderCardVo> orderCardVoList;
private EmpCardGift empCardGift;
private List<EmpCardGift> empCardGifts;
private String value;
private String serialNumber;
private String goods;
private String isEnable;
private String isTransfer;//是否转增 0 未转赠 1 转赠
private String type;//是否转增 1亲情卡 2家庭 3 企业

21
src/main/java/com/yxt/yyth/biz/empcard/EmpCardService.java
View File

@@ -118,7 +118,26 @@ 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())
.eq("codeKey", bindCardDto.getCodeKey()));
if (null == lpkGiftCard) {
return rb.setMsg("请核对卡号和密钥");
}
EmpAppletVo vo = baseMapper.getEmpCardBySid(lpkGiftCard.getSid());
if (vo.getState().equals("已过期")) {
return rb.setMsg("该卡已过期");
}
if (StringUtils.isNotBlank(lpkGiftCard.getCustomerSid())) {
return rb.setMsg("该卡已绑定");
}
lpkGiftCard.setCustomerSid(bindCardDto.getCustomerSid());
lpkGiftCard.setState("2");
lpkGiftCard.setBindDate(new Date());
baseMapper.updateById(lpkGiftCard);
return rb.success().setMsg("绑定成功");
}
public ResultBean updateEmpCardState(String empCardSid) {
ResultBean rb = new ResultBean().fail();

315
src/main/java/com/yxt/yyth/biz/empcardgift/EmpCardGiftService.java
View File

@@ -18,6 +18,7 @@ import com.yxt.yyth.api.empcard.EmpCard;
import com.yxt.yyth.api.empcard.EmpCardQuery;
import com.yxt.yyth.api.empcard.EmpCardVo;
import com.yxt.yyth.api.empcardgift.*;
import com.yxt.yyth.api.empcardgiftgoods.EmpCardGiftGoods;
import com.yxt.yyth.api.empcardgiftgoods.EmpCardGiftGoodsDto;
import com.yxt.yyth.api.empcardgiftgoods.EmpCardGiftGoodsVo;
import com.yxt.yyth.api.empcardgrantlog.EmpCardGrantLog;
@@ -203,6 +204,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());
GoodsVo goodsVo = new GoodsVo();
goodsVo.setGoods(s.getName());
goodsVo.setNum(s.getGoodsNumber());
@@ -217,10 +219,20 @@ public class EmpCardGiftService extends MybatisBaseService<EmpCardGiftMapper, Em
goodsVo.setLNum(0);
goodsVos.add(goodsVo);
} else {
if (null != goods) {
if (null != goods && null!=vo1) {
if (goods.getGoodsNumber() != s.getGoodsNumber()) {
goodsVo.setLNum(s.getGoodsNumber() - goods.getGoodsNumber()-vo1.getGoodsNumber());
// goodsVo.setSelect(s.getGoodsNumber() - goods.getGoodsNumber());
goodsVo.setSelect(0);
}
}else if(null != vo1){
if (vo1.getGoodsNumber() != s.getGoodsNumber()) {
goodsVo.setLNum(s.getGoodsNumber()- vo1.getGoodsNumber());
goodsVo.setSelect(0);
}
}else if(null != goods) {
if (goods.getGoodsNumber() != s.getGoodsNumber()) {
goodsVo.setLNum(s.getGoodsNumber() - goods.getGoodsNumber());
// goodsVo.setSelect(s.getGoodsNumber() - goods.getGoodsNumber());
goodsVo.setSelect(0);
}
} else {
@@ -253,8 +265,19 @@ public class EmpCardGiftService extends MybatisBaseService<EmpCardGiftMapper, Em
vo.setValue(vo2.getSid());
}
}
EmpCardGift empCardGift=baseMapper.selectOne(new QueryWrapper<EmpCardGift>().eq("empCardSid",vo.getSid()).eq("cardType","2"));
vo.setEmpCardGift(empCardGift);
List<EmpCardGift> empCardGift =baseMapper.selectList(new QueryWrapper<EmpCardGift>().eq("empCardSid",vo.getSid()).eq("cardType","2"));
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);
vo.setPName("亲情菜窖");
@@ -419,15 +442,6 @@ public class EmpCardGiftService extends MybatisBaseService<EmpCardGiftMapper, Em
record.setCode(card.getCode());
empCardGrantLogService.updateById(record);
int i = 0;
// EmpAppletVo voss =empCardService.getEmpCardBySid(empCard.getSid()).getData();
// for (com.yxt.yyth.api.lpkgiftcard.GoodsVo vo1 : voss.getGoodsVos()) {
// LpkReserveOrderGoods goods1 = lpkReserveOrderGoodsMapper.getReserveByCardSid(empCard.getSid(), vo1.getGoodsSid());
// if (null != goods1) {
// if (vo1.getNum() <= goods1.getGoodsNumber()) {
// i++;
// }
// }
// }
EmpAppletVo vo = empCardService.getEmpCardBySid(empCard.getSid()).getData();
for (com.yxt.yyth.api.lpkgiftcard.GoodsVo vo1 : vo.getGoodsVos()) {
EmpCardGrantLogVo goods1 = empCardGrantLogService.recordListGoods(dto.getEmpCardSid(), vo1.getGoodsSid()).getData();
@@ -469,65 +483,106 @@ 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){
return rb.setMsg("卡券数量不是数字，请重新填写");
}
if(count==0){
return rb.setMsg("卡券数量不能为0，请重新填写");
}
LpkGiftCard empCard = lpkGiftCardService.fetchBySid(dto.getEmpCardSid());
if (null == empCard) {
return rb.setMsg("请选择正确的提货卡");
}
// EmpAppletVo empAppletVo =empCardService.getEmpCardBySid(dto.getEmpCardSid()).getData();
// for(com.yxt.yyth.api.lpkgiftcard.GoodsVo goodsVo:empAppletVo.getGoodsVos()){
// for(GoodsVo gv :dto.getGoodsVoList()){
// if(goodsVo.getGoodsSid().equals(gv.getGoodsSid())){
// if(goodsVo.getSelect()*count>goodsVo.getLNum()){
// return rb.setMsg("商品数量不足，请重新选择");
// }
// }
// }
// }
AppletVo empAppletVo =lpkGiftCardService.getGifCardBySid(dto.getEmpCardSid()).getData();
for(com.yxt.yyth.api.lpkgiftcard.GoodsVo goodsVo:empAppletVo.getGoodsVos()){
for(GoodsVo gv :dto.getGoodsVoList()){
if(goodsVo.getGoodsSid().equals(gv.getGoodsSid())){
if(goodsVo.getSelect()*count>goodsVo.getLNum()){
return rb.setMsg("商品数量不足，请重新选择");
}
}
}
}
LpkGiftBag bag=lpkGiftBagService.getOne(new QueryWrapper<LpkGiftBag>().eq("sid",empCard.getGiftbagSid()));
EmpCardGift card = new EmpCardGift();
card.setCardType("3");
card.setRemarks(dto.getRemarks());
card.setEmpCardSid(dto.getEmpCardSid());
card.setEmpCardSerialNumber(empCard.getSerialNumber());
card.setEmpCardCode(empCard.getCode());
card.setEmpCardCustomerSid(empCard.getCustomerSid());
card.setState("1");
card.setCreateTime(new DateTime());
card.setGrantDate(new Date());
card.setEndDate(bag.getDateEnd());
card.setStartDate(bag.getDateStart());
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));
if (StringUtils.isBlank(maxSerNum)) {
card.setSerialNumber(cardArea + "0000001");
} else {
String substringSer = maxSerNum.substring(cardArea.length());
int i1 = Integer.parseInt(substringSer);
int finNum = i1 + 1;
int length = String.valueOf(finNum).length();
int len = 7 - length;
String num = String.valueOf(finNum);
for (int a = 0; a < len; a++) {
num = "0" + num;
for (int k = 0; k < count; k++) {
EmpCardGift card = new EmpCardGift();
card.setCardType("3");
card.setRemarks(dto.getRemarks());
card.setEmpCardSid(dto.getEmpCardSid());
card.setEmpCardSerialNumber(empCard.getSerialNumber());
card.setEmpCardCode(empCard.getCode());
card.setEmpCardCustomerSid(empCard.getCustomerSid());
card.setState("1");
card.setCreateTime(new DateTime());
card.setGrantDate(new Date());
card.setEndDate(bag.getDateEnd());
card.setStartDate(bag.getDateStart());
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));
if (StringUtils.isBlank(maxSerNum)) {
card.setSerialNumber(cardArea + "0000001");
} else {
String substringSer = maxSerNum.substring(cardArea.length());
int i1 = Integer.parseInt(substringSer);
int finNum = i1 + 1;
int length = String.valueOf(finNum).length();
int len = 7 - length;
String num = String.valueOf(finNum);
for (int a = 0; a < len; a++) {
num = "0" + num;
}
card.setSerialNumber(cardArea + num);
}
card.setSerialNumber(cardArea + num);
}
baseMapper.insert(card);
for (GoodsVo vo : dto.getGoodsVoList()) {
if(vo.getLNum()!=0){
EmpCardGiftGoodsDto dto1 = new EmpCardGiftGoodsDto();
dto1.setEmpCardGiftSid(card.getSid());
dto1.setGoodsSid(vo.getGoodsSid());
dto1.setGoodsNumber(vo.getLNum());
empCardGiftGoodsService.save(dto1);
baseMapper.insert(card);
for (GoodsVo vo : dto.getGoodsVoList()) {
if(vo.getLNum()!=0){
EmpCardGiftGoodsDto dto1 = new EmpCardGiftGoodsDto();
dto1.setEmpCardGiftSid(card.getSid());
dto1.setGoodsSid(vo.getGoodsSid());
dto1.setGoodsNumber(vo.getSelect());
empCardGiftGoodsService.save(dto1);
}
}
int i=0;
for (com.yxt.yyth.api.lpkgiftcard.GoodsVo vo1 : empAppletVo.getGoodsVos()) {
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();
}
}else{
if(goods2==null){
c=goods1.getGoodsNumber();
}else{
c=goods2.getGoodsNumber()+goods1.getGoodsNumber();
}
}
if (vo1.getNum() <= c) {
i++;
}
}
if (empAppletVo.getGoodsVos().size() == i) {
int i1=lpkReserveOrderGoodsMapper.selectCount(new QueryWrapper<LpkReserveOrderGoods>().eq("cardSid",empCard.getSid()));
if(i1==0){
//如果没有预约记录 直接改转赠状态
lpkGiftCardService.cardTransfer(dto.getEmpCardSid());
}else{
lpkGiftCardService.changState(empCard.getSid(), "5");
}
}
}
lpkGiftCardService.cardTransfer(dto.getEmpCardSid());
return rb.success();
}
@@ -537,53 +592,105 @@ 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){
return rb.setMsg("卡券数量不是数字，请重新填写");
}
if(count==0){
return rb.setMsg("卡券数量不能为0，请重新填写");
}
EmpCardGift empCard=baseMapper.selectOne(new QueryWrapper<EmpCardGift>().eq("sid",dto.getEmpCardSid()));
if (null == empCard) {
return rb.setMsg("请选择正确的福礼卡");
}
EmpCardGift card = new EmpCardGift();
card.setCardType("2");
card.setRemarks(dto.getRemarks());
card.setEmpCardSid(dto.getEmpCardSid());
card.setEmpCardSerialNumber(empCard.getSerialNumber());
card.setEmpCardCode(empCard.getCode());
card.setEmpCardCustomerSid(empCard.getCustomerSid());
card.setState("1");
card.setCreateTime(new DateTime());
card.setGrantDate(new Date());
card.setEndDate(empCard.getEndDate());
card.setStartDate(empCard.getStartDate());
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));
if (StringUtils.isBlank(maxSerNum)) {
card.setSerialNumber(cardArea + "0000001");
} else {
String substringSer = maxSerNum.substring(cardArea.length());
int i1 = Integer.parseInt(substringSer);
int finNum = i1 + 1;
int length = String.valueOf(finNum).length();
int len = 7 - length;
String num = String.valueOf(finNum);
for (int a = 0; a < len; a++) {
num = "0" + num;
}
card.setSerialNumber(cardArea + num);
}
baseMapper.insert(card);
for (GoodsVo vo : dto.getGoodsVoList()) {
if(vo.getLNum()!=0){
EmpCardGiftGoodsDto dto1 = new EmpCardGiftGoodsDto();
dto1.setEmpCardGiftSid(card.getSid());
dto1.setGoodsSid(vo.getGoodsSid());
dto1.setGoodsNumber(vo.getLNum());
empCardGiftGoodsService.save(dto1);
EmpGiftAppletVo empAppletVo =getGifCardBySid(dto.getEmpCardSid()).getData();
for(GoodsVo goodsVo:empAppletVo.getGoodsVos()){
for(GoodsVo gv :dto.getGoodsVoList()){
if(goodsVo.getGoodsSid().equals(gv.getGoodsSid())){
if(goodsVo.getSelect()*count>goodsVo.getLNum()){
return rb.setMsg("商品数量不足，请重新选择");
}
}
}
}
cardTransfer(dto.getEmpCardSid());
for (int k = 0; k < count; k++) {
EmpCardGift card = new EmpCardGift();
card.setCardType("2");
card.setRemarks(dto.getRemarks());
card.setEmpCardSid(dto.getEmpCardSid());
card.setEmpCardSerialNumber(empCard.getSerialNumber());
card.setEmpCardCode(empCard.getCode());
card.setEmpCardCustomerSid(empCard.getCustomerSid());
card.setState("1");
card.setCreateTime(new DateTime());
card.setGrantDate(new Date());
card.setEndDate(empCard.getEndDate());
card.setStartDate(empCard.getStartDate());
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));
if (StringUtils.isBlank(maxSerNum)) {
card.setSerialNumber(cardArea + "0000001");
} else {
String substringSer = maxSerNum.substring(cardArea.length());
int i1 = Integer.parseInt(substringSer);
int finNum = i1 + 1;
int length = String.valueOf(finNum).length();
int len = 7 - length;
String num = String.valueOf(finNum);
for (int a = 0; a < len; a++) {
num = "0" + num;
}
card.setSerialNumber(cardArea + num);
}
baseMapper.insert(card);
for (GoodsVo vo : dto.getGoodsVoList()) {
if(vo.getLNum()!=0){
EmpCardGiftGoodsDto dto1 = new EmpCardGiftGoodsDto();
dto1.setEmpCardGiftSid(card.getSid());
dto1.setGoodsSid(vo.getGoodsSid());
dto1.setGoodsNumber(vo.getSelect());
empCardGiftGoodsService.save(dto1);
}
}
int i=0;
for (GoodsVo vo1 : empAppletVo.getGoodsVos()) {
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();
}
}else{
if(goods2==null){
c=goods1.getGoodsNumber();
}else{
c=goods2.getGoodsNumber()+goods1.getGoodsNumber();
}
}
if (vo1.getNum() <= c) {
i++;
}
}
if (empAppletVo.getGoodsVos().size() == i) {
int i1=lpkReserveOrderGoodsMapper.selectCount(new QueryWrapper<LpkReserveOrderGoods>().eq("cardSid",empCard.getSid()));
if(i1==0){
//如果没有预约记录 直接改转赠状态
cardTransfer(dto.getEmpCardSid());
}else{
changState(empCard.getSid(), "5");
}
}
}
// cardTransfer(dto.getEmpCardSid());
return rb.success();
}
/**

1
src/main/java/com/yxt/yyth/biz/empcardgiftgoods/EmpCardGiftGoodsMapper.java
View File

@@ -21,4 +21,5 @@ import java.util.List;
public interface EmpCardGiftGoodsMapper extends BaseMapper<EmpCardGiftGoods> {
List<EmpCardGiftGoodsVo> getGoodsByEmpCardGiftSid(@Param("empCardGiftSid")String empCardGiftSid );
List<EmpCardGiftGoodsVo> getGoodsBySid(@Param("empCardGiftSid")String empCardGiftSid );
EmpCardGiftGoodsVo recordListGoods( @Param("empCardSid")String empCardSid,@Param("goodsSid")String goodsSid);
}

9
src/main/java/com/yxt/yyth/biz/empcardgiftgoods/EmpCardGiftGoodsMapper.xml
View File

@@ -8,5 +8,12 @@
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.yyth.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>
</mapper>

6
src/main/java/com/yxt/yyth/biz/empcardgiftgoods/EmpCardGiftGoodsService.java
View File

@@ -53,5 +53,9 @@ public class EmpCardGiftGoodsService extends MybatisBaseService<EmpCardGiftGoods
List<EmpCardGiftGoodsVo> list= baseMapper.getGoodsBySid(empCardGiftSid);
return rb.success().setData(list);
}
public ResultBean<EmpCardGiftGoodsVo> recordListGoods(String empCardSid,String goodsSid) {
ResultBean rb = ResultBean.fireFail();
EmpCardGiftGoodsVo list= baseMapper.recordListGoods(empCardSid,goodsSid);
return rb.success().setData(list);
}
}

43
src/main/java/com/yxt/yyth/biz/empreserveordergoods/EmpReserveOrderGoodsService.java
View File

@@ -6,6 +6,7 @@ import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.core.result.ResultBean;
import com.yxt.yyth.api.empcard.EmpAppletVo;
import com.yxt.yyth.api.empcardgift.EmpGiftAppletVo;
import com.yxt.yyth.api.empcardgiftgoods.EmpCardGiftGoodsVo;
import com.yxt.yyth.api.empreserveorder.EmpReserveOrderDto;
import com.yxt.yyth.api.empreserveordergoods.EmpReserveOrderGoods;
import com.yxt.yyth.api.lpkgiftcard.AppletVo;
@@ -14,6 +15,7 @@ import com.yxt.yyth.api.lpkreserveorder.LpkReserveOrderDto;
import com.yxt.yyth.api.lpkreserveordergoods.LpkReserveOrderGoods;
import com.yxt.yyth.biz.empcard.EmpCardService;
import com.yxt.yyth.biz.empcardgift.EmpCardGiftService;
import com.yxt.yyth.biz.empcardgiftgoods.EmpCardGiftGoodsService;
import com.yxt.yyth.biz.lpkgiftcard.LpkGiftCardService;
import com.yxt.yyth.biz.lpkreserveordergoods.LpkReserveOrderGoodsMapper;
import com.yxt.yyth.biz.lpkreserveordergoods.LpkReserveOrderGoodsService;
@@ -34,6 +36,8 @@ public class EmpReserveOrderGoodsService extends MybatisBaseService<EmpReserveOr
LpkReserveOrderGoodsMapper lpkReserveOrderGoodsMapper;
@Autowired
private EmpCardService empCardService;
@Autowired
EmpCardGiftGoodsService empCardGiftGoodsService;
public ResultBean<EmpReserveOrderGoods> getReserveByCardSid(String carSid, String goodsSid) {
ResultBean rb = new ResultBean();
EmpReserveOrderGoods goods = baseMapper.getReserveByCardSid(carSid, goodsSid);
@@ -55,19 +59,42 @@ public class EmpReserveOrderGoodsService extends MybatisBaseService<EmpReserveOr
}
EmpGiftAppletVo vo = empCardGiftService.getGifCardBySid(dto.getSid()).getData();
int i = 0;
for (GoodsVo vo1 : vo.getGoodsVos()) {
LpkReserveOrderGoods goods1 = lpkReserveOrderGoodsMapper.getReserveByCardSid(dto.getSid(), vo1.getGoodsSid());
if (null != goods1) {
if (vo1.getNum() <= goods1.getGoodsNumber()) {
i++;
EmpCardGiftGoodsVo goods1=empCardGiftGoodsService.recordListGoods(dto.getSid(),vo1.getGoodsSid()).getData();
LpkReserveOrderGoods goods2 = lpkReserveOrderGoodsMapper.getReserveByCardSid(dto.getSid(), vo1.getGoodsSid());
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();
}
}
if (vo.getGoodsVos().size() == i) {
empCardGiftService.changState(dto.getSid(), "5");
} else {
empCardGiftService.changState(dto.getSid(), "4");
if (vo1.getNum() <= c) {
i++;
}
}
if (vo.getGoodsVos().size() == i) {
empCardGiftService.changState(dto.getSid(), "5");
} else {
empCardGiftService.changState(dto.getSid(), "4");
}
// for (GoodsVo vo1 : vo.getGoodsVos()) {
// LpkReserveOrderGoods goods1 = lpkReserveOrderGoodsMapper.getReserveByCardSid(dto.getSid(), vo1.getGoodsSid());
// if (null != goods1) {
// if (vo1.getNum() <= goods1.getGoodsNumber()) {
// i++;
// }
// }
//
// }
return rb.success().setData("预约成功");
}

41
src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardService.java
View File

@@ -29,6 +29,8 @@ import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.yyth.api.empcardgift.EmpCardGift;
import com.yxt.yyth.api.empcardgift.EmpCardGiftDto;
import com.yxt.yyth.api.empcardgift.EmpCardGiftVo;
import com.yxt.yyth.api.empcardgiftgoods.EmpCardGiftGoods;
import com.yxt.yyth.api.empcardgiftgoods.EmpCardGiftGoodsVo;
import com.yxt.yyth.api.lpkcardbuildrecord.LpkCardBuildRecord;
import com.yxt.yyth.api.lpkcardgrantrecord.LpkCardGrantRecordDto;
@@ -46,6 +48,7 @@ import com.yxt.yyth.api.lpkreserveorder.*;
import com.yxt.yyth.api.lpkreserveordergoods.LpkReserveOrderGoods;
import com.yxt.yyth.api.lpkstore.LpkStoreDetailsVo;
import com.yxt.yyth.api.lpkstore.StoreSelect;
import com.yxt.yyth.biz.empcard.EmpCardService;
import com.yxt.yyth.biz.empcardgift.EmpCardGiftService;
import com.yxt.yyth.biz.empcardgiftgoods.EmpCardGiftGoodsService;
import com.yxt.yyth.biz.lpkcardbuildrecord.LpkCardBuildRecordService;
@@ -113,6 +116,8 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
LpkCardQrcodeService lpkCardQrcodeService;
@Autowired
EmpCardGiftGoodsService empCardGiftGoodsService;
@Autowired
EmpCardService empCardService;
public ResultBean bindCard(BindCardDto bindCardDto) {
ResultBean rb = new ResultBean().fail();
@@ -155,11 +160,10 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
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()));
if (null == lpkGiftCard1) {
ResultBean rb1 = empCardGiftService.bindCard(bindCardDto);
ResultBean rb1 = empCardService.bindCardA(bindCardDto);
return rb1;
}
LpkGiftCard lpkGiftCard = baseMapper.selectOne(new QueryWrapper<LpkGiftCard>().eq("code", bindCardDto.getCode())
@@ -224,6 +228,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();
GoodsVo goodsVo = new GoodsVo();
goodsVo.setGoods(s.getGoodsName());
goodsVo.setNum(s.getGoodsNumber());
@@ -238,13 +243,23 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
goodsVo.setLNum(0);
goodsVos.add(goodsVo);
} else {
if (null != goods) {
if (null != goods && null!=vo1) {
if (goods.getGoodsNumber() != s.getGoodsNumber()) {
goodsVo.setLNum(s.getGoodsNumber() - goods.getGoodsNumber());
goodsVo.setLNum(s.getGoodsNumber() - goods.getGoodsNumber()-vo1.getGoodsNumber());
// goodsVo.setSelect(s.getGoodsNumber() - goods.getGoodsNumber());
goodsVo.setSelect(0);
}
} else {
} else if(null != vo1){
if (vo1.getGoodsNumber() != s.getGoodsNumber()) {
goodsVo.setLNum(s.getGoodsNumber()- vo1.getGoodsNumber());
goodsVo.setSelect(0);
}
}else if(null != goods) {
if (goods.getGoodsNumber() != s.getGoodsNumber()) {
goodsVo.setLNum(s.getGoodsNumber() - goods.getGoodsNumber());
goodsVo.setSelect(0);
}
}else {
goodsVo.setLNum(s.getGoodsNumber());
// goodsVo.setSelect(s.getGoodsNumber());
goodsVo.setSelect(0);
@@ -272,8 +287,20 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
vo.setValue(vo2.getSid());
}
}
EmpCardGift empCardGift=empCardGiftService.getOne(new QueryWrapper<EmpCardGift>().eq("empCardSid",vo.getSid()).eq("cardType","3"));
vo.setEmpCardGift(empCardGift);
List<EmpCardGift> empCardGift =empCardGiftService.list(new QueryWrapper<EmpCardGift>().eq("empCardSid",vo.getSid()).eq("cardType","3"));
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(lpkReserveOrderCardVos);
vo.setGoodsVos(goodsVos);
vo.setPName("家庭菜窖");

37
src/main/java/com/yxt/yyth/biz/lpkreserveordergoods/LpkReserveOrderGoodsService.java
View File

@@ -5,6 +5,7 @@ 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.yyth.api.empcardgiftgoods.EmpCardGiftGoodsVo;
import com.yxt.yyth.api.lpkgiftcard.AppletVo;
import com.yxt.yyth.api.lpkgiftcard.GoodsVo;
import com.yxt.yyth.api.lpkreserveorder.Goods;
@@ -12,6 +13,7 @@ import com.yxt.yyth.api.lpkreserveorder.LpkReserveOrder;
import com.yxt.yyth.api.lpkreserveorder.LpkReserveOrderDto;
import com.yxt.yyth.api.lpkreserveordergoods.LpkReserveOrderGoods;
import com.yxt.yyth.api.lpkreserveordergoods.LpkReserveOrderGoodsDto;
import com.yxt.yyth.biz.empcardgiftgoods.EmpCardGiftGoodsService;
import com.yxt.yyth.biz.lpkgiftcard.LpkGiftCardService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -26,6 +28,8 @@ import java.util.List;
public class LpkReserveOrderGoodsService extends MybatisBaseService<LpkReserveOrderGoodsMapper, LpkReserveOrderGoods> {
@Autowired
LpkGiftCardService lpkGiftCardService;
@Autowired
EmpCardGiftGoodsService empCardGiftGoodsService;
public ResultBean<LpkReserveOrderGoods> getReserveByCardSid(String carSid, String goodsSid) {
ResultBean rb = new ResultBean();
@@ -48,20 +52,33 @@ public class LpkReserveOrderGoodsService extends MybatisBaseService<LpkReserveOr
}
}
AppletVo vo = lpkGiftCardService.getGifCardBySid(dto.getSid()).getData();
int i = 0;
for (GoodsVo vo1 : vo.getGoodsVos()) {
LpkReserveOrderGoods goods1 = baseMapper.getReserveByCardSid(dto.getSid(), vo1.getGoodsSid());
if (null != goods1) {
if (vo1.getNum() <= goods1.getGoodsNumber()) {
i++;
int i=0;
for (com.yxt.yyth.api.lpkgiftcard.GoodsVo vo1 : vo.getGoodsVos()) {
EmpCardGiftGoodsVo goods1=empCardGiftGoodsService.recordListGoods(dto.getSid(),vo1.getGoodsSid()).getData();
LpkReserveOrderGoods goods2 = baseMapper.getReserveByCardSid(dto.getSid(), vo1.getGoodsSid());
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();
}
}
if (vo.getGoodsVos().size() == i) {
lpkGiftCardService.changState(dto.getSid(), "5");
} else {
lpkGiftCardService.changState(dto.getSid(), "4");
if (vo1.getNum() <= c) {
i++;
}
}
if (vo.getGoodsVos().size() == i) {
lpkGiftCardService.changState(dto.getSid(), "5");
} else {
lpkGiftCardService.changState(dto.getSid(), "4");
}
return rb.success().setData("预约成功");
}

4
src/main/java/com/yxt/yyth/config/SaTokenConfigure.java
View File

@@ -46,7 +46,9 @@ public class SaTokenConfigure implements WebMvcConfigurer {
.excludePathPatterns("/empcardgift/shareEmpCard/**")
.excludePathPatterns("/empcardgift/generateEmpCardGift")
.excludePathPatterns("/empcardgift/generateEmpCard")
.excludePathPatterns("/lpkcustomer/wxSilentLogin");
.excludePathPatterns("/lpkcustomer/wxSilentLogin")
.excludePathPatterns("/lpkgiftcard/gifCardsByCustomerSid")
.excludePathPatterns("/lpkgiftcard/bindAllCard");
}