fix

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/financial/TopDivideLogController.java

@@ -98,8 +98,16 @@ public class TopDivideLogController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:log:list')")
     @PostMapping("/commissionPrint")
     public AjaxResult<TopDivideOrderVo> getCommissionPrint(@RequestBody TopDivideOrderQueryBo bo) {
-        List<TopDivideOrderVo> list = iTopDivideLogService.getCommissionList(bo);
-        return AjaxResult.success(list.get(0));
+        TopDivideOrderVo vo = iTopDivideLogService.getCommissionDetail(bo);
+        return AjaxResult.success(vo);
+    }
+
+    @ApiOperation("查询佣金结算列表统计")
+    @PreAuthorize("@ss.hasPermi('system:log:list')")
+    @GetMapping("/commissionOrderCount")
+    public AjaxResult<Map<String,Object>> commissionOrderCount(TopDivideOrderQueryBo bo) {
+        Map<String,Object> map = iTopDivideLogService.getCommissionOrderCount(bo);
+        return AjaxResult.success(map);
     }
 
     @ApiOperation("通过坏账配置详情")
@@ -141,6 +149,8 @@ public class TopDivideLogController extends BaseController {
         return AjaxResult.success(list);
     }
 
+
+
     /**
      * 获取分成记录详细信息
      */

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/order/TopOldOrderController.java

@@ -173,6 +173,8 @@ public class TopOldOrderController extends BaseController {
         return util.exportExcel(list, "佣金结算列表");
     }
 
+
+
     @ApiOperation("机构分成列表")
     @PreAuthorize("@ss.hasPermi('system:tp:list')")
     @GetMapping("/queryTenantList")

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/service/ITopDivideLogService.java

@@ -14,6 +14,7 @@ import com.zhongzheng.modules.top.goods.bo.TopOldOrderEditBo;
 
 import java.util.Collection;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 分成记录Service接口
@@ -71,6 +72,10 @@ public interface ITopDivideLogService extends IService<TopDivideLog> {
 
 	List<TopDivideOrderVo> getCommissionList(TopDivideOrderQueryBo bo);
 
+	TopDivideOrderVo getCommissionDetail(TopDivideOrderQueryBo bo);
+
+	Map<String,Object> getCommissionOrderCount(TopDivideOrderQueryBo bo);
+
 	String getBadBillConfig();
 
 	boolean updateBadBillConfig(List<SysTenantBadBillConfigBo> bo);

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/service/ITopDivideOrderService.java

@@ -60,6 +60,8 @@ public interface ITopDivideOrderService extends IService<TopDivideOrder> {
 
 	Map<String,Object> getMonthOrderCount(TopDivideOrderQueryBo bo);
 
+
+
 	List<TopDivideOrderVo> getMonthOrderListWithPrint(TopDivideOrderQueryBo bo);
 
 	List<TopDivideOrderVo> getMonthFinishList(TopDivideOrderQueryBo bo);
@@ -80,4 +82,6 @@ public interface ITopDivideOrderService extends IService<TopDivideOrder> {
 
 	Integer updateCheckStatusById(TopOrderBankPay bankPay);
 
+	List<String> getBusinessList(String orderSn);
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/service/impl/TopDivideLogServiceImpl.java

@@ -34,6 +34,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.pagehelper.Page;
 
+import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -350,6 +351,33 @@ public class TopDivideLogServiceImpl extends ServiceImpl<TopDivideLogMapper, Top
         return list;
     }
 
+    @Override
+    public TopDivideOrderVo getCommissionDetail(TopDivideOrderQueryBo bo) {
+        List<TopDivideOrderVo> list = iTopDivideOrderService.getMonthCreditList(bo);
+        TopDivideOrderVo vo = list.get(0);
+        List<String> businessList = iTopDivideOrderService.getBusinessList(vo.getOrderSn());
+        vo.setBusinessList(businessList);
+        return vo;
+    }
+
+    @Override
+    public Map<String, Object> getCommissionOrderCount(TopDivideOrderQueryBo bo) {
+        Map<String, Object> map = new HashMap<>();
+        List<TopDivideOrderVo> list = iTopDivideOrderService.getMonthCreditList(bo);
+        BigDecimal brokerageTotalMoney = new BigDecimal(0);
+        BigDecimal orderTotalPrice = new BigDecimal(0);
+        BigDecimal pretaxTotalBrokerage = new BigDecimal(0);
+        for(TopDivideOrderVo vo :list){
+            brokerageTotalMoney = brokerageTotalMoney.add(vo.getBrokerage());
+            orderTotalPrice = orderTotalPrice.add(vo.getOrderPrice());
+            pretaxTotalBrokerage = pretaxTotalBrokerage.add(vo.getPretaxBrokerage());
+        }
+        map.put("orderTotalPrice",orderTotalPrice);  //订单金额
+        map.put("BrokerageTotalMoney",brokerageTotalMoney); //结算佣金
+        map.put("pretaxTotalBrokerage",pretaxTotalBrokerage);//税前佣金
+        return map;
+    }
+
     @Override
     public String getBadBillConfig() {
         return topConfigService.selectConfigByKeyNoCache("bad_bill");

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/service/impl/TopDivideOrderServiceImpl.java

@@ -203,6 +203,8 @@ public class TopDivideOrderServiceImpl extends ServiceImpl<TopDivideOrderMapper,
         return map;
     }
 
+
+
     @Override
     public List<TopDivideOrderVo> getMonthOrderListWithPrint(TopDivideOrderQueryBo bo) {
         List<TopDivideOrderVo> fList = baseMapper.getFinishList(bo);
@@ -272,4 +274,9 @@ public class TopDivideOrderServiceImpl extends ServiceImpl<TopDivideOrderMapper,
     public Integer updateCheckStatusById(TopOrderBankPay bankPay) {
         return baseMapper.updateCheckStatusById(bankPay);
     }
+
+    @Override
+    public List<String> getBusinessList(String orderSn) {
+        return baseMapper.getBusinessList(orderSn);
+    }
 }