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

修改充值查询报文处理，以及充值机充值逻辑

Browse Source
This commit is contained in:
蒾酒
2025-01-06 12:20:22 +08:00
parent 745bde18ec
commit 882190f4e9
2 changed files with 84 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -223,38 +223,26 @@ public class UserRechargeCardsServiceImpl implements IUserRechargeCardsService
public int updateUserRecharge(RechargecardUser rechargecardUser){
// 根据id查询用户充值卡信息
UserRechargeCards info = userRechargeCardsMapper.selectUserRechargeCardsByCardnumber(String.valueOf(rechargecardUser.getCardnumber()));
if (info == null) {
// 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();
if(info.getUserId()!=null)
{
userConsumptionDetails.setUserId(info.getUserId());
}
//userConsumptionDetails.setCardNumber(info.getCardNumber());
userConsumptionDetails.setCardNumber(String.valueOf(rechargecardUser.getCardnumber()));
userConsumptionDetails.setBillingType(0);
userConsumptionDetails.setAmountDue(rechargecardUser.getAmount());
userConsumptionDetails.setBillingDate(DateUtils.getNowDate());
userConsumptionDetails.setPaymentStatus(2);
userConsumptionDetails.setPaymentMethod(rechargecardUser.getType());
userConsumptionDetails.setPaymentTime(DateUtils.getNowDate());
userConsumptionDetails.setStatus(0);
userConsumptionDetails.setAreaCode(String.valueOf(rechargecardUser.getAreacode()));
userConsumptionDetails.setCreateTime(DateUtils.getNowDate());
if(info.getDeptId()!=null)
{
userConsumptionDetails.setDeptId(info.getDeptId());
}
throw new ServiceException("卡号不存在！");
}*/
// UserConsumptionDetails userConsumptionDetails=new UserConsumptionDetails();
// userConsumptionDetails.setUserId(info.getUserId());
// userConsumptionDetails.setCardNumber(info.getCardNumber());
// userConsumptionDetails.setCardNumber(String.valueOf(rechargecardUser.getCardnumber()));
// userConsumptionDetails.setBillingType(0);
// userConsumptionDetails.setAmountDue(rechargecardUser.getAmount());
// userConsumptionDetails.setBillingDate(DateUtils.getNowDate());
// userConsumptionDetails.setPaymentStatus(2);
// userConsumptionDetails.setPaymentMethod(rechargecardUser.getType());
// userConsumptionDetails.setPaymentTime(DateUtils.getNowDate());
// userConsumptionDetails.setStatus(0);
// userConsumptionDetails.setAreaCode(String.valueOf(rechargecardUser.getAreacode()));
// userConsumptionDetails.setCreateTime(DateUtils.getNowDate());
// userConsumptionDetails.setDeptId(info.getDeptId());
/*UserConsumptionDetails userConsumptionDetails = UserConsumptionDetails.builder()
.userId(info.getUserId())
.cardNumber(info.getCardNumber())
@ -268,32 +256,22 @@ public class UserRechargeCardsServiceImpl implements IUserRechargeCardsService
.areaCode(rechargecardUser.getAreacode()) // 假设 getAreacode() 方法返回区域代码
.build();*/
NgUserRechargeRecords ngUserRechargeRecords=new NgUserRechargeRecords();
if(info.getUserId()!=null)
{
ngUserRechargeRecords.setUserId(info.getUserId());
}
if(info.getUserName()!=null)
{
ngUserRechargeRecords.setUserName(info.getUserName());
}
/* ngUserRechargeRecords.setCardNumber(info.getCardNumber());*/
// ngUserRechargeRecords.setUserId(info.getUserId());
// ngUserRechargeRecords.setUserName(info.getUserName());
// ngUserRechargeRecords.setCardNumber(info.getCardNumber());
ngUserRechargeRecords.setCardNumber(String.valueOf(rechargecardUser.getCardnumber()));
ngUserRechargeRecords.setAreaCode(String.valueOf(rechargecardUser.getAreacode()));
ngUserRechargeRecords.setType(rechargecardUser.getType());
ngUserRechargeRecords.setAmount(rechargecardUser.getAmount());
ngUserRechargeRecords.setBalance(info.getBalance());
// ngUserRechargeRecords.setBalance(info.getBalance());
ngUserRechargeRecords.setBalance(rechargecardUser.getAmount());
ngUserRechargeRecords.setRechargeTime(DateUtils.getNowDate());
ngUserRechargeRecords.setStatus(0);
ngUserRechargeRecords.setStatus(1);
ngUserRechargeRecords.setAreaCode(String.valueOf(rechargecardUser.getAreacode()));
ngUserRechargeRecords.setSerialNumber(rechargecardUser.getDeviceNumber());
if(info.getDeptId()!=null)
{
ngUserRechargeRecords.setDeptId(info.getDeptId());
}
// 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()
@ -306,28 +284,28 @@ public class UserRechargeCardsServiceImpl implements IUserRechargeCardsService
.areaCode(rechargecardUser.getAreacode())
.build();*/
userRechargeRecordsMapper.insertNgUserRechargeRecords(ngUserRechargeRecords);
userConsumptionDetailsMapper.insertUserConsumptionDetails(userConsumptionDetails);
// 更新用户充值卡信息，包括新的余额
info.setBalance(newBalance);
info.setUpdateTime(DateUtils.getNowDate());
info.setAreaCode(String.valueOf(rechargecardUser.getAreacode()));
// userConsumptionDetailsMapper.insertUserConsumptionDetails(userConsumptionDetails);
// // 更新用户充值卡信息，包括新的余额
// info.setBalance(newBalance);
// info.setUpdateTime(DateUtils.getNowDate());
// info.setAreaCode(String.valueOf(rechargecardUser.getAreacode()));
//构建主题
String topic ="hzlink/147/"+rechargecardUser.getDeviceNumber()+"/cmd/down";
//构建消息
Map<String,Object> param = new HashMap<>();
//远程阀控
param.put("cmd",1000);
Map<String,Object> data = new HashMap<>();
data.put("orderNum", ngUserRechargeRecords.getId());
data.put("cardNum",rechargecardUser.getCardnumber());
data.put("areaCode",rechargecardUser.getAreacode());
data.put("investBalance",rechargecardUser.getAmount().doubleValue()*100);
data.put("investWater",rechargecardUser.getWater()*100);
param.put("data",data);
pubMqttClient.publish(1,true,topic, JSONUtil.toJsonStr(param));
int i = userRechargeCardsMapper.updateUserRechargeCards(info);
// //构建主题
// String topic ="hzlink/147/"+rechargecardUser.getDeviceNumber()+"/cmd/down";
// //构建消息
// Map<String,Object> param = new HashMap<>();
// //远程阀控
// param.put("cmd",1000);
// Map<String,Object> data = new HashMap<>();
// data.put("orderNum", ngUserRechargeRecords.getId());
// data.put("cardNum",rechargecardUser.getCardnumber());
// data.put("areaCode",rechargecardUser.getAreacode());
// data.put("investBalance",rechargecardUser.getAmount().doubleValue()*100);
// data.put("investWater",rechargecardUser.getWater()*100);
//
// param.put("data",data);
// pubMqttClient.publish(1,true,topic, JSONUtil.toJsonStr(param));
// int i = userRechargeCardsMapper.updateUserRechargeCards(info);
return 1;
}
}