fix

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

@@ -45,12 +45,12 @@ public class TopOldOrderCheckLogController extends BaseController {
     /**
      * 查询订单退款审核记录列表
      */
-    @ApiOperation("查询订单退款审核记录列表")
+    @ApiOperation("查询审核记录列表")
     @PreAuthorize("@ss.hasPermi('system:log:list')")
     @GetMapping("/list")
     public TableDataInfo<TopOldOrderCheckLogVo> list(TopOldOrderCheckLogQueryBo bo) {
         startPage();
-        List<TopOldOrderCheckLogVo> list = iTopOldOrderCheckLogService.queryList(bo);
+        List<TopOldOrderCheckLogVo> list = iTopOldOrderCheckLogService.getCheckList(bo);
         return getDataTable(list);
     }
 

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

@@ -13,6 +13,7 @@ import com.zhongzheng.modules.top.goods.vo.TopOldOrderGoodsListVo;
 import com.zhongzheng.modules.top.goods.vo.TopOldOrderVo;
 import com.zhongzheng.modules.top.goods.vo.TopOrderStatisticsVo;
 import com.zhongzheng.modules.top.goods.vo.TopRefundOrderDetailVo;
+import com.zhongzheng.modules.top.order.vo.TopOldOrderExportVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -122,6 +123,15 @@ public class TopOldOrderController extends BaseController {
         return getDataTable(list);
     }
 
+    @ApiOperation("业务员提成列表导出")
+    @PreAuthorize("@ss.hasPermi('system:tp:list')")
+    @GetMapping("/sellerListExport")
+    public AjaxResult<List<TopOldOrderExportVo>> sellerListExport(TopOldOrderQueryBo bo) {
+        List<TopOldOrderExportVo> list = iTopOldOrderService.tenantListExport(bo);
+        ExcelUtil<TopOldOrderExportVo> util = new ExcelUtil<TopOldOrderExportVo>(TopOldOrderExportVo.class);
+        return util.exportExcel(list, "机构分成列表");
+    }
+
     @ApiOperation("机构分成列表")
     @PreAuthorize("@ss.hasPermi('system:tp:list')")
     @GetMapping("/queryTenantList")
@@ -131,6 +141,15 @@ public class TopOldOrderController extends BaseController {
         return getDataTable(list);
     }
 
+    @ApiOperation("机构分成列表导出")
+    @PreAuthorize("@ss.hasPermi('system:tp:list')")
+    @GetMapping("/tenantListExport")
+    public AjaxResult<List<TopOldOrderExportVo>> tenantListExport(TopOldOrderQueryBo 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/top/goods/bo/TopOldOrderCheckLogAddBo.java

@@ -54,4 +54,6 @@ public class TopOldOrderCheckLogAddBo {
     /** 审核人 */
     @ApiModelProperty("审核人")
     private String checkUsername;
+    @ApiModelProperty("企业ID")
+    private String tenantId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/bo/TopOldOrderCheckLogEditBo.java

@@ -62,5 +62,7 @@ public class TopOldOrderCheckLogEditBo {
     /** 审核人 */
     @ApiModelProperty("审核人")
     private String checkUsername;
+    @ApiModelProperty("企业ID")
+    private String tenantId;
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/bo/TopOldOrderCheckLogQueryBo.java

@@ -72,4 +72,6 @@ public class TopOldOrderCheckLogQueryBo extends BaseEntity {
 	/** 审核人 */
 	@ApiModelProperty("审核人")
 	private String checkUsername;
+	@ApiModelProperty("企业ID")
+	private String tenantId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/mapper/TopOldOrderCheckLogMapper.java

@@ -2,7 +2,11 @@ package com.zhongzheng.modules.top.goods.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.top.goods.bo.TopOldOrderCheckLogQueryBo;
 import com.zhongzheng.modules.top.goods.domain.TopOldOrderCheckLog;
+import com.zhongzheng.modules.top.goods.vo.TopOldOrderCheckLogVo;
+
+import java.util.List;
 
 /**
  * 订单退款审核记录Mapper接口
@@ -11,5 +15,6 @@ import com.zhongzheng.modules.top.goods.domain.TopOldOrderCheckLog;
  * @date 2023-04-24
  */
 public interface TopOldOrderCheckLogMapper extends BaseMapper<TopOldOrderCheckLog> {
+    List<TopOldOrderCheckLogVo> getCheckList(TopOldOrderCheckLogQueryBo bo);
 
 }

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

@@ -50,4 +50,6 @@ public interface ITopOldOrderCheckLogService extends IService<TopOldOrderCheckLo
 	 * @return
 	 */
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+	List<TopOldOrderCheckLogVo> getCheckList(TopOldOrderCheckLogQueryBo bo);
 }

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

@@ -81,4 +81,8 @@ public interface ITopOldOrderService extends IService<TopOldOrder> {
 
 	TopOrderStatisticsVo statisticsOrder();
 
+	List<TopOldOrderExportVo> tenantListExport(TopOldOrderQueryBo bo);
+
+	List<TopOldOrderExportVo> sellerListExport(TopOldOrderQueryBo bo);
+
 }

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

@@ -107,4 +107,12 @@ public class TopOldOrderCheckLogServiceImpl extends ServiceImpl<TopOldOrderCheck
         }
         return this.removeByIds(ids);
     }
+
+    @Override
+    public List<TopOldOrderCheckLogVo> getCheckList(TopOldOrderCheckLogQueryBo bo) {
+        List<TopOldOrderCheckLogVo> list = this.baseMapper.getCheckList(bo);
+        return list;
+    }
+
+
 }

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

@@ -714,6 +714,32 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
         return vo;
     }
 
+    @Override
+    public List<TopOldOrderExportVo> tenantListExport(TopOldOrderQueryBo bo) {
+        List<TopOldOrderExportVo> listExport = new ArrayList<>();
+        List<TopOldOrderVo> list = this.baseMapper.queryTenantList(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;
+    }
+
+    @Override
+    public List<TopOldOrderExportVo> sellerListExport(TopOldOrderQueryBo bo) {
+        List<TopOldOrderExportVo> listExport = new ArrayList<>();
+        List<TopOldOrderVo> list = this.baseMapper.queryDivSellerList(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;
+    }
+
     @Override
     public List<TopOldOrderVo> queryReceiveList(TopOldOrderQueryBo bo) {
         List<TopOldOrderVo> list = this.baseMapper.queryReceiveList(bo);

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/vo/TopOldOrderCheckLogVo.java

@@ -66,4 +66,6 @@ public class TopOldOrderCheckLogVo {
 	@Excel(name = "审核人")
 	@ApiModelProperty("审核人")
 	private String checkUsername;
+	@ApiModelProperty("企业ID")
+	private String tenantId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/vo/TopOldOrderVo.java

@@ -221,4 +221,6 @@ public class TopOldOrderVo {
 	@Excel(name = "分成审核状态 1正常 2待审核 3审核中  4审核不通过 5审核通过待支付 6已支付")
 	@ApiModelProperty("分成审核状态 1正常 2待审核 3审核中  4审核不通过 5审核通过待支付 6已支付")
 	private Integer divideStatus;
+	@ApiModelProperty("角色名称")
+	private String roleName;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/order/service/impl/TopOrderRecNoteServiceImpl.java

@@ -3,9 +3,13 @@ package com.zhongzheng.modules.top.order.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSONObject;
 import com.zhongzheng.common.exception.CustomException;
 import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.common.utils.ToolsUtils;
+import com.zhongzheng.common.utils.http.HttpUtils;
 import com.zhongzheng.modules.bank.domain.ExamQuestion;
+import com.zhongzheng.modules.grade.domain.ClassGradeUser;
 import com.zhongzheng.modules.top.order.bo.TopOrderRecNoteAddBo;
 import com.zhongzheng.modules.top.order.bo.TopOrderRecNoteEditBo;
 import com.zhongzheng.modules.top.order.bo.TopOrderRecNoteQueryBo;
@@ -19,9 +23,8 @@ 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.io.IOException;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -84,6 +87,10 @@ public class TopOrderRecNoteServiceImpl extends ServiceImpl<TopOrderRecNoteMappe
         validEntityBeforeSave(add);
         add.setCreateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());
+        if(bo.getNoteType()==1){
+            pushOldNote(bo.getOrderSn());
+            bo.setLastTime(DateUtils.getNowTime());
+        }
         return this.save(add);
     }
 
@@ -98,9 +105,33 @@ public class TopOrderRecNoteServiceImpl extends ServiceImpl<TopOrderRecNoteMappe
         TopOrderRecNote update = BeanUtil.toBean(bo, TopOrderRecNote.class);
         validEntityBeforeSave(update);
         update.setUpdateTime(DateUtils.getNowTime());
+        if(bo.getNoteType()==1){
+            pushOldNote(bo.getOrderSn());
+            bo.setLastTime(DateUtils.getNowTime());
+        }
         return this.updateById(update);
     }
 
+    private boolean pushOldNote(String orderSn){
+        Map<String, String> params = new HashMap<>();
+        Long nowTime = DateUtils.getNowTime();
+        String sign = ToolsUtils.EncoderByMd5(orderSn+"pubilc2022");
+        params.put("stamp", nowTime.toString());
+        params.put("sign", sign);
+        params.put("orderNos", orderSn);
+        String respone = "";
+        String path = "http://gdxypx.xy.com/WitSystem/BussinessApi/PressMsg";
+        try {
+            respone = HttpUtils.postFormBody(path, params);
+            if (!respone.contains("\"Status\":true")) {
+                throw new CustomException("同步请求错误"+respone);
+            }
+        } catch (IOException e) {
+            throw new CustomException("同步请求错误"+e.getMessage());
+        }
+        return true;
+    }
+
     /**
      * 保存前的数据校验
      *

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

@@ -18,5 +18,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="orderSn" column="order_sn"/>
     </resultMap>
 
+    <select id="getCheckList" parameterType="com.zhongzheng.modules.top.goods.bo.TopOldOrderCheckLogQueryBo" resultType="com.zhongzheng.modules.top.goods.vo.TopOldOrderCheckLogVo">
+        SELECT
+            cl.*,
+            r.role_name
+        FROM
+            top_old_order_check_log cl
+                LEFT JOIN top_sys_role r ON cl.role_id = r.role_id
+        WHERE
+            1 = 1
+        <if test="orderSn != null and orderSn != ''">
+            AND cl.order_sn = #{orderSn}
+        </if>
+        <if test="checkFrom != null and checkFrom != ''">
+            AND cl.check_from = #{checkFrom}
+        </if>
+        <if test="tenantId != null and tenantId != ''">
+            AND cl.tenant_id = #{tenantId}
+        </if>
+        order by cl.check_sort
+    </select>
 
 </mapper>

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

@@ -155,10 +155,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="queryDivSellerList" parameterType="com.zhongzheng.modules.top.goods.bo.TopOldOrderQueryBo" resultType="com.zhongzheng.modules.top.goods.vo.TopOldOrderVo">
         SELECT
         too.*,
-        st.tenant_name
+        st.tenant_name,
+        r.role_name
         FROM
         v_top_order too
         LEFT JOIN sys_tenant st ON too.tenant_id = st.tenant_id
+        LEFT JOIN top_old_order_check_log cl ON too.order_sn = cl.order_sn
+        AND cl.check_sign = 1
+        AND ( too.divide_model + 1 ) = cl.check_from
+        LEFT JOIN top_sys_role r ON cl.role_id = r.role_id
         where 1=1 AND too.divide_model = 2
         <if test="startTime != null and startTime != ''">
             AND too.create_time <![CDATA[ >= ]]> #{startTime}
@@ -178,16 +183,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="divideStatus != null and divideStatus != ''">
             AND too.divide_status = #{divideStatus}
         </if>
+        <if test="roleId != null and roleId != ''">
+            AND cl.role_id = #{roleId}
+        </if>
         ORDER BY too.order_id DESC
     </select>
 
     <select id="queryTenantList" parameterType="com.zhongzheng.modules.top.goods.bo.TopOldOrderQueryBo" resultType="com.zhongzheng.modules.top.goods.vo.TopOldOrderVo">
         SELECT
         too.*,
-        st.tenant_name
+        st.tenant_name,
+        r.role_name
         FROM
         top_old_order too
         LEFT JOIN sys_tenant st ON too.tenant_id = st.tenant_id
+        LEFT JOIN top_old_order_check_log cl ON too.order_sn = cl.order_sn
+        AND cl.check_sign = 1
+        AND ( too.divide_model + 1 ) = cl.check_from
+        LEFT JOIN top_sys_role r ON cl.role_id = r.role_id
         where 1=1 AND too.divide_model = 1
         <if test="startTime != null and startTime != ''">
             AND too.create_time <![CDATA[ >= ]]> #{startTime}
@@ -210,6 +223,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="tenantId != null and tenantId != ''">
             AND too.tenant_id = #{tenantId}
         </if>
+        <if test="roleId != null and roleId != ''">
+            AND cl.role_id = #{roleId}
+        </if>
         ORDER BY too.order_id DESC
     </select>