|
@@ -181,11 +181,7 @@ public class TbFeeDetailsService extends ServiceImpl<TbFeeDetailsMapper, TbFeeDe
|
|
|
|
|
|
public void chargeParkFee(List<PriceBO> cars, String transactionId, String outTradeNo, Date now) {
|
|
|
log.info("进入计算停车费:{}", JSONUtil.toJsonStr(cars));
|
|
|
- List<TbFeeDetails> transList = this.findByTransactionId(transactionId);
|
|
|
- if(transList.size() > 0){
|
|
|
- log.error("========收费明细已生成==========:{}", transactionId);
|
|
|
- return;
|
|
|
- }
|
|
|
+
|
|
|
String payDay = DateUtil.format(now, "yyyy-MM-dd");
|
|
|
for (PriceBO bo1 : cars) {
|
|
|
if(bo1.getP().compareTo(BigDecimal.valueOf(0)) == 0){
|
|
@@ -253,11 +249,7 @@ public class TbFeeDetailsService extends ServiceImpl<TbFeeDetailsMapper, TbFeeDe
|
|
|
.setBusinessCarNo(car.getNo());
|
|
|
}
|
|
|
public void chargeBusinessFee(List<TbBusinessItem> items, String transactionId, String outTradeNo, Date now) {
|
|
|
- List<TbFeeDetails> transList = this.findByTransactionId(transactionId);
|
|
|
- if(transList.size() > 0){
|
|
|
- log.error("========收费明细已生成==========:{}", transactionId);
|
|
|
- return;
|
|
|
- }
|
|
|
+
|
|
|
String nowStr = DateUtil.format(now, "yyyy-MM-dd HH:mm:ss");
|
|
|
String toDay = DateUtil.format(now, "yyyy-MM-dd");
|
|
|
for (TbBusinessItem item : items) {
|