录单
This commit is contained in:
@@ -1895,6 +1895,9 @@ public class JDUtil {
|
||||
|
||||
public void LD(String input, String fromWxid) {
|
||||
JDOrder jdOrder = parseOrderFromText(input);
|
||||
if (jdOrder.getOrderId() == null){
|
||||
return;
|
||||
}
|
||||
JDOrder byOrderId = jdOrderRepository.findByOrderId(jdOrder.getOrderId());
|
||||
if (byOrderId != null){
|
||||
logger.info("订单已存在:{}", byOrderId);
|
||||
@@ -1916,8 +1919,8 @@ public class JDUtil {
|
||||
distributionMark2 = "凡";
|
||||
}
|
||||
}
|
||||
sb.append(jdOrder.getOrderId()).append("\n").append(jdOrder.getModelNumber()).append("\n")
|
||||
.append(jdOrder.getOrderId()).append("\n").append(jdOrder.getAddress()).append("\n").append(jdOrder.getLogisticsLink()).append("\n")
|
||||
sb.append(jdOrder.getRemark()).append("\n").append(jdOrder.getOrderId()).append("\n").append(jdOrder.getModelNumber()).append("\n")
|
||||
.append(jdOrder.getAddress()).append("\n").append(jdOrder.getLogisticsLink()).append("\n")
|
||||
.append(jdOrder.getBuyer()).append("\n").append(jdOrder.getPaymentAmount()).append("\n");
|
||||
logger.info("订单信息:{}", sb);
|
||||
|
||||
|
||||
@@ -92,7 +92,7 @@ public class OrderUtil {
|
||||
if (shouldNotify) {
|
||||
String wxId = getWxidFromJdid(orderRow.getUnionId().toString());
|
||||
if (Util.isNotEmpty(wxId)) {
|
||||
String content = getFormattedOrderInfo(orderRow);
|
||||
String content = getFormattedOrderInfoForJB(orderRow);
|
||||
String alertMsg = "[爱心] 价保了 " + newProPriceAmount + " [爱心] \n" + content;
|
||||
|
||||
try {
|
||||
@@ -208,6 +208,28 @@ public class OrderUtil {
|
||||
|
||||
return orderInfo.toString();
|
||||
}
|
||||
// 价保
|
||||
public String getFormattedOrderInfoForJB(OrderRow orderRow) {
|
||||
SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
||||
ValidCodeConverter converter = new ValidCodeConverter();
|
||||
Long unionId = orderRow.getUnionId();
|
||||
String remarkFromJdid = getRemarkFromJdid(String.valueOf(unionId));
|
||||
StringBuilder orderInfo = new StringBuilder().append(" ").append(getEmjoy(orderRow.getValidCode())).append(" ").append(converter.getCodeDescription(orderRow.getValidCode())).append("\r");
|
||||
|
||||
//if (oldValidCode != -100 && !oldValidCode.equals(orderRow.getValidCode())) {
|
||||
// orderInfo.insert(0, "从 :" + getEmjoy(oldValidCode) + " "
|
||||
// + converter.getCodeDescription(oldValidCode) + "\r变成 "
|
||||
// + getEmjoy(orderRow.getValidCode()) + " "
|
||||
// + converter.getCodeDescription(orderRow.getValidCode()) + "\r\n");
|
||||
//}
|
||||
|
||||
orderInfo
|
||||
//+ "订单+sku:" + orderRow.getId() + "\r"
|
||||
.append("京粉:").append(remarkFromJdid).append("\r").append("订单:").append(orderRow.getOrderId()).append(" (").append(orderRow.getPlus() == 1 ? "plus" : "非plus").append(")\r").append("名称:").append(orderRow.getSkuName()).append("\r").append("\r")
|
||||
.append("下单:").append(formatter.format(orderRow.getOrderTime())).append("\r").append("完成:").append(orderRow.getFinishTime() != null ? formatter.format(orderRow.getFinishTime()) : "未完成");
|
||||
|
||||
return orderInfo.toString();
|
||||
}
|
||||
|
||||
|
||||
public String getEmjoy(Integer status) {
|
||||
|
||||
Reference in New Issue
Block a user