diff --git a/src/main/java/cn/van/business/util/OrderUtil.java b/src/main/java/cn/van/business/util/OrderUtil.java index bef1f67..bc57ac7 100644 --- a/src/main/java/cn/van/business/util/OrderUtil.java +++ b/src/main/java/cn/van/business/util/OrderUtil.java @@ -66,18 +66,18 @@ public class OrderUtil { "状态:" + (converter.getCodeDescription(orderRow.getValidCode())) + "\r" - + "名称:" + orderRow.getSkuName() + "\r" + + "名称:" + orderRow.getSkuName() + "\r\n" //+ "商品单价:" + orderRow.getPrice() + "\r" //+ "商品数量:" + orderRow.getSkuNum() + "\r" //+ "商品总价:" + (orderRow.getPrice() * orderRow.getSkuNum()) + "\r" - //+ "预估计佣金额:" + orderRow.getEstimateCosPrice() + "\n" + + "计佣金额:" + orderRow.getEstimateCosPrice() + "\r" - + "金额:" + orderRow.getActualCosPrice() + "\r" - + "比例:" + orderRow.getCommissionRate() + "%\r" + //+ "金额:" + orderRow.getActualCosPrice() + "\r" + + "比例:" + orderRow.getCommissionRate() + "\r" + "佣金:" + orderRow.getEstimateFee() + "\r\n" + "下单:" + formatter.format(orderRow.getOrderTime()) + "\r" - + "完成:" + (orderRow.getFinishTime() != null ? formatter.format(orderRow.getFinishTime()) : "未完成") + "\r\n"; + + "完成:" + (orderRow.getFinishTime() != null ? formatter.format(orderRow.getFinishTime()) : "未完成") + "\r"; if (oldValidCode != -100) { if (!oldValidCode.equals(orderRow.getValidCode())) orderInfo = "从 :" + (converter.getCodeDescription(oldValidCode)) + "\r变成 " + diff --git a/src/main/java/cn/van/business/util/WxMessageConsumer.java b/src/main/java/cn/van/business/util/WxMessageConsumer.java index e7df228..db536f9 100644 --- a/src/main/java/cn/van/business/util/WxMessageConsumer.java +++ b/src/main/java/cn/van/business/util/WxMessageConsumer.java @@ -308,11 +308,11 @@ public class WxMessageConsumer { //String finallyUrl = getUrlStr(msg); //String finallyUrl = extractProductId(msg); - String finallyUrl = msg.substring(2); - if (Util.isNotEmpty(finallyUrl)) { - String transferResultUrl = jdUtils.transfer(finallyUrl); - wxUtil.sendTextMessage(wxid, transferResultUrl, msgType, null); - } + //String finallyUrl = msg.substring(2); + //if (Util.isNotEmpty(finallyUrl)) { + // String transferResultUrl = jdUtils.transfer(finallyUrl); + // wxUtil.sendTextMessage(wxid, transferResultUrl, msgType, null); + //} } else if (msg.startsWith("京")) { jdUtils.sendOrderToWxByOrderJD(msg.replace("京", "")); }