记得上下班打卡 | git大法好,push需谨慎

Commit 035c3c95 authored by 胡佳晨's avatar 胡佳晨

erp 去除 emoj

parent d60730cf
...@@ -43,6 +43,8 @@ public class EmojiFilterUtil { ...@@ -43,6 +43,8 @@ public class EmojiFilterUtil {
((codePoint >= 0x10000) && (codePoint <= 0x10FFFF)); ((codePoint >= 0x10000) && (codePoint <= 0x10FFFF));
} }
/** /**
* 过滤emoji 或者 其他非文字类型的字符 * 过滤emoji 或者 其他非文字类型的字符
* *
......
package com.liquidnet.service.goblin.service.impl.erp; package com.liquidnet.service.goblin.service.impl.erp;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.liquidnet.commons.lang.util.CollectionUtil; import com.liquidnet.commons.lang.util.*;
import com.liquidnet.commons.lang.util.DateUtil;
import com.liquidnet.commons.lang.util.EmojiFilterUtil;
import com.liquidnet.commons.lang.util.JsonUtils;
import com.liquidnet.service.base.ResponseDto; import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.base.SqlMapping; import com.liquidnet.service.base.SqlMapping;
import com.liquidnet.service.base.constant.MQConst; import com.liquidnet.service.base.constant.MQConst;
...@@ -291,7 +288,7 @@ public class WdtServiceImpl implements IGoblinErpService { ...@@ -291,7 +288,7 @@ public class WdtServiceImpl implements IGoblinErpService {
orderSkuParam.setSpec_id(orderSkuVo.getSkuId()); orderSkuParam.setSpec_id(orderSkuVo.getSkuId());
orderSkuParam.setGoods_no(orderSkuVo.getSpuErpCode()); orderSkuParam.setGoods_no(orderSkuVo.getSpuErpCode());
orderSkuParam.setSpec_no(orderSkuVo.getSkuErpCode()); orderSkuParam.setSpec_no(orderSkuVo.getSkuErpCode());
orderSkuParam.setGoods_name(EmojiFilterUtil.filterEmoji(orderSkuVo.getSpuName())); orderSkuParam.setGoods_name(EmojiUtils.emojiChange(orderSkuVo.getSpuName()));
orderSkuParam.setAdjust_amount(BigDecimal.ZERO); orderSkuParam.setAdjust_amount(BigDecimal.ZERO);
orderSkuParam.setDiscount(BigDecimal.ZERO); orderSkuParam.setDiscount(BigDecimal.ZERO);
orderSkuParam.setShare_discount(orderSkuVo.getPriceVoucher()); orderSkuParam.setShare_discount(orderSkuVo.getPriceVoucher());
...@@ -307,7 +304,7 @@ public class WdtServiceImpl implements IGoblinErpService { ...@@ -307,7 +304,7 @@ public class WdtServiceImpl implements IGoblinErpService {
tradeListParam.setDelivery_term(1); tradeListParam.setDelivery_term(1);
tradeListParam.setTrade_time(orderVo.getCreatedAt()); tradeListParam.setTrade_time(orderVo.getCreatedAt());
tradeListParam.setPay_time(orderVo.getPayTime()); tradeListParam.setPay_time(orderVo.getPayTime());
tradeListParam.setBuyer_nick(EmojiFilterUtil.filterEmoji(orderVo.getUserName())); tradeListParam.setBuyer_nick(EmojiUtils.emojiChange(orderVo.getUserName()));
tradeListParam.setPay_id(orderVo.getPayCode()); tradeListParam.setPay_id(orderVo.getPayCode());
if (orderVo.getOrderAttrVo() == null || orderVo.getOrderAttrVo().getExpressAddress() == null || orderVo.getOrderAttrVo().getExpressAddress().equals("")) { if (orderVo.getOrderAttrVo() == null || orderVo.getOrderAttrVo().getExpressAddress() == null || orderVo.getOrderAttrVo().getExpressAddress().equals("")) {
tradeListParam.setReceiver_name("正在映画"); tradeListParam.setReceiver_name("正在映画");
...@@ -317,7 +314,7 @@ public class WdtServiceImpl implements IGoblinErpService { ...@@ -317,7 +314,7 @@ public class WdtServiceImpl implements IGoblinErpService {
tradeListParam.setReceiver_address("广渠路 创1985园区 3-12"); tradeListParam.setReceiver_address("广渠路 创1985园区 3-12");
tradeListParam.setReceiver_mobile("15901093014"); tradeListParam.setReceiver_mobile("15901093014");
} else { } else {
tradeListParam.setReceiver_name(EmojiFilterUtil.filterEmoji(orderVo.getOrderAttrVo().getExpressContacts())); tradeListParam.setReceiver_name(EmojiUtils.emojiChange(orderVo.getOrderAttrVo().getExpressContacts()));
String[] address = orderVo.getOrderAttrVo().getExpressAddress().split(" "); String[] address = orderVo.getOrderAttrVo().getExpressAddress().split(" ");
if (address.length > 0) { if (address.length > 0) {
tradeListParam.setReceiver_province(address[0]); tradeListParam.setReceiver_province(address[0]);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment