合并代码 并且解决冲突

xiaogang

2021-04-01 b64dfe0172b04830bd16c3aa5757fa87d291057f

 service-fee/src/main/java/com/java110/fee/bmo/tempCarFee/impl/GetTempCarFeeRulesImpl.java

@@ -16,8 +16,10 @@
package com.java110.fee.bmo.tempCarFee.impl;

import com.java110.dto.tempCarFeeConfig.TempCarFeeRuleDto;
import com.java110.dto.tempCarFeeConfig.TempCarPayOrderDto;
import com.java110.fee.bmo.tempCarFee.IGetTempCarFeeRules;
import com.java110.intf.fee.ITempCarFeeConfigInnerServiceSMO;
import com.java110.intf.job.IDataBusInnerServiceSMO;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
@@ -34,6 +36,9 @@
    @Autowired
    private ITempCarFeeConfigInnerServiceSMO tempCarFeeConfigInnerServiceSMOImpl;

    @Autowired
    private IDataBusInnerServiceSMO dataBusInnerServiceSMOImpl;

    @Override
    public ResponseEntity<String> queryRules(TempCarFeeRuleDto tempCarFeeRuleDto) {

@@ -41,4 +46,23 @@

        return ResultVo.createResponseEntity(tempCarFeeRuleDtos);
    }

    /**
     * 查询是临时车支付订单
     *
     * @param tempCarPayOrderDto
     * @return
     */
    @Override
    public ResponseEntity<String> getTempCarFeeOrder(TempCarPayOrderDto tempCarPayOrderDto) {

        ResultVo resultVo = dataBusInnerServiceSMOImpl.getTempCarFeeOrder(tempCarPayOrderDto);
        return ResultVo.createResponseEntity(resultVo);
    }

    @Override
    public ResponseEntity<String> notifyTempCarFeeOrder(TempCarPayOrderDto tempCarPayOrderDto) {
        ResultVo resultVo = dataBusInnerServiceSMOImpl.notifyTempCarFeeOrder(tempCarPayOrderDto);
        return ResultVo.createResponseEntity(resultVo);
    }
}