Commit 769482ef by 李东升

去除无用

parent 1793e098
...@@ -25,7 +25,7 @@ import org.springframework.web.bind.annotation.RestController; ...@@ -25,7 +25,7 @@ import org.springframework.web.bind.annotation.RestController;
* @updateData: 2020-04-17 11:41 * @updateData: 2020-04-17 11:41
* @updateContent: 请求controller * @updateContent: 请求controller
* @Version: 1.0.0 * @Version: 1.0.0
* <p>
* ************************************************ * ************************************************
* Copyright @ 李东升 2020. All rights reserved * Copyright @ 李东升 2020. All rights reserved
* ************************************************ * ************************************************
......
...@@ -60,13 +60,16 @@ public class ThsIntervalPayableMoney implements ThsRequestChargeAbstract { ...@@ -60,13 +60,16 @@ public class ThsIntervalPayableMoney implements ThsRequestChargeAbstract {
case 0: case 0:
long minute = DateUtils.subDate(inTime, new Date(), 2); long minute = DateUtils.subDate(inTime, new Date(), 2);
sumMoney = (minute / detail.intervalTime) * detail.money; sumMoney = (minute / detail.intervalTime) * detail.money;
break;
//按照小时收费 //按照小时收费
case 1: case 1:
long hour = DateUtils.subDate(inTime, new Date(), 3); long hour = DateUtils.subDate(inTime, new Date(), 3);
sumMoney = (hour / detail.intervalTime) * detail.money; sumMoney = (hour / detail.intervalTime) * detail.money;
break;
//按照固定收费 //按照固定收费
default: default:
sumMoney = (DateUtils.subDate(inTime, new Date(), 2) / detail.intervalTime) * detail.money; sumMoney = (DateUtils.subDate(inTime, new Date(), 2) / detail.intervalTime) * detail.money;
break;
} }
sumMoney = sumMoney > maxOneTimeMoney ? maxOneTimeMoney : sumMoney; sumMoney = sumMoney > maxOneTimeMoney ? maxOneTimeMoney : sumMoney;
return (int) sumMoney; return (int) sumMoney;
......
...@@ -39,9 +39,6 @@ public class ThsRequestChargeBO { ...@@ -39,9 +39,6 @@ public class ThsRequestChargeBO {
private MemberCarHelperService memberCarHelperService; private MemberCarHelperService memberCarHelperService;
@Autowired @Autowired
private ApplicationContext applicationContext;
@Autowired
private RequestChargeCommand requestChargeCommand; private RequestChargeCommand requestChargeCommand;
/** /**
...@@ -53,7 +50,6 @@ public class ThsRequestChargeBO { ...@@ -53,7 +50,6 @@ public class ThsRequestChargeBO {
*/ */
@GeneralPrintLogAOP(value = "请求费用BO") @GeneralPrintLogAOP(value = "请求费用BO")
public Integer getPayableMoney(ThsChargingRulesPO thsChargingRulesPO, String carNo, Date inTime) { public Integer getPayableMoney(ThsChargingRulesPO thsChargingRulesPO, String carNo, Date inTime) {
String chargeDetails = thsChargingRulesPO.getChargeDetails();
if (memberCarHelperService.vaildMember(thsChargingRulesPO.getParkCode(), carNo) != null) { if (memberCarHelperService.vaildMember(thsChargingRulesPO.getParkCode(), carNo) != null) {
return 0; return 0;
} }
......
...@@ -14,8 +14,6 @@ import java.util.List; ...@@ -14,8 +14,6 @@ import java.util.List;
* @Version: 1.0 * @Version: 1.0
*/ */
public enum ReasonCodeEnums { public enum ReasonCodeEnums {
/** /**
* 调用接口参数错误 * 调用接口参数错误
*/ */
......
...@@ -11,7 +11,6 @@ import java.lang.annotation.*; ...@@ -11,7 +11,6 @@ import java.lang.annotation.*;
* @updateData: * @updateData:
* @updateContent: 使用AOP注解拦截 * @updateContent: 使用AOP注解拦截
* @Version: 1.0 * @Version: 1.0
*/ */
/** /**
......
...@@ -26,7 +26,6 @@ import java.util.Map; ...@@ -26,7 +26,6 @@ import java.util.Map;
* @updateData: * @updateData:
* @updateContent: AOP拦截切面类 * @updateContent: AOP拦截切面类
* @Version: 1.0 * @Version: 1.0
*/ */
@Aspect @Aspect
@Component @Component
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment