|
|
|
@@ -11,6 +11,7 @@ import com.iformall.enums.EnumCarVendor; |
|
|
|
import com.iformall.enums.EnumCouponSendSendType; |
|
|
|
import com.iformall.enums.EnumETCPCode; |
|
|
|
import com.iformall.service.*; |
|
|
|
import com.iformall.utils.DateUtils; |
|
|
|
import com.iformall.utils.ETCPUtil; |
|
|
|
import org.apache.commons.collections.CollectionUtils; |
|
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
|
@@ -439,19 +440,24 @@ public class WxCarCallBackController extends BaseController { |
|
|
|
|
|
|
|
WxCarPayRecord query = new WxCarPayRecord(); |
|
|
|
query.setSynId(orderId); |
|
|
|
query.setFee(fee); |
|
|
|
if(feeTime != null) { |
|
|
|
query.setFeeTime(feeTime); |
|
|
|
} |
|
|
|
// 缴费时间在15分钟以内,更新之前的数据, ETCP会把之前的缴费自动退款 |
|
|
|
PageInfo<WxCarPayRecord> page = wxCarPayRecordService.findCarPayListByPage(query,1,2); |
|
|
|
if(page != null && page.getList().size() > 0){ |
|
|
|
|
|
|
|
if(page.getList().size() >= 2){ |
|
|
|
wxCarPayRecordService.saveOrUpdate(record); |
|
|
|
} else { |
|
|
|
WxCarPayRecord r = page.getList().get(0); |
|
|
|
record.setId(r.getId()); |
|
|
|
wxCarPayRecordService.saveOrUpdate(record); |
|
|
|
if(r.getFeeTime() == null) { |
|
|
|
// 无缴费信息, 更新 |
|
|
|
record.setId(r.getId()); |
|
|
|
wxCarPayRecordService.saveOrUpdate(record); |
|
|
|
} else { |
|
|
|
// 缴费时间在15分钟以内,更新之前的数据, ETCP会把之前的缴费自动退款 |
|
|
|
if(DateUtils.isInDate15Mins(feeTime, r.getFeeTime())) { |
|
|
|
record.setId(r.getId()); |
|
|
|
} |
|
|
|
wxCarPayRecordService.saveOrUpdate(record); |
|
|
|
} |
|
|
|
} |
|
|
|
} else { |
|
|
|
wxCarPayRecordService.saveOrUpdate(record); |
|
|
|
|