luhaojie/agricultural-monitoring-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	fastbee-gateway/fastbee-mq/src/main/java/com/fastbee/mq/redischannel/consumer/DeviceOtherMsgConsumer.java
This commit is contained in:
蒾酒 2025-01-06 15:35:36 +08:00
commit 8572ff63e7
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/service/impl/UserRechargeCardsServiceImpl.java
View File

@ -228,6 +228,16 @@ public class UserRechargeCardsServiceImpl implements IUserRechargeCardsService
// 如果没有找到对应的记录，返回0或者一个错误码
throw new ServiceException("卡号不存在！");
}*/
UserRechargeCards info = userRechargeCardsMapper.selectUserRechargeCardsByCardnumber(String.valueOf(rechargecardUser.getCardnumber()));
if (info == null) {
// 如果没有找到对应的记录，返回0或者一个错误码
//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.setUserId(info.getUserId());
@ -271,7 +281,7 @@ public class UserRechargeCardsServiceImpl implements IUserRechargeCardsService
ngUserRechargeRecords.setSerialNumber(rechargecardUser.getDeviceNumber());
// ngUserRechargeRecords.setDeptId(info.getDeptId());
// 计算新的余额
// BigDecimal newBalance = rechargecardUser.getAmount().add(info.getBalance());
BigDecimal newBalance = rechargecardUser.getAmount().add(info.getBalance());
/* userConsumptionDetails.setCreateTime(DateUtils.getNowDate());
NgUserRechargeRecords ngUserRechargeRecords = NgUserRechargeRecords.builder()
@ -284,9 +294,9 @@ public class UserRechargeCardsServiceImpl implements IUserRechargeCardsService
.areaCode(rechargecardUser.getAreacode())
.build();*/
userRechargeRecordsMapper.insertNgUserRechargeRecords(ngUserRechargeRecords);
// userConsumptionDetailsMapper.insertUserConsumptionDetails(userConsumptionDetails);
// // 更新用户充值卡信息，包括新的余额
// info.setBalance(newBalance);
//userConsumptionDetailsMapper.insertUserConsumptionDetails(userConsumptionDetails);
// 更新用户充值卡信息，包括新的余额
info.setBalance(newBalance);
// info.setUpdateTime(DateUtils.getNowDate());
// info.setAreaCode(String.valueOf(rechargecardUser.getAreacode()));
@ -305,7 +315,7 @@ public class UserRechargeCardsServiceImpl implements IUserRechargeCardsService
//
// param.put("data",data);
// pubMqttClient.publish(1,true,topic, JSONUtil.toJsonStr(param));
// int i = userRechargeCardsMapper.updateUserRechargeCards(info);
int i = userRechargeCardsMapper.updateUserRechargeCards(info);
return 1;
}
}