Commit 66b34a12 authored by shiyu's avatar shiyu

数据看板5

parent 7aa80705
...@@ -119,11 +119,11 @@ public class AdminDashbordServiceImpl implements AdminDashbordService { ...@@ -119,11 +119,11 @@ public class AdminDashbordServiceImpl implements AdminDashbordService {
OrderDataStat distirbutionOrderDataStat = distributorProfitDao.countOrderData(distirbutionOrderDto); OrderDataStat distirbutionOrderDataStat = distributorProfitDao.countOrderData(distirbutionOrderDto);
Map<String, Object> distributionOrderData = new HashMap<>(); Map<String, Object> distributionOrderData = new HashMap<>();
collectOrderData.put("totalAmount", PriceUtil.convertPriceFenToYuan(distirbutionOrderDataStat.getTotalAmount())); distributionOrderData.put("totalAmount", PriceUtil.convertPriceFenToYuan(distirbutionOrderDataStat.getTotalAmount()));
collectOrderData.put("totalOrderNum", distirbutionOrderDataStat.getTotalOrderNum()); distributionOrderData.put("totalOrderNum", distirbutionOrderDataStat.getTotalOrderNum());
double distributorProfit = distirbutionOrderDataStat.getTotalAmount().doubleValue() * 0.03; double distributorProfit = distirbutionOrderDataStat.getTotalAmount().doubleValue() * 0.03;
double channelDistributionProfit = distirbutionOrderDataStat.getTotalAmount().doubleValue() - distributorProfit; double channelDistributionProfit = distirbutionOrderDataStat.getTotalAmount().doubleValue() - distributorProfit;
collectOrderData.put("totalProfit", PriceUtil.convertPriceFromStr(PriceUtil.convertDoubleToString(channelDistributionProfit))); distributionOrderData.put("totalProfit", PriceUtil.convertPriceFromStr(PriceUtil.convertDoubleToString(channelDistributionProfit)));
dataPanelVo.setDistributionOrderData(distributionOrderData); dataPanelVo.setDistributionOrderData(distributionOrderData);
return Result.success(dataPanelVo); return Result.success(dataPanelVo);
} catch (Exception e) { } catch (Exception e) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment