数据报表-销量-统计
商品 规格 返回
This commit is contained in:
@@ -266,10 +266,10 @@ public class StockV2Vo {
|
||||
this.type = "称重商品";
|
||||
break;
|
||||
case "currentPrice":
|
||||
this.type = "套餐商品/团购卷";
|
||||
this.type = "时价商品";
|
||||
break;
|
||||
case "group":
|
||||
this.type = "时价商品";
|
||||
this.type = "套餐商品/团购卷";
|
||||
break;
|
||||
default:
|
||||
this.type = type;
|
||||
|
||||
@@ -48,10 +48,10 @@ public class StockVo {
|
||||
this.type = "称重商品";
|
||||
break;
|
||||
case "currentPrice":
|
||||
this.type = "套餐商品/团购卷";
|
||||
this.type = "时价商品";
|
||||
break;
|
||||
case "group":
|
||||
this.type = "时价商品";
|
||||
this.type = "套餐商品/团购卷";
|
||||
break;
|
||||
default:
|
||||
this.type = type;
|
||||
|
||||
@@ -152,11 +152,21 @@ public class TbOrderSalesCountByDayVo {
|
||||
count();
|
||||
}
|
||||
|
||||
|
||||
|
||||
public TbOrderSalesCountByDayVo(Long salesNum, Long refNum, Long num, BigDecimal salesAmount, BigDecimal refAmount) {
|
||||
this.salesNum = salesNum;
|
||||
this.refNum = refNum;
|
||||
this.salesAmount = salesAmount;
|
||||
this.refAmount = refAmount;
|
||||
this.num = num;
|
||||
count();
|
||||
}
|
||||
|
||||
public void count(){
|
||||
salesNum=salesNum-refNum;
|
||||
salesAmount=salesAmount.subtract(refAmount);
|
||||
if (salesNum == null) salesNum = 0l;
|
||||
if (refNum == null) refNum = 0l;
|
||||
salesNum = salesNum - refNum;
|
||||
if (salesAmount == null) salesAmount = BigDecimal.ZERO;
|
||||
if (refAmount == null) refAmount = BigDecimal.ZERO;
|
||||
salesAmount = salesAmount.subtract(refAmount);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user