fix

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

@@ -0,0 +1,62 @@
+package com.zhongzheng.controller.financial;
+
+import com.zhongzheng.common.annotation.Log;
+import com.zhongzheng.common.core.controller.BaseController;
+import com.zhongzheng.common.core.domain.AjaxResult;
+import com.zhongzheng.common.core.page.TableDataInfo;
+import com.zhongzheng.common.enums.BusinessType;
+import com.zhongzheng.common.utils.poi.ExcelUtil;
+import com.zhongzheng.modules.grade.vo.SyncUserChapterExport;
+import com.zhongzheng.modules.top.financial.bo.TopCostTpAddBo;
+import com.zhongzheng.modules.top.financial.bo.TopCostTpEditBo;
+import com.zhongzheng.modules.top.financial.bo.TopCostTpQueryBo;
+import com.zhongzheng.modules.top.financial.service.ITopCostTpService;
+import com.zhongzheng.modules.top.financial.vo.TopCostTpVo;
+import com.zhongzheng.modules.top.goods.bo.TopOldOrderQueryBo;
+import com.zhongzheng.modules.top.goods.service.ITopOldOrderService;
+import com.zhongzheng.modules.top.goods.vo.TopOldOrderVo;
+import com.zhongzheng.modules.top.order.vo.TopOldOrderExportVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 成本模板Controller
+ *
+ * @author ruoyi
+ * @date 2023-04-20
+ */
+@Api(value = "应收订单控制器", tags = {"成本模板管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/receive/order")
+public class ReceiveOrderController extends BaseController {
+
+    private final ITopOldOrderService iTopOldOrderService;
+
+
+    @ApiOperation("应收订单列表")
+    @PreAuthorize("@ss.hasPermi('system:tp:list')")
+    @GetMapping("/list")
+    public TableDataInfo<TopOldOrderVo> list(TopOldOrderQueryBo bo) {
+        startPage();
+        List<TopOldOrderVo> list = iTopOldOrderService.queryReceiveList(bo);
+        return getDataTable(list);
+    }
+
+    @ApiOperation("应收订单列表导出")
+    @PreAuthorize("@ss.hasPermi('system:tp:list')")
+    @GetMapping("/listExport")
+    public AjaxResult<List<TopOldOrderExportVo>> listExport(TopOldOrderQueryBo bo) {
+        List<TopOldOrderExportVo> list = iTopOldOrderService.queryReceiveListExport(bo);
+        ExcelUtil<TopOldOrderExportVo> util = new ExcelUtil<TopOldOrderExportVo>(TopOldOrderExportVo.class);
+        return util.exportExcel(list, "应收订单列表");
+    }
+
+}

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

@@ -0,0 +1,80 @@
+package com.zhongzheng.controller.financial;
+
+import java.util.List;
+import java.util.Arrays;
+
+import com.zhongzheng.modules.top.order.bo.TopOrderRecNoteAddBo;
+import com.zhongzheng.modules.top.order.bo.TopOrderRecNoteEditBo;
+import com.zhongzheng.modules.top.order.bo.TopOrderRecNoteQueryBo;
+import com.zhongzheng.modules.top.order.service.ITopOrderRecNoteService;
+import com.zhongzheng.modules.top.order.vo.TopOrderRecNoteVo;
+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 hjl
+ * @date 2023-04-24
+ */
+@Api(value = "订单收款提醒控制器", tags = {"订单收款提醒管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/receive/order/note")
+public class TopOrderRecNoteController extends BaseController {
+
+    private final ITopOrderRecNoteService iTopOrderRecNoteService;
+
+
+
+    /**
+     * 获取订单收款提醒详细信息
+     */
+    @ApiOperation("获取订单收款提醒详细信息")
+    @PreAuthorize("@ss.hasPermi('system:note:query')")
+    @GetMapping("/{id}")
+    public AjaxResult<TopOrderRecNoteVo> getInfo(@PathVariable("id" ) Long id) {
+        return AjaxResult.success(iTopOrderRecNoteService.queryById(id));
+    }
+
+    /**
+     * 新增订单收款提醒
+     */
+    @ApiOperation("新增订单收款提醒")
+    @PreAuthorize("@ss.hasPermi('system:note:add')")
+    @Log(title = "订单收款提醒", businessType = BusinessType.INSERT)
+    @PostMapping()
+    public AjaxResult<Void> add(@RequestBody TopOrderRecNoteAddBo bo) {
+        return toAjax(iTopOrderRecNoteService.insertByAddBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 修改订单收款提醒
+     */
+    @ApiOperation("修改订单收款提醒")
+    @PreAuthorize("@ss.hasPermi('system:note:edit')")
+    @Log(title = "订单收款提醒", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    public AjaxResult<Void> edit(@RequestBody TopOrderRecNoteEditBo bo) {
+        return toAjax(iTopOrderRecNoteService.updateByEditBo(bo) ? 1 : 0);
+    }
+
+
+}

zhongzheng-common/src/main/java/com/zhongzheng/common/utils/DateUtils.java

@@ -3,7 +3,9 @@ package com.zhongzheng.common.utils;
 import java.lang.management.ManagementFactory;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.time.ZoneOffset;
 import java.time.format.DateTimeFormatter;
 import java.util.Calendar;
 import java.util.Date;
@@ -371,4 +373,21 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
         return hh*60*60+mi*60+ss;
     }
 
+    public static Integer dayBetween(Long s1,Long s2) {
+        String date1str = timestampToDateFormat(s1);
+        String date2str = timestampToDateFormat(s2);
+        int count = 0;
+        if("".equals(date1str) || date1str == null || "".equals(date2str) || date2str == null) {
+            return count;
+        }
+        SimpleDateFormat format = new SimpleDateFormat("yyyy/MM/dd");
+       try {
+           Date date1 = format.parse(date1str);
+           Date date2 = format.parse(date2str);
+           count = ((int) ((date1.getTime() - date2.getTime()) / (1000*3600*24)));
+           return count;
+        }catch (Exception e){
+           return null;
+       }
+    }
 }

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

@@ -1,5 +1,6 @@
 package com.zhongzheng.modules.top.goods.bo;
 
+import com.zhongzheng.common.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -137,4 +138,8 @@ public class TopOldOrderAddBo {
 
     @ApiModelProperty("订单附件")
     private List<TopOldOrderAttachmentAddBo> orderAttachmentList;
+    /** 下单时间 */
+    @Excel(name = "下单时间")
+    @ApiModelProperty("下单时间")
+    private Long buyTime;
 }

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

@@ -1,5 +1,6 @@
 package com.zhongzheng.modules.top.goods.bo;
 
+import com.zhongzheng.common.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -167,4 +168,8 @@ public class TopOldOrderEditBo {
     @ApiModelProperty("预付款时间")
     private Integer predictPayTime;
 
+    /** 下单时间 */
+    @Excel(name = "下单时间")
+    @ApiModelProperty("下单时间")
+    private Long buyTime;
 }

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

@@ -1,5 +1,6 @@
 package com.zhongzheng.modules.top.goods.bo;
 
+import com.zhongzheng.common.annotation.Excel;
 import com.zhongzheng.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -63,4 +64,10 @@ public class TopOldOrderQueryBo extends BaseEntity {
 	private String keyword;
 	@ApiModelProperty("学员身份证")
 	private String userCard;
+	@ApiModelProperty("机构号/业务号")
+	private String keyNo;
+	/** 下单时间 */
+	@Excel(name = "下单时间")
+	@ApiModelProperty("下单时间")
+	private Long buyTime;
 }

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

@@ -108,4 +108,5 @@ private static final long serialVersionUID=1L;
     private Integer predictReceiveTime;
     /** 预付款时间 */
     private Integer predictPayTime;
+    private Long buyTime;
 }

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

@@ -22,4 +22,6 @@ public interface TopOldOrderMapper extends BaseMapper<TopOldOrder> {
     TopOldOrderVo queryById(@Param("orderSn") String orderSn);
 
     List<String> queryBusinessBySn(@Param("orderSn") String orderSn);
+
+    List<TopOldOrderVo> queryReceiveList(TopOldOrderQueryBo bo);
 }

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

@@ -6,6 +6,7 @@ import com.zhongzheng.modules.top.goods.bo.*;
 import com.zhongzheng.modules.top.goods.domain.TopOldOrder;
 import com.zhongzheng.modules.top.goods.vo.TopOldOrderGoodsListVo;
 import com.zhongzheng.modules.top.goods.vo.TopOldOrderVo;
+import com.zhongzheng.modules.top.order.vo.TopOldOrderExportVo;
 
 import java.util.Collection;
 import java.util.List;
@@ -53,4 +54,8 @@ public interface ITopOldOrderService extends IService<TopOldOrder> {
     List<TopOldOrderGoodsListVo> getOrderGoodsList(TopOldOrderGoodsQuery query);
 
     boolean checkOrder(TopOldOrderCheckBo bo);
+
+	List<TopOldOrderVo> queryReceiveList(TopOldOrderQueryBo bo);
+
+	List<TopOldOrderExportVo> queryReceiveListExport(TopOldOrderQueryBo bo);
 }

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

@@ -1,6 +1,7 @@
 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.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
@@ -29,10 +30,12 @@ import com.zhongzheng.modules.top.goods.service.ITopOldOrderService;
 import com.zhongzheng.modules.top.goods.vo.TopOldOrderAttachmentVo;
 import com.zhongzheng.modules.top.goods.vo.TopOldOrderGoodsListVo;
 import com.zhongzheng.modules.top.goods.vo.TopOldOrderVo;
+import com.zhongzheng.modules.top.order.vo.TopOldOrderExportVo;
 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;
@@ -243,4 +246,29 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
         }
         return false;
     }
+
+    @Override
+    public List<TopOldOrderVo> queryReceiveList(TopOldOrderQueryBo bo) {
+        List<TopOldOrderVo> list = this.baseMapper.queryReceiveList(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 list;
+    }
+
+    @Override
+    public List<TopOldOrderExportVo> queryReceiveListExport(TopOldOrderQueryBo bo) {
+        List<TopOldOrderExportVo> listExport = new ArrayList<>();
+        List<TopOldOrderVo> list = this.baseMapper.queryReceiveList(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/goods/vo/TopOldOrderVo.java

@@ -163,12 +163,39 @@ public class TopOldOrderVo {
 	private Integer createOrg;
 	/** 预收款时间 */
 	@ApiModelProperty("预收款时间")
-	private Integer predictReceiveTime;
+	private Long predictReceiveTime;
 	/** 预付款时间 */
 	@ApiModelProperty("预付款时间")
-	private Integer predictPayTime;
+	private Long predictPayTime;
 	@ApiModelProperty("订单附件集合")
 	private List<TopOldOrderAttachmentVo> attachmentList;
 	@ApiModelProperty("订单业务类型")
 	private List<String> businessNames;
+	@ApiModelProperty("企业名称")
+	private String tenantName;
+	@ApiModelProperty("预收款剩余天数")
+	private Integer predictReceiveDay;
+	/** $column.columnComment */
+	@ApiModelProperty("提醒通知ID")
+	private Long noteId;
+
+	/** 1立刻 2每天 3每周 4每月 */
+	@ApiModelProperty("1立刻 2每天 3每周 4每月")
+	private Long noteType;
+
+	/** 每天时间 */
+	@ApiModelProperty("每天时间")
+	private String dayTime;
+
+	/** 周几 1-7 */
+	@ApiModelProperty("周几 1-7")
+	private Integer weekTime;
+
+	/** 月天数 1-31 */
+	@ApiModelProperty("月天数 1-31")
+	private Integer monthTime;
+
+	/** 最后一次推送时间 */
+	@ApiModelProperty("最后一次推送时间")
+	private Long lastTime;
 }

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

@@ -0,0 +1,50 @@
+package com.zhongzheng.modules.top.order.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_order_rec_note
+ *
+ * @author hjl
+ * @date 2023-04-24
+ */
+@Data
+@ApiModel("订单收款提醒添加对象")
+public class TopOrderRecNoteAddBo {
+
+    /** 订单编号 */
+    @ApiModelProperty("订单编号")
+    private String orderSn;
+    /** 1立刻 2每天 3每周 4每月 */
+    @ApiModelProperty("1立刻 2每天 3每周 4每月")
+    private Long noteType;
+    /** 每天时间 */
+    @ApiModelProperty("每天时间")
+    private String dayTime;
+    /** 周几 1-7 */
+    @ApiModelProperty("周几 1-7")
+    private Integer weekTime;
+    /** 月天数 1-31 */
+    @ApiModelProperty("月天数 1-31")
+    private Integer monthTime;
+    /** 最后一次推送时间 */
+    @ApiModelProperty("最后一次推送时间")
+    private Long lastTime;
+    /** 添加时间 */
+    @ApiModelProperty("添加时间")
+    private Long createTime;
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+    /** 状态 1正常 0关闭 */
+    @ApiModelProperty("状态 1正常 0关闭")
+    private Integer status;
+    @ApiModelProperty("机构ID")
+    private String tenantId;
+}

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

@@ -0,0 +1,58 @@
+package com.zhongzheng.modules.top.order.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_order_rec_note
+ *
+ * @author hjl
+ * @date 2023-04-24
+ */
+@Data
+@ApiModel("订单收款提醒编辑对象")
+public class TopOrderRecNoteEditBo {
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long id;
+
+    /** 订单编号 */
+    @ApiModelProperty("订单编号")
+    private String orderSn;
+
+    /** 1立刻 2每天 3每周 4每月 */
+    @ApiModelProperty("1立刻 2每天 3每周 4每月")
+    private Long noteType;
+
+    /** 每天时间 */
+    @ApiModelProperty("每天时间")
+    private String dayTime;
+
+    /** 周几 1-7 */
+    @ApiModelProperty("周几 1-7")
+    private Integer weekTime;
+
+    /** 月天数 1-31 */
+    @ApiModelProperty("月天数 1-31")
+    private Integer monthTime;
+
+    /** 最后一次推送时间 */
+    @ApiModelProperty("最后一次推送时间")
+    private Long lastTime;
+
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+
+    /** 状态 1正常 0关闭 */
+    @ApiModelProperty("状态 1正常 0关闭")
+    private Integer status;
+    @ApiModelProperty("机构ID")
+    private String tenantId;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/order/bo/TopOrderRecNoteQueryBo.java

@@ -0,0 +1,60 @@
+package com.zhongzheng.modules.top.order.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+import java.util.Map;
+import java.util.HashMap;
+
+import com.zhongzheng.common.core.domain.BaseEntity;
+
+/**
+ * 订单收款提醒分页查询对象 top_order_rec_note
+ *
+ * @author hjl
+ * @date 2023-04-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("订单收款提醒分页查询对象")
+public class TopOrderRecNoteQueryBo extends BaseEntity {
+
+	/** 分页大小 */
+	@ApiModelProperty("分页大小")
+	private Integer pageSize;
+	/** 当前页数 */
+	@ApiModelProperty("当前页数")
+	private Integer pageNum;
+	/** 排序列 */
+	@ApiModelProperty("排序列")
+	private String orderByColumn;
+	/** 排序的方向desc或者asc */
+	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
+	private String isAsc;
+
+
+	/** 订单编号 */
+	@ApiModelProperty("订单编号")
+	private String orderSn;
+	/** 1立刻 2每天 3每周 4每月 */
+	@ApiModelProperty("1立刻 2每天 3每周 4每月")
+	private Long noteType;
+	/** 每天时间 */
+	@ApiModelProperty("每天时间")
+	private String dayTime;
+	/** 周几 1-7 */
+	@ApiModelProperty("周几 1-7")
+	private Integer weekTime;
+	/** 月天数 1-31 */
+	@ApiModelProperty("月天数 1-31")
+	private Integer monthTime;
+	/** 最后一次推送时间 */
+	@ApiModelProperty("最后一次推送时间")
+	private Long lastTime;
+	/** 状态 1正常 0关闭 */
+	@ApiModelProperty("状态 1正常 0关闭")
+	private Integer status;
+}

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

@@ -0,0 +1,50 @@
+package com.zhongzheng.modules.top.order.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_order_rec_note
+ *
+ * @author hjl
+ * @date 2023-04-24
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("top_order_rec_note")
+public class TopOrderRecNote implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** $column.columnComment */
+    @TableId(value = "id")
+    private Long id;
+    /** 订单编号 */
+    private String orderSn;
+    /** 1立刻 2每天 3每周 4每月 */
+    private Long noteType;
+    /** 每天时间 */
+    private String dayTime;
+    /** 周几 1-7 */
+    private Integer weekTime;
+    /** 月天数 1-31 */
+    private Integer monthTime;
+    /** 最后一次推送时间 */
+    private Long lastTime;
+    /** 添加时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+    /** 修改时间 */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+    /** 状态 1正常 0关闭 */
+    private Integer status;
+    private String tenantId;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/order/mapper/TopOrderRecNoteMapper.java

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.top.order.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.top.order.domain.TopOrderRecNote;
+
+/**
+ * 订单收款提醒Mapper接口
+ *
+ * @author hjl
+ * @date 2023-04-24
+ */
+public interface TopOrderRecNoteMapper extends BaseMapper<TopOrderRecNote> {
+
+}

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

@@ -0,0 +1,53 @@
+package com.zhongzheng.modules.top.order.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.top.order.bo.TopOrderRecNoteAddBo;
+import com.zhongzheng.modules.top.order.bo.TopOrderRecNoteEditBo;
+import com.zhongzheng.modules.top.order.bo.TopOrderRecNoteQueryBo;
+import com.zhongzheng.modules.top.order.domain.TopOrderRecNote;
+import com.zhongzheng.modules.top.order.vo.TopOrderRecNoteVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 订单收款提醒Service接口
+ *
+ * @author hjl
+ * @date 2023-04-24
+ */
+public interface ITopOrderRecNoteService extends IService<TopOrderRecNote> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	TopOrderRecNoteVo queryById(Long id);
+
+	/**
+	 * 查询列表
+	 */
+	List<TopOrderRecNoteVo> queryList(TopOrderRecNoteQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入订单收款提醒
+	 * @param bo 订单收款提醒新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(TopOrderRecNoteAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改订单收款提醒
+	 * @param bo 订单收款提醒编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(TopOrderRecNoteEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

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

@@ -0,0 +1,120 @@
+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.zhongzheng.common.exception.CustomException;
+import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.modules.bank.domain.ExamQuestion;
+import com.zhongzheng.modules.top.order.bo.TopOrderRecNoteAddBo;
+import com.zhongzheng.modules.top.order.bo.TopOrderRecNoteEditBo;
+import com.zhongzheng.modules.top.order.bo.TopOrderRecNoteQueryBo;
+import com.zhongzheng.modules.top.order.domain.TopOrderRecNote;
+import com.zhongzheng.modules.top.order.mapper.TopOrderRecNoteMapper;
+import com.zhongzheng.modules.top.order.service.ITopOrderRecNoteService;
+import com.zhongzheng.modules.top.order.vo.TopOrderRecNoteVo;
+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-04-24
+ */
+@Service
+public class TopOrderRecNoteServiceImpl extends ServiceImpl<TopOrderRecNoteMapper, TopOrderRecNote> implements ITopOrderRecNoteService {
+
+    @Override
+    public TopOrderRecNoteVo queryById(Long id){
+        TopOrderRecNote db = this.baseMapper.selectById(id);
+        return BeanUtil.toBean(db, TopOrderRecNoteVo.class);
+    }
+
+    @Override
+    public List<TopOrderRecNoteVo> queryList(TopOrderRecNoteQueryBo bo) {
+        LambdaQueryWrapper<TopOrderRecNote> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StrUtil.isNotBlank(bo.getOrderSn()), TopOrderRecNote::getOrderSn, bo.getOrderSn());
+        lqw.eq(bo.getNoteType() != null, TopOrderRecNote::getNoteType, bo.getNoteType());
+        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.eq(bo.getStatus() != null, TopOrderRecNote::getStatus, bo.getStatus());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<TopOrderRecNoteVo> entity2Vo(Collection<TopOrderRecNote> collection) {
+        List<TopOrderRecNoteVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, TopOrderRecNoteVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<TopOrderRecNote> page = (Page<TopOrderRecNote>)collection;
+            Page<TopOrderRecNoteVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(TopOrderRecNoteAddBo bo) {
+        if(Validator.isEmpty(bo.getOrderSn())||Validator.isEmpty(bo.getTenantId())){
+            throw new CustomException("参数缺失");
+        }
+        if (getOne(new LambdaQueryWrapper<TopOrderRecNote>().eq(TopOrderRecNote::getOrderSn, bo.getOrderSn()).eq(TopOrderRecNote::getTenantId, bo.getTenantId()).last("limit 1")) != null) {
+            throw new CustomException("该订单已经配置提醒了");
+        }
+        TopOrderRecNote add = BeanUtil.toBean(bo, TopOrderRecNote.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(TopOrderRecNoteEditBo bo) {
+        if(Validator.isEmpty(bo.getOrderSn())||Validator.isEmpty(bo.getTenantId())||Validator.isEmpty(bo.getId())){
+            throw new CustomException("参数缺失");
+        }
+        if (getOne(new LambdaQueryWrapper<TopOrderRecNote>().ne(TopOrderRecNote::getId, bo.getId()).eq(TopOrderRecNote::getOrderSn, bo.getOrderSn()).eq(TopOrderRecNote::getTenantId, bo.getTenantId()).last("limit 1")) != null) {
+            throw new CustomException("该订单已经配置提醒了");
+        }
+        TopOrderRecNote update = BeanUtil.toBean(bo, TopOrderRecNote.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(TopOrderRecNote entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return this.removeByIds(ids);
+    }
+}

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

@@ -0,0 +1,201 @@
+package com.zhongzheng.modules.top.order.vo;
+
+import com.zhongzheng.common.annotation.Excel;
+import com.zhongzheng.modules.top.goods.vo.TopOldOrderAttachmentVo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+
+/**
+ * 订单视图对象 mall_package
+ *
+ * @author ruoyi
+ * @date 2023-04-20
+ */
+@Data
+@ApiModel("订单视图对象")
+public class TopOldOrderExportVo {
+	private static final long serialVersionUID = 1L;
+
+
+
+	/** 订单编号 */
+	@Excel(name = "订单编号")
+	@ApiModelProperty("订单编号")
+	private String orderSn;
+
+	/** 订单标准价格 */
+	@Excel(name = "订单标准价格")
+	@ApiModelProperty("订单标准价格")
+	private BigDecimal orderPrice;
+	/** 支付订单号 */
+	@Excel(name = "支付订单号")
+	@ApiModelProperty("支付订单号")
+	private String orderGeneral;
+	/** 订单状态 -2 超时关闭，-1手动关闭，0待支付，1已支付 3部分已退款 4完全退款 */
+	@Excel(name = "订单状态 -2 超时关闭，-1手动关闭，0待支付，1已支付 3部分已退款 4完全退款")
+	@ApiModelProperty("订单状态 -2 超时关闭，-1手动关闭，0待支付，1已支付 3部分已退款 4完全退款")
+	private Integer orderStatus;
+	/** 支付时间 */
+	@Excel(name = "支付时间")
+	@ApiModelProperty("支付时间")
+	private Long payTime;
+	/** 支付平台  */
+	@Excel(name = "支付平台 ")
+	@ApiModelProperty("支付平台 ")
+	private Integer payType;
+	/** 微信流水号 */
+	@Excel(name = "微信流水号")
+	@ApiModelProperty("微信流水号")
+	private String transid;
+	/** 关闭时间 */
+	@Excel(name = "关闭时间")
+	@ApiModelProperty("关闭时间")
+	private Long cancelTime;
+	/** 订单完成时间 */
+	@Excel(name = "订单完成时间")
+	@ApiModelProperty("订单完成时间")
+	private Long finishTime;
+	/** 订单类型   1线上，2线下 */
+	@Excel(name = "订单类型   1线上，2线下")
+	@ApiModelProperty("订单类型   1线上，2线下")
+	private Integer orderType;
+	/** 支付价格(成交价) */
+	@Excel(name = "支付价格(成交价)")
+	@ApiModelProperty("支付价格(成交价)")
+	private BigDecimal payPrice;
+	/** 订单来源 1新系统C端订单，2旧系统C端订单，3旧系统B端订单  */
+	@Excel(name = "订单来源 1新系统C端订单，2旧系统C端订单，3旧系统B端订单 ")
+	@ApiModelProperty("订单来源 1新系统C端订单，2旧系统C端订单，3旧系统B端订单 ")
+	private Integer orderFrom;
+	/** 业务员名称 */
+	@Excel(name = "业务员名称")
+	@ApiModelProperty("业务员名称")
+	private String createUsername;
+	/** 1有效 0无效 */
+	@Excel(name = "1有效 0无效")
+	@ApiModelProperty("1有效 0无效")
+	private Integer status;
+	/** 业务员名称ID */
+	@Excel(name = "业务员名称ID")
+	@ApiModelProperty("业务员名称ID")
+	private Long createSysUserId;
+	/** 业务号 */
+	@Excel(name = "业务号")
+	@ApiModelProperty("业务号")
+	private String createNo;
+	/** 录单订单编号 */
+	@Excel(name = "录单订单编号")
+	@ApiModelProperty("录单订单编号")
+	private String inputOrderSn;
+	/** 支付状态 0未收费，1部分付款  2完全付款 3免费 */
+	@Excel(name = "支付状态 0未收费，1部分付款  2完全付款 3免费")
+	@ApiModelProperty("支付状态 0未收费，1部分付款  2完全付款 3免费")
+	private Integer payStatus;
+	/** 审核状态：0待审核，1已通过，2未通过，3已撤销 */
+	@Excel(name = "审核状态：0待审核，1已通过，2未通过，3已撤销")
+	@ApiModelProperty("审核状态：0待审核，1已通过，2未通过，3已撤销")
+	private Integer checkStatus;
+	/** 审核意见 */
+	@ApiModelProperty("审核意见")
+	private String checkReason;
+	/** 退款状态：0待审核，1未通过，2未退款，3已完成 */
+	@Excel(name = "退款状态：0待审核，1未通过，2未退款，3已完成")
+	@ApiModelProperty("退款状态：0待审核，1未通过，2未退款，3已完成")
+	private Integer refundStatus;
+	/** 账款状态：0未结清，1已结清 */
+	@Excel(name = "账款状态：0未结清，1已结清")
+	@ApiModelProperty("账款状态：0未结清，1已结清")
+	private Integer creditStatus;
+	/** 发票状态：0未开票，1已开票 */
+	@Excel(name = "发票状态：0未开票，1已开票")
+	@ApiModelProperty("发票状态：0未开票，1已开票")
+	private Integer invoiceStatus;
+	/** 盈亏（元） */
+	@Excel(name = "盈亏" , readConverterExp = "元=")
+	@ApiModelProperty("盈亏（元）")
+	private BigDecimal orderProfit;
+	/** 成本（元） */
+	@Excel(name = "成本" , readConverterExp = "元=")
+	@ApiModelProperty("成本（元）")
+	private BigDecimal orderCost;
+	/** 退款（元） */
+	@Excel(name = "退款" , readConverterExp = "元=")
+	@ApiModelProperty("退款（元）")
+	private BigDecimal orderRefund;
+	/** 已退（元） */
+	@Excel(name = "已退" , readConverterExp = "元=")
+	@ApiModelProperty("已退（元）")
+	private BigDecimal orderRefunded;
+	/** 未收账款（元） */
+	@Excel(name = "未收账款" , readConverterExp = "元=")
+	@ApiModelProperty("未收账款（元）")
+	private BigDecimal orderUncollected;
+	/** 实收账款（元） */
+	@Excel(name = "实收账款" , readConverterExp = "元=")
+	@ApiModelProperty("实收账款（元）")
+	private BigDecimal orderReceived;
+	/** 备注 */
+	@Excel(name = "备注")
+	@ApiModelProperty("备注")
+	private String remark;
+	/** 业务分类 */
+	@Excel(name = "业务分类")
+	@ApiModelProperty("业务分类")
+	private String orderBusiness;
+	/** 成本设置 */
+	@Excel(name = "成本设置")
+	@ApiModelProperty("成本设置")
+	private String costJson;
+	/** 订单来源系统名称 */
+	@ApiModelProperty("订单来源系统名称")
+	private String orderOrg;
+	/** 业务员机构 */
+	@ApiModelProperty("业务员机构")
+	private Integer createOrg;
+	/** 预收款时间 */
+	@ApiModelProperty("预收款时间")
+	private Long predictReceiveTime;
+	/** 预付款时间 */
+	@ApiModelProperty("预付款时间")
+	private Long predictPayTime;
+	@ApiModelProperty("订单附件集合")
+	private List<TopOldOrderAttachmentVo> attachmentList;
+	@ApiModelProperty("订单业务类型")
+	private List<String> businessNames;
+	@ApiModelProperty("企业名称")
+	private String tenantName;
+	@ApiModelProperty("预收款剩余天数")
+	private Integer predictReceiveDay;
+	/** $column.columnComment */
+	@ApiModelProperty("提醒通知ID")
+	private Long noteId;
+
+	/** 1立刻 2每天 3每周 4每月 */
+	@ApiModelProperty("1立刻 2每天 3每周 4每月")
+	private Long noteType;
+
+	/** 每天时间 */
+	@ApiModelProperty("每天时间")
+	private String dayTime;
+
+	/** 周几 1-7 */
+	@ApiModelProperty("周几 1-7")
+	private Integer weekTime;
+
+	/** 月天数 1-31 */
+	@ApiModelProperty("月天数 1-31")
+	private Integer monthTime;
+
+	/** 最后一次推送时间 */
+	@ApiModelProperty("最后一次推送时间")
+	private Long lastTime;
+	/** 下单时间 */
+	@Excel(name = "下单时间")
+	@ApiModelProperty("下单时间")
+	private Long buyTime;
+}

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

@@ -0,0 +1,56 @@
+package com.zhongzheng.modules.top.order.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.util.Date;
+
+
+
+/**
+ * 订单收款提醒视图对象 mall_package
+ *
+ * @author hjl
+ * @date 2023-04-24
+ */
+@Data
+@ApiModel("订单收款提醒视图对象")
+public class TopOrderRecNoteVo {
+	private static final long serialVersionUID = 1L;
+
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long id;
+
+	/** 订单编号 */
+	@Excel(name = "订单编号")
+	@ApiModelProperty("订单编号")
+	private String orderSn;
+	/** 1立刻 2每天 3每周 4每月 */
+	@Excel(name = "1立刻 2每天 3每周 4每月")
+	@ApiModelProperty("1立刻 2每天 3每周 4每月")
+	private Long noteType;
+	/** 每天时间 */
+	@Excel(name = "每天时间")
+	@ApiModelProperty("每天时间")
+	private String dayTime;
+	/** 周几 1-7 */
+	@Excel(name = "周几 1-7")
+	@ApiModelProperty("周几 1-7")
+	private Integer weekTime;
+	/** 月天数 1-31 */
+	@Excel(name = "月天数 1-31")
+	@ApiModelProperty("月天数 1-31")
+	private Integer monthTime;
+	/** 最后一次推送时间 */
+	@Excel(name = "最后一次推送时间")
+	@ApiModelProperty("最后一次推送时间")
+	private Long lastTime;
+	/** 状态 1正常 0关闭 */
+	@Excel(name = "状态 1正常 0关闭")
+	@ApiModelProperty("状态 1正常 0关闭")
+	private Integer status;
+	private String tenantId;
+}

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

@@ -39,6 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="remark" column="remark"/>
         <result property="orderBusiness" column="order_business"/>
         <result property="costJson" column="cost_json"/>
+        <result property="buyTime" column="buy_time"/>
     </resultMap>
 
     <select id="queryList" parameterType="com.zhongzheng.modules.top.goods.bo.TopOldOrderQueryBo" resultType="com.zhongzheng.modules.top.goods.vo.TopOldOrderVo">
@@ -110,4 +111,33 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT business_name FROM v_top_order_business WHERE order_sn = #{orderSn}
     </select>
 
+    <select id="queryReceiveList" parameterType="com.zhongzheng.modules.top.goods.bo.TopOldOrderQueryBo" resultType="com.zhongzheng.modules.top.goods.vo.TopOldOrderVo">
+        SELECT
+            too.*,
+            st.tenant_name,
+            rn.id as note_id,
+            rn.note_type,
+            rn.day_time,
+            rn.week_time,
+            rn.month_time,
+            rn.last_time
+        FROM
+            top_old_order too
+                LEFT JOIN sys_tenant st ON too.tenant_id = st.tenant_id
+                LEFT JOIN top_order_rec_note rn ON too.tenant_id = rn.tenant_id and too.order_sn = rn.order_sn
+        where 1=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="creditStatus != null and creditStatus != ''">
+            AND too.credit_status = #{creditStatus}
+        </if>
+        ORDER BY too.order_id DESC
+    </select>
 </mapper>

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

@@ -0,0 +1,21 @@
+<?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.order.mapper.TopOrderRecNoteMapper">
+
+    <resultMap type="com.zhongzheng.modules.top.order.domain.TopOrderRecNote" id="TopOrderRecNoteResult">
+        <result property="id" column="id"/>
+        <result property="orderSn" column="order_sn"/>
+        <result property="noteType" column="note_type"/>
+        <result property="dayTime" column="day_time"/>
+        <result property="weekTime" column="week_time"/>
+        <result property="monthTime" column="month_time"/>
+        <result property="lastTime" column="last_time"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="status" column="status"/>
+    </resultMap>
+
+
+</mapper>