Merge branch 'dev' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-API into dev

src/main/java/com/steerinfo/dil/controller/BMSController.java

@@ -301,8 +301,8 @@ public class BMSController extends BaseRESTfulController {
 
     @PostMapping("addTrainStatement")
     @ApiOperation(value = "生成火运费账单")
-    RESTfulResult addTrainStatement(@RequestBody Map<String, Object> map) {
-        return bmstrainFeign.addTrainStatement(map);
+    RESTfulResult addTrainStatement(@RequestBody List<Map<String, Object>> mapList) {
+        return bmstrainFeign.addTrainStatement(mapList);
     }
   
       @ApiModelProperty(value = "展示销售火运结算列表")
@@ -354,8 +354,8 @@ public class BMSController extends BaseRESTfulController {
             @ApiImplicitParam(name = "settlementId", value = "结算id", required = false, dataType = "BigDecimal"),
     })
     @PostMapping("/selectTrainSettlement/{settlementId}")
-    public List<Map<String,Object>> selectTrainSettlement(@PathVariable("settlementId") BigDecimal settlementId) {
-        return bmstrainFeign.selectTrainSettlement(settlementId);
+    public Map<String,Object> selectTrainSettlement(@PathVariable("settlementId") Integer settlementId) {
+        return bmstrainFeign.selectTrainSettlement(new BigDecimal(settlementId));
     }
 
     @PostMapping("getTruckDetailsOrderList")
@@ -363,11 +363,12 @@ public class BMSController extends BaseRESTfulController {
     public RESTfulResult getTruckDetailsOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
                                                   Integer pageNum,
                                                   Integer pageSize,
-                                                  Integer apiId) {
+                                                  Integer apiId,
+                                                  Integer orderType) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return bmstruckFeign.getTruckDetailsOrderList(mapValue, pageNum, pageSize, apiId);
+        return bmstruckFeign.getTruckDetailsOrderList(mapValue, pageNum, pageSize, apiId, orderType);
     }
 
     @PostMapping("getTruckResultList")
@@ -383,6 +384,88 @@ public class BMSController extends BaseRESTfulController {
         return bmstruckFeign.getTruckResultList(mapValue, pageNum, pageSize, apiId, new BigDecimal(orderId));
     }
 
+    @PostMapping("getTruckStatementList")
+    @ApiOperation(value = "展示汽运账单信息")
+    public RESTfulResult getTruckStatementList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                            Integer pageNum,
+                                            Integer pageSize,
+                                            Integer apiId) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return bmstruckFeign.getTruckStatementList(mapValue, pageNum, pageSize, apiId);
+    }
+
+    @PostMapping("getInvoiceList")
+    @ApiOperation(value = "展示发票")
+    public RESTfulResult getInvoiceList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                               Integer pageNum,
+                                               Integer pageSize,
+                                               Integer apiId) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return bmstruckFeign.getInvoiceList(mapValue, pageNum, pageSize, apiId);
+    }
+
+    @PostMapping("getSaleTruckStatementDetailsOrderList")
+    @ApiOperation(value = "展示账单下的详单")
+    public RESTfulResult getSaleTruckStatementDetailsOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                  Integer pageNum,
+                                                  Integer pageSize,
+                                                  Integer apiId,
+                                                  Integer statementId) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return bmstruckFeign.getSaleTruckStatementDetailsOrderList(mapValue, pageNum, pageSize, apiId, new BigDecimal(statementId));
+    }
+
+    @PostMapping("getUnFinishedTruckDetailsOrderList")
+    @ApiOperation(value = "展示汽运未生成账单的详单信息")
+    public RESTfulResult getUnFinishedTruckDetailsOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                               Integer pageNum,
+                                                               Integer pageSize,
+                                                               Integer apiId,
+                                                               Integer orderType) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return bmstruckFeign.getUnFinishedTruckDetailsOrderList(mapValue, pageNum, pageSize, apiId, orderType);
+    }
+
+    @PostMapping("addBmstruckInvoice")
+    @ApiOperation(value = "新增发票")
+    RESTfulResult addBmstruckInvoice(@RequestBody Map<String,Object> mapVal) {
+        return bmstruckFeign.addBmstruckInvoice(mapVal);
+    }
+
+    @PostMapping("updateBmstruckCheck")
+    @ApiOperation(value = "修改审核状态")
+    RESTfulResult updateBmstruckCheck(@RequestParam Integer statementId,
+                                      @RequestParam Integer status,
+                                      @RequestParam Integer person) {
+        return bmstruckFeign.updateBmstruckCheck(new BigDecimal(statementId),status,person);
+    }
+
+    @PostMapping("getSmallTruckFormula")
+    @ApiOperation(value = "查询销售汽运离100KM差距10KM内计费公式")
+    RESTfulResult getSmallTruckFormula() {
+        return bmstruckFeign.getSmallTruckFormula();
+    }
+
+    @PostMapping("getBigTruckFormula")
+    @ApiOperation(value = "查询销售汽运离100KM差距10KM外计费公式")
+    RESTfulResult getBigTruckFormula() {
+        return bmstruckFeign.getBigTruckFormula();
+    }
+
+    @PostMapping("addTruckStatement")
+    @ApiOperation(value = "新增汽运详单")
+    RESTfulResult addTruckStatement(@RequestBody List<Map<String,Object>> mapList) {
+        return bmstruckFeign.addTruckStatement(mapList);
+    }
+
     @PostMapping("addTruckDetailsOrder/{orderId}")
     @ApiOperation(value = "新增汽运详单")
     RESTfulResult addTruckDetailsOrder(@PathVariable("orderId") BigDecimal orderId) {

src/main/java/com/steerinfo/dil/feign/BmstrainFeign.java

@@ -125,11 +125,11 @@ public interface BmstrainFeign {
     /**
      * 生成火运费账单
      *
-     * @param map
+     * @param mapList
      * @return
      */
     @PostMapping(value = "/api/v1/bmstrain/bmstrainstatement/addTrainStatement")
-    RESTfulResult addTrainStatement(@RequestBody Map<String, Object> map);
+    RESTfulResult addTrainStatement(@RequestBody List<Map<String, Object>> mapList);
   
   /**
      * 展示销售火运结算列表
@@ -175,6 +175,6 @@ public interface BmstrainFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/bmstrain/bmstrainsettlement/selectTrainSettlement/{settlementId}")
-    List<Map<String,Object>> selectTrainSettlement(@PathVariable("settlementId") BigDecimal settlementId);
+    Map<String,Object> selectTrainSettlement(@PathVariable("settlementId") BigDecimal settlementId);
 
 }

src/main/java/com/steerinfo/dil/feign/BmstruckFeign.java

@@ -30,7 +30,8 @@ public interface BmstruckFeign {
     RESTfulResult getTruckDetailsOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
                                            @RequestParam("pageNum") Integer pageNum,
                                            @RequestParam("pageSize") Integer pageSize,
-                                           @RequestParam("apiId") Integer apiId);
+                                           @RequestParam("apiId") Integer apiId,
+                                           @RequestParam("orderType") Integer orderType);
 
     /**
      * 展示汽运实绩信息
@@ -73,6 +74,7 @@ public interface BmstruckFeign {
                                                               @RequestParam("pageSize") Integer pageSize,
                                                               @RequestParam("apiId") Integer apiId,
                                                               @RequestParam("orderType") BigDecimal orderType);
+
     /**
      * 新增内转汽运详单
      *
@@ -88,14 +90,121 @@ public interface BmstruckFeign {
      */
     @PostMapping(value = "/api/v1/bmstruck/bmstruckstatement/addConvertedTruckStatement")
     RESTfulResult addConvertedTruckStatement(@RequestBody(required = false) List<Map<String, Object>> mapList);
+
     /**
-     *删除汽运账单
+     * 删除汽运账单
      */
     @PostMapping(value = "/api/v1/bmstruck/bmstruckstatement/deleteConvertedTruckStatement/{statementId}")
     RESTfulResult delete(@PathVariable("statementId") BigDecimal statementId);
+
     /**
      * 审批计费账单
      */
     @PostMapping(value = "/api/v1/bmstruck/bmstruckstatement/updateConvertedTruckStatement/{statementId}")
     RESTfulResult update(@PathVariable("statementId") BigDecimal statementId);
+
+    /**
+     * 销售汽运计费账单
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/bmstruck/bmstruckstatement/getTruckStatementList")
+    RESTfulResult getTruckStatementList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                        @RequestParam("pageNum") Integer pageNum,
+                                        @RequestParam("pageSize") Integer pageSize,
+                                        @RequestParam("apiId") Integer apiId);
+
+    /**
+     * 生成销售汽运计费账单
+     *
+     * @param mapList
+     * @return
+     */
+    @PostMapping(value = "/api/v1/bmstruck/bmstruckstatement/addTruckStatement")
+    RESTfulResult addTruckStatement(@RequestBody List<Map<String, Object>> mapList);
+
+    /**
+     * 展示账单下的详单
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @param statementId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/bmstruck/bmstruckstatement/getSaleTruckStatementDetailsOrderList")
+    RESTfulResult getSaleTruckStatementDetailsOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                        @RequestParam("pageNum") Integer pageNum,
+                                                        @RequestParam("pageSize") Integer pageSize,
+                                                        @RequestParam("apiId") Integer apiId,
+                                                        @RequestParam("statementId") BigDecimal statementId);
+
+    /**
+     * 审核
+     * @param statementId
+     * @param status
+     * @param person
+     * @return
+     */
+    @PostMapping(value = "/api/v1/bmstruck/bmstruckcheck/updateBmstruckCheck")
+    RESTfulResult updateBmstruckCheck(@RequestParam("statementId") BigDecimal statementId,
+                                      @RequestParam("status") Integer status,
+                                      @RequestParam("person") Integer person);
+
+    /**
+     * 查询销售汽运离100KM差距10KM内计费公式
+     * @return
+     */
+    @PostMapping(value = "/api/v1/bmstruck/bmstruckformulas/getSmallTruckFormula")
+    RESTfulResult getSmallTruckFormula();
+
+    /**
+     * 查询销售汽运离100KM差距10KM外计费公式
+     * @return
+     */
+    @PostMapping(value = "/api/v1/bmstruck/bmstruckformulas/getBigTruckFormula")
+    RESTfulResult getBigTruckFormula();
+
+    /**
+     * 展示发票
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/bmstruck/bmstruckinvoice/getInvoiceList")
+    RESTfulResult getInvoiceList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                 @RequestParam("pageNum") Integer pageNum,
+                                 @RequestParam("pageSize") Integer pageSize,
+                                 @RequestParam("apiId") Integer apiId);
+
+    /**
+     * 新增发票
+     * @param mapVal
+     * @return
+     */
+    @PostMapping(value = "/api/v1/bmstruck/bmstruckinvoice/addBmstruckInvoice")
+    RESTfulResult addBmstruckInvoice(@RequestBody Map<String, Object> mapVal);
+
+    /**
+     * 展示汽运未生成账单的详单信息
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @param orderType
+     * @return
+     */
+    @PostMapping(value = "/api/v1/bmstruck/bmstruckdetailsorder/getUnFinishedTruckDetailsOrderList")
+    RESTfulResult getUnFinishedTruckDetailsOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                     @RequestParam("pageNum") Integer pageNum,
+                                     @RequestParam("pageSize") Integer pageSize,
+                                     @RequestParam("apiId") Integer apiId,
+                                     @RequestParam("orderType") Integer orderType);
 }