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

12/25

Browse Source
This commit is contained in:
wangpengfei
2023-12-25 15:35:38 +08:00
parent 2fb9b1d454
commit f957218dfa
11 changed files with 95 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/yxt/yyth/api/empcardgift/EmpCardGiftDto.java
View File

@@ -39,4 +39,5 @@ public class EmpCardGiftDto implements Dto {
private String isItlnvalid;
private String iReservation;
private List<GoodsVo> goodsVoList;
private String count;
}

1
src/main/java/com/yxt/yyth/api/lpkgiftbaggoods/LpkGiftBagGoods.java
View File

@@ -24,4 +24,5 @@ public class LpkGiftBagGoods {
private String giftbagSid;
private String goodsSid;
private String goodsNumber;
private String isGrounding;
}

1
src/main/java/com/yxt/yyth/biz/empcard/EmpCardMapper.java
View File

@@ -34,4 +34,5 @@ public interface EmpCardMapper extends BaseMapper<EmpCard> {
IPage<EmpAppletVo> getEmpCardByCustomerSid(IPage<EmpCard> page, @Param(Constants.WRAPPER) QueryWrapper<EmpCard> qw);
List<EmpCardVo> selEmpCardSid(@Param("empCardSid")String empCardSid);
EmpCardVo getBagGoods(@Param("sid")String sid ,@Param("goodsSid")String goodsSid);
}

12
src/main/java/com/yxt/yyth/biz/empcard/EmpCardMapper.xml
View File

@@ -121,11 +121,21 @@
</select>
<select id="selEmpCardSid" resultType="com.yxt.yyth.api.empcard.EmpCardVo">
SELECT card.*,
s.name as goodsNmae,
s.name as goodsName,
s.sid as goodsSid
FROM emp_card card
LEFT JOIN lpk_giftbag bag on card.giftbagSid = bag.sid
left join lpk_giftbag_goods s on card.sid = s.giftbagSid
where card.sid = #{empCardSid}
</select>
<select id="getBagGoods" resultType="com.yxt.yyth.api.empcard.EmpCardVo">
SELECT card.*,
s.sid as goodsSid,
s.goodsNumber as goodsNumber
FROM emp_card card
LEFT JOIN lpk_giftbag bag on card.giftbagSid = bag.sid
left join lpk_giftbag_goods s on bag.sid = s.giftbagSid
where card.sid = #{sid} and s.goodsSid=#{goodsSid}
</select>
</mapper>

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

@@ -220,7 +220,7 @@ public class EmpCardService extends MybatisBaseService<EmpCardMapper, EmpCard> {
if (StringUtils.isNotBlank(query.getNumber())) {
qw.like("serialNumber", query.getNumber());
}
// qw.eq("recordSid", query.getSid());
qw.eq("recordSid", query.getSid());
//得到所有要导出的数据
List<EmpCardExport> exportList = baseMapper.exportExcel(qw);
if (!exportList.isEmpty()) {
@@ -344,4 +344,9 @@ public class EmpCardService extends MybatisBaseService<EmpCardMapper, EmpCard> {
baseMapper.updateById(card);
return rb.success().setData("成功");
}
public ResultBean<EmpCardVo> getBagGoods(String sid,String goodsSid) {
ResultBean rb = new ResultBean().fail();
EmpCardVo card = baseMapper.getBagGoods(sid,goodsSid);
return rb.success().setData(card);
}
}

4
src/main/java/com/yxt/yyth/biz/empcardgift/EmpCardGiftRest.java
View File

@@ -109,8 +109,4 @@ public class EmpCardGiftRest {
// public ResultBean cardGrant(@RequestBody CardGrantDto dto) {
// return EmpCardGiftService.cardGrant(dto);
// }
//@Scheduled(cron = "0/1 * * * * ?")
//public void test() {
// System.out.println("执行");
//}
}

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

@@ -14,6 +14,7 @@ import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.yyth.api.empcard.EmpAppletVo;
import com.yxt.yyth.api.empcard.EmpCard;
import com.yxt.yyth.api.empcard.EmpCardVo;
import com.yxt.yyth.api.empcardgift.*;
import com.yxt.yyth.api.empcardgiftgoods.EmpCardGiftGoodsDto;
import com.yxt.yyth.api.empcardgiftgoods.EmpCardGiftGoodsVo;
@@ -326,65 +327,76 @@ public class EmpCardGiftService extends MybatisBaseService<EmpCardGiftMapper, Em
if(null==empCard){
return rb.setMsg("请选择正确的企业卡");
}
EmpCardGrantLog record = new EmpCardGrantLog();
record.setCreateTime(new DateTime());
record.setEmpCardSid(dto.getEmpCardSid());
record.setEmpCardCustomerSid(empCard.getCustomerSid());
empCardGrantLogService.insert(record);
EmpCardGift card = new EmpCardGift();
card.setRemarks(dto.getRemarks());
card.setEmpCardSid(dto.getEmpCardSid());
card.setEmpCardSerialNumber(empCard.getSerialNumber());
card.setEmpCardCode(empCard.getCode());
card.setEmpCardCustomerSid(empCard.getCustomerSid());
card.setRecordSid(record.getSid());
card.setState("1");
card.setCreateTime(new DateTime());
card.setGrantDate(new Date());
card.setCodeKey(dto.getCodeKey());
card.setCode(dto.getCode());
String cardArea="9";
String maxSerNum = baseMapper.selctMaxSerNum(cardArea);
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(GoodsVo goodsVo:dto.getGoodsVoList()){
EmpCardVo vo= empCardService.getBagGoods(dto.getEmpCardSid(),goodsVo.getGoodsSid()).getData();
if(goodsVo.getSelect()*Integer.valueOf(dto.getCount())>vo.getGoodsNumber()){
return rb.setMsg("商品数量不足，请重新选择");
}
card.setSerialNumber(cardArea + num);
}
baseMapper.insert(card);
for(GoodsVo vo:dto.getGoodsVoList()){
EmpCardGiftGoodsDto dto1=new EmpCardGiftGoodsDto();
dto1.setEmpCardGiftSid(card.getSid());
dto1.setGoodsSid(vo.getGoodsSid());
dto1.setGoodsNumber(vo.getSelect());
empCardGiftGoodsService.save(dto1);
for (int k = 0; k < Integer.valueOf(dto.getCount()); k++) {
EmpCardGrantLog record = new EmpCardGrantLog();
record.setCreateTime(new DateTime());
record.setEmpCardSid(dto.getEmpCardSid());
record.setEmpCardCustomerSid(empCard.getCustomerSid());
empCardGrantLogService.insert(record);
}
record.setSerialNumber(card.getSerialNumber());
record.setEmpCardSid(dto.getEmpCardSid());
record.setCode(dto.getCode());
empCardGrantLogService.updateById(record);
EmpCardGift card = new EmpCardGift();
card.setRemarks(dto.getRemarks());
card.setEmpCardSid(dto.getEmpCardSid());
card.setEmpCardSerialNumber(empCard.getSerialNumber());
card.setEmpCardCode(empCard.getCode());
card.setEmpCardCustomerSid(empCard.getCustomerSid());
card.setRecordSid(record.getSid());
card.setState("1");
card.setCreateTime(new DateTime());
card.setGrantDate(new Date());
EmpAppletVo vo = empCardService.getEmpCardBySid(empCard.getSid()).getData();
int i = 0;
for (com.yxt.yyth.api.lpkgiftcard.GoodsVo vo1 : vo.getGoodsVos()) {
EmpCardGrantLogVo goods1 = empCardGrantLogService.recordListGoods(dto.getEmpCardSid(), vo1.getGoodsSid()).getData();
if (null != goods1) {
if (vo1.getNum() <= goods1.getGoodsNumber()) {
i++;
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);
}
if (vo.getGoodsVos().size() == i) {
empCardService.changState(dto.getEmpCardSid(), "3");
baseMapper.insert(card);
for(GoodsVo vo:dto.getGoodsVoList()){
EmpCardGiftGoodsDto dto1=new EmpCardGiftGoodsDto();
dto1.setEmpCardGiftSid(card.getSid());
dto1.setGoodsSid(vo.getGoodsSid());
dto1.setGoodsNumber(vo.getSelect());
empCardGiftGoodsService.save(dto1);
}
record.setSerialNumber(card.getSerialNumber());
record.setEmpCardSid(dto.getEmpCardSid());
record.setCode(dto.getCode());
empCardGrantLogService.updateById(record);
EmpAppletVo vo = empCardService.getEmpCardBySid(empCard.getSid()).getData();
int i = 0;
for (com.yxt.yyth.api.lpkgiftcard.GoodsVo vo1 : vo.getGoodsVos()) {
EmpCardGrantLogVo goods1 = empCardGrantLogService.recordListGoods(dto.getEmpCardSid(), vo1.getGoodsSid()).getData();
if (null != goods1) {
if (vo1.getNum() <= goods1.getGoodsNumber()) {
i++;
}
}
if (vo.getGoodsVos().size() == i) {
empCardService.changState(dto.getEmpCardSid(), "3");
}
}
}
return rb.success();

3
src/main/java/com/yxt/yyth/biz/lpkgiftbag/LpkGiftBagMapper.xml
View File

@@ -21,7 +21,8 @@
boundary,
boundaryPrice,
iconUrl,
isEnable
isEnable,
isGrounding
from lpk_giftbag
<where>
${ew.sqlSegment}

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

@@ -183,7 +183,7 @@ public class LpkGiftBagService extends MybatisBaseService<LpkGiftBagMapper, LpkG
List<LpkGiftBagVo> pagging = baseMapper.giftBagList();
return rb.success().setData(pagging);
}
public ResultBean isGrounding(String sid,String state) {
public ResultBean isGrounding(String sid,String state) {
ResultBean rb = new ResultBean().fail();
LpkGiftBag bag=baseMapper.selectOne(new QueryWrapper<LpkGiftBag>().eq("sid",sid));
bag.setIsGrounding(state);

33
src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardMapper.xml
View File

@@ -182,37 +182,6 @@
LEFT JOIN lpk_goods d ON d.sid = c.goodsSid
GROUP BY
a.sid,
c.goodsSid UNION ALL
SELECT
a.CODE AS CODE,
a.createTime AS createTime,
CASE
WHEN a.CODE IS NOT NULL THEN
'福利卡'
END cardType,
CASE
a.state
WHEN 1 THEN
'未绑卡'
WHEN 2 THEN
'未绑卡'
WHEN 3 THEN
'未预约'
WHEN 4 THEN
'已预约'
WHEN 5 THEN
'已完成'
END stateValue,
a.customerSid AS bind,
a.bindDate AS bindDate,
d.NAME AS goodsName,
c.goodsNumber AS goodsNumber
FROM
emp_card_gift a
LEFT JOIN emp_card_gift_goods c ON c.empCardGiftSid = a.sid
LEFT JOIN lpk_goods d ON d.sid = c.goodsSid
GROUP BY
a.sid,
c.goodsSid;
c.goodsSid
</select>
</mapper>

10
src/main/java/com/yxt/yyth/config/SaTokenGloableException.java
View File

@@ -31,11 +31,13 @@ public class SaTokenGloableException extends GlobalExceptionHandler {
}
@ExceptionHandler({Exception.class})
public ResultBean handleException(Exception e) {
if(e.getMessage().contains("token 无效：")){
L.error(e.getMessage(), e);
return ResultBean.fireFail().setCode("5000").setMsg("系统异常：：" + e.getMessage());
if(null !=e.getMessage()){
if(e.getMessage().contains("token 无效：")){
L.error(e.getMessage(), e);
return ResultBean.fireFail().setCode("5000").setMsg("系统异常：：" + e.getMessage());
}
}
L.error(e.getMessage(), e);
return ResultBean.fireFail().setMsg("系统异常：：" + e.getMessage());
}