|
@@ -535,9 +535,12 @@ public class AwaitSendController {
|
|
|
String productName = ctrOrderProduct(orders.get(i));
|
|
|
if("jd".equalsIgnoreCase(salesOrderInfo.getSalesPostFirm())){
|
|
|
subTemplate = subTemplate.replace(salesId.toString(), "<font style=\"font-size:6px\">"+productName+"</font>");
|
|
|
- }else{
|
|
|
+ } else if("dbl".equalsIgnoreCase(salesOrderInfo.getSalesPostFirm())) {
|
|
|
+ subTemplate = subTemplate.replace(salesId.toString(), productName);
|
|
|
+ } else{
|
|
|
subTemplate = subTemplate.replace(ctrOrderUUID(salesOrderInfo.getSalesOrderId()), productName);
|
|
|
}
|
|
|
+
|
|
|
// 替换订单号
|
|
|
subTemplate = subTemplate.replace(orderId, orders.get(i).getSalesOrderId());
|
|
|
// 替换备注
|