|
@@ -31,6 +31,7 @@ import org.springblade.modules.auth.utils.TokenUtil;
|
|
|
import org.springblade.modules.business.entity.Facility;
|
|
|
import org.springblade.modules.business.service.IFacilityService;
|
|
|
import org.springblade.modules.business.service.IShopService;
|
|
|
+import org.springblade.modules.finance.entity.OrderGoods;
|
|
|
import org.springblade.modules.finance.service.IOrderGoodsService;
|
|
|
import org.springblade.modules.system.entity.User;
|
|
|
import org.springblade.modules.system.entity.UserMerchant;
|
|
@@ -204,7 +205,7 @@ public class ApiMerchantUserController {
|
|
|
List<MerchantPieRes> result = new ArrayList<>();
|
|
|
|
|
|
MerchantPieRes reveal = new MerchantPieRes();//展现
|
|
|
- reveal.setValue("200");
|
|
|
+ reveal.setValue("0");
|
|
|
reveal.setName("展现");
|
|
|
Map<String, String> revealColorMap = new HashMap<>();
|
|
|
revealColorMap.put("color", "#1890ff");
|
|
@@ -212,7 +213,7 @@ public class ApiMerchantUserController {
|
|
|
result.add(reveal);
|
|
|
|
|
|
MerchantPieRes order = new MerchantPieRes();//订单
|
|
|
- order.setValue("300");
|
|
|
+ order.setValue("0");
|
|
|
order.setName("点击");
|
|
|
Map<String, String> orderColorMap = new HashMap<>();
|
|
|
orderColorMap.put("color", "#91cb74");
|
|
@@ -220,15 +221,17 @@ public class ApiMerchantUserController {
|
|
|
result.add(order);
|
|
|
|
|
|
MerchantPieRes click = new MerchantPieRes();//订单
|
|
|
- click.setValue("100");
|
|
|
- click.setName("订单");
|
|
|
+ List<OrderGoods> merchantOrder = orderGoodsService.getMerchantOrder(AuthUtil.getUserId(), timeRangeReq.getStartTime(), timeRangeReq.getEndTime());
|
|
|
+ click.setValue(merchantOrder.size() + "");
|
|
|
+ click.setName("售出数量");
|
|
|
Map<String, String> clickColorMap = new HashMap<>();
|
|
|
clickColorMap.put("color", "#fac858");
|
|
|
click.setItemStyle(clickColorMap);
|
|
|
result.add(click);
|
|
|
|
|
|
MerchantPieRes pay = new MerchantPieRes();//付款
|
|
|
- pay.setValue("100");
|
|
|
+ List<OrderGoods> collect = merchantOrder.stream().filter(orderGoods -> orderGoods.getIsAfterSales() == 0).collect(Collectors.toList());
|
|
|
+ pay.setValue(collect.size() + "");
|
|
|
pay.setName("付款");
|
|
|
Map<String, String> payColorMap = new HashMap<>();
|
|
|
payColorMap.put("color", "#ee6666");
|