he2802 2 anni fa
parent
commit
315cdb619f
18 ha cambiato i file con 312 aggiunte e 17 eliminazioni
  1. 28 1
      zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/order/TopOldOrderController.java
  2. 10 0
      zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/schedule/ScheduleController.java
  3. 1 1
      zhongzheng-system/src/main/java/com/zhongzheng/modules/schedule/service/impl/ScheduleServiceImpl.java
  4. 12 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/bo/TopOldOrderAddBo.java
  5. 13 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/bo/TopOldOrderEditBo.java
  6. 19 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/bo/TopOldOrderQueryBo.java
  7. 8 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/domain/TopOldOrder.java
  8. 9 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/mapper/TopOldOrderMapper.java
  9. 9 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/ITopOldOrderService.java
  10. 70 4
      zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/impl/TopOldOrderServiceImpl.java
  11. 22 2
      zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/vo/TopOldOrderVo.java
  12. 2 2
      zhongzheng-system/src/main/java/com/zhongzheng/modules/top/order/bo/TopOrderRecNoteAddBo.java
  13. 2 2
      zhongzheng-system/src/main/java/com/zhongzheng/modules/top/order/bo/TopOrderRecNoteEditBo.java
  14. 2 2
      zhongzheng-system/src/main/java/com/zhongzheng/modules/top/order/domain/TopOrderRecNote.java
  15. 2 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/top/order/service/ITopOrderRecNoteService.java
  16. 21 1
      zhongzheng-system/src/main/java/com/zhongzheng/modules/top/order/service/impl/TopOrderRecNoteServiceImpl.java
  17. 2 2
      zhongzheng-system/src/main/java/com/zhongzheng/modules/top/order/vo/TopOrderRecNoteVo.java
  18. 80 0
      zhongzheng-system/src/main/resources/mapper/modules/top/TopOldOrderMapper.xml

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

@@ -24,7 +24,7 @@ import java.util.List;
 
 /**
  * 订单Controller
- * 
+ *
  * @author ruoyi
  * @date 2023-04-20
  */
@@ -114,4 +114,31 @@ public class TopOldOrderController extends BaseController {
         bo.setLoginId(loginUser.getUser().getUserId());
         return toAjax(iTopOldOrderService.checkOrder(bo) ? 1 : 0);
     }
+
+    @ApiOperation("业务员提成列表")
+    @PreAuthorize("@ss.hasPermi('system:tp:list')")
+    @GetMapping("/divSellerList")
+    public TableDataInfo<TopOldOrderVo> divSellerList(TopOldOrderQueryBo bo) {
+        startPage();
+        List<TopOldOrderVo> list = iTopOldOrderService.queryDivSellerList(bo);
+        return getDataTable(list);
+    }
+
+    @ApiOperation("机构分成列表")
+    @PreAuthorize("@ss.hasPermi('system:tp:list')")
+    @GetMapping("/queryTenantList")
+    public TableDataInfo<TopOldOrderVo> queryTenantList(TopOldOrderQueryBo bo) {
+        startPage();
+        List<TopOldOrderVo> list = iTopOldOrderService.queryTenantList(bo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 订单修改备注
+     */
+    @ApiOperation("订单修改备注")
+    @PostMapping("/updateRemark")
+    public AjaxResult<Void> updateRemark(@RequestBody TopOldOrderEditBo bo) {
+        return toAjax(iTopOldOrderService.updateRemark(bo) ? 1 : 0);
+    }
 }

+ 10 - 0
zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/schedule/ScheduleController.java

@@ -8,6 +8,7 @@ import com.zhongzheng.modules.exam.bo.ExamApplyQueryBo;
 import com.zhongzheng.modules.polyv.service.IPolyvLiveService;
 import com.zhongzheng.modules.schedule.service.IScheduleService;
 import com.zhongzheng.modules.sdk.service.ITopNuoMplatformLogService;
+import com.zhongzheng.modules.top.order.service.ITopOrderRecNoteService;
 import com.zhongzheng.modules.user.bo.UserQueryBo;
 import com.zhongzheng.modules.user.bo.UserWxFollowQueryBo;
 import com.zhongzheng.modules.wx.bo.WxLoginBody;
@@ -38,6 +39,8 @@ public class ScheduleController extends BaseController {
 
     private final ITopNuoMplatformLogService iTopNuoMplatformLogService;
 
+    private final ITopOrderRecNoteService iTopOrderRecNoteService;
+
     @ApiOperation("发票开票结果更新")
     @GetMapping("/distributionRebate")
     public AjaxResult distributionRebate(UserQueryBo bo){
@@ -51,4 +54,11 @@ public class ScheduleController extends BaseController {
         iTopNuoMplatformLogService.reOpenMplatform();
         return AjaxResult.success();
     }
+
+    @ApiOperation("催款提醒")
+    @GetMapping("/recTimeNoteBatchPush")
+    public AjaxResult recTimeNoteBatchPush(){
+        iTopOrderRecNoteService.timeNoteBatchPush();
+        return AjaxResult.success();
+    }
 }

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

@@ -814,7 +814,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
         InformRemindVo informRemindVo = informRemindService.queryByName("签署承诺书提醒");
         for (UserSubscribeVo subscribeVo : userSubscribeVo) {
            String dateStartStr = DateUtils.timestampToDate(subscribeVo.getApplySiteExamTime())+" "+subscribeVo.getApplySiteStartTime();
-           Long startTime = DateUtils.dateTimeSec(dateStartStr,DateUtils.YYYY_MM_DD_HH_MM_SS);
+           Long startTime = DateUtils.dateTimeSec(DateUtils.YYYY_MM_DD_HH_MM_SS,dateStartStr);
            Long nowTime = DateUtils.getNowTime();
            if((nowTime+7200L)<=startTime&&(nowTime+7380L)>=startTime){ //开考前2小时通知
                if (informRemindVo.getWayStatus().equals(1)) {

+ 12 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/bo/TopOldOrderAddBo.java

@@ -142,4 +142,16 @@ public class TopOldOrderAddBo {
     @Excel(name = "下单时间")
     @ApiModelProperty("下单时间")
     private Long buyTime;
+    /** 分成模式 1机构分成 2业务员分成 */
+    @ApiModelProperty("分成模式 1机构分成 2业务员分成")
+    private Integer divideModel;
+    /** 机构分成钱 */
+    @ApiModelProperty("机构分成钱")
+    private BigDecimal divideCompanyMoney;
+    /** 业务员分成钱 */
+    @ApiModelProperty("业务员分成钱")
+    private BigDecimal divideSellerMoney;
+    /** 分成审核状态 1正常 2待审核 3审核中  4审核不通过 5审核通过待支付 6已支付 */
+    @ApiModelProperty("分成审核状态 1正常 2待审核 3审核中  4审核不通过 5审核通过待支付 6已支付")
+    private Integer divideStatus;
 }

+ 13 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/bo/TopOldOrderEditBo.java

@@ -172,4 +172,17 @@ public class TopOldOrderEditBo {
     @Excel(name = "下单时间")
     @ApiModelProperty("下单时间")
     private Long buyTime;
+
+    /** 分成模式 1机构分成 2业务员分成 */
+    @ApiModelProperty("分成模式 1机构分成 2业务员分成")
+    private Integer divideModel;
+    /** 机构分成钱 */
+    @ApiModelProperty("机构分成钱")
+    private BigDecimal divideCompanyMoney;
+    /** 业务员分成钱 */
+    @ApiModelProperty("业务员分成钱")
+    private BigDecimal divideSellerMoney;
+    /** 分成审核状态 1正常 2待审核 3审核中  4审核不通过 5审核通过待支付 6已支付 */
+    @ApiModelProperty("分成审核状态 1正常 2待审核 3审核中  4审核不通过 5审核通过待支付 6已支付")
+    private Integer divideStatus;
 }

+ 19 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/bo/TopOldOrderQueryBo.java

@@ -70,4 +70,23 @@ public class TopOldOrderQueryBo extends BaseEntity {
 	@Excel(name = "下单时间")
 	@ApiModelProperty("下单时间")
 	private Long buyTime;
+	/** 分成模式 1机构分成 2业务员分成 */
+	@ApiModelProperty("分成模式 1机构分成 2业务员分成")
+	private Integer divideModel;
+	/** 机构分成钱 */
+	@ApiModelProperty("机构分成钱")
+	private BigDecimal divideCompanyMoney;
+	/** 业务员分成钱 */
+	@ApiModelProperty("业务员分成钱")
+	private BigDecimal divideSellerMoney;
+	/** 分成审核状态 1正常 2待审核 3审核中  4审核不通过 5审核通过待支付 6已支付 */
+	@ApiModelProperty("分成审核状态 1正常 2待审核 3审核中  4审核不通过 5审核通过待支付 6已支付")
+	private Integer divideStatus;
+	private List<Integer> divideStatusList;
+	@ApiModelProperty("机构ID")
+	private String tenantId;
+	@ApiModelProperty("角色ID")
+	private Long roleId;
+	@ApiModelProperty("统计类型 1应收账款 2机构分成 3业务员提成")
+	private Integer totalType;
 }

+ 8 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/domain/TopOldOrder.java

@@ -109,4 +109,12 @@ private static final long serialVersionUID=1L;
     /** 预付款时间 */
     private Integer predictPayTime;
     private Long buyTime;
+    /** 分成模式 1机构分成 2业务员分成 */
+    private Integer divideModel;
+    /** 机构分成钱 */
+    private BigDecimal divideCompanyMoney;
+    /** 业务员分成钱 */
+    private BigDecimal divideSellerMoney;
+    /** 分成审核状态 1正常 2待审核 3审核中  4审核不通过 5审核通过待支付 6已支付 */
+    private Integer divideStatus;
 }

+ 9 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/mapper/TopOldOrderMapper.java

@@ -7,6 +7,7 @@ import com.zhongzheng.modules.top.goods.domain.TopOldOrder;
 import com.zhongzheng.modules.top.goods.vo.TopOldOrderVo;
 import org.apache.ibatis.annotations.Param;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -24,4 +25,12 @@ public interface TopOldOrderMapper extends BaseMapper<TopOldOrder> {
     List<String> queryBusinessBySn(@Param("orderSn") String orderSn);
 
     List<TopOldOrderVo> queryReceiveList(TopOldOrderQueryBo bo);
+
+    List<TopOldOrderVo> queryDivSellerList(TopOldOrderQueryBo bo);
+
+    List<TopOldOrderVo> queryTenantList(TopOldOrderQueryBo bo);
+
+    BigDecimal tenantMoneyTotal(TopOldOrderQueryBo bo);
+
+    BigDecimal tenantSellerTotal(TopOldOrderQueryBo bo);
 }

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

@@ -10,6 +10,7 @@ import com.zhongzheng.modules.top.order.vo.TopOldOrderExportVo;
 
 import java.util.Collection;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 订单Service接口
@@ -58,4 +59,12 @@ public interface ITopOldOrderService extends IService<TopOldOrder> {
 	List<TopOldOrderVo> queryReceiveList(TopOldOrderQueryBo bo);
 
 	List<TopOldOrderExportVo> queryReceiveListExport(TopOldOrderQueryBo bo);
+
+	List<TopOldOrderVo> queryDivSellerList(TopOldOrderQueryBo bo);
+
+	List<TopOldOrderVo> queryTenantList(TopOldOrderQueryBo bo);
+
+	boolean updateRemark(TopOldOrderEditBo bo);
+
+	Map<String,Object> countOrderNum(TopOldOrderQueryBo bo);
 }

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

@@ -3,9 +3,11 @@ package com.zhongzheng.modules.top.goods.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.lang.Validator;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.Page;
 import com.zhongzheng.common.exception.CustomException;
@@ -17,6 +19,7 @@ import com.zhongzheng.modules.grade.domain.UserPeriod;
 import com.zhongzheng.modules.grade.service.IClassGradeUserService;
 import com.zhongzheng.modules.grade.service.IUserPeriodService;
 import com.zhongzheng.modules.order.service.IOrderGoodsService;
+import com.zhongzheng.modules.top.financial.domain.TopCostTp;
 import com.zhongzheng.modules.top.goods.bo.*;
 import com.zhongzheng.modules.top.goods.domain.TopOldOrder;
 import com.zhongzheng.modules.top.goods.domain.TopOldOrderAttachment;
@@ -35,10 +38,7 @@ import com.zhongzheng.modules.top.user.service.ITopSysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -271,4 +271,70 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
         }
         return listExport;
     }
+
+    @Override
+    public List<TopOldOrderVo> queryDivSellerList(TopOldOrderQueryBo bo) {
+        if(Validator.isNotEmpty(bo.getCreditStatus())){
+            List<Integer> divideStatusList = new ArrayList<>();
+            if(bo.getCreditStatus()==0){
+                divideStatusList.add(1);
+                divideStatusList.add(2);
+                divideStatusList.add(3);
+                divideStatusList.add(4);
+                divideStatusList.add(5);
+            }
+            if(bo.getCreditStatus()==1){
+                divideStatusList.add(6);
+            }
+            bo.setDivideStatusList(divideStatusList);
+        }
+        return this.baseMapper.queryDivSellerList(bo);
+    }
+
+    @Override
+    public List<TopOldOrderVo> queryTenantList(TopOldOrderQueryBo bo) {
+        if(Validator.isNotEmpty(bo.getCreditStatus())){
+            List<Integer> divideStatusList = new ArrayList<>();
+            if(bo.getCreditStatus()==0){
+                divideStatusList.add(1);
+                divideStatusList.add(2);
+                divideStatusList.add(3);
+                divideStatusList.add(4);
+                divideStatusList.add(5);
+            }
+            if(bo.getCreditStatus()==1){
+                divideStatusList.add(6);
+            }
+            bo.setDivideStatusList(divideStatusList);
+        }
+        return this.baseMapper.queryTenantList(bo);
+    }
+
+    @Override
+    public boolean updateRemark(TopOldOrderEditBo bo) {
+        if(Validator.isEmpty(bo.getRemark())||Validator.isEmpty(bo.getOrderSn())){
+            throw new CustomException("参数缺失");
+        }
+        LambdaUpdateWrapper<TopOldOrder> objectLambdaUpdateWrapper = Wrappers.lambdaUpdate();
+        objectLambdaUpdateWrapper.eq(TopOldOrder::getOrderSn, bo.getOrderSn());
+
+        objectLambdaUpdateWrapper.set(TopOldOrder::getRemark, bo.getRemark());
+        objectLambdaUpdateWrapper.set(TopOldOrder::getUpdateTime, DateUtils.getNowTime());
+        return update(null, objectLambdaUpdateWrapper);
+    }
+
+    @Override
+    public Map<String, Object> countOrderNum(TopOldOrderQueryBo bo) {
+        Map<String, Object> map = new HashMap<>();
+        if(bo.getTotalType()==1){
+
+        }
+        if(bo.getTotalType()==2){
+            map.put("tenantPay",baseMapper.tenantMoneyTotal(bo));
+        }
+        if(bo.getTotalType()==3){
+            map.put("sellerPay",baseMapper.tenantSellerTotal(bo));
+        }
+        return map;
+    }
 }

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

@@ -189,13 +189,33 @@ public class TopOldOrderVo {
 
 	/** 周几 1-7 */
 	@ApiModelProperty("周几 1-7")
-	private Integer weekTime;
+	private String weekTime;
 
 	/** 月天数 1-31 */
 	@ApiModelProperty("月天数 1-31")
-	private Integer monthTime;
+	private String monthTime;
 
 	/** 最后一次推送时间 */
 	@ApiModelProperty("最后一次推送时间")
 	private Long lastTime;
+	@ApiModelProperty("企业ID")
+	private String tenantId;
+	@ApiModelProperty("下单时间")
+	private Long buyTime;
+	/** 分成模式 1机构分成 2业务员分成 */
+	@Excel(name = "分成模式 1机构分成 2业务员分成")
+	@ApiModelProperty("分成模式 1机构分成 2业务员分成")
+	private Integer divideModel;
+	/** 机构分成钱 */
+	@Excel(name = "机构分成钱")
+	@ApiModelProperty("机构分成钱")
+	private BigDecimal divideCompanyMoney;
+	/** 业务员分成钱 */
+	@Excel(name = "业务员分成钱")
+	@ApiModelProperty("业务员分成钱")
+	private BigDecimal divideSellerMoney;
+	/** 分成审核状态 1正常 2待审核 3审核中  4审核不通过 5审核通过待支付 6已支付 */
+	@Excel(name = "分成审核状态 1正常 2待审核 3审核中  4审核不通过 5审核通过待支付 6已支付")
+	@ApiModelProperty("分成审核状态 1正常 2待审核 3审核中  4审核不通过 5审核通过待支付 6已支付")
+	private Integer divideStatus;
 }

+ 2 - 2
zhongzheng-system/src/main/java/com/zhongzheng/modules/top/order/bo/TopOrderRecNoteAddBo.java

@@ -29,10 +29,10 @@ public class TopOrderRecNoteAddBo {
     private String dayTime;
     /** 周几 1-7 */
     @ApiModelProperty("周几 1-7")
-    private Integer weekTime;
+    private String weekTime;
     /** 月天数 1-31 */
     @ApiModelProperty("月天数 1-31")
-    private Integer monthTime;
+    private String monthTime;
     /** 最后一次推送时间 */
     @ApiModelProperty("最后一次推送时间")
     private Long lastTime;

+ 2 - 2
zhongzheng-system/src/main/java/com/zhongzheng/modules/top/order/bo/TopOrderRecNoteEditBo.java

@@ -35,11 +35,11 @@ public class TopOrderRecNoteEditBo {
 
     /** 周几 1-7 */
     @ApiModelProperty("周几 1-7")
-    private Integer weekTime;
+    private String weekTime;
 
     /** 月天数 1-31 */
     @ApiModelProperty("月天数 1-31")
-    private Integer monthTime;
+    private String monthTime;
 
     /** 最后一次推送时间 */
     @ApiModelProperty("最后一次推送时间")

+ 2 - 2
zhongzheng-system/src/main/java/com/zhongzheng/modules/top/order/domain/TopOrderRecNote.java

@@ -33,9 +33,9 @@ private static final long serialVersionUID=1L;
     /** 每天时间 */
     private String dayTime;
     /** 周几 1-7 */
-    private Integer weekTime;
+    private String weekTime;
     /** 月天数 1-31 */
-    private Integer monthTime;
+    private String monthTime;
     /** 最后一次推送时间 */
     private Long lastTime;
     /** 添加时间 */

+ 2 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/top/order/service/ITopOrderRecNoteService.java

@@ -50,4 +50,6 @@ public interface ITopOrderRecNoteService extends IService<TopOrderRecNote> {
 	 * @return
 	 */
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+	List<TopOrderRecNoteVo> timeNoteBatchPush();
 }

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

@@ -47,7 +47,7 @@ public class TopOrderRecNoteServiceImpl extends ServiceImpl<TopOrderRecNoteMappe
         lqw.eq(StrUtil.isNotBlank(bo.getDayTime()), TopOrderRecNote::getDayTime, bo.getDayTime());
         lqw.eq(bo.getWeekTime() != null, TopOrderRecNote::getWeekTime, bo.getWeekTime());
         lqw.eq(bo.getMonthTime() != null, TopOrderRecNote::getMonthTime, bo.getMonthTime());
-        lqw.eq(bo.getLastTime() != null, TopOrderRecNote::getLastTime, bo.getLastTime());
+        lqw.lt(bo.getLastTime() != null, TopOrderRecNote::getLastTime, bo.getLastTime());
         lqw.eq(bo.getStatus() != null, TopOrderRecNote::getStatus, bo.getStatus());
         return entity2Vo(this.list(lqw));
     }
@@ -117,4 +117,24 @@ public class TopOrderRecNoteServiceImpl extends ServiceImpl<TopOrderRecNoteMappe
         }
         return this.removeByIds(ids);
     }
+
+    @Override
+    public List<TopOrderRecNoteVo> timeNoteBatchPush() {
+        //每天
+        TopOrderRecNoteQueryBo queryBo1 = new TopOrderRecNoteQueryBo();
+        queryBo1.setNoteType(2L);
+        queryBo1.setStatus(1);
+        queryBo1.setLastTime(DateUtils.getNowTime()-(24*3600));//一天只推一次
+        List<TopOrderRecNoteVo> list1 = queryList(queryBo1);
+        for(TopOrderRecNoteVo vo : list1){
+            String dayStr = DateUtils.getDate();
+            String timeStr = dayStr+" "+vo.getDayTime()+":00";
+            Long time = DateUtils.dateTimeSec(DateUtils.YYYY_MM_DD_HH_MM_SS,timeStr);
+            if(DateUtils.getNowTime().longValue()>time.longValue()){
+                //推送
+                System.out.println("推送");
+            }
+        }
+        return null;
+    }
 }

+ 2 - 2
zhongzheng-system/src/main/java/com/zhongzheng/modules/top/order/vo/TopOrderRecNoteVo.java

@@ -39,11 +39,11 @@ public class TopOrderRecNoteVo {
 	/** 周几 1-7 */
 	@Excel(name = "周几 1-7")
 	@ApiModelProperty("周几 1-7")
-	private Integer weekTime;
+	private String weekTime;
 	/** 月天数 1-31 */
 	@Excel(name = "月天数 1-31")
 	@ApiModelProperty("月天数 1-31")
-	private Integer monthTime;
+	private String monthTime;
 	/** 最后一次推送时间 */
 	@Excel(name = "最后一次推送时间")
 	@ApiModelProperty("最后一次推送时间")

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

@@ -140,4 +140,84 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
         ORDER BY too.order_id DESC
     </select>
+
+    <select id="queryDivSellerList" parameterType="com.zhongzheng.modules.top.goods.bo.TopOldOrderQueryBo" resultType="com.zhongzheng.modules.top.goods.vo.TopOldOrderVo">
+        SELECT
+        too.*,
+        st.tenant_name
+        FROM
+        v_top_order too
+        LEFT JOIN sys_tenant st ON too.tenant_id = st.tenant_id
+        where 1=1 AND too.divide_model = 2
+        <if test="startTime != null and startTime != ''">
+            AND too.create_time <![CDATA[ >= ]]> #{startTime}
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND too.create_time <![CDATA[ <= ]]> #{endTime}
+        </if>
+        <if test="keyNo != null and keyNo != ''">
+            AND (too.tenant_id like concat('%', #{keyNo}, '%') or too.create_no like concat('%', #{keyNo}, '%'))
+        </if>
+        <if test="divideStatusList != null and divideStatusList.size()!=0 ">
+            AND too.divide_status in
+            <foreach collection="divideStatusList" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="divideStatus != null and divideStatus != ''">
+            AND too.divide_status = #{divideStatus}
+        </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
+        FROM
+        top_old_order too
+        LEFT JOIN sys_tenant st ON too.tenant_id = st.tenant_id
+        where 1=1 AND too.divide_model = 1
+        <if test="startTime != null and startTime != ''">
+            AND too.create_time <![CDATA[ >= ]]> #{startTime}
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND too.create_time <![CDATA[ <= ]]> #{endTime}
+        </if>
+        <if test="keyNo != null and keyNo != ''">
+            AND (too.tenant_id like concat('%', #{keyNo}, '%') or too.create_no like concat('%', #{keyNo}, '%'))
+        </if>
+        <if test="divideStatusList != null and divideStatusList.size()!=0 ">
+            AND too.divide_status in
+            <foreach collection="divideStatusList" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="divideStatus != null and divideStatus != ''">
+            AND too.divide_status = #{divideStatus}
+        </if>
+        <if test="tenantId != null and tenantId != ''">
+            AND too.tenant_id = #{tenantId}
+        </if>
+        ORDER BY too.order_id DESC
+    </select>
+
+    <select id="tenantMoneyTotal" parameterType="com.zhongzheng.modules.top.goods.bo.TopOldOrderQueryBo" resultType="Float">
+        SELECT
+            IFNULL( SUM( too.divide_company_money ), 0 )
+        FROM
+            v_top_order too
+        WHERE
+            too.divide_model = 1
+          AND too.divide_status = 5
+    </select>
+    <select id="tenantSellerTotal" parameterType="com.zhongzheng.modules.top.goods.bo.TopOldOrderQueryBo" resultType="Float">
+        SELECT
+            IFNULL( SUM( too.divide_seller_money ), 0 )
+        FROM
+            v_top_order too
+        WHERE
+            too.divide_model = 2
+          AND too.divide_status = 5
+    </select>
 </mapper>