承运与无车承运对接

performance-api/src/main/java/com/clx/performance/feign/PerformanceFeign.java

@@ -11,6 +11,7 @@ import com.clx.performance.param.pc.owner.UpdateStatusParam;
 import com.clx.performance.vo.app.collect.AppCollectTruckVO;
 import com.clx.performance.vo.feign.FreightEstimateVO;
 import com.clx.performance.vo.feign.OrderGoodsFeignVO;
+import com.clx.performance.vo.feign.PlatformServiceFeeConfigFeignVO;
 import com.clx.performance.vo.pc.OwnerAccountAllVO;
 import com.clx.performance.vo.pc.OwnerAccountArrearsVO;
 import com.clx.performance.vo.pc.OwnerLoanAccountVO;
@@ -125,7 +126,12 @@ public interface PerformanceFeign {
     /**
      * 更新挂单运费
      */
-    @GetMapping(value = {"clx-performance/feign/orderGoods/updatePendingOrderFright"})
+    @PostMapping(value = {"clx-performance/feign/orderGoods/updatePendingOrderFright"})
     Result<Void> updatePendingOrderFright(@RequestParam("orderGoodsNo") String orderGoodsNo,@RequestParam("pendingOrderFreight") BigDecimal pendingOrderFreight);
 
+    /**
+     * 获取平台服务费配置
+     */
+    @GetMapping(value = {"clx-performance/feign/platformServiceFee/getPlatformServiceFeeConfig"})
+    Result<PlatformServiceFeeConfigFeignVO> getPlatformServiceFeeConfig();
 }

performance-api/src/main/java/com/clx/performance/vo/feign/PlatformServiceFeeConfigFeignVO.java

+package com.clx.performance.vo.feign;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.math.BigDecimal;
+
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class PlatformServiceFeeConfigFeignVO {
+
+    @ApiModelProperty(value = "订单报价方式,1:未税,2:含税")
+    private Integer orderQuotationType;
+    @ApiModelProperty(value = "结算方式")
+    private Integer settlementType;
+    @ApiModelProperty(value = "接单保证金")
+    private BigDecimal deposit;
+    @ApiModelProperty(value = "平台服务费费率")
+    private BigDecimal serviceFeeRate;
+}

performance-web/src/main/java/com/clx/performance/controller/feign/OrderGoodsFeignController.java

@@ -49,8 +49,9 @@ public class OrderGoodsFeignController {
     }
 
     @ApiOperation(value = "更新挂单运费", notes = "<br>By:艾庆国")
-    @GetMapping(value = {"/updatePendingOrderFright"})
-    Result<Void> updatePendingOrderFright(@RequestParam("orderGoodsNo") String orderGoodsNo,@RequestParam("pendingOrderFreight") BigDecimal pendingOrderFreight){
+    @PostMapping(value = {"/updatePendingOrderFright"})
+    Result<Void> updatePendingOrderFright(@RequestParam("orderGoodsNo") String orderGoodsNo,
+                                          @RequestParam("pendingOrderFreight") BigDecimal pendingOrderFreight){
 
         orderGoodsService.updateFrightPrice(orderGoodsNo, pendingOrderFreight);
         return Result.ok();

performance-web/src/main/java/com/clx/performance/controller/feign/PlatformServiceFeeFeignController.java

+package com.clx.performance.controller.feign;
+
+import com.clx.performance.service.PlatformServiceFeeConfigService;
+import com.clx.performance.vo.feign.PlatformServiceFeeConfigFeignVO;
+import com.msl.common.result.Result;
+import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/feign/platformServiceFee")
+@Validated
+@Api(tags = "平台服务费Feign")
+public class PlatformServiceFeeFeignController {
+
+    @Autowired
+    private PlatformServiceFeeConfigService platformServiceFeeConfigService;
+
+    @GetMapping(value = {"/getPlatformServiceFeeConfig"})
+    Result<PlatformServiceFeeConfigFeignVO> getPlatformServiceFeeConfig(){
+
+        return Result.ok(platformServiceFeeConfigService.getConfig());
+
+    }
+
+}

performance-web/src/main/java/com/clx/performance/service/PlatformServiceFeeConfigService.java

 package com.clx.performance.service;
 
 import com.clx.performance.param.pc.carrier.SavePlatformServiceFeeConfigParam;
+import com.clx.performance.vo.feign.PlatformServiceFeeConfigFeignVO;
 import com.clx.performance.vo.pc.carrier.settle.CarrierPagePlatformServiceFeeConfigVO;
 
 
@@ -14,4 +15,6 @@ public interface PlatformServiceFeeConfigService {
     CarrierPagePlatformServiceFeeConfigVO getPlatformServiceFeeConfigDetail(int id);
 
     void updatePlatformServiceFeeConfig(SavePlatformServiceFeeConfigParam config);
+
+    PlatformServiceFeeConfigFeignVO getConfig();
 }

performance-web/src/main/java/com/clx/performance/service/impl/PlatformServiceFeeConfigServiceImpl.java

@@ -6,6 +6,7 @@ import com.clx.performance.model.PlatformServiceFeeConfig;
 import com.clx.performance.param.pc.carrier.SavePlatformServiceFeeConfigParam;
 import com.clx.performance.service.PlatformServiceFeeConfigService;
 import com.clx.performance.struct.PlatformServiceFeeConfigStruct;
+import com.clx.performance.vo.feign.PlatformServiceFeeConfigFeignVO;
 import com.clx.performance.vo.pc.carrier.settle.CarrierPagePlatformServiceFeeConfigVO;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -45,4 +46,10 @@ public class PlatformServiceFeeConfigServiceImpl implements PlatformServiceFeeCo
         config.setServiceFeeRate(param.getServiceFeeRate());
         platformServiceFeeConfigDao.updatePlatformServiceFeeConfig(config);
     }
+
+    @Override
+    public PlatformServiceFeeConfigFeignVO getConfig() {
+        return platformServiceFeeConfigStruct
+                .convertPlatformServiceFeeConfigFeignVO(platformServiceFeeConfigDao.listPlatformServiceFeeConfig());
+    }
 }

performance-web/src/main/java/com/clx/performance/struct/PlatformServiceFeeConfigStruct.java

@@ -2,6 +2,7 @@ package com.clx.performance.struct;
 
 import com.clx.performance.enums.PlatformServiceFeeConfigEnum;
 import com.clx.performance.model.PlatformServiceFeeConfig;
+import com.clx.performance.vo.feign.PlatformServiceFeeConfigFeignVO;
 import com.clx.performance.vo.pc.carrier.settle.CarrierPagePlatformServiceFeeConfigVO;
 import com.msl.common.utils.DateStructUtil;
 import com.msl.common.utils.DateUtils;
@@ -15,4 +16,6 @@ public interface PlatformServiceFeeConfigStruct {
     @Mapping(target = "orderQuotationTypeMsg", expression = "java(Objects.isNull(config.getOrderQuotationType()) ? null : PlatformServiceFeeConfigEnum.getMsgByCode(config.getOrderQuotationType()))")
     CarrierPagePlatformServiceFeeConfigVO convertToDetail(PlatformServiceFeeConfig config);
 
+    PlatformServiceFeeConfigFeignVO convertPlatformServiceFeeConfigFeignVO(PlatformServiceFeeConfig config);
+
 }