|
|
@@ -86,8 +86,7 @@ public class LhbOrderRechargeServiceImpl extends MPJBaseServiceImpl<LhbOrderRech
|
|
|
} else {
|
|
|
LhbOrderRecharge orderRecharge = new LhbOrderRecharge();
|
|
|
BeanUtils.copyProperties(billExcelVO, orderRecharge);
|
|
|
- Optional<String> first = ReUtil.findAll(REGEX, billExcelVO.getBillFee(), 0).stream().findFirst();
|
|
|
- first.ifPresent(s -> orderRecharge.setBillFee(NumberUtil.mul(new BigDecimal(s), 100)));
|
|
|
+ orderRecharge.setBillFee(NumberUtil.mul(new BigDecimal(billExcelVO.getBillFee()), 100));
|
|
|
orderRecharge.setIfCode(order.getIfCode());
|
|
|
orderRecharge.setIsvNo(order.getIsvNo());
|
|
|
orderRecharge.setBillMonth(billExcelVO.getBillMonth());
|
|
|
@@ -105,7 +104,7 @@ public class LhbOrderRechargeServiceImpl extends MPJBaseServiceImpl<LhbOrderRech
|
|
|
importAsyncInfo.doneAdd(1);
|
|
|
}
|
|
|
|
|
|
- redisTemplate.opsForValue().set(uuid, JSON.toJSONString(importAsyncInfo), 15, TimeUnit.MINUTES);
|
|
|
+ redisTemplate.opsForValue().set(uuid, JSON.toJSONString(importAsyncInfo), 1, TimeUnit.MINUTES);
|
|
|
}
|
|
|
}
|
|
|
}
|