submit

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/common/CommonController.java

@@ -1,9 +1,11 @@
 package com.zhongzheng.controller.common;
 
 import cn.hutool.core.lang.Validator;
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.zhongzheng.common.annotation.Log;
+import com.zhongzheng.common.config.RuoYiConfig;
 import com.zhongzheng.common.core.controller.BaseController;
 import com.zhongzheng.common.core.domain.AjaxResult;
 import com.zhongzheng.common.core.domain.model.TopLoginUser;
@@ -14,6 +16,7 @@ import com.zhongzheng.common.exception.CustomException;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.common.utils.ServletUtils;
 import com.zhongzheng.common.utils.ToolsUtils;
+import com.zhongzheng.common.utils.file.FileUtils;
 import com.zhongzheng.framework.web.service.WxLoginService;
 import com.zhongzheng.modules.activity.vo.ActivityGoodsPriceVo;
 import com.zhongzheng.modules.base.bo.ConfigQueryBo;
@@ -42,6 +45,12 @@ import com.zhongzheng.modules.sdk.service.NuonuoService;
 import com.zhongzheng.modules.system.bo.SysTenantQueryBo;
 import com.zhongzheng.modules.system.service.ISysConfigService;
 import com.zhongzheng.modules.system.service.ISysTenantService;
+import com.zhongzheng.modules.top.financial.bo.TopOrderRemindBo;
+import com.zhongzheng.modules.top.financial.bo.TopOrderRevocationBo;
+import com.zhongzheng.modules.top.financial.bo.TopSellerDiscountBo;
+import com.zhongzheng.modules.top.financial.vo.TopOrderRevocationVo;
+import com.zhongzheng.modules.top.financial.vo.TopSellerDiscountVo;
+import com.zhongzheng.modules.top.goods.bo.TopFinishOrderBo;
 import com.zhongzheng.modules.top.goods.bo.TopOldOrderAddBo;
 import com.zhongzheng.modules.top.goods.bo.TopOldOrderCheckBo;
 import com.zhongzheng.modules.top.goods.bo.TopOldOrderQueryBo;
@@ -55,10 +64,15 @@ import com.zhongzheng.modules.wx.domain.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.text.ParseException;
 import java.util.HashMap;
 import java.util.List;
@@ -76,11 +90,40 @@ import java.util.Map;
 @RequestMapping("/sys/common/")
 public class CommonController extends BaseController {
 
+    private static final Logger log = LoggerFactory.getLogger(CommonController.class);
 
     private final ITopNuoMplatformLogService iTopNuoMplatformLogService;
 
     private final ITopOldOrderService iTopOldOrderService;
 
+    /**
+     * 通用下载请求
+     *
+     * @param fileName 文件名称
+     * @param delete   是否删除
+     */
+    @GetMapping("/download")
+    public void fileDownload(String fileName, Boolean delete, HttpServletResponse response, HttpServletRequest request) {
+        try {
+            if (!FileUtils.checkAllowDownload(fileName)) {
+                throw new Exception(StrUtil.format("文件名称({})非法，不允许下载。 ", fileName));
+            }
+            String realFileName = System.currentTimeMillis() + fileName.substring(fileName.indexOf("_") + 1);
+            String filePath = RuoYiConfig.getDownloadPath() + fileName;
+
+            response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
+            FileUtils.setAttachmentResponseHeader(response, realFileName);
+            FileUtils.writeBytes(filePath, response.getOutputStream());
+           /* if (delete)
+            {
+                FileUtils.deleteFile(filePath);
+            }*/
+            FileUtils.deleteFile(filePath);
+        } catch (Exception e) {
+            log.error("下载文件失败", e);
+        }
+    }
+
     /**
      * 新增诺税通开单记录
      */
@@ -101,19 +144,19 @@ public class CommonController extends BaseController {
     @ApiOperation("B端订单退款申请")
     @PostMapping("/refund/apply")
     public AjaxResult<Void> orderRefundApply(@RequestBody TopOrderRefundApplyBo bo) {
-        if(!ToolsUtils.checkSignFromOldSys(bo.getStamp().toString(),bo.getSign())){
+        if(!ToolsUtils.checkOrderSignFromOldSys(bo.getOrderSn(),bo.getStamp().toString(),bo.getSign())){
             throw new CustomException("签名错误");
         }
         return toAjax(iTopOldOrderService.orderRefundApply(bo) ? 1 : 0);
     }
 
     /**
-     * B端订单退款申请
+     * B端订单新增订单
      */
     @ApiOperation("新增订单")
     @PostMapping("/save/order")
     public AjaxResult<Void> saveOrder(@RequestBody TopOldOrderAddBo bo) {
-//        if(!ToolsUtils.checkSignFromOldSys(bo.getStamp().toString(),bo.getSign())){
+//        if(!ToolsUtils.checkOrderSignFromOldSys(bo.getOrderSn(),bo.getStamp().toString(),bo.getSign())){
 //            throw new CustomException("签名错误");
 //        }
         return toAjax(iTopOldOrderService.insertByAddBo(bo) ? 1 : 0);
@@ -140,4 +183,76 @@ public class CommonController extends BaseController {
         }
         return toAjax(iTopOldOrderService.payToCompanyCallBack(bo) ? 1 : 0);
     }
+
+    /**
+     * B端订单修改
+     */
+    @ApiOperation("B端订单修改")
+    @PostMapping("/edit/order")
+    public AjaxResult<Void> editOrder(@RequestBody TopOldOrderAddBo bo) {
+        if(!ToolsUtils.checkOrderSignFromOldSys(bo.getOrderSn(),bo.getStamp().toString(),bo.getSign())){
+            throw new CustomException("签名错误");
+        }
+        return toAjax(iTopOldOrderService.editOrder(bo) ? 1 : 0);
+    }
+
+    /**
+     * B端订单审核修改
+     */
+    @ApiOperation("B端订单审核修改")
+    @PostMapping("/edit/order/check")
+    public AjaxResult<Void> editOrderCheck(@RequestBody TopOldOrderAddBo bo) {
+        if(!ToolsUtils.checkOrderSignFromOldSys(bo.getOrderSn(),bo.getStamp().toString(),bo.getSign())){
+            throw new CustomException("签名错误");
+        }
+        return toAjax(iTopOldOrderService.editOrderCheck(bo) ? 1 : 0);
+    }
+
+    /**
+     * B端订单审核修改通知
+     */
+    @ApiOperation("B端订单审核修改通知")
+    @PostMapping("/edit/order/remind")
+    public AjaxResult<Void> editOrderRemind(@RequestBody TopOrderRemindBo bo) {
+        if(!ToolsUtils.checkSignFromOldSys(bo.getStamp().toString(),bo.getSign())){
+            throw new CustomException("签名错误");
+        }
+        return toAjax(iTopOldOrderService.editOrderRemind(bo) ? 1 : 0);
+    }
+
+    /**
+     * B端订单批量完单
+     */
+    @ApiOperation("B端订单批量完单")
+    @PostMapping("/order/finish")
+    public AjaxResult<Void> finishOrder(@RequestBody TopFinishOrderBo bo) {
+        if(!ToolsUtils.checkSignFromOldSys(bo.getStamp().toString(),bo.getSign())){
+            throw new CustomException("签名错误");
+        }
+        return toAjax(iTopOldOrderService.finishOrder(bo) ? 1 : 0);
+    }
+
+    /**
+     * B端订单获取业务员优惠额度
+     */
+    @ApiOperation("B端订单获取业务员优惠额度")
+    @PostMapping("/seller/discount")
+    public AjaxResult<TopSellerDiscountVo> getSellerDiscount(@RequestBody TopSellerDiscountBo bo) {
+        if(!ToolsUtils.checkSignFromOldSys(bo.getStamp().toString(),bo.getSign())){
+            throw new CustomException("签名错误");
+        }
+        return AjaxResult.success(iTopOldOrderService.getSellerDiscount(bo));
+    }
+
+    /**
+     * B端订单撤销
+     */
+    @ApiOperation("B端订单撤销")
+    @PostMapping("/order/revocation")
+    public AjaxResult<TopOrderRevocationVo> orderRevocation(@RequestBody TopOrderRevocationBo bo) {
+        if(!ToolsUtils.checkOrderSignFromOldSys(bo.getOrderSn(),bo.getStamp().toString(),bo.getSign())){
+            throw new CustomException("签名错误");
+        }
+        return AjaxResult.success(iTopOldOrderService.orderRevocation(bo));
+    }
 }

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

@@ -8,6 +8,7 @@ import com.zhongzheng.common.utils.ServletUtils;
 import com.zhongzheng.common.utils.poi.ExcelUtil;
 import com.zhongzheng.framework.web.service.TopTokenService;
 import com.zhongzheng.modules.top.financial.vo.TopCostTpVo;
+import com.zhongzheng.modules.top.financial.vo.TopOrderLogVo;
 import com.zhongzheng.modules.top.goods.bo.*;
 import com.zhongzheng.modules.top.goods.service.ITopOldOrderService;
 import com.zhongzheng.modules.top.goods.vo.TopOldOrderGoodsListVo;
@@ -98,7 +99,7 @@ public class TopOldOrderController extends BaseController {
      * 修改订单
      */
     @ApiOperation("修改订单")
-    @PutMapping()
+    @PostMapping("/edit")
     public AjaxResult<Void> edit(@RequestBody TopOldOrderEditBo bo) {
         return toAjax(iTopOldOrderService.updateByEditBo(bo) ? 1 : 0);
     }
@@ -198,6 +199,9 @@ public class TopOldOrderController extends BaseController {
     @ApiOperation("批量完单")
     @PostMapping("/finish")
     public AjaxResult<Void> finishOrder(@RequestBody TopFinishOrderBo bo) {
+        TopLoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        bo.setLoginId(loginUser.getUser().getUserId());
+        bo.setLoginName(loginUser.getUser().getUserName());
         return toAjax(iTopOldOrderService.finishOrder(bo) ? 1 : 0);
     }
 
@@ -241,4 +245,15 @@ public class TopOldOrderController extends BaseController {
         return AjaxResult.success(iTopOldOrderService.divideOrderDetail(orderSn));
     }
 
+    /**
+     * 订单操作记录
+     */
+    @ApiOperation("订单操作记录")
+    @GetMapping("/log")
+    public TableDataInfo<TopOrderLogVo> logList(TopOldOrderQueryBo bo) {
+        startPage();
+        List<TopOrderLogVo> list = iTopOldOrderService.logList(bo);
+        return getDataTable(list);
+    }
+
 }

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

@@ -296,6 +296,17 @@ public class ToolsUtils {
         return true;
     }
 
+    public static Boolean checkOrderSignFromOldSys(String orderSn,String stamp,String sign) {
+        String newSign = orderSn+stamp+"pubilc2022";
+        if(!sign.equals(ToolsUtils.EncoderByMd5(newSign))){
+            return false;
+        }
+        if((Long.parseLong(stamp)+10L>(DateUtils.getNowTime().longValue()))&&(Long.parseLong(stamp)<(DateUtils.getNowTime().longValue()-10L))){
+            return false;
+        }
+        return true;
+    }
+
     public static Boolean checkSignCwSnFromOldSys(String cwSn,String stamp,String sign) {
         String newSign = cwSn+stamp+"pubilc2022";
         if(!sign.equals(ToolsUtils.EncoderByMd5(newSign))){

zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/domain/InformRemindRelevance.java

@@ -0,0 +1,40 @@
+package com.zhongzheng.modules.inform.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * 提醒设置绑定业务对象 inform_remind_business
+ *
+ * @author ruoyi
+ * @date 2021-11-30
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("inform_remind_relevance")
+public class InformRemindRelevance implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** $column.columnComment */
+    @TableId(value = "id")
+    private Long id;
+    /** 业务ID */
+    private Long remindId;
+    /** 提醒设置ID */
+    private Long relevanceId;
+    /** 类型：1学员退学提醒 */
+    private Integer type;
+    /** 添加时间 */
+    private Long createTime;
+    /** 修改时间 */
+    private Long updateTime;
+
+    private Long tenantId;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/mapper/InformRemindRelevanceMapper.java

@@ -0,0 +1,18 @@
+package com.zhongzheng.modules.inform.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.inform.domain.InformRemindBusiness;
+import com.zhongzheng.modules.inform.domain.InformRemindRelevance;
+import com.zhongzheng.modules.inform.vo.InformRemindBusinessVo;
+
+import java.util.List;
+
+/**
+ * 提醒设置绑定业务Mapper接口
+ *
+ * @author ruoyi
+ * @date 2021-11-30
+ */
+public interface InformRemindRelevanceMapper extends BaseMapper<InformRemindRelevance> {
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/service/IInformRemindRelevanceService.java

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.inform.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.inform.domain.InformRemindBusiness;
+import com.zhongzheng.modules.inform.domain.InformRemindRelevance;
+
+/**
+ * 提醒设置绑定业务Service接口
+ *
+ * @author ruoyi
+ * @date 2021-11-30
+ */
+public interface IInformRemindRelevanceService extends IService<InformRemindRelevance> {
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/service/impl/InformRemindRelevanceServiceImpl.java

@@ -0,0 +1,18 @@
+package com.zhongzheng.modules.inform.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zhongzheng.modules.inform.domain.InformRemindRelevance;
+import com.zhongzheng.modules.inform.mapper.InformRemindRelevanceMapper;
+import com.zhongzheng.modules.inform.service.IInformRemindRelevanceService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 提醒设置绑定业务Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2021-11-30
+ */
+@Service
+public class InformRemindRelevanceServiceImpl extends ServiceImpl<InformRemindRelevanceMapper, InformRemindRelevance> implements IInformRemindRelevanceService {
+
+}

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

@@ -161,8 +161,17 @@ private static final long serialVersionUID=1L;
     /** 实收账款（元） */
     private BigDecimal orderReceived;
     /** 成本设置 */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String costJson;
     /** 底单：1新系统，2旧系统 */
     private Integer orderBase;
+    /** 分成模式 1机构分成 2业务员分成*/
+    private Integer divideModel;
+    /** 机构分成钱 */
+    private BigDecimal divideCompanyMoney;
+    /** 业务员分成钱 */
+    private BigDecimal divideSellerMoney;
+    /** 分成审核状态 1正常 2待审核 3审核中  4审核不通过 5审核通过待支付 6已支付*/
+    private Integer divideStatus;
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/system/domain/SysOldOrg.java

@@ -45,5 +45,8 @@ private static final long serialVersionUID=1L;
     /** 0 失效 1启用 */
     private Integer status;
 
+    /** 分成模式 1机构分成 2业务员分成 */
+    private Integer divideModel;
+
 
 }

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

@@ -0,0 +1,36 @@
+package com.zhongzheng.modules.top.financial.bo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 成本模板对象 top_cost_tp
+ *
+ * @author ruoyi
+ * @date 2023-04-20
+ */
+@Data
+public class TopOrderLogQueryBo implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** 分页大小 */
+    @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;
+
+}

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

@@ -0,0 +1,31 @@
+package com.zhongzheng.modules.top.financial.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.util.List;
+
+/**
+ * 订单编辑对象 top_order
+ *
+ * @author ruoyi
+ * @date 2023-04-20
+ */
+@Data
+@ApiModel("订单审核对象")
+public class TopOrderRemindBo {
+
+    @ApiModelProperty("当前时间戳")
+    @NotBlank(message = "当前时间戳不能为空")
+    private Long stamp;
+
+    @ApiModelProperty("签名")
+    @NotBlank(message = "签名不能为空")
+    private String sign;
+
+    @ApiModelProperty("学员名称，多个逗号隔开")
+    private String userNames;
+
+}

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

@@ -0,0 +1,28 @@
+package com.zhongzheng.modules.top.financial.bo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @author yangdamao
+ * @date 2023年05月04日 19:02
+ */
+@Data
+public class TopOrderRevocationBo implements Serializable {
+
+    @ApiModelProperty("当前时间戳")
+    @NotBlank(message = "当前时间戳不能为空")
+    private Long stamp;
+
+    @ApiModelProperty("签名")
+    @NotBlank(message = "签名不能为空")
+    private String sign;
+
+    @ApiModelProperty("订单号")
+    private String orderSn;
+
+    private Long tenantId;
+}

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

@@ -0,0 +1,28 @@
+package com.zhongzheng.modules.top.financial.bo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @author yangdamao
+ * @date 2023年05月04日 19:02
+ */
+@Data
+public class TopSellerDiscountBo implements Serializable {
+
+    @ApiModelProperty("当前时间戳")
+    @NotBlank(message = "当前时间戳不能为空")
+    private Long stamp;
+
+    @ApiModelProperty("签名")
+    @NotBlank(message = "签名不能为空")
+    private String sign;
+
+    @ApiModelProperty("业务员角色key")
+    private String sellerKey;
+
+    private Long tenantId;
+}

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

@@ -0,0 +1,45 @@
+package com.zhongzheng.modules.top.financial.domain;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * 成本模板对象 top_cost_tp
+ *
+ * @author ruoyi
+ * @date 2023-04-20
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("top_old_seller_discount")
+public class TopOldSellerDiscount implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** $column.columnComment */
+    @TableId(value = "tp_id")
+    private Long id;
+    /** 业务员角色key */
+    private String sellerKey;
+    /** 优惠金额 */
+    private BigDecimal discountMoney;
+    /** 优惠类型：1百分比，2固定金额 */
+    private String discountType;
+    /** 0 禁用 1启用 */
+    private Integer status;
+    /** 添加时间 */
+    private Long createTime;
+    /** 修改时间 */
+    private Long updateTime;
+
+    private Long tenantId;
+}

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

@@ -0,0 +1,45 @@
+package com.zhongzheng.modules.top.financial.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * 成本模板对象 top_cost_tp
+ *
+ * @author ruoyi
+ * @date 2023-04-20
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("top_order_log")
+public class TopOrderLog implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** $column.columnComment */
+    @TableId(value = "tp_id")
+    private Long id;
+    /** 订单编号 */
+    private String orderSn;
+    /** 操作人 */
+    private String createBy;
+    /** 操作行为 */
+    private String action;
+    /** 字段 */
+    private String field;
+    /** 操作前的值 */
+    private String fieldBefore;
+    /** 操作后的值 */
+    private String fieldAfter;
+    /** 创建时间 */
+    private Long createTime;
+
+    private Long tenantId;
+}

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

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.top.financial.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.top.financial.domain.TopOldSellerDiscount;
+
+/**
+ * 成本模板Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-04-20
+ */
+public interface TopOldSellerDiscountMapper extends BaseMapper<TopOldSellerDiscount> {
+}

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

@@ -0,0 +1,15 @@
+package com.zhongzheng.modules.top.financial.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.top.financial.domain.TopOldSellerDiscount;
+import com.zhongzheng.modules.top.financial.domain.TopOrderLog;
+
+/**
+ * 成本模板Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-04-20
+ */
+public interface TopOrderLogMapper extends BaseMapper<TopOrderLog> {
+}

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

@@ -0,0 +1,13 @@
+package com.zhongzheng.modules.top.financial.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.top.financial.domain.TopOldSellerDiscount;
+
+/**
+ * 成本模板Service接口
+ *
+ * @author ruoyi
+ * @date 2023-04-20
+ */
+public interface ITopOldSellerDiscountService extends IService<TopOldSellerDiscount> {
+}

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

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.top.financial.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.top.financial.domain.TopOldSellerDiscount;
+import com.zhongzheng.modules.top.financial.domain.TopOrderLog;
+
+/**
+ * 成本模板Service接口
+ *
+ * @author ruoyi
+ * @date 2023-04-20
+ */
+public interface ITopOrderLogService extends IService<TopOrderLog> {
+}

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

@@ -0,0 +1,17 @@
+package com.zhongzheng.modules.top.financial.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zhongzheng.modules.top.financial.domain.TopOldSellerDiscount;
+import com.zhongzheng.modules.top.financial.mapper.TopOldSellerDiscountMapper;
+import com.zhongzheng.modules.top.financial.service.ITopOldSellerDiscountService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 成本模板Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2023-04-20
+ */
+@Service
+public class TopOldSellerDiscountServiceImpl extends ServiceImpl<TopOldSellerDiscountMapper, TopOldSellerDiscount> implements ITopOldSellerDiscountService {
+}

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

@@ -0,0 +1,20 @@
+package com.zhongzheng.modules.top.financial.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zhongzheng.modules.top.financial.domain.TopOldSellerDiscount;
+import com.zhongzheng.modules.top.financial.domain.TopOrderLog;
+import com.zhongzheng.modules.top.financial.mapper.TopOldSellerDiscountMapper;
+import com.zhongzheng.modules.top.financial.mapper.TopOrderLogMapper;
+import com.zhongzheng.modules.top.financial.service.ITopOldSellerDiscountService;
+import com.zhongzheng.modules.top.financial.service.ITopOrderLogService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 成本模板Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2023-04-20
+ */
+@Service
+public class TopOrderLogServiceImpl extends ServiceImpl<TopOrderLogMapper, TopOrderLog> implements ITopOrderLogService {
+}

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

@@ -0,0 +1,47 @@
+package com.zhongzheng.modules.top.financial.vo;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * 成本模板对象 top_cost_tp
+ *
+ * @author ruoyi
+ * @date 2023-04-20
+ */
+@Data
+public class TopOrderLogVo implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    private Long id;
+    /** 订单编号 */
+    @ApiModelProperty("订单编号")
+    private String orderSn;
+    /** 操作人 */
+    @ApiModelProperty("操作人")
+    private String createBy;
+    /** 操作行为 */
+    @ApiModelProperty("操作行为")
+    private String action;
+    /** 字段 */
+    @ApiModelProperty("字段")
+    private String field;
+    /** 操作前的值 */
+    @ApiModelProperty("操作前的值")
+    private String fieldBefore;
+    /** 操作后的值 */
+    @ApiModelProperty("操作后的值")
+    private String fieldAfter;
+    /** 创建时间 */
+    @ApiModelProperty("创建时间")
+    private Long createTime;
+
+    private Long tenantId;
+}

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

@@ -0,0 +1,24 @@
+package com.zhongzheng.modules.top.financial.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @author yangdamao
+ * @date 2023年05月04日 19:02
+ */
+@Data
+public class TopOrderRevocationVo implements Serializable {
+
+    @ApiModelProperty("订单号")
+    private String orderSn;
+
+    @ApiModelProperty("审核状态：0待审核，1已通过，2未通过，3已撤销")
+    private Integer checkStatus;
+
+    private Long tenantId;
+}

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

@@ -0,0 +1,26 @@
+package com.zhongzheng.modules.top.financial.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @author yangdamao
+ * @date 2023年05月04日 19:02
+ */
+@Data
+public class TopSellerDiscountVo implements Serializable {
+
+    @ApiModelProperty("业务员角色key")
+    private String sellerKey;
+
+    @ApiModelProperty("优惠额度")
+    private BigDecimal discountMoney;
+
+    @ApiModelProperty("优惠类型：1百分比，2固定金额")
+    private Integer discountType;
+
+    private Long tenantId;
+}

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

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
 import java.util.List;
 
 /**
@@ -16,13 +17,23 @@ import java.util.List;
 @ApiModel("订单审核对象")
 public class TopFinishOrderBo {
 
+    @ApiModelProperty("当前时间戳")
+    private Long stamp;
+
+    @ApiModelProperty("签名")
+    private String sign;
+
     @ApiModelProperty("$column.columnComment")
     private List<Long> orderIdList;
 
     @ApiModelProperty("订单编号")
     private List<String> orderSnList;
 
-    @ApiModelProperty("完单状态：0未完单，1已完单")
+    @ApiModelProperty("完单状态：0取消完单，1已完单")
     private Integer finishStatus;
 
+    private Long loginId;
+
+    private String loginName;
+
 }

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

@@ -91,7 +91,7 @@ public class TopOldOrderAddBo {
     @ApiModelProperty("录单订单编号")
     private String inputOrderSn;
     /** 支付状态 0未收费，1部分付款  2完全付款 3免费 */
-    @ApiModelProperty("支付状态 0未收费，1部分付款  2完全付款 3免费")
+    @ApiModelProperty("支付状态 1未收费，2部分付款  3完全付款 4免费")
     private Integer payStatus;
     /** 审核状态：0待审核，1已通过，2未通过，3已撤销 */
     @ApiModelProperty("审核状态：0待审核，1已通过，2未通过，3已撤销")
@@ -123,8 +123,8 @@ public class TopOldOrderAddBo {
     /** 未收账款（元） */
     @ApiModelProperty("未收账款（元）")
     private BigDecimal orderUncollected;
-    /** 实收账款（元） */
-    @ApiModelProperty("实收账款（元）")
+    /** 已收账款（元） */
+    @ApiModelProperty("已收账款（元）")
     private BigDecimal orderReceived;
     /** 备注 */
     @ApiModelProperty("备注")
@@ -159,7 +159,7 @@ public class TopOldOrderAddBo {
     private Long buyTime;
 
     @ApiModelProperty("机构ID")
-    private Long TenantId;
+    private Long tenantId;
     /** 分成模式 1机构分成 2业务员分成 */
     @ApiModelProperty("分成模式 1机构分成 2业务员分成")
     private Integer divideModel;

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

@@ -76,9 +76,9 @@ public class TopOldOrderGoodsAddBo {
     /** 业务全称 */
     @ApiModelProperty("业务全称")
     private String businessFullName;
-    /** 学习状态：0未开始，1学习中，2已结束 */
-    @ApiModelProperty("学习状态：0未开始，1学习中，2已结束")
-    private Integer studyStatus;
+
+    @ApiModelProperty("学员状态：0待审核，-1已取消")
+    private Integer checkStatus;
     @ApiModelProperty("旧系统自增ID")
     private Long signId;
     @ApiModelProperty("学员名称")

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

@@ -42,5 +42,8 @@ public class TopOldOrderGoodsQuery extends BaseEntity {
 	private String userName;
 	@ApiModelProperty("学员身份证")
 	private String userCard;
-
+	@ApiModelProperty("退款状态 0（无和学员端拒绝退款）  1退款中 2已退款 3拒绝退款")
+	private Integer refundStatus;
+	@ApiModelProperty("学员状态：0待审核，1已通过，2未通过，3已撤销，-1已取消")
+	private Integer checkStatus;
 }

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

@@ -34,6 +34,9 @@ public class TopOldOrderQueryBo extends BaseEntity {
 	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
 	private String isAsc;
 
+	/** 订单编号 */
+	@ApiModelProperty("订单编号集合")
+	private List<String> orderSnList;
 
 	/** 订单编号 */
 	@ApiModelProperty("订单编号")

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

@@ -1,9 +1,6 @@
 package com.zhongzheng.modules.top.goods.domain;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
@@ -76,8 +73,11 @@ private static final long serialVersionUID=1L;
     private Integer payStatus;
     /** 审核状态：0待审核，1已通过，2未通过，3已撤销 */
     private Integer checkStatus;
+    /** 审核人名称 */
+    private String checkBy;
     /** 审核意见 */
-    private String checkReason;
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private String checkRemark;
     /** 退款状态：0待审核，1正常，2未退款，3已完成，4未通过 */
     private Integer refundStatus;
     /** 账款状态：0未结清，1已结清 */
@@ -100,9 +100,8 @@ private static final long serialVersionUID=1L;
     private BigDecimal orderReceived;
     /** 备注 */
     private String remark;
-    /** 业务分类 */
-    private String orderBusiness;
     /** 成本设置 */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String costJson;
     /** 订单来源系统名称 */
     private String orderOrg;

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

@@ -41,4 +41,6 @@ private static final long serialVersionUID=1L;
     /** 更新时间 */
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private Long updateTime;
+
+    private Long tenantId;
 }

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

@@ -72,7 +72,7 @@ private static final long serialVersionUID=1L;
     /** 业务全称 */
     private String businessFullName;
     /** 学习状态：0未开始，1学习中，2已结束 */
-    private Integer studyStatus;
+    private Integer checkStatus;
     @ApiModelProperty("旧系统自增ID")
     private Long signId;
     @ApiModelProperty("学员名称")

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

@@ -2,6 +2,7 @@ package com.zhongzheng.modules.top.goods.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.top.financial.vo.TopOrderLogVo;
 import com.zhongzheng.modules.top.goods.bo.TopOldOrderQueryBo;
 import com.zhongzheng.modules.top.goods.domain.TopOldOrder;
 import com.zhongzheng.modules.top.goods.vo.TopOldOrderVo;
@@ -40,4 +41,6 @@ public interface TopOldOrderMapper extends BaseMapper<TopOldOrder> {
     List<TopOldOrderVo> queryListAll();
 
     TopOldOrder getOrderBySn(@Param("orderSn") String orderSn);
+
+    List<TopOrderLogVo> logList(TopOldOrderQueryBo bo);
 }

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

@@ -2,7 +2,13 @@ package com.zhongzheng.modules.top.goods.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.top.financial.bo.TopOrderRemindBo;
+import com.zhongzheng.modules.top.financial.bo.TopOrderRevocationBo;
+import com.zhongzheng.modules.top.financial.bo.TopSellerDiscountBo;
 import com.zhongzheng.modules.top.financial.vo.TopCostTpVo;
+import com.zhongzheng.modules.top.financial.vo.TopOrderLogVo;
+import com.zhongzheng.modules.top.financial.vo.TopOrderRevocationVo;
+import com.zhongzheng.modules.top.financial.vo.TopSellerDiscountVo;
 import com.zhongzheng.modules.top.goods.bo.*;
 import com.zhongzheng.modules.top.goods.domain.TopOldOrder;
 import com.zhongzheng.modules.top.goods.vo.TopOldOrderGoodsListVo;
@@ -96,6 +102,17 @@ public interface ITopOldOrderService extends IService<TopOldOrder> {
 
 	boolean updateOrderCost(TopUpdateCostBo bo);
 
+	TopSellerDiscountVo getSellerDiscount(TopSellerDiscountBo bo);
+
+	TopOrderRevocationVo orderRevocation(TopOrderRevocationBo bo);
+
+	boolean editOrder(TopOldOrderAddBo bo);
+
+    boolean editOrderCheck(TopOldOrderAddBo bo);
+
+	boolean editOrderRemind(TopOrderRemindBo bo);
+
+	List<TopOrderLogVo> logList(TopOldOrderQueryBo bo);
 	Boolean payToCompany(TopOldOrderQueryBo bo);
 
 	Boolean payToCompanyCallBack(PayOrderCallBackBo bo);

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

@@ -50,7 +50,7 @@ public class TopCourseProjectTypeServiceImpl extends ServiceImpl<TopCourseProjec
         lqw.like(StrUtil.isNotBlank(bo.getProjectName()), TopCourseProjectType::getProjectName, bo.getProjectName());
         lqw.eq(StrUtil.isNotBlank(bo.getEncoder()), TopCourseProjectType::getEncoder, bo.getEncoder());
         lqw.eq(bo.getEducationId() != null, TopCourseProjectType::getEducationId, bo.getEducationId());
-        lqw.eq(bo.getStatus() != null, TopCourseProjectType::getStatus, bo.getStatus());
+        lqw.in(bo.getStatus() != null, TopCourseProjectType::getStatus, bo.getStatus());
         lqw.eq(bo.getSort() != null, TopCourseProjectType::getSort, bo.getSort());
         return entity2Vo(this.list(lqw));
     }

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

@@ -56,7 +56,6 @@ public class TopOldOrderGoodsServiceImpl extends ServiceImpl<TopOldOrderGoodsMap
         lqw.like(StrUtil.isNotBlank(bo.getMajorName()), TopOldOrderGoods::getMajorName, bo.getMajorName());
         lqw.like(StrUtil.isNotBlank(bo.getGoodsName()), TopOldOrderGoods::getGoodsName, bo.getGoodsName());
         lqw.like(StrUtil.isNotBlank(bo.getBusinessName()), TopOldOrderGoods::getBusinessName, bo.getBusinessName());
-        lqw.eq(bo.getStudyStatus() != null, TopOldOrderGoods::getStudyStatus, bo.getStudyStatus());
         return entity2Vo(this.list(lqw));
     }
 

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

@@ -64,8 +64,8 @@ public class TopOldOrderVo {
 	@ApiModelProperty("订单完成时间")
 	private Long finishTime;
 	/** 订单类型   1线上，2线下 */
-	@Excel(name = "订单类型   1线上，2线下")
-	@ApiModelProperty("订单类型   1线上，2线下")
+	@Excel(name = "订单类型   1线下，2线上")
+	@ApiModelProperty("订单类型   1线下，2线上")
 	private Integer orderType;
 	/** 支付价格(成交价) */
 	@Excel(name = "支付价格(成交价)")
@@ -237,7 +237,8 @@ public class TopOldOrderVo {
 	@ApiModelProperty("审核进度")
 	private List<TopOldOrderCheckLogVo> checkLogVos;
 
-
+	@ApiModelProperty("业务分类")
+	private String schemeName;
 
 	@ApiModelProperty("流程类型：1审核，2支付")
 	private Integer checkType;

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

@@ -56,10 +56,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM
             top_old_order_goods
         WHERE
-            order_sn = ''
+            order_sn = #{orderSn}
           AND `status` = 1
-          AND refund_status != 2
-	      AND opay_status IN (2,3,4)
+--           AND refund_status != 2
+-- 	      AND pay_status IN (2,3,4)
         <if test="userCard != null and userCard != ''">
             AND user_card = #{userCard,typeHandler=com.zhongzheng.common.type.EncryptHandler}
         </if>

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

@@ -100,6 +100,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="orderSn != null and orderSn != ''">
             AND vto.order_sn = #{orderSn}
         </if>
+        <if test="orderSnList != null and orderSnList.size()!=0 ">
+            AND vto.order_sn in
+            <foreach collection="orderSnList" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="keyword != null and keyword != ''">
             AND (
             vto.create_org LIKE CONCAT( '%', #{keyword}, '%' )
@@ -326,5 +332,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT * FROM v_top_order WHERE order_sn = #{orderSn}
     </select>
 
+    <select id="logList" parameterType="com.zhongzheng.modules.top.financial.bo.TopOrderLogQueryBo" resultType="com.zhongzheng.modules.top.financial.vo.TopOrderLogVo">
+        SELECT * FROM top_order_log WHERE order_sn = #{orderSn}
+    </select>
 
 </mapper>