|
|
@@ -18,8 +18,8 @@ import com.kym.entity.miniapp.delay.DelayChargeOrder;
|
|
|
import com.kym.service.admin.EquipmentInfoService;
|
|
|
import com.kym.service.admin.EquipmentRelationService;
|
|
|
import com.kym.service.enplus.EnPlusService;
|
|
|
-import com.kym.service.miniapp.*;
|
|
|
import com.kym.service.jobs.DelayService;
|
|
|
+import com.kym.service.miniapp.*;
|
|
|
import org.slf4j.Logger;
|
|
|
import org.slf4j.LoggerFactory;
|
|
|
import org.springframework.beans.BeanUtils;
|
|
|
@@ -171,7 +171,7 @@ public class ChargeServiceImpl implements ChargeService {
|
|
|
* @return
|
|
|
*/
|
|
|
@Override
|
|
|
- @DSTransactional(rollbackFor = Exception.class)
|
|
|
+ @DSTransactional(noRollbackFor = java.net.SocketTimeoutException.class)
|
|
|
public Map<String, String> queryStartCharge(Long userId, String connectorId, Long userRechargeRightsId, Boolean isBooking, LocalDateTime startTime, LocalDateTime endTime) {
|
|
|
if (isBooking) {
|
|
|
// 预约时间不能超过未来24H
|
skyline