aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-06-01 14:42:24 +08:00
parent 9d88e63151
commit a3dd1311b1
2 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
View File

@ -13,6 +13,7 @@ package com.xdadan.erp.emis.service;
import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.lang.Snowflake; import cn.hutool.core.lang.Snowflake;
import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.IdUtil;
import cn.hutool.db.DbUtil;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.serializer.PropertyFilter; import com.alibaba.fastjson.serializer.PropertyFilter;
@ -550,10 +551,10 @@ public class EmisBaseService {
order.put("package3dm", package3dm); order.put("package3dm", package3dm);
// 如果是子单收件人信息需要加密 // 如果是子单收件人信息需要加密
String address=waybill.getReceiveAddress(); String address= WaybillHelper.removeUnSeeChar(waybill.getReceiveAddress());
String company=waybill.getReceiveCompany(); String company=WaybillHelper.removeUnSeeChar(waybill.getReceiveCompany());
String mobile=waybill.getReceiveMobile(); String mobile=WaybillHelper.removeUnSeeChar(waybill.getReceiveMobile());
String consignee=waybill.getReceiveName(); String consignee=WaybillHelper.removeUnSeeChar(waybill.getReceiveName());
if(isSubBill){ if(isSubBill){
address=Convert.chineseNameFirst(address); address=Convert.chineseNameFirst(address);
@ -574,12 +575,12 @@ public class EmisBaseService {
custName= custUser.getCustName(); custName= custUser.getCustName();
} }
} }
order.put("custName", custName); order.put("custName", WaybillHelper.removeUnSeeChar(custName));
order.put("sendAddress", waybill.getSendAddress()); order.put("sendAddress", WaybillHelper.removeUnSeeChar(waybill.getSendAddress()));
order.put("sendCompany", waybill.getSendCompany()); order.put("sendCompany", WaybillHelper.removeUnSeeChar(waybill.getSendCompany()));
order.put("sendMobile", waybill.getSendMobile()); order.put("sendMobile", WaybillHelper.removeUnSeeChar(waybill.getSendMobile()));
order.put("sendPerson", waybill.getSendName()); order.put("sendPerson", WaybillHelper.removeUnSeeChar(waybill.getSendName()));
order.put("sendDate",DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS,waybill.getSendDate())); order.put("sendDate",DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS,waybill.getSendDate()));
// k1 - 收件国(中文) // k1 - 收件国(中文)
@ -609,8 +610,8 @@ public class EmisBaseService {
order.put("extData",extData.toJSONString()); order.put("extData",extData.toJSONString());
order.put("qrCodeText",extData.toJSONString()); order.put("qrCodeText",extData.toJSONString());
order.put("goodsInfo", waybill.getGoodsInfo()); order.put("goodsInfo", WaybillHelper.removeUnSeeChar(waybill.getGoodsInfo()));
order.put("remark", waybill.getRemark()); order.put("remark", WaybillHelper.removeUnSeeChar(waybill.getRemark()));
String billWeight="0.0"; String billWeight="0.0";
String totalVolume="0.0"; String totalVolume="0.0";

10
emis-biz/src/main/java/com/xdadan/erp/emis/utils/WaybillHelper.java
View File

@ -232,4 +232,14 @@ public class WaybillHelper {
return value; return value;
}, SerializerFeature.WriteMapNullValue); }, SerializerFeature.WriteMapNullValue);
} }
public static String removeUnSeeChar(String str) {
if(!StringUtils.isEmpty(str)){
return str.replaceAll("\\p{C}", "");
}
return str;
}
} }