From c53ef17ae6b4822dd7efdd0abccc691cde5d64eb Mon Sep 17 00:00:00 2001 From: linfso Date: Sat, 11 May 2024 18:57:59 +0800 Subject: [PATCH] md --- .../com/xdadan/erp/emis/domain/EmisBrand.java | 15 ++++---- .../erp/emis/domain/enumtype/TransType.java | 19 ++++++++++ .../service/impl/EmisWaybillServiceImpl.java | 18 ++++++++-- .../xdadan/erp/emis/utils/WaybillHelper.java | 35 +++++++++++++------ .../main/resources/mapper/EmisBrandMapper.xml | 31 ++++++++++------ 5 files changed, 87 insertions(+), 31 deletions(-) create mode 100644 emis-biz/src/main/java/com/xdadan/erp/emis/domain/enumtype/TransType.java diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisBrand.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisBrand.java index a5ce41ee5..b94a46e6a 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisBrand.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisBrand.java @@ -1,10 +1,10 @@ -/** +/** * @Project: emis * @Title: EmisBrand.java * @author linfso - * @date 2023-12-14 13:02:47 + * @date 2024-05-11 10:57:00 * @Copyright: ShangHai Duta 2022 All rights reserved. - * @version v1.0 + * @version v1.0 * @Description:

品牌 实体类

*/ @@ -17,6 +17,7 @@ import com.xdadan.erp.common.annotation.Excel; import com.xdadan.erp.common.core.domain.BaseEntity; import com.xdadan.erp.common.core.domain.TreeEntity; import java.io.Serializable; +import java.math.BigDecimal; import java.util.Date; import lombok.Data; @@ -25,9 +26,9 @@ import lombok.Data; * @ClassName EmisBrand * @Description 品牌 * @author linfso - * @date 2023-12-14 13:02:47 + * @date 2024-05-11 10:57:00 */ - @Data +@Data public class EmisBrand extends BaseEntity { private static final long serialVersionUID = 1L; @@ -44,11 +45,11 @@ public class EmisBrand extends BaseEntity private String logo; /* url */ private String url; - /* 排序 */ - private Integer sortOrder; /* 0-未开放 1-开放 */ private Integer status; /* 品牌图片(多图;号隔开) */ private String brandImg; + /* order_num */ + private Integer orderNum; } diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/enumtype/TransType.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/enumtype/TransType.java new file mode 100644 index 000000000..42af69f35 --- /dev/null +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/enumtype/TransType.java @@ -0,0 +1,19 @@ +package com.xdadan.erp.emis.domain.enumtype; + +public enum TransType { + + EXPRESS_TRANS("1","快递"), + AIR_TRANS("2","空运"), + LAND_TRANS("3","陆运"), + SEA_TRANS("4","海运"), + TRAIN_TRANS("5","铁路"); + + + public String typeCode; + public String typeName; + + TransType(String typeCode, String typeName) { + this.typeCode = typeCode; + this.typeName = typeName; + } +} diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java index e05b8d7c8..0e3c9d3c1 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java @@ -24,6 +24,7 @@ import com.googlecode.aviator.AviatorEvaluator; import com.xdadan.erp.common.utils.DateUtils; import com.xdadan.erp.common.utils.DictUtils; import com.xdadan.erp.emis.domain.*; +import com.xdadan.erp.emis.domain.enumtype.TransType; import com.xdadan.erp.emis.domain.exception.EmisBizError; import com.xdadan.erp.emis.domain.enumtype.EmisBizErrorType; import com.xdadan.erp.emis.domain.vo.*; @@ -629,9 +630,20 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb double volumeWeight=0.0D; if(!StringUtils.isEmpty(emisTransLine.getMeterRate())) { - volumeWeight=totalVolume * (1000000 / Double.valueOf(emisTransLine.getMeterRate())); - DecimalFormat df = new DecimalFormat("#.#####"); - volumeWeight= Double.parseDouble(df.format(volumeWeight)); + // 特殊计泡处理 + // 6000 167 + // 3333 300 + + if("6000".equals(emisTransLine.getMeterRate())){ + volumeWeight=167.0f*totalVolume; + }else if("3333".equals(emisTransLine.getMeterRate())){ + volumeWeight=300.0f*totalVolume; + }else{ + volumeWeight=totalVolume * (1000000 / Double.valueOf(emisTransLine.getMeterRate())); + DecimalFormat df = new DecimalFormat("#.#####"); + volumeWeight= Double.parseDouble(df.format(volumeWeight)); + } + } emisWaybill.setVolumeWeight(BigDecimal.valueOf(volumeWeight)); emisWaybill.setMeterType(emisTransLine.getMeterRate()); diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/utils/WaybillHelper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/utils/WaybillHelper.java index 006d9bbe9..606e7f3ba 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/utils/WaybillHelper.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/utils/WaybillHelper.java @@ -79,7 +79,12 @@ public class WaybillHelper { // 1 小数进1 ,抹零+1 else if("3".equals(carryType)){ setteldWeight=Math.ceil(weight); - }else{ + } + // 抹零 取整 + else if("4".equals(carryType)){ + setteldWeight=Math.floor(weight); + } + else{ setteldWeight=weight; } @@ -184,19 +189,27 @@ public class WaybillHelper { // System.out.println(d); try { +// +// long startAll = System.currentTimeMillis(); +// +// for(int i=0;i<100;i++) { +// long start = System.currentTimeMillis(); +// JSONObject rst = WaybillHelper.parseChinaAddress("13818415183 孙丹 广西壮族自治区南宁市西乡塘区衡阳街道广西省南宁市衡阳西路34号大院"+i); +// System.out.println(rst); +// long end4 = System.currentTimeMillis(); +// System.out.println("escape time single:" + (end4 - start) + "ms"); +// } +// long endAll = System.currentTimeMillis(); - long startAll = System.currentTimeMillis(); +// System.out.println("All escape time:" + (endAll - startAll) + "ms"); - for(int i=0;i<100;i++) { - long start = System.currentTimeMillis(); - JSONObject rst = WaybillHelper.parseChinaAddress("13818415183 孙丹 广西壮族自治区南宁市西乡塘区衡阳街道广西省南宁市衡阳西路34号大院"+i); - System.out.println(rst); - long end4 = System.currentTimeMillis(); - System.out.println("escape time single:" + (end4 - start) + "ms"); - } - long endAll = System.currentTimeMillis(); + // 6000 167 + // 3333 300 + // 5000 0.1 + float volumeWeight=166.667f; + System.out.println(WaybillHelper.calcSettledWeight(volumeWeight,"3")); + System.out.println(WaybillHelper.calcSettledWeight(volumeWeight,"4")); - System.out.println("All escape time:" + (endAll - startAll) + "ms"); } catch (Exception e) { e.printStackTrace(); diff --git a/emis-biz/src/main/resources/mapper/EmisBrandMapper.xml b/emis-biz/src/main/resources/mapper/EmisBrandMapper.xml index ca2695644..2d0e78f72 100644 --- a/emis-biz/src/main/resources/mapper/EmisBrandMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisBrandMapper.xml @@ -4,6 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + @@ -11,9 +12,9 @@ - + @@ -21,24 +22,26 @@ + + - select id, code, name, name_en, logo, url, sort_order, status, brand_img, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time from emis_brand + select id, code, name, name_en, logo, url, status, brand_img, order_num, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_brand @@ -65,9 +70,9 @@ name_en, logo, url, - sort_order, status, brand_img, + order_num, remark, tenant_id, del_flag, @@ -75,6 +80,8 @@ create_time, update_by, update_time, + create_site, + update_site, #{id}, @@ -83,9 +90,9 @@ #{nameEn}, #{logo}, #{url}, - #{sortOrder}, #{status}, #{brandImg}, + #{orderNum}, #{remark}, #{tenantId}, #{delFlag}, @@ -93,6 +100,8 @@ #{createTime}, #{updateBy}, #{updateTime}, + #{createSite}, + #{updateSite}, @@ -104,9 +113,9 @@ name_en = #{nameEn}, logo = #{logo}, url = #{url}, - sort_order = #{sortOrder}, status = #{status}, brand_img = #{brandImg}, + order_num = #{orderNum}, remark = #{remark}, tenant_id = #{tenantId}, del_flag = #{delFlag}, @@ -114,16 +123,18 @@ create_time = #{createTime}, update_by = #{updateBy}, update_time = #{updateTime}, + create_site = #{createSite}, + update_site = #{updateSite}, where id = #{id} - delete from emis_brand where id = #{id} + update emis_brand set del_flag='1' where id = #{id} - delete from emis_brand where id in + update emis_brand set del_flag='1' where id in #{id}