diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataFreightDetailEntity.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataFreightDetailEntity.java new file mode 100644 index 000000000..9a72073cd --- /dev/null +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataFreightDetailEntity.java @@ -0,0 +1,102 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.tenant.mp.TenantEntity; + +import java.math.BigDecimal; + +/** + * 基础客户品牌类型明细表 实体类 + * @author zhaoqiaobo + * @since 2024-03-04 + */ +@Data +@TableName("logpm_basicdata_freight_detail") +@ApiModel(value = "BasicdataFreight明细对象", description = "基础客户品牌类型明细表") +@EqualsAndHashCode(callSuper = true) +public class BasicdataFreightDetailEntity extends TenantEntity { + + /** + * 预留1 + */ + @ApiModelProperty(value = "预留1") + private String reserve1; + /** + * 预留2 + */ + @ApiModelProperty(value = "预留2") + private String reserve2; + /** + * 预留3 + */ + @ApiModelProperty(value = "预留3") + private String reserve3; + /** + * 预留4 + */ + @ApiModelProperty(value = "预留4") + private String reserve4; + /** + * 预留5 + */ + @ApiModelProperty(value = "预留5") + private String reserve5; + /** + * 计算方式;1件 2方 3公斤 + */ + @ApiModelProperty(value = "计算方式;1件 2方 3公斤") + private Long formulaMode; + @ApiModelProperty(value = "计算方式;1件 2方 3公斤") + private String formulaModeName; + + /** + * 费用名称 + */ + @ApiModelProperty(value = "费用名称id") + private String itemId; + + @ApiModelProperty(value = "费用名称") + private String itemName; + + /** + * 费用 + */ + @ApiModelProperty(value = "费用") + private BigDecimal cost; + /** + * 类型id + */ + @ApiModelProperty(value = "类型：干,仓，配") + private String typeId; + /** + * 类型名称 + */ + @ApiModelProperty(value = "类型：干,仓，配") + private String typeName; + /** + * 类型 + */ + @ApiModelProperty(value = "基础客户品牌类型id") + private Long freightId; + +} diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataFreightEntity.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataFreightEntity.java index 0e07223b0..44fe9fed3 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataFreightEntity.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataFreightEntity.java @@ -63,11 +63,7 @@ public class BasicdataFreightEntity extends TenantEntity { */ @ApiModelProperty(value = "预留5") private String reserve5; - /** - * 计算方式;1件 2方 3公斤 - */ - @ApiModelProperty(value = "计算方式;1件 2方 3公斤") - private Integer formulaMode; + /** * 物品名称 */ @@ -102,7 +98,7 @@ public class BasicdataFreightEntity extends TenantEntity { * 一口价 */ @ApiModelProperty(value = "一口价") - private BigDecimal fixedPrice; + private Byte fixedPrice; /** * 生效时间 */ @@ -122,6 +118,6 @@ public class BasicdataFreightEntity extends TenantEntity { * 标识;1 干仓配 2 一口价 3 每趟 4户 */ @ApiModelProperty(value = "标识;1 干仓配 2 一口价 3 每趟 4户") - private Byte identification; + private Integer identification; } diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataFreightClient.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataFreightClient.java index 3a0bbc52c..15dd11422 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataFreightClient.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataFreightClient.java @@ -16,13 +16,17 @@ */ package com.logpm.basicdata.feign; +import com.logpm.basicdata.entity.BasicdataFreightDetailEntity; import com.logpm.basicdata.entity.BasicdataFreightEntity; +import com.logpm.basicdata.vo.BasicdataFreightApiVO; import org.springblade.common.constant.ModuleNameConstant; import org.springblade.core.mp.support.BladePage; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; +import java.util.List; + /** * 基础客户品牌类型表 Feign接口类 * @@ -36,6 +40,7 @@ public interface IBasicdataFreightClient { String API_PREFIX = "/client"; String TOP = API_PREFIX + "/top123"; + String PRICE = API_PREFIX + "/pirce"; /** * 获取基础客户品牌类型表列表 @@ -47,4 +52,9 @@ public interface IBasicdataFreightClient { @GetMapping(TOP) BladePage top(@RequestParam("current") Integer current, @RequestParam("size") Integer size); + @GetMapping(PRICE) + List pirce(BasicdataFreightApiVO param); + + + } diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataFreightApiVO.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataFreightApiVO.java new file mode 100644 index 000000000..cb0ecd945 --- /dev/null +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataFreightApiVO.java @@ -0,0 +1,37 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.vo; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 基础客户品牌类型表 视图实体类 + * + * @author cyz + * @since 2023-06-08 + */ +@Data +public class BasicdataFreightApiVO implements Serializable { + private static final long serialVersionUID = 1L; + private String itemName; + private String category; + private String issueWarehouse; + private String destination; + private String arrivalWarehouse; +}