|
|
@@ -1315,7 +1315,7 @@ public class OrderController {
|
|
|
systemFormat.setSales(new BigDecimal(systemFormat.getTotalSalesInclTax()).subtract(new BigDecimal(systemFormat.getTaxAmount())).setScale(2,BigDecimal.ROUND_HALF_UP).toString());
|
|
|
// 设置实际销售额
|
|
|
systemFormat.setCurrentPrice(new BigDecimal(systemFormat.getTotalSalesInclTax()).divide(new BigDecimal(systemFormat.getUnitSold()),2,BigDecimal.ROUND_HALF_UP).setScale(2,BigDecimal.ROUND_HALF_UP).toEngineeringString());
|
|
|
- if (Dict.orderStatus.item_401.equals(systemFormat.getOrderStatus())){
|
|
|
+ if (Dict.orderStatus.item_401.getItem().equals(systemFormat.getOrderStatus())){
|
|
|
systemFormat.setUnitSold("-"+systemFormat.getUnitSold());
|
|
|
systemFormat.setSales("-"+systemFormat.getSales());
|
|
|
systemFormat.setTaxAmount("-"+systemFormat.getTaxAmount());
|
|
|
@@ -1334,7 +1334,7 @@ public class OrderController {
|
|
|
}
|
|
|
}
|
|
|
// 如果是退货
|
|
|
- if (Dict.orderStatus.item_401.equals(systemFormat.getOrderStatus())){
|
|
|
+ if (Dict.orderStatus.item_401.getItem().equals(systemFormat.getOrderStatus())){
|
|
|
systemFormat.setSaleReturnType("整单退货");
|
|
|
systemFormat.setTransactionType("退货");
|
|
|
}else{
|
