|
@@ -21,6 +21,7 @@ import com.xy.utils.*;
|
|
import io.swagger.annotations.Api;
|
|
import io.swagger.annotations.Api;
|
|
import io.swagger.annotations.ApiOperation;
|
|
import io.swagger.annotations.ApiOperation;
|
|
import lombok.AllArgsConstructor;
|
|
import lombok.AllArgsConstructor;
|
|
|
|
+import lombok.extern.slf4j.Slf4j;
|
|
import org.springframework.context.annotation.Lazy;
|
|
import org.springframework.context.annotation.Lazy;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.validation.annotation.Validated;
|
|
import org.springframework.validation.annotation.Validated;
|
|
@@ -44,6 +45,7 @@ import static com.xy.utils.PlusBeans.toPageBean;
|
|
* @author lijin
|
|
* @author lijin
|
|
* @since 2023-04-14
|
|
* @since 2023-04-14
|
|
*/
|
|
*/
|
|
|
|
+@Slf4j
|
|
@Service
|
|
@Service
|
|
@Api(tags = "设备计费表")
|
|
@Api(tags = "设备计费表")
|
|
@AllArgsConstructor(onConstructor_ = @Lazy)
|
|
@AllArgsConstructor(onConstructor_ = @Lazy)
|
|
@@ -111,11 +113,11 @@ public class DeviceChargingServiceImpl extends ServiceImpl<DeviceChargingMapper,
|
|
.setTimeout(now)
|
|
.setTimeout(now)
|
|
.setCreateTime(now)
|
|
.setCreateTime(now)
|
|
);
|
|
);
|
|
- throw new CommRuntimeException("管理费欠费");
|
|
|
|
|
|
+ throw new CommRuntimeException(R.Enum.CHARGING.getCode(), R.Enum.CHARGING.getMsg());
|
|
}
|
|
}
|
|
int contrast = DataTime.stringContrast(DataTime.toString(deviceCharging.getTimeout()), DataTime.toString(now));
|
|
int contrast = DataTime.stringContrast(DataTime.toString(deviceCharging.getTimeout()), DataTime.toString(now));
|
|
if (deviceCharging.getChargingX() == 0 && contrast <= 0) {
|
|
if (deviceCharging.getChargingX() == 0 && contrast <= 0) {
|
|
- throw new CommRuntimeException("管理费欠费");
|
|
|
|
|
|
+ throw new CommRuntimeException(R.Enum.CHARGING.getCode(), R.Enum.CHARGING.getMsg());
|
|
}
|
|
}
|
|
return R.ok();
|
|
return R.ok();
|
|
}
|
|
}
|