fix

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

@@ -0,0 +1,92 @@
+package com.zhongzheng.controller.order;
+
+import java.util.List;
+import java.util.Arrays;
+
+import com.zhongzheng.modules.top.goods.bo.TopOldOrderCheckLogAddBo;
+import com.zhongzheng.modules.top.goods.bo.TopOldOrderCheckLogEditBo;
+import com.zhongzheng.modules.top.goods.bo.TopOldOrderCheckLogQueryBo;
+import com.zhongzheng.modules.top.goods.service.ITopOldOrderCheckLogService;
+import com.zhongzheng.modules.top.goods.vo.TopOldOrderCheckLogVo;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.zhongzheng.common.annotation.Log;
+import com.zhongzheng.common.core.controller.BaseController;
+import com.zhongzheng.common.core.domain.AjaxResult;
+import com.zhongzheng.common.enums.BusinessType;
+import com.zhongzheng.common.utils.poi.ExcelUtil;
+import com.zhongzheng.common.core.page.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * 订单退款审核记录Controller
+ *
+ * @author ruoyi
+ * @date 2023-04-26
+ */
+@Api(value = "订单退款审核记录控制器", tags = {"订单退款审核记录管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/check/order/log")
+public class TopOldOrderCheckLogController extends BaseController {
+
+    private final ITopOldOrderCheckLogService iTopOldOrderCheckLogService;
+
+    /**
+     * 查询订单退款审核记录列表
+     */
+    @ApiOperation("查询订单退款审核记录列表")
+    @PreAuthorize("@ss.hasPermi('system:log:list')")
+    @GetMapping("/list")
+    public TableDataInfo<TopOldOrderCheckLogVo> list(TopOldOrderCheckLogQueryBo bo) {
+        startPage();
+        List<TopOldOrderCheckLogVo> list = iTopOldOrderCheckLogService.queryList(bo);
+        return getDataTable(list);
+    }
+
+
+
+    /**
+     * 获取订单退款审核记录详细信息
+     */
+    @ApiOperation("获取订单退款审核记录详细信息")
+    @PreAuthorize("@ss.hasPermi('system:log:query')")
+    @GetMapping("/{id}")
+    public AjaxResult<TopOldOrderCheckLogVo> getInfo(@PathVariable("id" ) Long id) {
+        return AjaxResult.success(iTopOldOrderCheckLogService.queryById(id));
+    }
+
+    /**
+     * 新增订单退款审核记录
+     */
+    @ApiOperation("新增订单退款审核记录")
+    @PreAuthorize("@ss.hasPermi('system:log:add')")
+    @Log(title = "订单退款审核记录", businessType = BusinessType.INSERT)
+    @PostMapping()
+    public AjaxResult<Void> add(@RequestBody TopOldOrderCheckLogAddBo bo) {
+        return toAjax(iTopOldOrderCheckLogService.insertByAddBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 修改订单退款审核记录
+     */
+    @ApiOperation("修改订单退款审核记录")
+    @PreAuthorize("@ss.hasPermi('system:log:edit')")
+    @Log(title = "订单退款审核记录", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    public AjaxResult<Void> edit(@RequestBody TopOldOrderCheckLogEditBo bo) {
+        return toAjax(iTopOldOrderCheckLogService.updateByEditBo(bo) ? 1 : 0);
+    }
+
+
+}

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

@@ -21,6 +21,7 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 订单Controller
@@ -187,5 +188,10 @@ public class TopOldOrderController extends BaseController {
         return AjaxResult.success(iTopOldOrderService.statisticsOrder());
     }
 
+    @ApiOperation("订单应收应付统计")
+    @GetMapping("/countOrderNum")
+    public AjaxResult<Map<String, Object>> countOrderNum(TopOldOrderQueryBo bo) {
+        return AjaxResult.success(iTopOldOrderService.countOrderNum(bo));
+    }
 
 }

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

@@ -42,4 +42,16 @@ public class TopOldOrderCheckLogAddBo {
     /** 修改时间 */
     @ApiModelProperty("修改时间")
     private Long updateTime;
+    /** 审核来源 1退款 2机构分成应付 3业务员提成 */
+    @ApiModelProperty("审核来源 1退款 2机构分成应付 3业务员提成")
+    private Integer checkFrom;
+    /** 订单号 */
+    @ApiModelProperty("订单号")
+    private String orderSn;
+    /** 审核时间 */
+    @ApiModelProperty("审核时间")
+    private Long checkTime;
+    /** 审核人 */
+    @ApiModelProperty("审核人")
+    private String checkUsername;
 }

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

@@ -49,5 +49,18 @@ public class TopOldOrderCheckLogEditBo {
     @ApiModelProperty("修改时间")
     private Long updateTime;
 
+    /** 审核来源 1退款 2机构分成应付 3业务员提成 */
+    @ApiModelProperty("审核来源 1退款 2机构分成应付 3业务员提成")
+    private Integer checkFrom;
+
+    /** 订单号 */
+    @ApiModelProperty("订单号")
+    private String orderSn;
+    /** 审核时间 */
+    @ApiModelProperty("审核时间")
+    private Long checkTime;
+    /** 审核人 */
+    @ApiModelProperty("审核人")
+    private String checkUsername;
 
 }

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

@@ -54,4 +54,16 @@ public class TopOldOrderCheckLogQueryBo extends BaseEntity {
 	/** 状态 1正常 0关闭 */
 	@ApiModelProperty("状态 1正常 0关闭")
 	private Integer status;
+	/** 审核来源 1退款 2机构分成应付 3业务员提成 */
+	@ApiModelProperty("审核来源 1退款 2机构分成应付 3业务员提成")
+	private Integer checkFrom;
+	/** 订单号 */
+	@ApiModelProperty("订单号")
+	private String orderSn;
+	/** 审核时间 */
+	@ApiModelProperty("审核时间")
+	private Long checkTime;
+	/** 审核人 */
+	@ApiModelProperty("审核人")
+	private String checkUsername;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/domain/TopOldOrderCheckLog.java

@@ -49,4 +49,12 @@ private static final long serialVersionUID=1L;
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private Long updateTime;
     private Long tenantId;
+    /** 审核来源 1退款 2机构分成应付 3业务员提成 */
+    private Integer checkFrom;
+    /** 订单号 */
+    private String orderSn;
+    /** 审核时间 */
+    private Long checkTime;
+    /** 审核人 */
+    private String checkUsername;
 }

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

@@ -702,7 +702,6 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
             }
         }
         Integer orderNum = vos.size();
-
         vo.setOrderProfitTotal(profit);
         vo.setOrderPriceTotal(price);
         vo.setOrderReceivedTotal(received);
@@ -794,7 +793,8 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
     @Override
     public Map<String, Object> countOrderNum(TopOldOrderQueryBo bo) {
         Map<String, Object> map = new HashMap<>();
-        if(bo.getTotalType()==1){
+        /*if(bo.getTotalType()==1){
+
 
         }
         if(bo.getTotalType()==2){
@@ -802,7 +802,17 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
         }
         if(bo.getTotalType()==3){
             map.put("sellerPay",baseMapper.tenantSellerTotal(bo));
-        }
+        }*/
+        List<TopOldOrderVo> vos = baseMapper.queryListAll();
+        BigDecimal price = vos.stream().filter(x -> ObjectUtils.isNotNull(x.getOrderPrice())).map(TopOldOrderVo::getOrderPrice).reduce(BigDecimal.ZERO, BigDecimal::add);
+        BigDecimal received = vos.stream().filter(x -> ObjectUtils.isNotNull(x.getOrderReceived())).map(TopOldOrderVo::getOrderReceived).reduce(BigDecimal.ZERO, BigDecimal::add);
+        BigDecimal uncollected = vos.stream().filter(x -> ObjectUtils.isNotNull(x.getOrderUncollected())).map(TopOldOrderVo::getOrderUncollected).reduce(BigDecimal.ZERO, BigDecimal::add);
+        map.put("orderPriceTotal",price);
+        map.put("orderReceivedTotal",received);
+        map.put("orderUncollectedTotal",uncollected);
+
+        map.put("tenantPay",baseMapper.tenantMoneyTotal(bo));
+        map.put("sellerPay",baseMapper.tenantSellerTotal(bo));
         return map;
     }
 }

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

@@ -50,4 +50,20 @@ public class TopOldOrderCheckLogVo {
 	@Excel(name = "状态 1正常 0关闭")
 	@ApiModelProperty("状态 1正常 0关闭")
 	private Integer status;
+	/** 审核来源 1退款 2机构分成应付 3业务员提成 */
+	@Excel(name = "审核来源 1退款 2机构分成应付 3业务员提成")
+	@ApiModelProperty("审核来源 1退款 2机构分成应付 3业务员提成")
+	private Integer checkFrom;
+	/** 订单号 */
+	@Excel(name = "订单号")
+	@ApiModelProperty("订单号")
+	private String orderSn;
+	/** 审核时间 */
+	@Excel(name = "审核时间")
+	@ApiModelProperty("审核时间")
+	private Long checkTime;
+	/** 审核人 */
+	@Excel(name = "审核人")
+	@ApiModelProperty("审核人")
+	private String checkUsername;
 }

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

@@ -14,6 +14,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="status" column="status"/>
         <result property="createTime" column="create_time"/>
         <result property="updateTime" column="update_time"/>
+        <result property="checkFrom" column="check_from"/>
+        <result property="orderSn" column="order_sn"/>
     </resultMap>
 
 

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

@@ -213,7 +213,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ORDER BY too.order_id DESC
     </select>
 
-    <select id="tenantMoneyTotal" parameterType="com.zhongzheng.modules.top.goods.bo.TopOldOrderQueryBo" resultType="Float">
+    <select id="tenantMoneyTotal" parameterType="com.zhongzheng.modules.top.goods.bo.TopOldOrderQueryBo" resultType="BigDecimal">
         SELECT
             IFNULL( SUM( too.divide_company_money ), 0 )
         FROM
@@ -222,7 +222,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             too.divide_model = 1
           AND too.divide_status = 5
     </select>
-    <select id="tenantSellerTotal" parameterType="com.zhongzheng.modules.top.goods.bo.TopOldOrderQueryBo" resultType="Float">
+    <select id="tenantSellerTotal" parameterType="com.zhongzheng.modules.top.goods.bo.TopOldOrderQueryBo" resultType="BigDecimal">
         SELECT
             IFNULL( SUM( too.divide_seller_money ), 0 )
         FROM