fix

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

@@ -8,8 +8,11 @@ import com.zhongzheng.common.utils.SecurityUtils;
 import com.zhongzheng.modules.system.bo.SysTenantBadBillConfigBo;
 import com.zhongzheng.modules.top.financial.bo.TopDivideLogEditBo;
 import com.zhongzheng.modules.top.financial.bo.TopDivideLogQueryBo;
+import com.zhongzheng.modules.top.financial.bo.TopDivideOrderQueryBo;
 import com.zhongzheng.modules.top.financial.service.ITopDivideLogService;
+import com.zhongzheng.modules.top.financial.service.ITopDivideOrderService;
 import com.zhongzheng.modules.top.financial.vo.TopDivideLogVo;
+import com.zhongzheng.modules.top.financial.vo.TopDivideOrderVo;
 import com.zhongzheng.modules.top.goods.bo.TopOldOrderEditBo;
 import com.zhongzheng.modules.top.user.vo.TopSysConfigVo;
 import lombok.RequiredArgsConstructor;
@@ -47,6 +50,8 @@ public class TopDivideLogController extends BaseController {
 
     private final ITopDivideLogService iTopDivideLogService;
 
+    private final ITopDivideOrderService iTopDivideOrderService;
+
     /**
      * 查询分成记录列表
      */
@@ -101,4 +106,12 @@ public class TopDivideLogController extends BaseController {
     {
         return toAjax(iTopDivideLogService.updateBadBillConfig(bo));
     }
+
+    @ApiOperation("查询月份订单列表")
+    @PreAuthorize("@ss.hasPermi('system:log:list')")
+    @GetMapping("/monthOrderList")
+    public AjaxResult<List<TopDivideOrderVo>> getMonthOrderList(TopDivideOrderQueryBo bo) {
+        List<TopDivideOrderVo> list = iTopDivideOrderService.getMonthOrderList(bo);
+        return AjaxResult.success(list);
+    }
 }

zhongzheng-admin/src/main/resources/application-dev.yml

@@ -158,6 +158,8 @@ oldOrder:
     studyRecord: http://gdxypx.xy.com/WitSystem/BussinessApi/GetStudyRecord
     orderCheck: http://gdxypx.xy.com/WitSystem/BussinessApi/AuditUnderOrder
     finishOrder: http://gdxypx.xy.com/WitSystem/BussinessApi/CompleteOrder
+    refuseCheck: http://gdxypx.xy.com/WitSystem/BussinessApi/ReFundAuditResult
+    inputOrderSn: http://gdxypx.xy.com/WitSystem/BussinessApi/GetNewYxtinputOrderSn
 
 oldSys:
     host: http://gdxypx.xy.com

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/bo/TopDivideOrderAddBo.java

@@ -0,0 +1,39 @@
+package com.zhongzheng.modules.top.financial.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 分成记录订单关联添加对象 top_divide_order
+ *
+ * @author hjl
+ * @date 2023-05-12
+ */
+@Data
+@ApiModel("分成记录订单关联添加对象")
+public class TopDivideOrderAddBo {
+
+    /** 分成记录ID */
+    @ApiModelProperty("分成记录ID")
+    private Long divideLogId;
+    /** 订单号 */
+    @ApiModelProperty("订单号")
+    private String orderSn;
+    /** 1 完单  2退款 */
+    @ApiModelProperty("1 完单  2退款")
+    private Integer orderType;
+    /** 状态 1正常 0关闭 */
+    @ApiModelProperty("状态 1正常 0关闭")
+    private Integer status;
+    /** 创建时间 */
+    @ApiModelProperty("创建时间")
+    private Long createTime;
+    /** 更新时间 */
+    @ApiModelProperty("更新时间")
+    private Long updateTime;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/bo/TopDivideOrderEditBo.java

@@ -0,0 +1,44 @@
+package com.zhongzheng.modules.top.financial.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+/**
+ * 分成记录订单关联编辑对象 top_divide_order
+ *
+ * @author hjl
+ * @date 2023-05-12
+ */
+@Data
+@ApiModel("分成记录订单关联编辑对象")
+public class TopDivideOrderEditBo {
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long id;
+
+    /** 分成记录ID */
+    @ApiModelProperty("分成记录ID")
+    private Long divideLogId;
+
+    /** 订单号 */
+    @ApiModelProperty("订单号")
+    private String orderSn;
+
+    /** 1 完单  2退款 */
+    @ApiModelProperty("1 完单  2退款")
+    private Integer orderType;
+
+    /** 状态 1正常 0关闭 */
+    @ApiModelProperty("状态 1正常 0关闭")
+    private Integer status;
+
+    /** 更新时间 */
+    @ApiModelProperty("更新时间")
+    private Long updateTime;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/bo/TopDivideOrderQueryBo.java

@@ -0,0 +1,66 @@
+package com.zhongzheng.modules.top.financial.bo;
+
+import com.zhongzheng.common.annotation.Excel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.Map;
+import java.util.HashMap;
+
+import com.zhongzheng.common.core.domain.BaseEntity;
+
+/**
+ * 分成记录订单关联分页查询对象 top_divide_order
+ *
+ * @author hjl
+ * @date 2023-05-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("分成记录订单关联分页查询对象")
+public class TopDivideOrderQueryBo extends BaseEntity {
+
+	/** 分页大小 */
+	@ApiModelProperty("分页大小")
+	private Integer pageSize;
+	/** 当前页数 */
+	@ApiModelProperty("当前页数")
+	private Integer pageNum;
+	/** 排序列 */
+	@ApiModelProperty("排序列")
+	private String orderByColumn;
+	/** 排序的方向desc或者asc */
+	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
+	private String isAsc;
+
+
+	/** 分成记录ID */
+	@ApiModelProperty("分成月份记录ID")
+	private Long divideLogId;
+	/** 订单号 */
+	@ApiModelProperty("订单号")
+	private String orderSn;
+	/** 1 完单  2退款 */
+	@ApiModelProperty("1 完单  2退款")
+	private Integer orderType;
+	/** 状态 1正常 0关闭 */
+	@ApiModelProperty("状态 1正常 0关闭")
+	private Integer status;
+	/** 待扣分成(元),待扣提成(元) */
+	@Excel(name = "待扣分成(元),待扣提成(元)")
+	@ApiModelProperty("待扣分成(元),待扣提成(元)")
+	private BigDecimal deductMoney;
+
+	/** 待付分成(元),待审提成(元),待付佣金(元) */
+	@Excel(name = "待付分成(元),待审提成(元),待付佣金(元)")
+	@ApiModelProperty("待付分成(元),待审提成(元),待付佣金(元)")
+	private BigDecimal payMoney;
+	/** 审核状态：0待审核，1已通过，-1未通过，（2待支付，3已支付） */
+	@Excel(name = "审核状态：0待审核，1已通过，-1未通过，" , readConverterExp = "2=待支付，3已支付")
+	@ApiModelProperty("审核状态：0待审核，1已通过，-1未通过，（2待支付，3已支付）")
+	private Integer checkStatus;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/domain/TopDivideLog.java

@@ -59,4 +59,5 @@ private static final long serialVersionUID=1L;
     private Long createSysUserId;
     /** 业务号 */
     private String createNo;
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/domain/TopDivideOrder.java

@@ -0,0 +1,43 @@
+package com.zhongzheng.modules.top.financial.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.zhongzheng.common.annotation.Excel;
+
+/**
+ * 分成记录订单关联对象 top_divide_order
+ *
+ * @author hjl
+ * @date 2023-05-12
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("top_divide_order")
+public class TopDivideOrder implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** $column.columnComment */
+    @TableId(value = "id")
+    private Long id;
+    /** 分成记录ID */
+    private Long divideLogId;
+    /** 订单号 */
+    private String orderSn;
+    /** 1 完单  2退款 */
+    private Integer orderType;
+    /** 状态 1正常 0关闭 */
+    private Integer status;
+    /** 创建时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+    /** 更新时间 */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/mapper/TopDivideOrderMapper.java

@@ -0,0 +1,23 @@
+package com.zhongzheng.modules.top.financial.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.top.financial.bo.TopDivideLogQueryBo;
+import com.zhongzheng.modules.top.financial.bo.TopDivideOrderQueryBo;
+import com.zhongzheng.modules.top.financial.domain.TopDivideOrder;
+import com.zhongzheng.modules.top.financial.vo.TopDivideLogVo;
+import com.zhongzheng.modules.top.financial.vo.TopDivideOrderVo;
+
+import java.util.List;
+
+/**
+ * 分成记录订单关联Mapper接口
+ *
+ * @author hjl
+ * @date 2023-05-12
+ */
+public interface TopDivideOrderMapper extends BaseMapper<TopDivideOrder> {
+    List<TopDivideOrderVo> getFinishList(TopDivideOrderQueryBo bo);
+
+    List<TopDivideOrderVo> getRefundList(TopDivideOrderQueryBo bo);
+}

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

@@ -0,0 +1,57 @@
+package com.zhongzheng.modules.top.financial.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.top.financial.bo.TopDivideLogQueryBo;
+import com.zhongzheng.modules.top.financial.bo.TopDivideOrderAddBo;
+import com.zhongzheng.modules.top.financial.bo.TopDivideOrderEditBo;
+import com.zhongzheng.modules.top.financial.bo.TopDivideOrderQueryBo;
+import com.zhongzheng.modules.top.financial.domain.TopDivideOrder;
+import com.zhongzheng.modules.top.financial.vo.TopDivideLogVo;
+import com.zhongzheng.modules.top.financial.vo.TopDivideOrderVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 分成记录订单关联Service接口
+ *
+ * @author hjl
+ * @date 2023-05-12
+ */
+public interface ITopDivideOrderService extends IService<TopDivideOrder> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	TopDivideOrderVo queryById(Long id);
+
+	/**
+	 * 查询列表
+	 */
+	List<TopDivideOrderVo> queryList(TopDivideOrderQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入分成记录订单关联
+	 * @param bo 分成记录订单关联新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(TopDivideOrderAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改分成记录订单关联
+	 * @param bo 分成记录订单关联编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(TopDivideOrderEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+	List<TopDivideOrderVo> getMonthOrderList(TopDivideOrderQueryBo bo);
+
+}

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

@@ -163,9 +163,7 @@ public class TopDivideLogServiceImpl extends ServiceImpl<TopDivideLogMapper, Top
     public boolean updateBadBillConfig(List<SysTenantBadBillConfigBo> bo) {
         LambdaUpdateWrapper<TopSysConfig> objectLambdaUpdateWrapper = Wrappers.lambdaUpdate();
         objectLambdaUpdateWrapper.eq(TopSysConfig::getConfigKey, "bad_bill");
-
-        objectLambdaUpdateWrapper.set(TopSysConfig::getConfigValue, JSON.toJSON(bo));
-
+        objectLambdaUpdateWrapper.set(TopSysConfig::getConfigValue, JSON.toJSONString(bo));
         return topConfigService.update(null, objectLambdaUpdateWrapper);
     }
 }

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

@@ -0,0 +1,121 @@
+package com.zhongzheng.modules.top.financial.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.modules.top.financial.bo.TopDivideLogQueryBo;
+import com.zhongzheng.modules.top.financial.bo.TopDivideOrderAddBo;
+import com.zhongzheng.modules.top.financial.bo.TopDivideOrderEditBo;
+import com.zhongzheng.modules.top.financial.bo.TopDivideOrderQueryBo;
+import com.zhongzheng.modules.top.financial.domain.TopDivideOrder;
+import com.zhongzheng.modules.top.financial.mapper.TopDivideOrderMapper;
+import com.zhongzheng.modules.top.financial.service.ITopDivideOrderService;
+import com.zhongzheng.modules.top.financial.vo.TopDivideLogVo;
+import com.zhongzheng.modules.top.financial.vo.TopDivideOrderVo;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.Page;
+
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 分成记录订单关联Service业务层处理
+ *
+ * @author hjl
+ * @date 2023-05-12
+ */
+@Service
+public class TopDivideOrderServiceImpl extends ServiceImpl<TopDivideOrderMapper, TopDivideOrder> implements ITopDivideOrderService {
+
+    @Override
+    public TopDivideOrderVo queryById(Long id){
+        TopDivideOrder db = this.baseMapper.selectById(id);
+        return BeanUtil.toBean(db, TopDivideOrderVo.class);
+    }
+
+    @Override
+    public List<TopDivideOrderVo> queryList(TopDivideOrderQueryBo bo) {
+        LambdaQueryWrapper<TopDivideOrder> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getDivideLogId() != null, TopDivideOrder::getDivideLogId, bo.getDivideLogId());
+        lqw.eq(StrUtil.isNotBlank(bo.getOrderSn()), TopDivideOrder::getOrderSn, bo.getOrderSn());
+        lqw.eq(bo.getOrderType() != null, TopDivideOrder::getOrderType, bo.getOrderType());
+        lqw.eq(bo.getStatus() != null, TopDivideOrder::getStatus, bo.getStatus());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<TopDivideOrderVo> entity2Vo(Collection<TopDivideOrder> collection) {
+        List<TopDivideOrderVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, TopDivideOrderVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<TopDivideOrder> page = (Page<TopDivideOrder>)collection;
+            Page<TopDivideOrderVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(TopDivideOrderAddBo bo) {
+        TopDivideOrder add = BeanUtil.toBean(bo, TopDivideOrder.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(TopDivideOrderEditBo bo) {
+        TopDivideOrder update = BeanUtil.toBean(bo, TopDivideOrder.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(TopDivideOrder entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return this.removeByIds(ids);
+    }
+
+    @Override
+    public List<TopDivideOrderVo> getMonthOrderList(TopDivideOrderQueryBo bo) {
+        List<TopDivideOrderVo> fList = baseMapper.getFinishList(bo);
+        List<TopDivideOrderVo> rList = baseMapper.getRefundList(bo);
+        for(TopDivideOrderVo vo : rList){
+            if(vo.getPayStatus()==1){
+                vo.setCheckStatus(3);
+            }
+            if(vo.getPayStatus()==0||vo.getPayStatus()==2){
+                vo.setCheckStatus(2);
+            }
+        }
+        fList.addAll(rList);
+        return fList;
+    }
+}

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

@@ -106,4 +106,7 @@ public class TopDivideLogVo {
 	private String createNo;
 	@ApiModelProperty("账单类型 (1月份 2季度 3半年 4年度)")
 	private Integer billType;
+
+	private Long monthTime;
+
 }

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

@@ -0,0 +1,69 @@
+package com.zhongzheng.modules.top.financial.vo;
+
+import com.zhongzheng.common.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+
+
+/**
+ * 分成记录订单关联视图对象 mall_package
+ *
+ * @author hjl
+ * @date 2023-05-12
+ */
+@Data
+@ApiModel("分成记录订单关联视图对象")
+public class TopDivideOrderVo {
+	private static final long serialVersionUID = 1L;
+
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long id;
+
+	/** 分成记录ID */
+	@Excel(name = "分成记录ID")
+	@ApiModelProperty("分成记录ID")
+	private Long divideLogId;
+	/** 订单号 */
+	@Excel(name = "订单号")
+	@ApiModelProperty("订单号")
+	private String orderSn;
+	/** 1 完单  2退款 */
+	@Excel(name = "1 完单  2退款")
+	@ApiModelProperty("1 完单  2退款")
+	private Integer orderType;
+	/** 状态 1正常 0关闭 */
+	@Excel(name = "状态 1正常 0关闭")
+	@ApiModelProperty("状态 1正常 0关闭")
+	private Integer status;
+	/** 待扣分成(元),待扣提成(元) */
+	@Excel(name = "待扣分成(元),待扣提成(元)")
+	@ApiModelProperty("待扣分成(元),待扣提成(元)")
+	private BigDecimal deductMoney;
+	/** 备注 */
+	@Excel(name = "备注")
+	@ApiModelProperty("备注")
+	private String remark;
+	/** 待付分成(元),待审提成(元),待付佣金(元) */
+	@Excel(name = "待付分成(元),待审提成(元),待付佣金(元)")
+	@ApiModelProperty("待付分成(元),待审提成(元),待付佣金(元)")
+	private BigDecimal payMoney;
+	/** 审核状态：0待审核，1已通过，-1未通过，（2待支付，3已支付） */
+	@Excel(name = "审核状态：0待审核，1已通过，-1未通过，" , readConverterExp = "2=待支付，3已支付")
+	@ApiModelProperty("审核状态：0待审核，1已通过，-1未通过，（2待支付，3已支付）")
+	private Integer checkStatus;
+	private String tenantId;
+
+	private String tenantName;
+
+	/** 1已打款 0未打款 */
+	@Excel(name = "1已打款 0未打款")
+	@ApiModelProperty("1已打款 0未打款")
+	private Integer payStatus;
+}

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

@@ -128,7 +128,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
     </select>
 
-    <select id="getCommissionList" parameterType="com.zhongzheng.modules.top.financial.bo.TopDivideLogQueryBo"  resultType="com.zhongzheng.modules.top.financial.vo.TopDivideLogVo">
+    <select id="getCommissionList" parameterType="com.zhongzheng.modules.top.financial.bo.TopDivideOrderQueryBo"  resultType="com.zhongzheng.modules.top.financial.vo.TopDivideOrderVo">
         SELECT
         dl.*,
         st.tenant_name
@@ -146,8 +146,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 #{item}
             </foreach>
         </if>
-        GROUP BY
-        dl.tenant_id
+        
     </select>
 
 

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

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zhongzheng.modules.top.financial.mapper.TopDivideOrderMapper">
+
+    <resultMap type="com.zhongzheng.modules.top.financial.domain.TopDivideOrder" id="TopDivideOrderResult">
+        <result property="id" column="id"/>
+        <result property="divideLogId" column="divide_log_id"/>
+        <result property="orderSn" column="order_sn"/>
+        <result property="orderType" column="order_type"/>
+        <result property="status" column="status"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+    </resultMap>
+
+    <select id="getFinishList" parameterType="com.zhongzheng.modules.top.financial.bo.TopDivideOrderQueryBo"  resultType="com.zhongzheng.modules.top.financial.vo.TopDivideOrderVo">
+        SELECT
+            tdo.*,
+            st.tenant_name ,
+            cl.check_status,
+            dl.pay_status
+        FROM
+            top_divide_order tdo
+                LEFT JOIN top_divide_log dl ON tdo.divide_log_id = dl.id
+                LEFT JOIN sys_tenant st ON dl.tenant_id = st.tenant_id
+                LEFT JOIN
+            top_old_order_check_log cl ON (dl.divide_type+1) = cl.check_from AND  cl.check_sign = 1  AND  tdo.order_sn = cl.order_sn
+        WHERE
+            tdo.order_type = 1
+          AND tdo.divide_log_id = #{divideLogId}
+    </select>
+
+    <select id="getRefundList" parameterType="com.zhongzheng.modules.top.financial.bo.TopDivideOrderQueryBo"  resultType="com.zhongzheng.modules.top.financial.vo.TopDivideOrderVo">
+        SELECT
+            tdo.*,
+            st.tenant_name,
+            dl.pay_status
+        FROM
+            top_divide_order tdo
+                LEFT JOIN top_divide_log dl ON tdo.divide_log_id = dl.id
+                LEFT JOIN sys_tenant st ON dl.tenant_id = st.tenant_id
+        WHERE
+            tdo.order_type = 2
+          AND tdo.divide_log_id = #{divideLogId}
+    </select>
+</mapper>