Commit a953f10f authored by liaoanyuan's avatar liaoanyuan

管理端充值卡生成卡片事务注解修改

parent 113dff68
...@@ -9,6 +9,7 @@ import cn.wisenergy.model.app.RefillCard; ...@@ -9,6 +9,7 @@ import cn.wisenergy.model.app.RefillCard;
import cn.wisenergy.model.dto.RefillCardDto; import cn.wisenergy.model.dto.RefillCardDto;
import cn.wisenergy.model.vo.UserQueryVo; import cn.wisenergy.model.vo.UserQueryVo;
import cn.wisenergy.service.app.RefillCardService; import cn.wisenergy.service.app.RefillCardService;
import cn.wisenergy.service.common.RefillCardManager;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
...@@ -31,9 +32,11 @@ public class RefillCardServiceImpl implements RefillCardService { ...@@ -31,9 +32,11 @@ public class RefillCardServiceImpl implements RefillCardService {
@Autowired @Autowired
private CardMapper cardMapper; private CardMapper cardMapper;
@Autowired
private RefillCardManager refillCardManager;
@Override @Override
@Transactional @Transactional(rollbackFor = Exception.class)
public R<Boolean> add(RefillCard refillCard) { public R<Boolean> add(RefillCard refillCard) {
log.info("RefillCardServiceImpl[].add[].input.param:refillCard:{}"+refillCard); log.info("RefillCardServiceImpl[].add[].input.param:refillCard:{}"+refillCard);
...@@ -70,7 +73,7 @@ public class RefillCardServiceImpl implements RefillCardService { ...@@ -70,7 +73,7 @@ public class RefillCardServiceImpl implements RefillCardService {
@Override @Override
public R<PageInfo<RefillCardDto>> getList(Integer pageNum, Integer pageSize) { public R<PageInfo<RefillCardDto>> getList(Integer pageNum, Integer pageSize) {
log.info("RefillCardServiceImpl[].getList[].input.param:pageNum,pageSize"+pageNum,pageSize); log.info("RefillCardServiceImpl[].getList[].input.param:pageNum,pageSize"+pageNum+ pageSize);
if (null == pageSize || pageSize == 0) { if (null == pageSize || pageSize == 0) {
pageSize = 10; pageSize = 10;
} }
...@@ -101,7 +104,6 @@ public class RefillCardServiceImpl implements RefillCardService { ...@@ -101,7 +104,6 @@ public class RefillCardServiceImpl implements RefillCardService {
} }
@Override @Override
@Transactional
public R<Boolean> createCard(Integer id) { public R<Boolean> createCard(Integer id) {
log.info("RefillCardServiceImpl[].createCard[].input.param:id"+id); log.info("RefillCardServiceImpl[].createCard[].input.param:id"+id);
if (null==id||id==0) { if (null==id||id==0) {
...@@ -114,32 +116,7 @@ public class RefillCardServiceImpl implements RefillCardService { ...@@ -114,32 +116,7 @@ public class RefillCardServiceImpl implements RefillCardService {
return R.error("该充值卡不存在"); return R.error("该充值卡不存在");
} }
//获取充值卡的卡数,并生成卡片 return refillCardManager.addCardMannger(byId);
ArrayList<CardInfo> cardInfos = new ArrayList<>();
//子卡添加
for (int i = 0; i < byId.getCardNumber(); i++) {
CardInfo cardInfo = new CardInfo();
cardInfo.setBatchNumber(byId.getBatchNumber());
cardInfo.setIsDelete(0);
cardInfo.setMoney("10");
cardInfo.setStatus(0);
cardInfo.setLimit(3);
cardInfo.setSecretKey(SecretkeyUtil.getSecretkey());
cardInfo.setCardNumber(CardNumberUtil.cardNumber());
cardInfos.add(cardInfo);
}
int add1 = cardMapper.add(cardInfos);
if (add1==0) {
return R.ok(1,false);
}
int isMakeCard = refillCardMapper.setIsMakeCard(id);
if (isMakeCard==0) {
return R.ok(1,false);
}
return R.ok(0,true);
} }
} }
package cn.wisenergy.service.common;
import cn.wisenergy.common.utils.CardNumberUtil;
import cn.wisenergy.common.utils.R;
import cn.wisenergy.common.utils.SecretkeyUtil;
import cn.wisenergy.mapper.CardMapper;
import cn.wisenergy.mapper.RefillCardMapper;
import cn.wisenergy.model.app.CardInfo;
import cn.wisenergy.model.app.RefillCard;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
@Component
@Slf4j
public class RefillCardManager {
@Autowired
RefillCardMapper refillCardMapper;
@Autowired
private CardMapper cardMapper;
@Transactional(rollbackFor = Exception.class)
public R<Boolean> addCardMannger(RefillCard byId){
//获取充值卡的卡数,并生成卡片
ArrayList<CardInfo> cardInfos = new ArrayList<>();
//子卡添加
for (int i = 0; i < byId.getCardNumber(); i++) {
CardInfo cardInfo = new CardInfo();
cardInfo.setBatchNumber(byId.getBatchNumber());
cardInfo.setIsDelete(0);
cardInfo.setMoney("10");
cardInfo.setStatus(0);
cardInfo.setLimit(3);
cardInfo.setSecretKey(SecretkeyUtil.getSecretkey());
cardInfo.setCardNumber(CardNumberUtil.cardNumber());
cardInfos.add(cardInfo);
}
int add1 = cardMapper.add(cardInfos);
if (add1==0) {
return R.ok(1,false);
}
int isMakeCard = refillCardMapper.setIsMakeCard(byId.getId());
if (isMakeCard==0) {
return R.ok(1,false);
}
return R.ok(0,true);
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment