Merge branch 'refs/heads/v17.5_order_child_sync_broker_20240617' into dev

performance-api/src/main/java/com/clx/performance/enums/PlatformServiceFeeConfigEnum.java

+package com.clx.performance.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+import java.util.Objects;
+import java.util.Optional;
+
+/**
+ * @author yangqifa
+ */
+@Getter
+@AllArgsConstructor
+public enum PlatformServiceFeeConfigEnum {
+
+    /**
+     * 未税
+     */
+    TAX_EXCLUDED(1, "未税"),
+    /**
+     * 含税
+     */
+    TAX_INCLUDED(2, "含税");
+
+    private final Integer code;
+    private final String msg;
+
+    public static Optional<PlatformServiceFeeConfigEnum> getByCode(int code) {
+        return Arrays.stream(values()).filter(e -> Objects.equals(e.getCode(), code)).findFirst();
+    }
+
+    public static String getMsgByCode(int code) {
+        return getByCode(code).map(PlatformServiceFeeConfigEnum::getMsg).orElse(null);
+    }
+}

performance-api/src/main/java/com/clx/performance/param/pc/carrier/SavePlatformServiceFeeConfigParam.java

+package com.clx.performance.param.pc.carrier;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+
+/**
+ * @author yangqifa
+ */
+@Getter
+@Setter
+public class SavePlatformServiceFeeConfigParam {
+
+    @ApiModelProperty(value = "id")
+    private Integer id;
+    @ApiModelProperty(value = "订单报价方式,1:未税,2:含税")
+    private Integer orderQuotationType;
+    @ApiModelProperty(value = "接单保证金，最多保留两位小数")
+    private BigDecimal deposit;
+    @ApiModelProperty(value = "平台服务费费率")
+    private BigDecimal serviceFeeRate;
+
+}

performance-api/src/main/java/com/clx/performance/vo/pc/carrier/settle/CarrierPagePlatformServiceFeeConfigVO.java

+package com.clx.performance.vo.pc.carrier.settle;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.math.BigDecimal;
+
+
+/**
+ * @author yangqifa
+ */
+@Getter
+@Setter
+@ToString
+public class CarrierPagePlatformServiceFeeConfigVO {
+
+    @ApiModelProperty(value = "id")
+    private Integer id;
+    @ApiModelProperty(value = "订单报价方式,1:未税,2:含税")
+    private Integer orderQuotationType;
+    @ApiModelProperty(value = "订单报价方式")
+    private String orderQuotationTypeMsg;
+    @ApiModelProperty(value = "接单保证金，最多保留两位小数")
+    private BigDecimal deposit;
+    @ApiModelProperty(value = "平台服务费费率")
+    private BigDecimal serviceFeeRate;
+}

performance-web/src/main/java/com/clx/performance/controller/pc/carrier/PlatformServiceFeeConfigController.java

+package com.clx.performance.controller.pc.carrier;
+
+import com.clx.performance.param.pc.carrier.SavePlatformServiceFeeConfigParam;
+import com.clx.performance.service.PlatformServiceFeeConfigService;
+import com.clx.performance.vo.pc.carrier.settle.CarrierPagePlatformServiceFeeConfigVO;
+import com.msl.common.convertor.aspect.UnitCovert;
+import com.msl.common.result.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author yangqifa
+ */
+@Slf4j
+@RestController
+@RequestMapping(value = "/pc/carrier/platformServiceFeeConfig")
+@Validated
+@Api(tags = "承运端-平台费率配置")
+@AllArgsConstructor
+public class PlatformServiceFeeConfigController {
+
+    private final PlatformServiceFeeConfigService platformServiceFeeConfigService;
+
+    @ApiOperation(value = "平台费率配置列表", notes = "<br>By:杨启发")
+    @GetMapping("/listPlatformServiceFeeConfig")
+    @UnitCovert(param = false)
+    public Result<CarrierPagePlatformServiceFeeConfigVO> listPlatformServiceFeeConfig() {
+        return Result.ok(platformServiceFeeConfigService.listPlatformServiceFeeConfig());
+    }
+
+    @ApiOperation(value = "平台费率配置详情", notes = "<br>By:杨启发")
+    @GetMapping("/getPlatformServiceFeeConfigDetail")
+    @UnitCovert(param = false)
+    public Result<CarrierPagePlatformServiceFeeConfigVO> getPlatformServiceFeeConfigDetail(@NotNull(message = "id不能为空") Integer id) {
+        return Result.ok(platformServiceFeeConfigService.getPlatformServiceFeeConfigDetail(id));
+    }
+
+    @ApiOperation(value = "编辑平台费率配置", notes = "<br>By:杨启发")
+    @PostMapping("/updatePlatformServiceFeeConfig")
+    public Result updatePlatformServiceFeeConfig(@RequestBody @Validated SavePlatformServiceFeeConfigParam param) {
+        platformServiceFeeConfigService.updatePlatformServiceFeeConfig(param);
+        return Result.ok();
+    }
+
+}

performance-web/src/main/java/com/clx/performance/dao/PlatformServiceFeeConfigDao.java

+package com.clx.performance.dao;
+
+import com.clx.performance.mapper.PlatformServiceFeeConfigMapper;
+import com.clx.performance.model.PlatformServiceFeeConfig;
+import com.msl.common.dao.BaseDao;
+
+
+/**
+ * @author yangqifa
+ */
+public interface PlatformServiceFeeConfigDao extends BaseDao<PlatformServiceFeeConfigMapper, PlatformServiceFeeConfig, Integer> {
+
+    PlatformServiceFeeConfig listPlatformServiceFeeConfig();
+
+    boolean updatePlatformServiceFeeConfig(PlatformServiceFeeConfig config);
+
+}

performance-web/src/main/java/com/clx/performance/dao/impl/PlatformServiceFeeConfigImpl.java

+package com.clx.performance.dao.impl;
+
+import com.clx.performance.dao.PlatformServiceFeeConfigDao;
+import com.clx.performance.mapper.PlatformServiceFeeConfigMapper;
+import com.clx.performance.model.PlatformServiceFeeConfig;
+import com.msl.common.dao.impl.BaseDaoImpl;
+import org.springframework.stereotype.Repository;
+
+
+/**
+ * @author yangqifa
+ */
+@Repository
+public class PlatformServiceFeeConfigImpl extends BaseDaoImpl<PlatformServiceFeeConfigMapper, PlatformServiceFeeConfig, Integer> implements PlatformServiceFeeConfigDao {
+
+    @Override
+    public PlatformServiceFeeConfig listPlatformServiceFeeConfig() {
+        return list().get(0);
+    }
+
+    @Override
+    public boolean updatePlatformServiceFeeConfig(PlatformServiceFeeConfig config) {
+        return update(lUdWrapper()
+                .eq(PlatformServiceFeeConfig::getId, config.getId())
+                .set(PlatformServiceFeeConfig::getOrderQuotationType, config.getOrderQuotationType())
+                .set(PlatformServiceFeeConfig::getDeposit, config.getDeposit())
+                .set(PlatformServiceFeeConfig::getServiceFeeRate, config.getServiceFeeRate())
+        );
+    }
+}

performance-web/src/main/java/com/clx/performance/mapper/PlatformServiceFeeConfigMapper.java

+package com.clx.performance.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.clx.performance.model.PlatformServiceFeeConfig;
+
+/**
+ * @author yangqifa
+ */
+public interface PlatformServiceFeeConfigMapper extends BaseMapper<PlatformServiceFeeConfig> {
+}
\ No newline at end of file

performance-web/src/main/java/com/clx/performance/model/PlatformServiceFeeConfig.java

+package com.clx.performance.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.msl.common.config.KeyColumn;
+import com.msl.common.model.HasKey;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 平台服务费配置表
+ *
+ * @author yangqifa
+ */
+@Setter
+@Getter
+public class PlatformServiceFeeConfig implements HasKey<Integer> {
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 订单报价方式,1:未税,2:含税
+     */
+    private Integer orderQuotationType;
+
+    /**
+     * 接单保证金，最多保留两位小数
+     */
+    private BigDecimal deposit;
+
+    /**
+     * 平台服务费费率
+     */
+    private BigDecimal serviceFeeRate;
+
+    /**
+     * 创建时间
+     */
+    private Date createdTime;
+
+    /**
+     * 更新时间
+     */
+    private Date modifiedTime;
+
+    @KeyColumn("id")
+    @Override
+    public Integer gainKey() {
+        return id;
+    }
+}
\ No newline at end of file

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.pc.carrier.settle.CarrierPagePlatformServiceFeeConfigVO;
+
+
+/**
+ * @author yangqifa
+ */
+public interface PlatformServiceFeeConfigService {
+
+    CarrierPagePlatformServiceFeeConfigVO listPlatformServiceFeeConfig();
+
+    CarrierPagePlatformServiceFeeConfigVO getPlatformServiceFeeConfigDetail(int id);
+
+    void updatePlatformServiceFeeConfig(SavePlatformServiceFeeConfigParam config);
+}

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

+package com.clx.performance.service.impl;
+
+import com.clx.performance.dao.PlatformServiceFeeConfigDao;
+import com.clx.performance.enums.PerformanceResultEnum;
+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.pc.carrier.settle.CarrierPagePlatformServiceFeeConfigVO;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * @author yangqifa
+ */
+@Slf4j
+@Service
+@AllArgsConstructor
+public class PlatformServiceFeeConfigServiceImpl implements PlatformServiceFeeConfigService {
+
+    private final PlatformServiceFeeConfigDao platformServiceFeeConfigDao;
+
+    private final PlatformServiceFeeConfigStruct platformServiceFeeConfigStruct;
+
+    @Override
+    public CarrierPagePlatformServiceFeeConfigVO listPlatformServiceFeeConfig() {
+        PlatformServiceFeeConfig config = platformServiceFeeConfigDao.listPlatformServiceFeeConfig();
+        return platformServiceFeeConfigStruct.convertToDetail(config);
+    }
+
+    @Override
+    public CarrierPagePlatformServiceFeeConfigVO getPlatformServiceFeeConfigDetail(int id) {
+        PlatformServiceFeeConfig config = platformServiceFeeConfigDao.getEntityByKey(id).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
+        return platformServiceFeeConfigStruct.convertToDetail(config);
+    }
+
+    @Override
+    public void updatePlatformServiceFeeConfig(SavePlatformServiceFeeConfigParam param) {
+        PlatformServiceFeeConfig config = new PlatformServiceFeeConfig();
+        config.setId(param.getId());
+        config.setOrderQuotationType(param.getOrderQuotationType());
+        config.setDeposit(param.getDeposit());
+        config.setServiceFeeRate(param.getServiceFeeRate());
+        platformServiceFeeConfigDao.updatePlatformServiceFeeConfig(config);
+    }
+}

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

+package com.clx.performance.struct;
+
+import com.clx.performance.enums.PlatformServiceFeeConfigEnum;
+import com.clx.performance.model.PlatformServiceFeeConfig;
+import com.clx.performance.vo.pc.carrier.settle.CarrierPagePlatformServiceFeeConfigVO;
+import com.msl.common.utils.DateStructUtil;
+import com.msl.common.utils.DateUtils;
+import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
+
+import java.util.Objects;
+
+@Mapper(componentModel = "spring", uses = DateStructUtil.class, imports = {PlatformServiceFeeConfigEnum.class, Objects.class, DateUtils.class})
+public interface PlatformServiceFeeConfigStruct {
+    @Mapping(target = "orderQuotationTypeMsg", expression = "java(Objects.isNull(config.getOrderQuotationType()) ? null : PlatformServiceFeeConfigEnum.getMsgByCode(config.getOrderQuotationType()))")
+    CarrierPagePlatformServiceFeeConfigVO convertToDetail(PlatformServiceFeeConfig config);
+
+}