修改充值机充值,当卡号不存在时新建卡信息
This commit is contained in:
parent
92f5863df3
commit
745bde18ec
@ -224,14 +224,22 @@ public class UserRechargeCardsServiceImpl implements IUserRechargeCardsService
|
|||||||
|
|
||||||
// 根据id查询用户充值卡信息
|
// 根据id查询用户充值卡信息
|
||||||
UserRechargeCards info = userRechargeCardsMapper.selectUserRechargeCardsByCardnumber(String.valueOf(rechargecardUser.getCardnumber()));
|
UserRechargeCards info = userRechargeCardsMapper.selectUserRechargeCardsByCardnumber(String.valueOf(rechargecardUser.getCardnumber()));
|
||||||
/*if (info == null) {
|
if (info == null) {
|
||||||
// 如果没有找到对应的记录,返回0或者一个错误码
|
// 如果没有找到对应的记录,返回0或者一个错误码
|
||||||
throw new ServiceException("卡号不存在!");
|
//throw new ServiceException("卡号不存在!");
|
||||||
}*/
|
UserRechargeCards userRechargeCards=new UserRechargeCards();
|
||||||
|
userRechargeCards.setAreaCode(String.valueOf(rechargecardUser.getAreacode()));
|
||||||
|
userRechargeCards.setCardNumber(String.valueOf(rechargecardUser.getCardnumber()));
|
||||||
|
userRechargeCardsMapper.insertUserRechargeCards(userRechargeCards);//如果没有该卡号则新建一条
|
||||||
|
info = userRechargeCardsMapper.selectUserRechargeCardsByCardnumber(String.valueOf(rechargecardUser.getCardnumber()));
|
||||||
|
}
|
||||||
|
|
||||||
UserConsumptionDetails userConsumptionDetails=new UserConsumptionDetails();
|
UserConsumptionDetails userConsumptionDetails=new UserConsumptionDetails();
|
||||||
userConsumptionDetails.setUserId(info.getUserId());
|
if(info.getUserId()!=null)
|
||||||
userConsumptionDetails.setCardNumber(info.getCardNumber());
|
{
|
||||||
|
userConsumptionDetails.setUserId(info.getUserId());
|
||||||
|
}
|
||||||
|
//userConsumptionDetails.setCardNumber(info.getCardNumber());
|
||||||
userConsumptionDetails.setCardNumber(String.valueOf(rechargecardUser.getCardnumber()));
|
userConsumptionDetails.setCardNumber(String.valueOf(rechargecardUser.getCardnumber()));
|
||||||
userConsumptionDetails.setBillingType(0);
|
userConsumptionDetails.setBillingType(0);
|
||||||
userConsumptionDetails.setAmountDue(rechargecardUser.getAmount());
|
userConsumptionDetails.setAmountDue(rechargecardUser.getAmount());
|
||||||
@ -242,7 +250,11 @@ public class UserRechargeCardsServiceImpl implements IUserRechargeCardsService
|
|||||||
userConsumptionDetails.setStatus(0);
|
userConsumptionDetails.setStatus(0);
|
||||||
userConsumptionDetails.setAreaCode(String.valueOf(rechargecardUser.getAreacode()));
|
userConsumptionDetails.setAreaCode(String.valueOf(rechargecardUser.getAreacode()));
|
||||||
userConsumptionDetails.setCreateTime(DateUtils.getNowDate());
|
userConsumptionDetails.setCreateTime(DateUtils.getNowDate());
|
||||||
userConsumptionDetails.setDeptId(info.getDeptId());
|
if(info.getDeptId()!=null)
|
||||||
|
{
|
||||||
|
userConsumptionDetails.setDeptId(info.getDeptId());
|
||||||
|
}
|
||||||
|
|
||||||
/*UserConsumptionDetails userConsumptionDetails = UserConsumptionDetails.builder()
|
/*UserConsumptionDetails userConsumptionDetails = UserConsumptionDetails.builder()
|
||||||
.userId(info.getUserId())
|
.userId(info.getUserId())
|
||||||
.cardNumber(info.getCardNumber())
|
.cardNumber(info.getCardNumber())
|
||||||
@ -256,9 +268,15 @@ public class UserRechargeCardsServiceImpl implements IUserRechargeCardsService
|
|||||||
.areaCode(rechargecardUser.getAreacode()) // 假设 getAreacode() 方法返回区域代码
|
.areaCode(rechargecardUser.getAreacode()) // 假设 getAreacode() 方法返回区域代码
|
||||||
.build();*/
|
.build();*/
|
||||||
NgUserRechargeRecords ngUserRechargeRecords=new NgUserRechargeRecords();
|
NgUserRechargeRecords ngUserRechargeRecords=new NgUserRechargeRecords();
|
||||||
ngUserRechargeRecords.setUserId(info.getUserId());
|
if(info.getUserId()!=null)
|
||||||
ngUserRechargeRecords.setUserName(info.getUserName());
|
{
|
||||||
ngUserRechargeRecords.setCardNumber(info.getCardNumber());
|
ngUserRechargeRecords.setUserId(info.getUserId());
|
||||||
|
}
|
||||||
|
if(info.getUserName()!=null)
|
||||||
|
{
|
||||||
|
ngUserRechargeRecords.setUserName(info.getUserName());
|
||||||
|
}
|
||||||
|
/* ngUserRechargeRecords.setCardNumber(info.getCardNumber());*/
|
||||||
ngUserRechargeRecords.setCardNumber(String.valueOf(rechargecardUser.getCardnumber()));
|
ngUserRechargeRecords.setCardNumber(String.valueOf(rechargecardUser.getCardnumber()));
|
||||||
ngUserRechargeRecords.setAreaCode(String.valueOf(rechargecardUser.getAreacode()));
|
ngUserRechargeRecords.setAreaCode(String.valueOf(rechargecardUser.getAreacode()));
|
||||||
ngUserRechargeRecords.setType(rechargecardUser.getType());
|
ngUserRechargeRecords.setType(rechargecardUser.getType());
|
||||||
@ -269,7 +287,11 @@ public class UserRechargeCardsServiceImpl implements IUserRechargeCardsService
|
|||||||
ngUserRechargeRecords.setStatus(0);
|
ngUserRechargeRecords.setStatus(0);
|
||||||
ngUserRechargeRecords.setAreaCode(String.valueOf(rechargecardUser.getAreacode()));
|
ngUserRechargeRecords.setAreaCode(String.valueOf(rechargecardUser.getAreacode()));
|
||||||
ngUserRechargeRecords.setSerialNumber(rechargecardUser.getDeviceNumber());
|
ngUserRechargeRecords.setSerialNumber(rechargecardUser.getDeviceNumber());
|
||||||
ngUserRechargeRecords.setDeptId(info.getDeptId());
|
if(info.getDeptId()!=null)
|
||||||
|
{
|
||||||
|
ngUserRechargeRecords.setDeptId(info.getDeptId());
|
||||||
|
}
|
||||||
|
|
||||||
// 计算新的余额
|
// 计算新的余额
|
||||||
BigDecimal newBalance = rechargecardUser.getAmount().add(info.getBalance());
|
BigDecimal newBalance = rechargecardUser.getAmount().add(info.getBalance());
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user