diff --git a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/impl/XhpcCardServiceImpl.java b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/impl/XhpcCardServiceImpl.java index 5525f495..d1d3e664 100644 --- a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/impl/XhpcCardServiceImpl.java +++ b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/impl/XhpcCardServiceImpl.java @@ -520,26 +520,8 @@ public class XhpcCardServiceImpl implements IXhpcCardService { tIccardLog.setOperatorid(Math.toIntExact(tokenService.getLoginUser().getSysUser().getUserId())); tIccardLog.setCreatetime(new Date()); CardLogInfo cardLogInfo = new CardLogInfo(); - /** - * { - * "cardInfo": { - * "cardID": "A721DCD7", - * "cardNo": "2020101304", - * "cardType": 0, - * "password": null, - * "userIndex": 0, - * "corpNo": "100002", - * "cashPledge": 0, - * "balance": 0, - * "status": 3, - * "prepay": 0 - * }, - * "operatorId": 1044, - * "operate": 5 - * } - */ cardLogInfo.setOperate(5); - cardLogInfo.setOperatorId(tokenService.getLoginUser().getSysUser().getOperatorId()); + cardLogInfo.setOperatorId(tokenService.getLoginUser().getSysUser().getUserId()); CardLogInfo.CardInfoDTO cardInfoDTO = new CardLogInfo.CardInfoDTO(); cardInfoDTO.setCardID(tIccardInfo.getCardid()); cardInfoDTO.setCardNo(tIccardInfo.getCardno()); @@ -581,10 +563,17 @@ public class XhpcCardServiceImpl implements IXhpcCardService { dataDTO.setCardSerialNumber(tIccardLog.getUniqueid()); dataDTO.setOperate(Integer.valueOf(tIccardLog.getOperate())); dataDTO.setCashPledge(Long.valueOf(cardInfo.getCashPledge())); - dataDTO.setBalance(Long.valueOf(cardInfo.getBalance())); + Integer balance = cardInfo.getBalance(); + if (balance != null) { + dataDTO.setBalance(Long.valueOf(balance)); + } dataDTO.setOperateTime(MyDateUtil.parseDateToStr(tIccardLog.getCreatetime())); XhpcOperator operator2 = xhpcOperatorMapper.selectByPrimaryKey(cardLogInfo.getOperatorId()); - dataDTO.setOperatorName(operator2.getName()); + if (operator2 != null) { + dataDTO.setOperatorName(operator2.getName()); + } else { + dataDTO.setOperatorName(null); + } operateCardsLogResponse.getData().add(dataDTO); } return R.ok(operateCardsLogResponse);