|
|
@@ -295,7 +295,7 @@ public class FeiYunUtils {
|
|
|
int max = Integer.parseInt(commonInfoService.findOne(420).getValue());
|
|
|
for (int i=0;i<max;i++){
|
|
|
stringBuilder.append("<CB>").append("#").append(tbOrder.getCountOrder()).append("-").append("墨轩云商").append("</CB><BR>");
|
|
|
- stringBuilder.append("<CB>").append(tbOrder.getShopName()).append("</CB><BR>");
|
|
|
+ stringBuilder.append("<C>").append(tbOrder.getShopName()).append("</C><BR>");
|
|
|
if(tbOrder.getOrderType()==1){
|
|
|
stringBuilder.append("<BOLD>类型:").append("到店取餐</BOLD><BR>");
|
|
|
stringBuilder.append("<BOLD>取餐号:").append(tbOrder.getOrderCode()).append("</BOLD><BR>");
|
|
|
@@ -304,7 +304,7 @@ public class FeiYunUtils {
|
|
|
}
|
|
|
stringBuilder.append("订单号:").append(tbOrder.getOrderNumber()).append("<BR>");
|
|
|
stringBuilder.append("--------------------------------<BR>");
|
|
|
- stringBuilder.append("<B>名称 单价 数量 金额 </B><BR>");
|
|
|
+ stringBuilder.append("名称 单价 数量 金额 <BR>");
|
|
|
stringBuilder.append("--------------------------------<BR>");
|
|
|
BigDecimal packMoney=BigDecimal.ZERO;
|
|
|
BigDecimal goodsMoney=BigDecimal.ZERO;
|
|
|
@@ -320,8 +320,8 @@ public class FeiYunUtils {
|
|
|
}else{
|
|
|
name=orderGoods.getGoodsName();
|
|
|
}
|
|
|
- stringBuilder.append("<B>").append(name).append("</B><BR>");
|
|
|
- stringBuilder.append("<B> ");
|
|
|
+ stringBuilder.append(name).append("<BR>");
|
|
|
+ stringBuilder.append(" ");
|
|
|
stringBuilder.append(orderGoods.getGoodsPrice());
|
|
|
if(orderGoods.getGoodsPrice().doubleValue()<10){
|
|
|
stringBuilder.append(" ");
|
|
|
@@ -333,7 +333,7 @@ public class FeiYunUtils {
|
|
|
stringBuilder.append(orderGoods.getGoodsNum());
|
|
|
stringBuilder.append(" ");
|
|
|
stringBuilder.append(sumMoney);
|
|
|
- stringBuilder.append("</B><BR>");
|
|
|
+ stringBuilder.append("<BR>");
|
|
|
stringBuilder.append("<BR>");
|
|
|
}
|
|
|
stringBuilder.append("--------------------------------<BR>");
|
|
|
@@ -344,17 +344,17 @@ public class FeiYunUtils {
|
|
|
stringBuilder.append("<BOLD>备注:").append(remark).append("</BOLD><BR>");
|
|
|
stringBuilder.append("--------------------------------<BR>");
|
|
|
|
|
|
- stringBuilder.append("<B>打包费:").append(packMoney).append("元</B><BR>");
|
|
|
- stringBuilder.append("<B>商品费:").append(goodsMoney).append("元</B><BR>");
|
|
|
+ stringBuilder.append("打包费:").append(packMoney).append("元<BR>");
|
|
|
+ stringBuilder.append("商品费:").append(goodsMoney).append("元<BR>");
|
|
|
if(tbOrder.getCouponMoney()!=null){
|
|
|
- stringBuilder.append("<B>优惠券:-").append(tbOrder.getCouponMoney()).append("元</B><BR>");
|
|
|
+ stringBuilder.append("优惠券:-").append(tbOrder.getCouponMoney()).append("元<BR>");
|
|
|
}
|
|
|
BigDecimal errandMoney = tbOrder.getErrandMoney();
|
|
|
if(errandMoney==null){
|
|
|
errandMoney=BigDecimal.ZERO;
|
|
|
}
|
|
|
- stringBuilder.append("<B>跑腿费:").append(errandMoney).append("元</B><BR>");
|
|
|
- stringBuilder.append("<B>合计:").append(tbOrder.getPayMoney()).append("元</B><BR>");
|
|
|
+ stringBuilder.append("跑腿费:").append(errandMoney).append("元<BR>");
|
|
|
+ stringBuilder.append("<BOLD>合计:").append(tbOrder.getPayMoney()).append("元</BOLD><BR>");
|
|
|
stringBuilder.append("--------------------------------<BR>");
|
|
|
if(StringUtils.isNotEmpty(tbOrder.getAddress())){
|
|
|
JSONObject jsonObject = JSONObject.parseObject(tbOrder.getAddress());
|
|
|
@@ -364,16 +364,14 @@ public class FeiYunUtils {
|
|
|
String province = jsonObject.getString("province");
|
|
|
String userName = jsonObject.getString("userName");
|
|
|
String phone = jsonObject.getString("userPhone");
|
|
|
- stringBuilder.append("<B>").append(userName).append("</B>").append("<BR>");
|
|
|
- stringBuilder.append("<B>").append(phone).append("</B>").append("<BR>");
|
|
|
- stringBuilder.append("<B>").append(province).append(city).append(district).append(addressDetail).append("</B>").append("<BR>");
|
|
|
+ stringBuilder.append("<BOLD>").append(userName).append("</BOLD>").append("<BR>");
|
|
|
+ stringBuilder.append("<BOLD>").append(phone).append("</BOLD>").append("<BR>");
|
|
|
+ stringBuilder.append("<BOLD>").append(province).append(city).append(district).append(addressDetail).append("</BOLD>").append("<BR>");
|
|
|
}else{
|
|
|
stringBuilder.append("<B>").append(tbOrder.getPhone()).append("</B>").append("<BR>");
|
|
|
}
|
|
|
|
|
|
- stringBuilder.append("<B>订餐时间:").append(tbOrder.getPayTime()).append("</B><BR>");
|
|
|
- stringBuilder.append("<BR>").append("<BR>").append("<BR>");
|
|
|
- stringBuilder.append("<CB>祝您用餐愉快</CB><BR>");
|
|
|
+ stringBuilder.append("<BOLD>订餐时间:").append(tbOrder.getPayTime()).append("</BOLD><BR>");
|
|
|
stringBuilder.append("<BR>").append("<BR>").append("<BR>");
|
|
|
stringBuilder.append("<CUT>");
|
|
|
}
|