合并代码 并且解决冲突

xiaogang

2021-04-01 b64dfe0172b04830bd16c3aa5757fa87d291057f

 service-fee/src/main/java/com/java110/fee/api/TempCarFeeApi.java

@@ -16,13 +16,12 @@
package com.java110.fee.api;

import com.java110.dto.tempCarFeeConfig.TempCarFeeRuleDto;
import com.java110.dto.tempCarFeeConfig.TempCarPayOrderDto;
import com.java110.fee.bmo.tempCarFee.IGetTempCarFeeRules;
import com.java110.utils.util.BeanConvertUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;

/**
 * 临时车费接口类
@@ -51,4 +50,38 @@
        tempCarFeeRuleDto.setRuleId(ruleId);
        return getTempCarFeeRulesImpl.queryRules(tempCarFeeRuleDto);
    }


    /**
     * 查询；临时车停车收费规则
     *
     * @param paId 停车场ID
     * @return
     * @serviceCode /tempCarFee/queryTempCarFeeRules
     * @path /app/tempCarFee/queryTempCarFeeRules
     */
    @RequestMapping(value = "/getTempCarFeeOrder", method = RequestMethod.GET)
    public ResponseEntity<String> getTempCarFeeOrder(
            @RequestParam(value = "paId", required = false) String paId,
            @RequestParam(value = "carNum", required = false) String carNum
            ) {
        TempCarPayOrderDto tempCarPayOrderDto = new TempCarPayOrderDto();
        tempCarPayOrderDto.setPaId(paId);
        tempCarPayOrderDto.setCarNum(carNum);
        return getTempCarFeeRulesImpl.getTempCarFeeOrder(tempCarPayOrderDto);
    }

    /**
     * 缴费通知
     *
     * @param reqParam 停车场ID
     * @return
     * @serviceCode /tempCarFee/queryTempCarFeeRules
     * @path /app/tempCarFee/queryTempCarFeeRules
     */
    @RequestMapping(value = "/notifyTempCarFeeOrder", method = RequestMethod.POST)
    public ResponseEntity<String> notifyTempCarFeeOrder(@RequestBody String reqParam) {
        TempCarPayOrderDto tempCarPayOrderDto = BeanConvertUtil.covertBean(reqParam,TempCarPayOrderDto.class);
        return getTempCarFeeRulesImpl.notifyTempCarFeeOrder(tempCarPayOrderDto);
    }
}