1
This commit is contained in:
@@ -98,10 +98,15 @@ public class OrderUtil {
|
||||
SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
||||
ValidCodeConverter converter = new ValidCodeConverter();
|
||||
String orderInfo =
|
||||
" " +getEmjoy(orderRow.getValidCode())+" "+ (converter.getCodeDescription(orderRow.getValidCode())) + "\r" +
|
||||
" " +getEmjoy(orderRow.getValidCode())+" "+ (converter.getCodeDescription(orderRow.getValidCode())) + "\r";
|
||||
if (oldValidCode != -100) {
|
||||
if (!oldValidCode.equals(orderRow.getValidCode()))
|
||||
orderInfo = "从 :" +getEmjoy(orderRow.getValidCode())+" "+(converter.getCodeDescription(oldValidCode)) + "\r变成 " +
|
||||
getEmjoy(orderRow.getValidCode())+" "+(converter.getCodeDescription(orderRow.getValidCode())) + "\r\n" + orderInfo;
|
||||
}
|
||||
|
||||
//+ "订单+sku:" + orderRow.getId() + "\r"
|
||||
"订单:" + orderRow.getOrderId() + " (" + (orderRow.getPlus() == 1 ? "plus" : "非plus") + ")\r" +
|
||||
orderInfo ="订单:" + orderRow.getOrderId() + " (" + (orderRow.getPlus() == 1 ? "plus" : "非plus") + ")\r" +
|
||||
|
||||
|
||||
"名称:" + orderRow.getSkuName() + "\r\n"
|
||||
@@ -116,11 +121,7 @@ public class OrderUtil {
|
||||
|
||||
+ "下单:" + formatter.format(orderRow.getOrderTime()) + "\r"
|
||||
+ "完成:" + (orderRow.getFinishTime() != null ? formatter.format(orderRow.getFinishTime()) : "未完成") + "\r";
|
||||
if (oldValidCode != -100) {
|
||||
if (!oldValidCode.equals(orderRow.getValidCode()))
|
||||
orderInfo = "从 :" + (converter.getCodeDescription(oldValidCode)) + "\r变成 " +
|
||||
(converter.getCodeDescription(orderRow.getValidCode())) + "\r\n" + orderInfo;
|
||||
}
|
||||
|
||||
|
||||
|
||||
return orderInfo;
|
||||
|
||||
Reference in New Issue
Block a user