利润图表

ch-admin-api/src/main/java/com/wwdz/ch/admin/impl/AdminDashbordServiceImpl.java

@@ -120,7 +120,8 @@ public class AdminDashbordServiceImpl implements AdminDashbordService {
 
             //统计分销订单数据
             DistributorProfitRequestDto distirbutionOrderDto = new DistributorProfitRequestDto();
-            distirbutionOrderDto.setTypeList(Arrays.asList(DistributionEnum.DistributionTypeEnum.FIXED_PRICE.getCode(), DistributionEnum.DistributionTypeEnum.AUCTION.getCode()));
+            distirbutionOrderDto.setTypeList(Arrays.asList(DistributionEnum.DistributionTypeEnum.FIXED_PRICE.getCode(), DistributionEnum.DistributionTypeEnum.AUCTION.getCode(),
+                    DistributionEnum.DistributionTypeEnum.COLLECT.getCode(), DistributionEnum.DistributionTypeEnum.GROUP_PURCHASE.getCode()));
             distirbutionOrderDto.setStartCreateTime(startTime);
             distirbutionOrderDto.setEndCreateTime(endTime);
             OrderDataStat distirbutionOrderDataStat = distributorProfitDao.countOrderData(distirbutionOrderDto);
@@ -129,8 +130,13 @@ public class AdminDashbordServiceImpl implements AdminDashbordService {
             distributionOrderData.put("totalAmount", PriceUtil.convertPriceFenToYuan(distirbutionOrderDataStat.getTotalAmount()));
             distributionOrderData.put("totalOrderNum", distirbutionOrderDataStat.getTotalOrderNum());
             double distributorProfit = distirbutionOrderDataStat.getTotalAmount().doubleValue() * 0.03;
-            double channelDistributionProfit = distirbutionOrderDataStat.getTotalAmount().doubleValue() - distributorProfit;
-            distributionOrderData.put("totalProfit", PriceUtil.convertDoubleToString(channelDistributionProfit));
+            UserAccountDetailRequestDto userAccountDetailRequestDto = new UserAccountDetailRequestDto();
+            userAccountDetailRequestDto.setStartCreateTime(startTime);
+            userAccountDetailRequestDto.setEndCreateTime(endTime);
+            Result financeResult = sysFinanceService.findSystemBillIncomeDetail(userAccountDetailRequestDto);
+            Map<String, Object> map = (Map<String, Object>) financeResult.getData();
+            String totalAmount = (String) map.get("amount");
+            distributionOrderData.put("totalProfit", totalAmount);
             dataPanelVo.setDistributionOrderData(distributionOrderData);
             return Result.success(dataPanelVo);
         } catch (Exception e) {

ch-wx-api/src/main/java/com/wwdz/ch/wx/config/WebMvcConfiguration.java

@@ -50,13 +50,13 @@ public class WebMvcConfiguration implements WebMvcConfigurer {
 					/*	,"/wx/specialPerformance/**"
 						, "/wx/supplierItem/**", "/wx/shareRecord/**", "/wx/distributionOrder/**", "/wx/selfPage/**", "/wx/auctionRecord/**",
 						"/wx/shareRecord/**","/wx/collectionBook/**", "/wx/collectedRecord/**", "/wx/collectionItemsRelation/**","/wx/collectionShareRecord/**"
-						,"/wx/logistics/**","/wx/follow/**","/wx/user/findById","/wx/user/updateQrCode", "/wx/groupPurchase/**"
+						,"/wx/logistics/**","/wx/follow/**","/wx/user/findById","/wx/user/updateQrCode", "/wx/groupPurchase/**",
 
 						//		, "/wx/supplierItem/**", "/wx/shareRecord/**", "/wx/distributionOrder/**", "/wx/selfPage/**", "/wx/auctionRecord/**"
 						"/wx/officialAccount/**",
 						"/wx/item/**",
 						"/wx/aiAssistant/**",
-						"/wx/im/**"*/
+						"/wx/im/**" */
 				);
 	}
 }