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

Commit 1047bc57 authored by 胡佳晨's avatar 胡佳晨

erp 去除 emoj

parent e618b6e0
......@@ -3,6 +3,7 @@ package com.liquidnet.service.goblin.service.impl.erp;
import com.alibaba.fastjson.JSON;
import com.liquidnet.commons.lang.util.CollectionUtil;
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.SqlMapping;
......@@ -196,10 +197,10 @@ public class WdtServiceImpl implements IGoblinErpService {
@Override
public ResponseDto<Boolean> pushTrade(String singleId) {
List<TradeListParam> listOrder = ErpObjectUtil.tradeListParam();
List<List<String>> orderIdList = CollectionUtil.arrayListListString();
List<String> shopNoList = goblinRedisUtils.getStoreErpShopNoList();
for (String shopNo : shopNoList) {
List<TradeListParam> listOrder = ErpObjectUtil.tradeListParam();
List<List<String>> orderIdList = CollectionUtil.arrayListListString();
// 获取 订单id 数据
if ("".equals(singleId) || null == singleId) {
List<String> list = CollectionUtil.arrayListString();
......@@ -290,7 +291,7 @@ public class WdtServiceImpl implements IGoblinErpService {
orderSkuParam.setSpec_id(orderSkuVo.getSkuId());
orderSkuParam.setGoods_no(orderSkuVo.getSpuErpCode());
orderSkuParam.setSpec_no(orderSkuVo.getSkuErpCode());
orderSkuParam.setGoods_name(orderSkuVo.getSpuName());
orderSkuParam.setGoods_name(EmojiFilterUtil.filterEmoji(orderSkuVo.getSpuName()));
orderSkuParam.setAdjust_amount(BigDecimal.ZERO);
orderSkuParam.setDiscount(BigDecimal.ZERO);
orderSkuParam.setShare_discount(orderSkuVo.getPriceVoucher());
......@@ -306,7 +307,7 @@ public class WdtServiceImpl implements IGoblinErpService {
tradeListParam.setDelivery_term(1);
tradeListParam.setTrade_time(orderVo.getCreatedAt());
tradeListParam.setPay_time(orderVo.getPayTime());
tradeListParam.setBuyer_nick(orderVo.getUserName());
tradeListParam.setBuyer_nick(EmojiFilterUtil.filterEmoji(orderVo.getUserName()));
tradeListParam.setPay_id(orderVo.getPayCode());
if (orderVo.getOrderAttrVo() == null || orderVo.getOrderAttrVo().getExpressAddress() == null || orderVo.getOrderAttrVo().getExpressAddress().equals("")) {
tradeListParam.setReceiver_name("正在映画");
......@@ -360,7 +361,7 @@ public class WdtServiceImpl implements IGoblinErpService {
orderSkuParam.setSpec_id(orderVo.getBoxSkuId().equals("") ? orderVo.getSkuId() : orderVo.getBoxSkuId());
orderSkuParam.setGoods_no(orderVo.getSpuErpCode());
orderSkuParam.setSpec_no(orderVo.getSkuErpCode());
orderSkuParam.setGoods_name(spuVo.getName());
orderSkuParam.setGoods_name(EmojiFilterUtil.filterEmoji(spuVo.getName()));
orderSkuParam.setAdjust_amount(BigDecimal.ZERO);
orderSkuParam.setDiscount(BigDecimal.ZERO);
orderSkuParam.setShare_discount(skuVo.getPrice().multiply(BigDecimal.valueOf(orderVo.getNum())).subtract(orderVo.getPriceActual()));
......
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