PC端 累计营业收入,平台佣金收入,累计商家收入 接口bug修改

nightFragrance-admin/src/main/java/com/ylx/web/controller/massage/TOrderController.java

@@ -619,7 +619,11 @@ public class TOrderController extends BaseController {
     @RequestMapping(value = "pc/totalData", method = RequestMethod.GET)
     public R totalData() {
         log.info("累计营业收入,平台佣金收入,累计商家收入,查询开始：{}", LocalDateTime.now());
-        return R.ok(orderService.totalData());
+        LoginUser loginUser = this.getLoginUser();
+        log.info("登录用户信息：{}", JSON.toJSONString(loginUser));
+        TOrder order = new TOrder();
+        order.setDeptId(loginUser.getDeptId().toString());
+        return R.ok(orderService.totalData(order));
     }
 
     @ApiOperation("商户收益，总额，待结算，已结算")

nightFragrance-massage/src/main/java/com/ylx/massage/mapper/TOrderMapper.java

@@ -22,7 +22,7 @@ import java.util.List;
 @Mapper
 public interface TOrderMapper extends BaseMapper<TOrder> {
 
-    public Page<TOrder> getAll(Page<TOrder>page, @Param("param") TOrder param);
+    Page<TOrder> getAll(Page<TOrder>page, @Param("param") TOrder param);
 
     Integer getOrderNum(@Param("jsid") String jsid, @Param("startDate") Date startDate, @Param("endDate") Date endDate);
 
@@ -37,4 +37,6 @@ public interface TOrderMapper extends BaseMapper<TOrder> {
     //执行存储过程 大于48小时 订单状态更新为 已结算  自动分账  订单总金额*佣金比例划入用户余额
     void callAutoAccount(@Param("hCount")int hCount, @Param("percent")BigDecimal percent);
 
+    List<TOrder> getAll(@Param("param") TOrder param);
+
 }

nightFragrance-massage/src/main/java/com/ylx/massage/service/TOrderService.java

@@ -127,7 +127,7 @@ public interface TOrderService extends IService<TOrder> {
      * 累计营业收入  累计平台佣金收入  累计商家收入
      * @return
      */
-    public Map<String, String> totalData();
+    public Map<String, String> totalData(TOrder order);
 
     /**
      * 执行存储过程 大于48小时 订单状态更新为 已结算  自动分账  订单总金额划入用户余额

nightFragrance-massage/src/main/java/com/ylx/massage/service/impl/TOrderServiceImpl.java

@@ -1476,21 +1476,20 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
      * @return
      */
     @Override
-    public Map<String, String> totalData() {
+    public Map<String, String> totalData(TOrder order) {
         //订单状态(-1：待付款 0：待接单 1：已接单 6：已出发 2：已到达 3：服务中 4：待评价
         //5：已完成 7：退单待审核 8：退单审核通过  -2：已取消 -3：已拒绝)
 
         // 过滤 待付款 退单审核通过 已取消 已拒绝
-        List<TOrder> listOrder = baseMapper.selectList(new LambdaQueryWrapper<TOrder>().
-                ne(TOrder::getnStatus, OrderStatusEnum.WAIT_PAY).ne(TOrder::getnStatus, OrderStatusEnum.CANCEL_APPLICATION_PASS).
-                ne(TOrder::getnStatus, OrderStatusEnum.CANCEL).ne(TOrder::getnStatus, OrderStatusEnum.REFUSE));
+        List<TOrder> listOrder = baseMapper.getAll(order);
+
         Map<String, String> map = new HashMap<>();
         final BigDecimal[] total1 = {BigDecimal.ZERO};
         final BigDecimal[] total2 = {BigDecimal.ZERO};
         BigDecimal total3 = BigDecimal.ZERO;
-        listOrder.forEach(order -> {
-            total1[0] = total1[0].add(null == order.getTotalPrice() ? BigDecimal.ZERO : order.getTotalPrice());
-            total2[0] = total2[0].add(null == order.getTotalPrice() ? BigDecimal.ZERO : order.getTotalPrice().
+        listOrder.forEach(o -> {
+            total1[0] = total1[0].add(null == o.getTotalPrice() ? BigDecimal.ZERO : o.getTotalPrice());
+            total2[0] = total2[0].add(null == o.getTotalPrice() ? BigDecimal.ZERO : o.getTotalPrice().
                     multiply(new BigDecimal(hPercent)).setScale(2, RoundingMode.DOWN));
         });
         total3 = total1[0].subtract(total2[0]).setScale(2, RoundingMode.DOWN);