|
|
@@ -458,16 +458,16 @@ public class ChargeServiceImpl implements ChargeService {
|
|
|
// 查询redis缓存,有数据则更新chargeOrder再返回
|
|
|
var orderDataStr = redisTemplate.opsForHash().get(RedisKeys.CHARGE_ORDER_EQUIP_CHARGE_STATUS, chargeOrder.getStartChargeSeq());
|
|
|
if (CommUtil.isNotEmptyAndNull(orderDataStr)) {
|
|
|
- var data = JSONObject.parseObject(orderDataStr.toString());
|
|
|
+ var data = JSONObject.parseObject(orderDataStr.toString(), ChargeOrder.class);
|
|
|
// 更新订单信息
|
|
|
- chargeOrder.setSoc(data.getDoubleValue("Soc"));
|
|
|
- chargeOrder.setTotalPower(data.getDoubleValue("TotalPower"));
|
|
|
- chargeOrder.setTotalMoney((data.getBigDecimal("TotalMoney").multiply(BigDecimal.valueOf(100))).intValue());
|
|
|
- chargeOrder.setElecMoney((data.getBigDecimal("ElecMoney").multiply(BigDecimal.valueOf(100))).intValue());
|
|
|
- chargeOrder.setServiceMoney((data.getBigDecimal("SeviceMoney").multiply(BigDecimal.valueOf(100))).intValue()); // 这里文档service单词错误,按文档填写
|
|
|
- chargeOrder.setSumPeriod(data.getIntValue("SumPeriod"));
|
|
|
- chargeOrder.setChargeDetail(data.getString("ChargeDetails"));
|
|
|
- chargeOrder.setChargeStatus(data.getIntValue("StartChargeSeqStat"));
|
|
|
+ chargeOrder.setSoc(data.getSoc());
|
|
|
+ chargeOrder.setTotalPower(data.getTotalPower());
|
|
|
+ chargeOrder.setTotalMoney((data.getTotalMoney()));
|
|
|
+ chargeOrder.setElecMoney((data.getElecMoney()));
|
|
|
+ chargeOrder.setServiceMoney((data.getServiceMoney()));
|
|
|
+ chargeOrder.setSumPeriod(data.getSumPeriod());
|
|
|
+ chargeOrder.setChargeDetail(data.getChargeDetail());
|
|
|
+ chargeOrder.setChargeStatus(data.getChargeStatus());
|
|
|
}
|
|
|
return chargeOrder;
|
|
|
} else {
|