|
|
@@ -1746,12 +1746,22 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, LandOrder> implem
|
|
|
if (corp != null) {
|
|
|
extraAmountItemD.append("客户名称").append(":").append(corp.getCname()).append(" >>>> ");
|
|
|
}
|
|
|
- extraAmountItemD.append(fee.getFeeName()).append(":").append(fee.getAmount()).append("\n");
|
|
|
+ extraAmountItemD.append(fee.getFeeName()).append(":").append(fee.getAmount());
|
|
|
+ if (fee.getRemarks() != null && !fee.getRemarks().isEmpty()) {
|
|
|
+ extraAmountItemD.append("----").append("备注").append(":").append(fee.getRemarks()).append("\n");
|
|
|
+ } else {
|
|
|
+ extraAmountItemD.append("\n");
|
|
|
+ }
|
|
|
} else {
|
|
|
if (corp != null) {
|
|
|
extraAmountItemC.append("车队名称").append(":").append(corp.getCname()).append(" >>>> ");
|
|
|
}
|
|
|
- extraAmountItemC.append(fee.getFeeName()).append(":").append(fee.getAmount()).append("\n");
|
|
|
+ extraAmountItemC.append(fee.getFeeName()).append(":").append(fee.getAmount());
|
|
|
+ if (fee.getRemarks() != null && !fee.getRemarks().isEmpty()) {
|
|
|
+ extraAmountItemC.append("----").append("备注").append(":").append(fee.getRemarks()).append("\n");
|
|
|
+ } else {
|
|
|
+ extraAmountItemC.append("\n");
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|