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:
蒾酒 2024-12-21 09:27:47 +08:00
parent e56f026591
commit da62663bb0
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/domain/dto/RechargecardUser.java
View File

@ -6,10 +6,10 @@ import java.math.BigDecimal;
@Data @Data
public class RechargecardUser { public class RechargecardUser {
private Integer cardNumber;//卡号 private Integer cardnumber;//卡号
private BigDecimal amount;//充值金额 private BigDecimal amount;//充值金额
private Integer type;//充值方式 private Integer type;//充值方式
private Integer areaCode;//区域码 private Integer areacode;//区域码
private String deviceNumber;//设备码 private String deviceNumber;//设备码
private Integer water;//充值水量 private Integer water;//充值水量
} }

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

@ -141,7 +141,7 @@ public class UserRechargeCardsServiceImpl implements IUserRechargeCardsService
UserConsumptionDetails userConsumptionDetails=new UserConsumptionDetails(); UserConsumptionDetails userConsumptionDetails=new UserConsumptionDetails();
// userConsumptionDetails.setUserId(info.getUserId()); // userConsumptionDetails.setUserId(info.getUserId());
// userConsumptionDetails.setCardNumber(info.getCardNumber()); // 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());
userConsumptionDetails.setBillingDate(DateUtils.getNowDate()); userConsumptionDetails.setBillingDate(DateUtils.getNowDate());
@ -149,7 +149,7 @@ public class UserRechargeCardsServiceImpl implements IUserRechargeCardsService
userConsumptionDetails.setPaymentMethod(rechargecardUser.getType()); userConsumptionDetails.setPaymentMethod(rechargecardUser.getType());
userConsumptionDetails.setPaymentTime(DateUtils.getNowDate()); userConsumptionDetails.setPaymentTime(DateUtils.getNowDate());
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 userConsumptionDetails = UserConsumptionDetails.builder() /*UserConsumptionDetails userConsumptionDetails = UserConsumptionDetails.builder()
.userId(info.getUserId()) .userId(info.getUserId())
@ -167,15 +167,15 @@ public class UserRechargeCardsServiceImpl implements IUserRechargeCardsService
// ngUserRechargeRecords.setUserId(info.getUserId()); // ngUserRechargeRecords.setUserId(info.getUserId());
// ngUserRechargeRecords.setUserName(info.getUserName()); // ngUserRechargeRecords.setUserName(info.getUserName());
// ngUserRechargeRecords.setCardNumber(info.getCardNumber()); // 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());
ngUserRechargeRecords.setAmount(rechargecardUser.getAmount()); ngUserRechargeRecords.setAmount(rechargecardUser.getAmount());
// ngUserRechargeRecords.setBalance(info.getBalance()); // ngUserRechargeRecords.setBalance(info.getBalance());
ngUserRechargeRecords.setBalance(rechargecardUser.getAmount()); ngUserRechargeRecords.setBalance(rechargecardUser.getAmount());
ngUserRechargeRecords.setRechargeTime(DateUtils.getNowDate()); ngUserRechargeRecords.setRechargeTime(DateUtils.getNowDate());
ngUserRechargeRecords.setStatus(0); ngUserRechargeRecords.setStatus(0);
ngUserRechargeRecords.setAreaCode(String.valueOf(rechargecardUser.getAreaCode())); ngUserRechargeRecords.setAreaCode(String.valueOf(rechargecardUser.getAreacode()));
// 计算新的余额 // 计算新的余额
// BigDecimal newBalance = rechargecardUser.getAmount().add(info.getBalance()); // BigDecimal newBalance = rechargecardUser.getAmount().add(info.getBalance());
@ -204,8 +204,8 @@ public class UserRechargeCardsServiceImpl implements IUserRechargeCardsService
param.put("cmd",1000); param.put("cmd",1000);
Map<String,Object> data = new HashMap<>(); Map<String,Object> data = new HashMap<>();
data.put("orderNum", ngUserRechargeRecords.getId()); data.put("orderNum", ngUserRechargeRecords.getId());
data.put("cardNum",rechargecardUser.getCardNumber()); data.put("cardNum",rechargecardUser.getCardnumber());
data.put("areaCode",rechargecardUser.getAreaCode()); data.put("areaCode",rechargecardUser.getAreacode());
data.put("investBalance",rechargecardUser.getAmount().doubleValue()); data.put("investBalance",rechargecardUser.getAmount().doubleValue());
data.put("investWater",rechargecardUser.getWater()); data.put("investWater",rechargecardUser.getWater());