fix

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

@@ -8,6 +8,7 @@ import com.zhongzheng.common.utils.ServletUtils;
 import com.zhongzheng.common.utils.poi.ExcelUtil;
 import com.zhongzheng.framework.web.service.TopTokenService;
 import com.zhongzheng.modules.top.financial.bo.OrderRefundPayBo;
+import com.zhongzheng.modules.top.financial.bo.TopDivideLogQueryBo;
 import com.zhongzheng.modules.top.financial.vo.OrderRefundPayDetailVo;
 import com.zhongzheng.modules.top.financial.vo.TopCostTpVo;
 import com.zhongzheng.modules.top.financial.vo.TopOrderLogVo;
@@ -143,7 +144,7 @@ public class TopOldOrderController extends BaseController {
     @ApiOperation("业务员提成列表导出")
     @PreAuthorize("@ss.hasPermi('system:tp:list')")
     @GetMapping("/sellerListExport")
-    public AjaxResult<List<TopOldOrderExportVo>> sellerListExport(TopOldOrderQueryBo bo) {
+    public AjaxResult<List<TopOldOrderExportVo>> sellerListExport(TopDivideLogQueryBo bo) {
         List<TopOldOrderExportVo> list = iTopOldOrderService.tenantListExport(bo);
         ExcelUtil<TopOldOrderExportVo> util = new ExcelUtil<TopOldOrderExportVo>(TopOldOrderExportVo.class);
         return util.exportExcel(list, "机构分成列表");
@@ -161,7 +162,7 @@ public class TopOldOrderController extends BaseController {
     @ApiOperation("机构分成列表导出")
     @PreAuthorize("@ss.hasPermi('system:tp:list')")
     @GetMapping("/tenantListExport")
-    public AjaxResult<List<TopOldOrderExportVo>> tenantListExport(TopOldOrderQueryBo bo) {
+    public AjaxResult<List<TopOldOrderExportVo>> tenantListExport(TopDivideLogQueryBo bo) {
         List<TopOldOrderExportVo> list = iTopOldOrderService.tenantListExport(bo);
         ExcelUtil<TopOldOrderExportVo> util = new ExcelUtil<TopOldOrderExportVo>(TopOldOrderExportVo.class);
         return util.exportExcel(list, "机构分成列表");

zhongzheng-system/src/main/java/com/zhongzheng/modules/schedule/service/impl/ScheduleServiceImpl.java

@@ -1532,7 +1532,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
 
     @Override
     public void makeDivideBrokerageMonthBill() {
-        //生成机构佣金
+        //生成机构佣金,佣金只返给机构
         // 上月起始
         Calendar cal1 = new GregorianCalendar();
         cal1.add(Calendar.MONTH, -1);
@@ -1601,6 +1601,9 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
                     addBo.setOrderSn(vo.getOrderSn());
                     addBo.setOrderType(1);
                     iTopDivideOrderService.insertByAddBo(addBo);
+                    //佣金机构下的订单，要么都有业务员，要么都没有，有则取第一个
+                    divideLog.setCreateUsername(vo.getCreateUsername());
+                    divideLog.setCreateNo(vo.getCreateNo());
                 }
                 divideLog.setTotalPayMoney(totalPayMoney);
                 //退款待扣分成
@@ -1617,6 +1620,10 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
                     addBo.setRefundSn(vo.getRefundSn());
                     addBo.setOrderType(2);
                     iTopDivideOrderService.insertByAddBo(addBo);
+                    //佣金机构下的订单，要么都有业务员，要么都没有，有则取第一个
+                    divideLog.setCreateUsername(vo.getCreateUsername());
+                    divideLog.setCreateNo(vo.getCreateNo());
+
                 }
                 //加上上个月流入待扣分成
                 divideLog.setDeductMoney(divideLog.getDeductMoney().add(deductMoney));

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/vo/TopDivideOrderVo.java

@@ -84,5 +84,14 @@ public class TopDivideOrderVo {
 	private Integer divideType;
 	@ApiModelProperty("退款时间")
 	private Long refundTime;
+	/** 业务员名称 */
+	@ApiModelProperty("业务员名称")
+	private String createUsername;
+	/** 业务员名称ID */
+	@ApiModelProperty("业务员名称ID")
+	private Long createSysUserId;
+	/** 业务号 */
+	@ApiModelProperty("业务号")
+	private String createNo;
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/ITopOldOrderService.java

@@ -89,7 +89,7 @@ public interface ITopOldOrderService extends IService<TopOldOrder> {
 	TopOrderStatisticsVo statisticsOrder();
 
 
-	List<TopOldOrderExportVo> tenantListExport(TopOldOrderQueryBo bo);
+	List<TopOldOrderExportVo> tenantListExport(TopDivideLogQueryBo bo);
 
 	List<TopOldOrderExportVo> sellerListExport(TopOldOrderQueryBo bo);
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/impl/TopOldOrderServiceImpl.java

@@ -2324,15 +2324,15 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
     }
 
     @Override
-    public List<TopOldOrderExportVo> tenantListExport(TopOldOrderQueryBo bo) {
+    public List<TopOldOrderExportVo> tenantListExport(TopDivideLogQueryBo bo) {
         List<TopOldOrderExportVo> listExport = new ArrayList<>();
-        List<TopOldOrderVo> list = this.baseMapper.queryTenantList(bo);
-        for (TopOldOrderVo vo : list) {
+        List<TopDivideLogVo> list = iTopDivideLogService.getCompanyList(bo);
+       /* for (TopOldOrderVo vo : list) {
             if (vo.getCreditStatus() == 0 && Validator.isNotEmpty(vo.getPredictReceiveTime())) {
                 Integer predictDay = DateUtils.dayBetween(vo.getPredictReceiveTime(), DateUtils.getNowTime());
                 vo.setPredictReceiveDay(predictDay);
             }
-        }
+        }*/
         return listExport;
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/order/vo/TopOldOrderCompanyExportVo.java

@@ -0,0 +1,63 @@
+package com.zhongzheng.modules.top.order.vo;
+
+import com.zhongzheng.common.annotation.Excel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+
+/**
+ * 订单视图对象 mall_package
+ *
+ * @author ruoyi
+ * @date 2023-04-20
+ */
+@Data
+@ApiModel("订单视图对象")
+public class TopOldOrderCompanyExportVo {
+	private static final long serialVersionUID = 1L;
+
+	@Excel(name = "时间")
+	@ApiModelProperty("时间")
+	private String timeStr;
+
+	/** 下单时间 */
+	@Excel(name = "类型")
+	@ApiModelProperty("类型")
+	private String billType;
+
+
+	@Excel(name = "机构名称")
+	@ApiModelProperty("机构名称")
+	private String tenantName;
+
+	@Excel(name = "已付分成(元)")
+	@ApiModelProperty("已付分成(元)")
+	private String createUsername;
+	/** 业务号 */
+	@Excel(name = "业务号")
+	@ApiModelProperty("业务号")
+	private String createNo;
+	/** 订单标准价格 */
+	@Excel(name = "合同金额(元)")
+	@ApiModelProperty("订单标准价格")
+	private BigDecimal orderPrice;
+	/** 实收账款（元） */
+	@Excel(name = "已收账款(元)")
+	@ApiModelProperty("实收账款（元）")
+	private BigDecimal orderReceived;
+	/** 未收账款（元） */
+	@Excel(name = "未收账款(元)")
+	@ApiModelProperty("未收账款（元）")
+	private BigDecimal orderUncollected;
+	/** 预收款时间 */
+	@Excel(name = "预收时间")
+	@ApiModelProperty("预收款时间")
+	private String predictReceiveTime;
+	@ApiModelProperty("剩余天数")
+	private Integer predictReceiveDay;
+
+
+}

zhongzheng-system/src/main/resources/mapper/modules/top/TopDivideOrderMapper.xml

@@ -83,7 +83,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         v.divide_company_money,
         v.divide_seller_money,
         v.tenant_id,
-        v.create_no
+        v.create_no,
+        v.create_username
         FROM
         v_top_order v
         WHERE
@@ -109,7 +110,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         tor.divide_money,
         tor.tenant_id,
         tor.refund_sn,
-        v.create_no
+        v.create_no,
+        v.create_username
         FROM
         top_old_order_refund tor
         LEFT JOIN v_top_order v on tor.order_sn = v.order_sn