|
|
@@ -168,16 +168,6 @@ public class CardBusiness {
|
|
|
|
|
|
public R<PtCardVo> writeCardSuccess(PtCardBo cardBo) throws InterruptedException {
|
|
|
PtCardBo queryBo = BeanUtil.copyProperties(cardBo,PtCardBo.class);
|
|
|
- //if (cardBo.getCardNo() > 0) {
|
|
|
- // queryBo.setCardNo(cardBo.getCardNo());
|
|
|
- //}
|
|
|
- //if (cardBo.getFactoryId() > 0) {
|
|
|
- // queryBo.setFactoryId(cardBo.getFactoryId());
|
|
|
- //}
|
|
|
- //if (cardBo.getCardId() > 0) {
|
|
|
- // queryBo.setCardId(cardBo.getCardId());
|
|
|
- //}
|
|
|
-
|
|
|
// 补卡和换卡时需要注销旧卡
|
|
|
if (ObjectUtil.equals(cardBo.getOperateType(), CardOperateEnum.REISSUE)
|
|
|
|| ObjectUtil.equals(cardBo.getOperateType(), CardOperateEnum.CHANGE)) {
|
|
|
@@ -199,8 +189,7 @@ public class CardBusiness {
|
|
|
}
|
|
|
Thread.sleep(2000);
|
|
|
queryBo.setChangeTime(DateUtil.date());
|
|
|
- ptCardService.saveOrUpdate(queryBo);
|
|
|
- PtCardVo cardVo = ptCardService.selectOneByBo(queryBo);
|
|
|
+ PtCardVo cardVo = ptCardService.saveOrUpdate(queryBo);
|
|
|
return R.ok(cardVo);
|
|
|
}
|
|
|
|