1
This commit is contained in:
@@ -94,39 +94,42 @@ public class OrderUtil {
|
|||||||
/**
|
/**
|
||||||
* 将数据库订单转化成微信所需要文本
|
* 将数据库订单转化成微信所需要文本
|
||||||
*/
|
*/
|
||||||
public String getFormattedOrderInfo(OrderRow orderRow, Integer oldValidCode) {
|
public String getFormattedOrderInfo(OrderRow orderRow, Integer oldValidCode) {
|
||||||
SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
||||||
ValidCodeConverter converter = new ValidCodeConverter();
|
ValidCodeConverter converter = new ValidCodeConverter();
|
||||||
String orderInfo =
|
|
||||||
" " +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"
|
StringBuilder orderInfo = new StringBuilder()
|
||||||
orderInfo ="订单:" + orderRow.getOrderId() + " (" + (orderRow.getPlus() == 1 ? "plus" : "非plus") + ")\r" +
|
.append(" ").append(getEmjoy(orderRow.getValidCode())).append(" ")
|
||||||
|
.append(converter.getCodeDescription(orderRow.getValidCode())).append("\r");
|
||||||
|
|
||||||
|
if (oldValidCode != -100 && !oldValidCode.equals(orderRow.getValidCode())) {
|
||||||
"名称:" + orderRow.getSkuName() + "\r\n"
|
orderInfo.insert(0, "从 :" + getEmjoy(oldValidCode) + " "
|
||||||
//+ "商品单价:" + orderRow.getPrice() + "\r"
|
+ converter.getCodeDescription(oldValidCode) + "\r变成 "
|
||||||
//+ "商品数量:" + orderRow.getSkuNum() + "\r"
|
+ getEmjoy(orderRow.getValidCode()) + " "
|
||||||
//+ "商品总价:" + (orderRow.getPrice() * orderRow.getSkuNum()) + "\r"
|
+ converter.getCodeDescription(orderRow.getValidCode()) + "\r\n");
|
||||||
+ "计佣金额:" + orderRow.getEstimateCosPrice() + "\r"
|
|
||||||
|
|
||||||
//+ "金额:" + orderRow.getActualCosPrice() + "\r"
|
|
||||||
+ "比例:" + orderRow.getCommissionRate() + "\r"
|
|
||||||
+ "[Packet] 佣金:" + orderRow.getEstimateFee() + "\r\n"
|
|
||||||
|
|
||||||
+ "下单:" + formatter.format(orderRow.getOrderTime()) + "\r"
|
|
||||||
+ "完成:" + (orderRow.getFinishTime() != null ? formatter.format(orderRow.getFinishTime()) : "未完成") + "\r";
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
return orderInfo;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
orderInfo
|
||||||
|
//+ "订单+sku:" + orderRow.getId() + "\r"
|
||||||
|
.append("订单:").append(orderRow.getOrderId()).append(" (")
|
||||||
|
.append(orderRow.getPlus() == 1 ? "plus" : "非plus").append(")\r")
|
||||||
|
.append("名称:").append(orderRow.getSkuName()).append("\r\n")
|
||||||
|
//+ "商品单价:" + orderRow.getPrice() + "\r"
|
||||||
|
//+ "商品数量:" + orderRow.getSkuNum() + "\r"
|
||||||
|
//+ "商品总价:" + (orderRow.getPrice() * orderRow.getSkuNum()) + "\r"
|
||||||
|
.append("计佣金额:").append(orderRow.getEstimateCosPrice()).append("\r")
|
||||||
|
//+ "金额:" + orderRow.getActualCosPrice() + "\r"
|
||||||
|
.append("比例:").append(orderRow.getCommissionRate()).append("\r")
|
||||||
|
.append("[Packet] 佣金:").append(orderRow.getEstimateFee()).append("\r\n")
|
||||||
|
.append("下单:").append(formatter.format(orderRow.getOrderTime())).append("\r")
|
||||||
|
.append("完成:").append(orderRow.getFinishTime() != null
|
||||||
|
? formatter.format(orderRow.getFinishTime())
|
||||||
|
: "未完成").append("\r");
|
||||||
|
|
||||||
|
return orderInfo.toString();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
public String getEmjoy(Integer status){
|
public String getEmjoy(Integer status){
|
||||||
return switch (status) {
|
return switch (status) {
|
||||||
//[爱心]已付款
|
//[爱心]已付款
|
||||||
|
|||||||
Reference in New Issue
Block a user