submit

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/order/TopOrderAttachmentController.java → zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/order/TopOldOrderAttachmentController.java

@@ -6,11 +6,11 @@ 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.top.goods.bo.TopOrderAttachmentAddBo;
-import com.zhongzheng.modules.top.goods.bo.TopOrderAttachmentEditBo;
-import com.zhongzheng.modules.top.goods.bo.TopOrderAttachmentQueryBo;
-import com.zhongzheng.modules.top.goods.service.ITopOrderAttachmentService;
-import com.zhongzheng.modules.top.goods.vo.TopOrderAttachmentVo;
+import com.zhongzheng.modules.top.goods.bo.TopOldOrderAttachmentAddBo;
+import com.zhongzheng.modules.top.goods.bo.TopOldOrderAttachmentEditBo;
+import com.zhongzheng.modules.top.goods.bo.TopOldOrderAttachmentQueryBo;
+import com.zhongzheng.modules.top.goods.service.ITopOldOrderAttachmentService;
+import com.zhongzheng.modules.top.goods.vo.TopOldOrderAttachmentVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -31,9 +31,9 @@ import java.util.List;
 @RequiredArgsConstructor(onConstructor_ = @Autowired)
 @RestController
 @RequestMapping("/system/order/attachment")
-public class TopOrderAttachmentController extends BaseController {
+public class TopOldOrderAttachmentController extends BaseController {
 
-    private final ITopOrderAttachmentService iTopOrderAttachmentService;
+    private final ITopOldOrderAttachmentService iTopOrderAttachmentService;
 
     /**
      * 查询订单附件列表
@@ -41,9 +41,9 @@ public class TopOrderAttachmentController extends BaseController {
     @ApiOperation("查询订单附件列表")
     @PreAuthorize("@ss.hasPermi('system:attachment:list')")
     @GetMapping("/list")
-    public TableDataInfo<TopOrderAttachmentVo> list(TopOrderAttachmentQueryBo bo) {
+    public TableDataInfo<TopOldOrderAttachmentVo> list(TopOldOrderAttachmentQueryBo bo) {
         startPage();
-        List<TopOrderAttachmentVo> list = iTopOrderAttachmentService.queryList(bo);
+        List<TopOldOrderAttachmentVo> list = iTopOrderAttachmentService.queryList(bo);
         return getDataTable(list);
     }
 
@@ -54,9 +54,9 @@ public class TopOrderAttachmentController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:attachment:export')")
     @Log(title = "订单附件", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
-    public AjaxResult<TopOrderAttachmentVo> export(TopOrderAttachmentQueryBo bo) {
-        List<TopOrderAttachmentVo> list = iTopOrderAttachmentService.queryList(bo);
-        ExcelUtil<TopOrderAttachmentVo> util = new ExcelUtil<TopOrderAttachmentVo>(TopOrderAttachmentVo.class);
+    public AjaxResult<TopOldOrderAttachmentVo> export(TopOldOrderAttachmentQueryBo bo) {
+        List<TopOldOrderAttachmentVo> list = iTopOrderAttachmentService.queryList(bo);
+        ExcelUtil<TopOldOrderAttachmentVo> util = new ExcelUtil<TopOldOrderAttachmentVo>(TopOldOrderAttachmentVo.class);
         return util.exportExcel(list, "订单附件");
     }
 
@@ -66,7 +66,7 @@ public class TopOrderAttachmentController extends BaseController {
     @ApiOperation("获取订单附件详细信息")
     @PreAuthorize("@ss.hasPermi('system:attachment:query')")
     @GetMapping("/{id}")
-    public AjaxResult<TopOrderAttachmentVo> getInfo(@PathVariable("id" ) Long id) {
+    public AjaxResult<TopOldOrderAttachmentVo> getInfo(@PathVariable("id" ) Long id) {
         return AjaxResult.success(iTopOrderAttachmentService.queryById(id));
     }
 
@@ -77,7 +77,7 @@ public class TopOrderAttachmentController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:attachment:add')")
     @Log(title = "订单附件", businessType = BusinessType.INSERT)
     @PostMapping()
-    public AjaxResult<Void> add(@RequestBody TopOrderAttachmentAddBo bo) {
+    public AjaxResult<Void> add(@RequestBody TopOldOrderAttachmentAddBo bo) {
         return toAjax(iTopOrderAttachmentService.insertByAddBo(bo) ? 1 : 0);
     }
 
@@ -88,7 +88,7 @@ public class TopOrderAttachmentController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:attachment:edit')")
     @Log(title = "订单附件", businessType = BusinessType.UPDATE)
     @PutMapping()
-    public AjaxResult<Void> edit(@RequestBody TopOrderAttachmentEditBo bo) {
+    public AjaxResult<Void> edit(@RequestBody TopOldOrderAttachmentEditBo bo) {
         return toAjax(iTopOrderAttachmentService.updateByEditBo(bo) ? 1 : 0);
     }
 

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

@@ -3,22 +3,16 @@ package com.zhongzheng.controller.order;
 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.domain.model.LoginUser;
 import com.zhongzheng.common.core.domain.model.TopLoginUser;
 import com.zhongzheng.common.core.page.TableDataInfo;
 import com.zhongzheng.common.enums.BusinessType;
-import com.zhongzheng.common.utils.SecurityUtils;
 import com.zhongzheng.common.utils.ServletUtils;
 import com.zhongzheng.common.utils.poi.ExcelUtil;
-import com.zhongzheng.framework.web.service.TokenService;
 import com.zhongzheng.framework.web.service.TopTokenService;
-import com.zhongzheng.modules.top.goods.bo.TopOrderAddBo;
-import com.zhongzheng.modules.top.goods.bo.TopOrderEditBo;
-import com.zhongzheng.modules.top.goods.bo.TopOrderGoodsQuery;
-import com.zhongzheng.modules.top.goods.bo.TopOrderQueryBo;
-import com.zhongzheng.modules.top.goods.service.ITopOrderService;
-import com.zhongzheng.modules.top.goods.vo.TopOrderGoodsListVo;
-import com.zhongzheng.modules.top.goods.vo.TopOrderVo;
+import com.zhongzheng.modules.top.goods.bo.*;
+import com.zhongzheng.modules.top.goods.service.ITopOldOrderService;
+import com.zhongzheng.modules.top.goods.vo.TopOldOrderGoodsListVo;
+import com.zhongzheng.modules.top.goods.vo.TopOldOrderVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -26,7 +20,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -39,9 +32,9 @@ import java.util.List;
 @RequiredArgsConstructor(onConstructor_ = @Autowired)
 @RestController
 @RequestMapping("/system/top/order")
-public class TopOrderController extends BaseController {
+public class TopOldOrderController extends BaseController {
 
-    private final ITopOrderService iTopOrderService;
+    private final ITopOldOrderService iTopOldOrderService;
 
     private final TopTokenService tokenService;
 
@@ -50,11 +43,11 @@ public class TopOrderController extends BaseController {
      */
     @ApiOperation("查询订单列表")
     @GetMapping("/list")
-    public TableDataInfo<TopOrderVo> list(TopOrderQueryBo bo) {
+    public TableDataInfo<TopOldOrderVo> list(TopOldOrderQueryBo bo) {
         TopLoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         bo.setLoginId(loginUser.getUser().getUserId());
         startPage();
-        List<TopOrderVo> list = iTopOrderService.queryList(bo);
+        List<TopOldOrderVo> list = iTopOldOrderService.queryList(bo);
         return getDataTable(list);
     }
 
@@ -63,9 +56,9 @@ public class TopOrderController extends BaseController {
      */
     @ApiOperation("导出订单列表")
     @GetMapping("/export")
-    public AjaxResult<TopOrderVo> export(TopOrderQueryBo bo) {
-        List<TopOrderVo> list = iTopOrderService.queryList(bo);
-        ExcelUtil<TopOrderVo> util = new ExcelUtil<TopOrderVo>(TopOrderVo.class);
+    public AjaxResult<TopOldOrderVo> export(TopOldOrderQueryBo bo) {
+        List<TopOldOrderVo> list = iTopOldOrderService.queryList(bo);
+        ExcelUtil<TopOldOrderVo> util = new ExcelUtil<TopOldOrderVo>(TopOldOrderVo.class);
         return util.exportExcel(list, "订单");
     }
 
@@ -74,8 +67,8 @@ public class TopOrderController extends BaseController {
      */
     @ApiOperation("获取订单详细信息")
     @GetMapping("/{orderSn}")
-    public AjaxResult<TopOrderVo> getInfo(@PathVariable("orderSn" ) String orderSn) {
-        return AjaxResult.success(iTopOrderService.queryById(orderSn));
+    public AjaxResult<TopOldOrderVo> getInfo(@PathVariable("orderSn" ) String orderSn) {
+        return AjaxResult.success(iTopOldOrderService.queryById(orderSn));
     }
 
     /**
@@ -83,9 +76,9 @@ public class TopOrderController extends BaseController {
      */
     @ApiOperation("获取订单商品信息")
     @GetMapping("/goods/list")
-    public TableDataInfo<TopOrderGoodsListVo> getOrderGoodsList(TopOrderGoodsQuery query) {
+    public TableDataInfo<TopOldOrderGoodsListVo> getOrderGoodsList(TopOldOrderGoodsQuery query) {
         startPage();
-        List<TopOrderGoodsListVo> list = iTopOrderService.getOrderGoodsList(query);
+        List<TopOldOrderGoodsListVo> list = iTopOldOrderService.getOrderGoodsList(query);
         return getDataTable(list);
     }
 
@@ -96,8 +89,8 @@ public class TopOrderController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:order:add')")
     @Log(title = "订单", businessType = BusinessType.INSERT)
     @PostMapping()
-    public AjaxResult<Void> add(@RequestBody TopOrderAddBo bo) {
-        return toAjax(iTopOrderService.insertByAddBo(bo) ? 1 : 0);
+    public AjaxResult<Void> add(@RequestBody TopOldOrderAddBo bo) {
+        return toAjax(iTopOldOrderService.insertByAddBo(bo) ? 1 : 0);
     }
 
     /**
@@ -107,18 +100,18 @@ public class TopOrderController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:order:edit')")
     @Log(title = "订单", businessType = BusinessType.UPDATE)
     @PutMapping()
-    public AjaxResult<Void> edit(@RequestBody TopOrderEditBo bo) {
-        return toAjax(iTopOrderService.updateByEditBo(bo) ? 1 : 0);
+    public AjaxResult<Void> edit(@RequestBody TopOldOrderEditBo bo) {
+        return toAjax(iTopOldOrderService.updateByEditBo(bo) ? 1 : 0);
     }
 
     /**
-     * 删除订单
+     * 订单审核
      */
-    @ApiOperation("删除订单")
-    @PreAuthorize("@ss.hasPermi('system:order:remove')")
-    @Log(title = "订单" , businessType = BusinessType.DELETE)
-    @DeleteMapping("/{orderIds}")
-    public AjaxResult<Void> remove(@PathVariable Long[] orderIds) {
-        return toAjax(iTopOrderService.deleteWithValidByIds(Arrays.asList(orderIds), true) ? 1 : 0);
+    @ApiOperation("订单审核")
+    @PostMapping("/check")
+    public AjaxResult<Void> checkOrder(@RequestBody TopOldOrderCheckBo bo) {
+        TopLoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        bo.setLoginId(loginUser.getUser().getUserId());
+        return toAjax(iTopOldOrderService.checkOrder(bo) ? 1 : 0);
     }
 }

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/order/TopOrderGoodsController.java → zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/order/TopOldOrderGoodsController.java

@@ -6,11 +6,11 @@ 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.top.goods.bo.TopOrderGoodsAddBo;
-import com.zhongzheng.modules.top.goods.bo.TopOrderGoodsEditBo;
-import com.zhongzheng.modules.top.goods.bo.TopOrderGoodsQueryBo;
-import com.zhongzheng.modules.top.goods.service.ITopOrderGoodsService;
-import com.zhongzheng.modules.top.goods.vo.TopOrderGoodsVo;
+import com.zhongzheng.modules.top.goods.bo.TopOldOrderGoodsAddBo;
+import com.zhongzheng.modules.top.goods.bo.TopOldOrderGoodsEditBo;
+import com.zhongzheng.modules.top.goods.bo.TopOldOrderGoodsQueryBo;
+import com.zhongzheng.modules.top.goods.service.ITopOldOrderGoodsService;
+import com.zhongzheng.modules.top.goods.vo.TopOldOrderGoodsVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -31,9 +31,9 @@ import java.util.List;
 @RequiredArgsConstructor(onConstructor_ = @Autowired)
 @RestController
 @RequestMapping("/system/order/goods")
-public class TopOrderGoodsController extends BaseController {
+public class TopOldOrderGoodsController extends BaseController {
 
-    private final ITopOrderGoodsService iTopOrderGoodsService;
+    private final ITopOldOrderGoodsService iTopOldOrderGoodsService;
 
     /**
      * 查询订单商品列表
@@ -41,9 +41,9 @@ public class TopOrderGoodsController extends BaseController {
     @ApiOperation("查询订单商品列表")
     @PreAuthorize("@ss.hasPermi('system:goods:list')")
     @GetMapping("/list")
-    public TableDataInfo<TopOrderGoodsVo> list(TopOrderGoodsQueryBo bo) {
+    public TableDataInfo<TopOldOrderGoodsVo> list(TopOldOrderGoodsQueryBo bo) {
         startPage();
-        List<TopOrderGoodsVo> list = iTopOrderGoodsService.queryList(bo);
+        List<TopOldOrderGoodsVo> list = iTopOldOrderGoodsService.queryList(bo);
         return getDataTable(list);
     }
 
@@ -54,9 +54,9 @@ public class TopOrderGoodsController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:goods:export')")
     @Log(title = "订单商品", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
-    public AjaxResult<TopOrderGoodsVo> export(TopOrderGoodsQueryBo bo) {
-        List<TopOrderGoodsVo> list = iTopOrderGoodsService.queryList(bo);
-        ExcelUtil<TopOrderGoodsVo> util = new ExcelUtil<TopOrderGoodsVo>(TopOrderGoodsVo.class);
+    public AjaxResult<TopOldOrderGoodsVo> export(TopOldOrderGoodsQueryBo bo) {
+        List<TopOldOrderGoodsVo> list = iTopOldOrderGoodsService.queryList(bo);
+        ExcelUtil<TopOldOrderGoodsVo> util = new ExcelUtil<TopOldOrderGoodsVo>(TopOldOrderGoodsVo.class);
         return util.exportExcel(list, "订单商品");
     }
 
@@ -66,8 +66,8 @@ public class TopOrderGoodsController extends BaseController {
     @ApiOperation("获取订单商品详细信息")
     @PreAuthorize("@ss.hasPermi('system:goods:query')")
     @GetMapping("/{orderGoodsId}")
-    public AjaxResult<TopOrderGoodsVo> getInfo(@PathVariable("orderGoodsId" ) Long orderGoodsId) {
-        return AjaxResult.success(iTopOrderGoodsService.queryById(orderGoodsId));
+    public AjaxResult<TopOldOrderGoodsVo> getInfo(@PathVariable("orderGoodsId" ) Long orderGoodsId) {
+        return AjaxResult.success(iTopOldOrderGoodsService.queryById(orderGoodsId));
     }
 
     /**
@@ -77,8 +77,8 @@ public class TopOrderGoodsController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:goods:add')")
     @Log(title = "订单商品", businessType = BusinessType.INSERT)
     @PostMapping()
-    public AjaxResult<Void> add(@RequestBody TopOrderGoodsAddBo bo) {
-        return toAjax(iTopOrderGoodsService.insertByAddBo(bo) ? 1 : 0);
+    public AjaxResult<Void> add(@RequestBody TopOldOrderGoodsAddBo bo) {
+        return toAjax(iTopOldOrderGoodsService.insertByAddBo(bo) ? 1 : 0);
     }
 
     /**
@@ -88,8 +88,8 @@ public class TopOrderGoodsController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:goods:edit')")
     @Log(title = "订单商品", businessType = BusinessType.UPDATE)
     @PutMapping()
-    public AjaxResult<Void> edit(@RequestBody TopOrderGoodsEditBo bo) {
-        return toAjax(iTopOrderGoodsService.updateByEditBo(bo) ? 1 : 0);
+    public AjaxResult<Void> edit(@RequestBody TopOldOrderGoodsEditBo bo) {
+        return toAjax(iTopOldOrderGoodsService.updateByEditBo(bo) ? 1 : 0);
     }
 
     /**
@@ -100,6 +100,6 @@ public class TopOrderGoodsController extends BaseController {
     @Log(title = "订单商品" , businessType = BusinessType.DELETE)
     @DeleteMapping("/{orderGoodsIds}")
     public AjaxResult<Void> remove(@PathVariable Long[] orderGoodsIds) {
-        return toAjax(iTopOrderGoodsService.deleteWithValidByIds(Arrays.asList(orderGoodsIds), true) ? 1 : 0);
+        return toAjax(iTopOldOrderGoodsService.deleteWithValidByIds(Arrays.asList(orderGoodsIds), true) ? 1 : 0);
     }
 }

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

@@ -8,11 +8,9 @@ import com.zhongzheng.modules.order.bo.OrderGoodsQueryBo;
 import com.zhongzheng.modules.order.bo.OrderQueryBo;
 import com.zhongzheng.modules.order.domain.OrderGoods;
 import com.zhongzheng.modules.order.vo.OrderGoodsVo;
-import com.zhongzheng.modules.top.goods.bo.TopOrderGoodsQuery;
-import com.zhongzheng.modules.top.goods.vo.TopOrderGoodsListVo;
-import com.zhongzheng.modules.top.goods.vo.TopOrderGoodsVo;
+import com.zhongzheng.modules.top.goods.bo.TopOldOrderGoodsQuery;
+import com.zhongzheng.modules.top.goods.vo.TopOldOrderGoodsListVo;
 import org.apache.ibatis.annotations.Param;
-import org.springframework.security.core.parameters.P;
 
 import java.util.List;
 
@@ -65,5 +63,5 @@ public interface OrderGoodsMapper extends BaseMapper<OrderGoods> {
 
     OrderGoods getOrderByGoods(@Param("userId")Long userId,@Param("goodsId") Long goodsId);
 
-    List<TopOrderGoodsListVo> listByOrderSn(TopOrderGoodsQuery query);
+    List<TopOldOrderGoodsListVo> listByOrderSn(TopOldOrderGoodsQuery query);
 }

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

@@ -1,8 +1,6 @@
 package com.zhongzheng.modules.order.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.zhongzheng.common.core.page.PageDomain;
-import com.zhongzheng.common.core.page.TableDataInfo;
 import com.zhongzheng.modules.course.vo.CourseLiveVo;
 import com.zhongzheng.modules.goods.bo.CheckGoodsStatusBo;
 import com.zhongzheng.modules.goods.bo.GoodsQueryBo;
@@ -12,14 +10,11 @@ import com.zhongzheng.modules.order.bo.*;
 import com.zhongzheng.modules.order.domain.OrderGoods;
 import com.zhongzheng.modules.order.vo.OrderGoodsVo;
 import com.zhongzheng.modules.order.vo.OrderUserGoodsVo;
-import com.zhongzheng.modules.top.goods.bo.TopOrderGoodsQuery;
-import com.zhongzheng.modules.top.goods.vo.TopOrderGoodsListVo;
-import com.zhongzheng.modules.top.goods.vo.TopOrderGoodsVo;
-import org.apache.ibatis.annotations.Param;
+import com.zhongzheng.modules.top.goods.bo.TopOldOrderGoodsQuery;
+import com.zhongzheng.modules.top.goods.vo.TopOldOrderGoodsListVo;
 
 import java.util.Collection;
 import java.util.List;
-import java.util.Map;
 
 /**
  * 订单商品Service接口
@@ -118,5 +113,5 @@ public interface IOrderGoodsService extends IService<OrderGoods> {
 
     OrderGoods getOrderByGoods(Long userId, Long goodsId);
 
-    List<TopOrderGoodsListVo> listByOrderSn(TopOrderGoodsQuery query);
+    List<TopOldOrderGoodsListVo> listByOrderSn(TopOldOrderGoodsQuery query);
 }

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

@@ -56,9 +56,8 @@ import com.zhongzheng.modules.order.vo.OrderListVo;
 import com.zhongzheng.modules.order.vo.OrderUserGoodsVo;
 import com.zhongzheng.modules.polyv.bo.PolyvLiveQueryBo;
 import com.zhongzheng.modules.polyv.service.IPolyvLiveService;
-import com.zhongzheng.modules.top.goods.bo.TopOrderGoodsQuery;
-import com.zhongzheng.modules.top.goods.vo.TopOrderGoodsListVo;
-import com.zhongzheng.modules.top.goods.vo.TopOrderGoodsVo;
+import com.zhongzheng.modules.top.goods.bo.TopOldOrderGoodsQuery;
+import com.zhongzheng.modules.top.goods.vo.TopOldOrderGoodsListVo;
 import com.zhongzheng.modules.user.bo.SubjectStudyRecordQueryBo;
 import com.zhongzheng.modules.user.bo.UserExamGoodsQueryBo;
 import com.zhongzheng.modules.user.bo.UserStudyRecordQueryBo;
@@ -676,7 +675,7 @@ public class OrderGoodsServiceImpl extends ServiceImpl<OrderGoodsMapper, OrderGo
     }
 
     @Override
-    public List<TopOrderGoodsListVo> listByOrderSn(TopOrderGoodsQuery query) {
+    public List<TopOldOrderGoodsListVo> listByOrderSn(TopOldOrderGoodsQuery query) {
         return baseMapper.listByOrderSn(query);
     }
 

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

@@ -15,7 +15,7 @@ import java.util.List;
  */
 @Data
 @ApiModel("订单添加对象")
-public class TopOrderAddBo {
+public class TopOldOrderAddBo {
 
     /** 订单编号 */
     @ApiModelProperty("订单编号")
@@ -133,8 +133,8 @@ public class TopOrderAddBo {
     private Integer predictPayTime;
 
     @ApiModelProperty("订单商品")
-    private List<TopOrderGoodsAddBo> orderGoodsList;
+    private List<TopOldOrderGoodsAddBo> orderGoodsList;
 
     @ApiModelProperty("订单附件")
-    private List<TopOrderAttachmentAddBo> orderAttachmentList;
+    private List<TopOldOrderAttachmentAddBo> orderAttachmentList;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/bo/TopOrderAttachmentAddBo.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/bo/TopOldOrderAttachmentAddBo.java

@@ -13,7 +13,7 @@ import lombok.Data;
  */
 @Data
 @ApiModel("订单附件添加对象")
-public class TopOrderAttachmentAddBo {
+public class TopOldOrderAttachmentAddBo {
 
     /** 订单编号 */
     @ApiModelProperty("订单编号")

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/bo/TopOrderAttachmentEditBo.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/bo/TopOldOrderAttachmentEditBo.java

@@ -13,7 +13,7 @@ import lombok.Data;
  */
 @Data
 @ApiModel("订单附件编辑对象")
-public class TopOrderAttachmentEditBo {
+public class TopOldOrderAttachmentEditBo {
 
     /** 主键 */
     @ApiModelProperty("主键")

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/bo/TopOrderAttachmentQueryBo.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/bo/TopOldOrderAttachmentQueryBo.java

@@ -15,7 +15,7 @@ import lombok.EqualsAndHashCode;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ApiModel("订单附件分页查询对象")
-public class TopOrderAttachmentQueryBo extends BaseEntity {
+public class TopOldOrderAttachmentQueryBo extends BaseEntity {
 
 	/** 分页大小 */
 	@ApiModelProperty("分页大小")

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

@@ -0,0 +1,37 @@
+package com.zhongzheng.modules.top.goods.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 订单编辑对象 top_order
+ *
+ * @author ruoyi
+ * @date 2023-04-20
+ */
+@Data
+@ApiModel("订单编辑对象")
+public class TopOldOrderCheckBo {
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long orderId;
+
+    /** 订单编号 */
+    @ApiModelProperty("订单编号")
+    private String orderSn;
+
+    /** 审核状态：0待审核，1已通过，2未通过，3已撤销 */
+    @ApiModelProperty("审核状态：0待审核，1已通过，2未通过，3已撤销")
+    private Integer checkStatus;
+
+    /** 审核意见 */
+    @ApiModelProperty("审核意见")
+    private String checkReason;
+
+    private Long loginId;
+
+}

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

@@ -14,7 +14,7 @@ import java.math.BigDecimal;
  */
 @Data
 @ApiModel("订单编辑对象")
-public class TopOrderEditBo {
+public class TopOldOrderEditBo {
 
     /** $column.columnComment */
     @ApiModelProperty("$column.columnComment")

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

@@ -14,7 +14,7 @@ import java.math.BigDecimal;
  */
 @Data
 @ApiModel("订单商品添加对象")
-public class TopOrderGoodsAddBo {
+public class TopOldOrderGoodsAddBo {
 
     /** 订单编号 */
     @ApiModelProperty("订单编号")

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/bo/TopOrderGoodsEditBo.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/bo/TopOldOrderGoodsEditBo.java

@@ -14,7 +14,7 @@ import java.math.BigDecimal;
  */
 @Data
 @ApiModel("订单商品编辑对象")
-public class TopOrderGoodsEditBo {
+public class TopOldOrderGoodsEditBo {
 
     /** $column.columnComment */
     @ApiModelProperty("$column.columnComment")

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

@@ -17,7 +17,7 @@ import java.util.List;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ApiModel("订单分页查询对象")
-public class TopOrderGoodsQuery extends BaseEntity {
+public class TopOldOrderGoodsQuery extends BaseEntity {
 
 	/** 分页大小 */
 	@ApiModelProperty("分页大小")

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/bo/TopOrderGoodsQueryBo.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/bo/TopOldOrderGoodsQueryBo.java

@@ -17,7 +17,7 @@ import java.math.BigDecimal;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ApiModel("订单商品分页查询对象")
-public class TopOrderGoodsQueryBo extends BaseEntity {
+public class TopOldOrderGoodsQueryBo extends BaseEntity {
 
 	/** 分页大小 */
 	@ApiModelProperty("分页大小")

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

@@ -18,7 +18,7 @@ import java.util.List;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ApiModel("订单分页查询对象")
-public class TopOrderQueryBo extends BaseEntity {
+public class TopOldOrderQueryBo extends BaseEntity {
 
 	/** 分页大小 */
 	@ApiModelProperty("分页大小")

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

@@ -20,8 +20,8 @@ import java.math.BigDecimal;
 @Data
 @NoArgsConstructor
 @Accessors(chain = true)
-@TableName("top_order")
-public class TopOrder implements Serializable {
+@TableName("top_old_order")
+public class TopOldOrder implements Serializable {
 
 private static final long serialVersionUID=1L;
 
@@ -74,6 +74,8 @@ private static final long serialVersionUID=1L;
     private Integer payStatus;
     /** 审核状态：0待审核，1已通过，2未通过，3已撤销 */
     private Integer checkStatus;
+    /** 审核意见 */
+    private String checkReason;
     /** 退款状态：0待审核，1未通过，2未退款，3已完成 */
     private Integer refundStatus;
     /** 账款状态：0未结清，1已结清 */

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

@@ -19,8 +19,8 @@ import java.io.Serializable;
 @Data
 @NoArgsConstructor
 @Accessors(chain = true)
-@TableName("top_order_attachment")
-public class TopOrderAttachment implements Serializable {
+@TableName("top_old_order_attachment")
+public class TopOldOrderAttachment implements Serializable {
 
 private static final long serialVersionUID=1L;
 

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

@@ -0,0 +1,42 @@
+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 lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * 【请填写功能名称】对象 top_certificate
+ *
+ * @author ruoyi
+ * @date 2023-03-15
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("top_old_order_check")
+public class TopOldOrderCheck implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** $column.columnComment */
+    @TableId(value = "id")
+    private Long id;
+    /** 审核类型:1B端订单审核 */
+    private Integer checkType;
+    /** 审核角色key */
+    private String checkRole;
+    /** 审核顺序 */
+    private Integer checkSort;
+    /**  状态 1正常 0关闭 */
+    private Integer status;
+    /** 创建时间 */
+    private Long createTime;
+    /** 更新时间 */
+    private Long updateTime;
+}

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

@@ -21,8 +21,8 @@ import java.math.BigDecimal;
 @Data
 @NoArgsConstructor
 @Accessors(chain = true)
-@TableName("top_order_goods")
-public class TopOrderGoods implements Serializable {
+@TableName("top_old_order_goods")
+public class TopOldOrderGoods implements Serializable {
 
 private static final long serialVersionUID=1L;
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/mapper/TopOrderAttachmentMapper.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/mapper/TopOldOrderAttachmentMapper.java

@@ -2,7 +2,7 @@ package com.zhongzheng.modules.top.goods.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zhongzheng.modules.top.goods.domain.TopOrderAttachment;
+import com.zhongzheng.modules.top.goods.domain.TopOldOrderAttachment;
 
 /**
  * 订单附件Mapper接口
@@ -10,6 +10,6 @@ import com.zhongzheng.modules.top.goods.domain.TopOrderAttachment;
  * @author ruoyi
  * @date 2023-04-20
  */
-public interface TopOrderAttachmentMapper extends BaseMapper<TopOrderAttachment> {
+public interface TopOldOrderAttachmentMapper extends BaseMapper<TopOldOrderAttachment> {
 
 }

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

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.top.goods.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.top.goods.domain.TopOldOrderCheck;
+
+/**
+ * 【请填写功能名称】Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-03-15
+ */
+public interface TopOldOrderCheckMapper extends BaseMapper<TopOldOrderCheck> {
+
+}

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

@@ -0,0 +1,19 @@
+package com.zhongzheng.modules.top.goods.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.top.goods.bo.TopOldOrderGoodsQuery;
+import com.zhongzheng.modules.top.goods.domain.TopOldOrderGoods;
+import com.zhongzheng.modules.top.goods.vo.TopOldOrderGoodsListVo;
+
+import java.util.List;
+
+/**
+ * 订单商品Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-04-20
+ */
+public interface TopOldOrderGoodsMapper extends BaseMapper<TopOldOrderGoods> {
+
+    List<TopOldOrderGoodsListVo> getListByQuery(TopOldOrderGoodsQuery query);
+}

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

@@ -0,0 +1,25 @@
+package com.zhongzheng.modules.top.goods.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.top.goods.bo.TopOldOrderQueryBo;
+import com.zhongzheng.modules.top.goods.domain.TopOldOrder;
+import com.zhongzheng.modules.top.goods.vo.TopOldOrderVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 订单Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-04-20
+ */
+public interface TopOldOrderMapper extends BaseMapper<TopOldOrder> {
+
+    List<TopOldOrderVo> queryList(TopOldOrderQueryBo bo);
+
+    TopOldOrderVo queryById(@Param("orderSn") String orderSn);
+
+    List<String> queryBusinessBySn(@Param("orderSn") String orderSn);
+}

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

@@ -1,19 +0,0 @@
-package com.zhongzheng.modules.top.goods.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zhongzheng.modules.top.goods.bo.TopOrderGoodsQuery;
-import com.zhongzheng.modules.top.goods.domain.TopOrderGoods;
-import com.zhongzheng.modules.top.goods.vo.TopOrderGoodsListVo;
-
-import java.util.List;
-
-/**
- * 订单商品Mapper接口
- *
- * @author ruoyi
- * @date 2023-04-20
- */
-public interface TopOrderGoodsMapper extends BaseMapper<TopOrderGoods> {
-
-    List<TopOrderGoodsListVo> getListByQuery(TopOrderGoodsQuery query);
-}

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

@@ -1,25 +0,0 @@
-package com.zhongzheng.modules.top.goods.mapper;
-
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zhongzheng.modules.top.goods.bo.TopOrderQueryBo;
-import com.zhongzheng.modules.top.goods.domain.TopOrder;
-import com.zhongzheng.modules.top.goods.vo.TopOrderVo;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 订单Mapper接口
- *
- * @author ruoyi
- * @date 2023-04-20
- */
-public interface TopOrderMapper extends BaseMapper<TopOrder> {
-
-    List<TopOrderVo> queryList(TopOrderQueryBo bo);
-
-    TopOrderVo queryById(@Param("orderSn") String orderSn);
-
-    List<String> queryBusinessBySn(@Param("orderSn") String orderSn);
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/ITopOrderAttachmentService.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/ITopOldOrderAttachmentService.java

@@ -2,11 +2,11 @@ package com.zhongzheng.modules.top.goods.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.zhongzheng.modules.top.goods.bo.TopOrderAttachmentAddBo;
-import com.zhongzheng.modules.top.goods.bo.TopOrderAttachmentEditBo;
-import com.zhongzheng.modules.top.goods.bo.TopOrderAttachmentQueryBo;
-import com.zhongzheng.modules.top.goods.domain.TopOrderAttachment;
-import com.zhongzheng.modules.top.goods.vo.TopOrderAttachmentVo;
+import com.zhongzheng.modules.top.goods.bo.TopOldOrderAttachmentAddBo;
+import com.zhongzheng.modules.top.goods.bo.TopOldOrderAttachmentEditBo;
+import com.zhongzheng.modules.top.goods.bo.TopOldOrderAttachmentQueryBo;
+import com.zhongzheng.modules.top.goods.domain.TopOldOrderAttachment;
+import com.zhongzheng.modules.top.goods.vo.TopOldOrderAttachmentVo;
 
 import java.util.Collection;
 import java.util.List;
@@ -17,31 +17,31 @@ import java.util.List;
  * @author ruoyi
  * @date 2023-04-20
  */
-public interface ITopOrderAttachmentService extends IService<TopOrderAttachment> {
+public interface ITopOldOrderAttachmentService extends IService<TopOldOrderAttachment> {
 	/**
 	 * 查询单个
 	 * @return
 	 */
-	TopOrderAttachmentVo queryById(Long id);
+	TopOldOrderAttachmentVo queryById(Long id);
 
 	/**
 	 * 查询列表
 	 */
-	List<TopOrderAttachmentVo> queryList(TopOrderAttachmentQueryBo bo);
+	List<TopOldOrderAttachmentVo> queryList(TopOldOrderAttachmentQueryBo bo);
 
 	/**
 	 * 根据新增业务对象插入订单附件
 	 * @param bo 订单附件新增业务对象
 	 * @return
 	 */
-	Boolean insertByAddBo(TopOrderAttachmentAddBo bo);
+	Boolean insertByAddBo(TopOldOrderAttachmentAddBo bo);
 
 	/**
 	 * 根据编辑业务对象修改订单附件
 	 * @param bo 订单附件编辑业务对象
 	 * @return
 	 */
-	Boolean updateByEditBo(TopOrderAttachmentEditBo bo);
+	Boolean updateByEditBo(TopOldOrderAttachmentEditBo bo);
 
 	/**
 	 * 校验并删除数据

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

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.top.goods.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.top.goods.domain.TopOldOrderCheck;
+
+/**
+ * 【请填写功能名称】Service接口
+ *
+ * @author ruoyi
+ * @date 2023-03-15
+ */
+public interface ITopOldOrderCheckService extends IService<TopOldOrderCheck> {
+
+}

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

@@ -0,0 +1,56 @@
+package com.zhongzheng.modules.top.goods.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.top.goods.bo.TopOldOrderGoodsAddBo;
+import com.zhongzheng.modules.top.goods.bo.TopOldOrderGoodsEditBo;
+import com.zhongzheng.modules.top.goods.bo.TopOldOrderGoodsQuery;
+import com.zhongzheng.modules.top.goods.bo.TopOldOrderGoodsQueryBo;
+import com.zhongzheng.modules.top.goods.domain.TopOldOrderGoods;
+import com.zhongzheng.modules.top.goods.vo.TopOldOrderGoodsListVo;
+import com.zhongzheng.modules.top.goods.vo.TopOldOrderGoodsVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 订单商品Service接口
+ *
+ * @author ruoyi
+ * @date 2023-04-20
+ */
+public interface ITopOldOrderGoodsService extends IService<TopOldOrderGoods> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	TopOldOrderGoodsVo queryById(Long orderGoodsId);
+
+	/**
+	 * 查询列表
+	 */
+	List<TopOldOrderGoodsVo> queryList(TopOldOrderGoodsQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入订单商品
+	 * @param bo 订单商品新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(TopOldOrderGoodsAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改订单商品
+	 * @param bo 订单商品编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(TopOldOrderGoodsEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    List<TopOldOrderGoodsListVo> getListByQuery(TopOldOrderGoodsQuery query);
+}

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

@@ -2,13 +2,10 @@ package com.zhongzheng.modules.top.goods.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.zhongzheng.modules.top.goods.bo.TopOrderAddBo;
-import com.zhongzheng.modules.top.goods.bo.TopOrderEditBo;
-import com.zhongzheng.modules.top.goods.bo.TopOrderGoodsQuery;
-import com.zhongzheng.modules.top.goods.bo.TopOrderQueryBo;
-import com.zhongzheng.modules.top.goods.domain.TopOrder;
-import com.zhongzheng.modules.top.goods.vo.TopOrderGoodsListVo;
-import com.zhongzheng.modules.top.goods.vo.TopOrderVo;
+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 java.util.Collection;
 import java.util.List;
@@ -19,31 +16,31 @@ import java.util.List;
  * @author ruoyi
  * @date 2023-04-20
  */
-public interface ITopOrderService extends IService<TopOrder> {
+public interface ITopOldOrderService extends IService<TopOldOrder> {
 	/**
 	 * 查询单个
 	 * @return
 	 */
-	TopOrderVo queryById(String orderSn);
+	TopOldOrderVo queryById(String orderSn);
 
 	/**
 	 * 查询列表
 	 */
-	List<TopOrderVo> queryList(TopOrderQueryBo bo);
+	List<TopOldOrderVo> queryList(TopOldOrderQueryBo bo);
 
 	/**
 	 * 根据新增业务对象插入订单
 	 * @param bo 订单新增业务对象
 	 * @return
 	 */
-	Boolean insertByAddBo(TopOrderAddBo bo);
+	Boolean insertByAddBo(TopOldOrderAddBo bo);
 
 	/**
 	 * 根据编辑业务对象修改订单
 	 * @param bo 订单编辑业务对象
 	 * @return
 	 */
-	Boolean updateByEditBo(TopOrderEditBo bo);
+	Boolean updateByEditBo(TopOldOrderEditBo bo);
 
 	/**
 	 * 校验并删除数据
@@ -53,5 +50,7 @@ public interface ITopOrderService extends IService<TopOrder> {
 	 */
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
 
-    List<TopOrderGoodsListVo> getOrderGoodsList(TopOrderGoodsQuery query);
+    List<TopOldOrderGoodsListVo> getOrderGoodsList(TopOldOrderGoodsQuery query);
+
+    boolean checkOrder(TopOldOrderCheckBo bo);
 }

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

@@ -1,56 +0,0 @@
-package com.zhongzheng.modules.top.goods.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zhongzheng.modules.top.goods.bo.TopOrderGoodsAddBo;
-import com.zhongzheng.modules.top.goods.bo.TopOrderGoodsEditBo;
-import com.zhongzheng.modules.top.goods.bo.TopOrderGoodsQuery;
-import com.zhongzheng.modules.top.goods.bo.TopOrderGoodsQueryBo;
-import com.zhongzheng.modules.top.goods.domain.TopOrderGoods;
-import com.zhongzheng.modules.top.goods.vo.TopOrderGoodsListVo;
-import com.zhongzheng.modules.top.goods.vo.TopOrderGoodsVo;
-
-import java.util.Collection;
-import java.util.List;
-
-/**
- * 订单商品Service接口
- *
- * @author ruoyi
- * @date 2023-04-20
- */
-public interface ITopOrderGoodsService extends IService<TopOrderGoods> {
-	/**
-	 * 查询单个
-	 * @return
-	 */
-	TopOrderGoodsVo queryById(Long orderGoodsId);
-
-	/**
-	 * 查询列表
-	 */
-	List<TopOrderGoodsVo> queryList(TopOrderGoodsQueryBo bo);
-
-	/**
-	 * 根据新增业务对象插入订单商品
-	 * @param bo 订单商品新增业务对象
-	 * @return
-	 */
-	Boolean insertByAddBo(TopOrderGoodsAddBo bo);
-
-	/**
-	 * 根据编辑业务对象修改订单商品
-	 * @param bo 订单商品编辑业务对象
-	 * @return
-	 */
-	Boolean updateByEditBo(TopOrderGoodsEditBo bo);
-
-	/**
-	 * 校验并删除数据
-	 * @param ids 主键集合
-	 * @param isValid 是否校验,true-删除前校验,false-不校验
-	 * @return
-	 */
-	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
-
-    List<TopOrderGoodsListVo> getListByQuery(TopOrderGoodsQuery query);
-}

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

@@ -0,0 +1,17 @@
+package com.zhongzheng.modules.top.goods.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zhongzheng.modules.top.goods.domain.TopOldOrderCheck;
+import com.zhongzheng.modules.top.goods.mapper.TopOldOrderCheckMapper;
+import com.zhongzheng.modules.top.goods.service.ITopOldOrderCheckService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 【请填写功能名称】Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2023-03-15
+ */
+@Service
+public class TopOldOrderCheckServiceImpl extends ServiceImpl<TopOldOrderCheckMapper, TopOldOrderCheck> implements ITopOldOrderCheckService {
+}

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

@@ -0,0 +1,121 @@
+package com.zhongzheng.modules.top.goods.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.Page;
+import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.modules.top.goods.bo.TopOldOrderGoodsAddBo;
+import com.zhongzheng.modules.top.goods.bo.TopOldOrderGoodsEditBo;
+import com.zhongzheng.modules.top.goods.bo.TopOldOrderGoodsQuery;
+import com.zhongzheng.modules.top.goods.bo.TopOldOrderGoodsQueryBo;
+import com.zhongzheng.modules.top.goods.domain.TopOldOrderGoods;
+import com.zhongzheng.modules.top.goods.mapper.TopOldOrderGoodsMapper;
+import com.zhongzheng.modules.top.goods.service.ITopOldOrderGoodsService;
+import com.zhongzheng.modules.top.goods.vo.TopOldOrderGoodsListVo;
+import com.zhongzheng.modules.top.goods.vo.TopOldOrderGoodsVo;
+import org.springframework.stereotype.Service;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 订单商品Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2023-04-20
+ */
+@Service
+public class TopOldOrderGoodsServiceImpl extends ServiceImpl<TopOldOrderGoodsMapper, TopOldOrderGoods> implements ITopOldOrderGoodsService {
+
+    @Override
+    public TopOldOrderGoodsVo queryById(Long orderGoodsId){
+        TopOldOrderGoods db = this.baseMapper.selectById(orderGoodsId);
+        return BeanUtil.toBean(db, TopOldOrderGoodsVo.class);
+    }
+
+    @Override
+    public List<TopOldOrderGoodsVo> queryList(TopOldOrderGoodsQueryBo bo) {
+        LambdaQueryWrapper<TopOldOrderGoods> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StrUtil.isNotBlank(bo.getOrderSn()), TopOldOrderGoods::getOrderSn, bo.getOrderSn());
+        lqw.eq(bo.getGoodsId() != null, TopOldOrderGoods::getGoodsId, bo.getGoodsId());
+        lqw.eq(bo.getGoodsPrice() != null, TopOldOrderGoods::getGoodsPrice, bo.getGoodsPrice());
+        lqw.eq(bo.getGoodsRealPrice() != null, TopOldOrderGoods::getGoodsRealPrice, bo.getGoodsRealPrice());
+        lqw.eq(bo.getStatus() != null, TopOldOrderGoods::getStatus, bo.getStatus());
+        lqw.eq(bo.getGoodsReceived() != null, TopOldOrderGoods::getGoodsReceived, bo.getGoodsReceived());
+        lqw.eq(bo.getRefundStatus() != null, TopOldOrderGoods::getRefundStatus, bo.getRefundStatus());
+        lqw.eq(bo.getPayStatus() != null, TopOldOrderGoods::getPayStatus, bo.getPayStatus());
+        lqw.eq(bo.getEducationTypeId() != null, TopOldOrderGoods::getEducationTypeId, bo.getEducationTypeId());
+        lqw.eq(bo.getBusinessId() != null, TopOldOrderGoods::getBusinessId, bo.getBusinessId());
+        lqw.eq(bo.getMajorId() != null, TopOldOrderGoods::getMajorId, bo.getMajorId());
+        lqw.eq(bo.getProjectId() != null, TopOldOrderGoods::getProjectId, bo.getProjectId());
+        lqw.eq(StrUtil.isNotBlank(bo.getSubjectIds()), TopOldOrderGoods::getSubjectIds, bo.getSubjectIds());
+        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));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<TopOldOrderGoodsVo> entity2Vo(Collection<TopOldOrderGoods> collection) {
+        List<TopOldOrderGoodsVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, TopOldOrderGoodsVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<TopOldOrderGoods> page = (Page<TopOldOrderGoods>)collection;
+            Page<TopOldOrderGoodsVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(TopOldOrderGoodsAddBo bo) {
+        TopOldOrderGoods add = BeanUtil.toBean(bo, TopOldOrderGoods.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(TopOldOrderGoodsEditBo bo) {
+        TopOldOrderGoods update = BeanUtil.toBean(bo, TopOldOrderGoods.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(TopOldOrderGoods entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return this.removeByIds(ids);
+    }
+
+    @Override
+    public List<TopOldOrderGoodsListVo> getListByQuery(TopOldOrderGoodsQuery query) {
+        return baseMapper.getListByQuery(query);
+    }
+}

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

@@ -1,16 +1,13 @@
 package com.zhongzheng.modules.top.goods.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 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;
-import com.zhongzheng.common.type.EncryptHandler;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.modules.course.domain.CourseSubject;
 import com.zhongzheng.modules.course.service.ICourseSubjectService;
@@ -18,30 +15,27 @@ import com.zhongzheng.modules.grade.domain.ClassGradeUser;
 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.domain.OrderGoods;
 import com.zhongzheng.modules.order.service.IOrderGoodsService;
-import com.zhongzheng.modules.top.goods.bo.TopOrderAddBo;
-import com.zhongzheng.modules.top.goods.bo.TopOrderEditBo;
-import com.zhongzheng.modules.top.goods.bo.TopOrderGoodsQuery;
-import com.zhongzheng.modules.top.goods.bo.TopOrderQueryBo;
-import com.zhongzheng.modules.top.goods.domain.TopOrder;
-import com.zhongzheng.modules.top.goods.domain.TopOrderAttachment;
-import com.zhongzheng.modules.top.goods.domain.TopOrderGoods;
-import com.zhongzheng.modules.top.goods.mapper.TopOrderMapper;
-import com.zhongzheng.modules.top.goods.service.ITopOrderAttachmentService;
-import com.zhongzheng.modules.top.goods.service.ITopOrderGoodsService;
-import com.zhongzheng.modules.top.goods.service.ITopOrderService;
-import com.zhongzheng.modules.top.goods.vo.TopOrderAttachmentVo;
-import com.zhongzheng.modules.top.goods.vo.TopOrderGoodsListVo;
-import com.zhongzheng.modules.top.goods.vo.TopOrderGoodsVo;
-import com.zhongzheng.modules.top.goods.vo.TopOrderVo;
+import com.zhongzheng.modules.top.goods.bo.*;
+import com.zhongzheng.modules.top.goods.domain.TopOldOrder;
+import com.zhongzheng.modules.top.goods.domain.TopOldOrderAttachment;
+import com.zhongzheng.modules.top.goods.domain.TopOldOrderCheck;
+import com.zhongzheng.modules.top.goods.domain.TopOldOrderGoods;
+import com.zhongzheng.modules.top.goods.mapper.TopOldOrderMapper;
+import com.zhongzheng.modules.top.goods.service.ITopOldOrderAttachmentService;
+import com.zhongzheng.modules.top.goods.service.ITopOldOrderCheckService;
+import com.zhongzheng.modules.top.goods.service.ITopOldOrderGoodsService;
+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.user.service.ITopSysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
-import java.util.Set;
 import java.util.stream.Collectors;
 
 /**
@@ -51,13 +45,13 @@ import java.util.stream.Collectors;
  * @date 2023-04-20
  */
 @Service
-public class TopOrderServiceImpl extends ServiceImpl<TopOrderMapper, TopOrder> implements ITopOrderService {
+public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOldOrder> implements ITopOldOrderService {
 
     @Autowired
-    private ITopOrderGoodsService topOrderGoodsService;
+    private ITopOldOrderGoodsService topOrderGoodsService;
 
     @Autowired
-    private ITopOrderAttachmentService topOrderAttachmentService;
+    private ITopOldOrderAttachmentService topOrderAttachmentService;
 
     @Autowired
     private IOrderGoodsService orderGoodsService;
@@ -71,31 +65,37 @@ public class TopOrderServiceImpl extends ServiceImpl<TopOrderMapper, TopOrder> i
     @Autowired
     private IClassGradeUserService classGradeUserService;
 
+    @Autowired
+    private ITopOldOrderCheckService topOrderCheckService;
+
+    @Autowired
+    private ITopSysUserService topSysUserService;
+
     @Override
-    public TopOrderVo queryById(String orderSn){
+    public TopOldOrderVo queryById(String orderSn){
         //查询视图 v_top_order
-        TopOrderVo orderVo = baseMapper.queryById(orderSn);
+        TopOldOrderVo orderVo = baseMapper.queryById(orderSn);
         if (ObjectUtils.isNull(orderVo)){
             throw new CustomException("订单号错误！");
         }
         //订单附件
         if (orderVo.getOrderFrom() != 1){
             //旧系统订单
-            List<TopOrderAttachment> list = topOrderAttachmentService
-                    .list(new LambdaQueryWrapper<TopOrderAttachment>()
-                    .eq(TopOrderAttachment::getOrderSn, orderVo.getOrderSn())
-                    .eq(TopOrderAttachment::getStatus, 1));
+            List<TopOldOrderAttachment> list = topOrderAttachmentService
+                    .list(new LambdaQueryWrapper<TopOldOrderAttachment>()
+                    .eq(TopOldOrderAttachment::getOrderSn, orderVo.getOrderSn())
+                    .eq(TopOldOrderAttachment::getStatus, 1));
             if (CollectionUtils.isNotEmpty(list)){
-                orderVo.setAttachmentList(list.stream().map(x -> BeanUtil.toBean(x, TopOrderAttachmentVo.class)).collect(Collectors.toList()));
+                orderVo.setAttachmentList(list.stream().map(x -> BeanUtil.toBean(x, TopOldOrderAttachmentVo.class)).collect(Collectors.toList()));
             }
         }
         return orderVo;
     }
 
     @Override
-    public List<TopOrderVo> queryList(TopOrderQueryBo bo) {
+    public List<TopOldOrderVo> queryList(TopOldOrderQueryBo bo) {
         //查询视图 v_top_order
-        List<TopOrderVo> orderVoList = baseMapper.queryList(bo);
+        List<TopOldOrderVo> orderVoList = baseMapper.queryList(bo);
         if (CollectionUtils.isNotEmpty(orderVoList)){
             //订单业务类型
             orderVoList.forEach(item -> {
@@ -112,13 +112,13 @@ public class TopOrderServiceImpl extends ServiceImpl<TopOrderMapper, TopOrder> i
     * @param collection 实体类集合
     * @return
     */
-    private List<TopOrderVo> entity2Vo(Collection<TopOrder> collection) {
-        List<TopOrderVo> voList = collection.stream()
-                .map(any -> BeanUtil.toBean(any, TopOrderVo.class))
+    private List<TopOldOrderVo> entity2Vo(Collection<TopOldOrder> collection) {
+        List<TopOldOrderVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, TopOldOrderVo.class))
                 .collect(Collectors.toList());
         if (collection instanceof Page) {
-            Page<TopOrder> page = (Page<TopOrder>)collection;
-            Page<TopOrderVo> pageVo = new Page<>();
+            Page<TopOldOrder> page = (Page<TopOldOrder>)collection;
+            Page<TopOldOrderVo> pageVo = new Page<>();
             BeanUtil.copyProperties(page,pageVo);
             pageVo.addAll(voList);
             voList = pageVo;
@@ -127,8 +127,8 @@ public class TopOrderServiceImpl extends ServiceImpl<TopOrderMapper, TopOrder> i
     }
 
     @Override
-    public Boolean insertByAddBo(TopOrderAddBo bo) {
-        TopOrder add = BeanUtil.toBean(bo, TopOrder.class);
+    public Boolean insertByAddBo(TopOldOrderAddBo bo) {
+        TopOldOrder add = BeanUtil.toBean(bo, TopOldOrder.class);
         validEntityBeforeSave(add);
         add.setCreateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());
@@ -136,21 +136,21 @@ public class TopOrderServiceImpl extends ServiceImpl<TopOrderMapper, TopOrder> i
         this.save(add);
         //订单商品
         if (CollectionUtils.isNotEmpty(bo.getOrderGoodsList())){
-            List<TopOrderGoods> collect = bo.getOrderGoodsList().stream().map(item -> BeanUtil.toBean(item, TopOrderGoods.class)).collect(Collectors.toList());
+            List<TopOldOrderGoods> collect = bo.getOrderGoodsList().stream().map(item -> BeanUtil.toBean(item, TopOldOrderGoods.class)).collect(Collectors.toList());
             topOrderGoodsService.saveBatch(collect);
         }
 
         //订单附件
         if (CollectionUtils.isNotEmpty(bo.getOrderAttachmentList())){
-            List<TopOrderAttachment> collect = bo.getOrderAttachmentList().stream().map(item -> BeanUtil.toBean(item, TopOrderAttachment.class)).collect(Collectors.toList());
+            List<TopOldOrderAttachment> collect = bo.getOrderAttachmentList().stream().map(item -> BeanUtil.toBean(item, TopOldOrderAttachment.class)).collect(Collectors.toList());
             topOrderAttachmentService.saveBatch(collect);
         }
         return true;
     }
 
     @Override
-    public Boolean updateByEditBo(TopOrderEditBo bo) {
-        TopOrder update = BeanUtil.toBean(bo, TopOrder.class);
+    public Boolean updateByEditBo(TopOldOrderEditBo bo) {
+        TopOldOrder update = BeanUtil.toBean(bo, TopOldOrder.class);
         validEntityBeforeSave(update);
         update.setUpdateTime(DateUtils.getNowTime());
         return this.updateById(update);
@@ -161,7 +161,7 @@ public class TopOrderServiceImpl extends ServiceImpl<TopOrderMapper, TopOrder> i
      *
      * @param entity 实体类数据
      */
-    private void validEntityBeforeSave(TopOrder entity){
+    private void validEntityBeforeSave(TopOldOrder entity){
         //TODO 做一些数据校验,如唯一约束
     }
 
@@ -174,12 +174,12 @@ public class TopOrderServiceImpl extends ServiceImpl<TopOrderMapper, TopOrder> i
     }
 
     @Override
-    public List<TopOrderGoodsListVo> getOrderGoodsList(TopOrderGoodsQuery query) {
+    public List<TopOldOrderGoodsListVo> getOrderGoodsList(TopOldOrderGoodsQuery query) {
         if (query.getOrderFrom() == 1){
             //新系统订单
-            List<TopOrderGoodsListVo> topOrderGoodsListVos = orderGoodsService.listByOrderSn(query);
-            if (CollectionUtils.isNotEmpty(topOrderGoodsListVos)){
-                topOrderGoodsListVos.forEach(item -> {
+            List<TopOldOrderGoodsListVo> topOldOrderGoodsListVos = orderGoodsService.listByOrderSn(query);
+            if (CollectionUtils.isNotEmpty(topOldOrderGoodsListVos)){
+                topOldOrderGoodsListVos.forEach(item -> {
                     item.setUserCount(1);
                     //专业
                     if (StringUtils.isNotBlank(item.getSubjectIds())){
@@ -207,28 +207,40 @@ public class TopOrderServiceImpl extends ServiceImpl<TopOrderMapper, TopOrder> i
                     }
                 });
             }
-            return topOrderGoodsListVos;
+            return topOldOrderGoodsListVos;
         }
         //旧系统订单
-        List<TopOrderGoodsListVo> list = topOrderGoodsService.getListByQuery(query);
+        List<TopOldOrderGoodsListVo> list = topOrderGoodsService.getListByQuery(query);
         if (CollectionUtils.isNotEmpty(list)){
             //学员数量
             Integer userCount = 0;
-            List<TopOrderGoods> goodsList = topOrderGoodsService
-                    .list(new LambdaQueryWrapper<TopOrderGoods>().eq(TopOrderGoods::getOrderSn, query.getOrderSn())
-                    .eq(TopOrderGoods::getStatus, 1)
-                    .ne(TopOrderGoods::getRefundStatus, 2)
-                    .in(TopOrderGoods::getPayStatus, Arrays.asList(2, 3, 4)));
+            List<TopOldOrderGoods> goodsList = topOrderGoodsService
+                    .list(new LambdaQueryWrapper<TopOldOrderGoods>().eq(TopOldOrderGoods::getOrderSn, query.getOrderSn())
+                    .eq(TopOldOrderGoods::getStatus, 1)
+                    .ne(TopOldOrderGoods::getRefundStatus, 2)
+                    .in(TopOldOrderGoods::getPayStatus, Arrays.asList(2, 3, 4)));
             if (CollectionUtils.isNotEmpty(goodsList)){
-                userCount = goodsList.stream().map(TopOrderGoods::getUserCard).collect(Collectors.toSet()).size();
+                userCount = goodsList.stream().map(TopOldOrderGoods::getUserCard).collect(Collectors.toSet()).size();
             }
             //老系统查询学习状态
 
             //数据处理
-            for (TopOrderGoodsListVo item : list) {
+            for (TopOldOrderGoodsListVo item : list) {
                 item.setUserCount(userCount);
             }
         }
         return list;
     }
+
+    @Override
+    public boolean checkOrder(TopOldOrderCheckBo bo) {
+        //校验当前登入角色
+        List<String>  roleKeys = topSysUserService.getRoleKeyById(bo.getLoginId());
+        List<TopOldOrderCheck> list = topOrderCheckService
+                .list(new LambdaQueryWrapper<TopOldOrderCheck>().eq(TopOldOrderCheck::getCheckType, 1));
+        if (CollectionUtils.isEmpty(list)){
+            throw new CustomException("");
+        }
+        return false;
+    }
 }

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

@@ -7,13 +7,13 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.Page;
 import com.zhongzheng.common.utils.DateUtils;
-import com.zhongzheng.modules.top.goods.bo.TopOrderAttachmentAddBo;
-import com.zhongzheng.modules.top.goods.bo.TopOrderAttachmentEditBo;
-import com.zhongzheng.modules.top.goods.bo.TopOrderAttachmentQueryBo;
-import com.zhongzheng.modules.top.goods.domain.TopOrderAttachment;
-import com.zhongzheng.modules.top.goods.mapper.TopOrderAttachmentMapper;
-import com.zhongzheng.modules.top.goods.service.ITopOrderAttachmentService;
-import com.zhongzheng.modules.top.goods.vo.TopOrderAttachmentVo;
+import com.zhongzheng.modules.top.goods.bo.TopOldOrderAttachmentAddBo;
+import com.zhongzheng.modules.top.goods.bo.TopOldOrderAttachmentEditBo;
+import com.zhongzheng.modules.top.goods.bo.TopOldOrderAttachmentQueryBo;
+import com.zhongzheng.modules.top.goods.domain.TopOldOrderAttachment;
+import com.zhongzheng.modules.top.goods.mapper.TopOldOrderAttachmentMapper;
+import com.zhongzheng.modules.top.goods.service.ITopOldOrderAttachmentService;
+import com.zhongzheng.modules.top.goods.vo.TopOldOrderAttachmentVo;
 import org.springframework.stereotype.Service;
 
 import java.util.Collection;
@@ -27,21 +27,21 @@ import java.util.stream.Collectors;
  * @date 2023-04-20
  */
 @Service
-public class TopOrderAttachmentServiceImpl extends ServiceImpl<TopOrderAttachmentMapper, TopOrderAttachment> implements ITopOrderAttachmentService {
+public class TopOrderAttachmentServiceImpl extends ServiceImpl<TopOldOrderAttachmentMapper, TopOldOrderAttachment> implements ITopOldOrderAttachmentService {
 
     @Override
-    public TopOrderAttachmentVo queryById(Long id){
-        TopOrderAttachment db = this.baseMapper.selectById(id);
-        return BeanUtil.toBean(db, TopOrderAttachmentVo.class);
+    public TopOldOrderAttachmentVo queryById(Long id){
+        TopOldOrderAttachment db = this.baseMapper.selectById(id);
+        return BeanUtil.toBean(db, TopOldOrderAttachmentVo.class);
     }
 
     @Override
-    public List<TopOrderAttachmentVo> queryList(TopOrderAttachmentQueryBo bo) {
-        LambdaQueryWrapper<TopOrderAttachment> lqw = Wrappers.lambdaQuery();
-        lqw.eq(StrUtil.isNotBlank(bo.getOrderSn()), TopOrderAttachment::getOrderSn, bo.getOrderSn());
-        lqw.eq(StrUtil.isNotBlank(bo.getAttachmentUrl()), TopOrderAttachment::getAttachmentUrl, bo.getAttachmentUrl());
-        lqw.eq(bo.getAttachmentType() != null, TopOrderAttachment::getAttachmentType, bo.getAttachmentType());
-        lqw.eq(bo.getStatus() != null, TopOrderAttachment::getStatus, bo.getStatus());
+    public List<TopOldOrderAttachmentVo> queryList(TopOldOrderAttachmentQueryBo bo) {
+        LambdaQueryWrapper<TopOldOrderAttachment> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StrUtil.isNotBlank(bo.getOrderSn()), TopOldOrderAttachment::getOrderSn, bo.getOrderSn());
+        lqw.eq(StrUtil.isNotBlank(bo.getAttachmentUrl()), TopOldOrderAttachment::getAttachmentUrl, bo.getAttachmentUrl());
+        lqw.eq(bo.getAttachmentType() != null, TopOldOrderAttachment::getAttachmentType, bo.getAttachmentType());
+        lqw.eq(bo.getStatus() != null, TopOldOrderAttachment::getStatus, bo.getStatus());
         return entity2Vo(this.list(lqw));
     }
 
@@ -51,13 +51,13 @@ public class TopOrderAttachmentServiceImpl extends ServiceImpl<TopOrderAttachmen
     * @param collection 实体类集合
     * @return
     */
-    private List<TopOrderAttachmentVo> entity2Vo(Collection<TopOrderAttachment> collection) {
-        List<TopOrderAttachmentVo> voList = collection.stream()
-                .map(any -> BeanUtil.toBean(any, TopOrderAttachmentVo.class))
+    private List<TopOldOrderAttachmentVo> entity2Vo(Collection<TopOldOrderAttachment> collection) {
+        List<TopOldOrderAttachmentVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, TopOldOrderAttachmentVo.class))
                 .collect(Collectors.toList());
         if (collection instanceof Page) {
-            Page<TopOrderAttachment> page = (Page<TopOrderAttachment>)collection;
-            Page<TopOrderAttachmentVo> pageVo = new Page<>();
+            Page<TopOldOrderAttachment> page = (Page<TopOldOrderAttachment>)collection;
+            Page<TopOldOrderAttachmentVo> pageVo = new Page<>();
             BeanUtil.copyProperties(page,pageVo);
             pageVo.addAll(voList);
             voList = pageVo;
@@ -66,8 +66,8 @@ public class TopOrderAttachmentServiceImpl extends ServiceImpl<TopOrderAttachmen
     }
 
     @Override
-    public Boolean insertByAddBo(TopOrderAttachmentAddBo bo) {
-        TopOrderAttachment add = BeanUtil.toBean(bo, TopOrderAttachment.class);
+    public Boolean insertByAddBo(TopOldOrderAttachmentAddBo bo) {
+        TopOldOrderAttachment add = BeanUtil.toBean(bo, TopOldOrderAttachment.class);
         validEntityBeforeSave(add);
         add.setCreateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());
@@ -75,8 +75,8 @@ public class TopOrderAttachmentServiceImpl extends ServiceImpl<TopOrderAttachmen
     }
 
     @Override
-    public Boolean updateByEditBo(TopOrderAttachmentEditBo bo) {
-        TopOrderAttachment update = BeanUtil.toBean(bo, TopOrderAttachment.class);
+    public Boolean updateByEditBo(TopOldOrderAttachmentEditBo bo) {
+        TopOldOrderAttachment update = BeanUtil.toBean(bo, TopOldOrderAttachment.class);
         validEntityBeforeSave(update);
         update.setUpdateTime(DateUtils.getNowTime());
         return this.updateById(update);
@@ -87,7 +87,7 @@ public class TopOrderAttachmentServiceImpl extends ServiceImpl<TopOrderAttachmen
      *
      * @param entity 实体类数据
      */
-    private void validEntityBeforeSave(TopOrderAttachment entity){
+    private void validEntityBeforeSave(TopOldOrderAttachment entity){
         //TODO 做一些数据校验,如唯一约束
     }
 

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

@@ -1,121 +0,0 @@
-package com.zhongzheng.modules.top.goods.service.impl;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.github.pagehelper.Page;
-import com.zhongzheng.common.utils.DateUtils;
-import com.zhongzheng.modules.top.goods.bo.TopOrderGoodsAddBo;
-import com.zhongzheng.modules.top.goods.bo.TopOrderGoodsEditBo;
-import com.zhongzheng.modules.top.goods.bo.TopOrderGoodsQuery;
-import com.zhongzheng.modules.top.goods.bo.TopOrderGoodsQueryBo;
-import com.zhongzheng.modules.top.goods.domain.TopOrderGoods;
-import com.zhongzheng.modules.top.goods.mapper.TopOrderGoodsMapper;
-import com.zhongzheng.modules.top.goods.service.ITopOrderGoodsService;
-import com.zhongzheng.modules.top.goods.vo.TopOrderGoodsListVo;
-import com.zhongzheng.modules.top.goods.vo.TopOrderGoodsVo;
-import org.springframework.stereotype.Service;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * 订单商品Service业务层处理
- *
- * @author ruoyi
- * @date 2023-04-20
- */
-@Service
-public class TopOrderGoodsServiceImpl extends ServiceImpl<TopOrderGoodsMapper, TopOrderGoods> implements ITopOrderGoodsService {
-
-    @Override
-    public TopOrderGoodsVo queryById(Long orderGoodsId){
-        TopOrderGoods db = this.baseMapper.selectById(orderGoodsId);
-        return BeanUtil.toBean(db, TopOrderGoodsVo.class);
-    }
-
-    @Override
-    public List<TopOrderGoodsVo> queryList(TopOrderGoodsQueryBo bo) {
-        LambdaQueryWrapper<TopOrderGoods> lqw = Wrappers.lambdaQuery();
-        lqw.eq(StrUtil.isNotBlank(bo.getOrderSn()), TopOrderGoods::getOrderSn, bo.getOrderSn());
-        lqw.eq(bo.getGoodsId() != null, TopOrderGoods::getGoodsId, bo.getGoodsId());
-        lqw.eq(bo.getGoodsPrice() != null, TopOrderGoods::getGoodsPrice, bo.getGoodsPrice());
-        lqw.eq(bo.getGoodsRealPrice() != null, TopOrderGoods::getGoodsRealPrice, bo.getGoodsRealPrice());
-        lqw.eq(bo.getStatus() != null, TopOrderGoods::getStatus, bo.getStatus());
-        lqw.eq(bo.getGoodsReceived() != null, TopOrderGoods::getGoodsReceived, bo.getGoodsReceived());
-        lqw.eq(bo.getRefundStatus() != null, TopOrderGoods::getRefundStatus, bo.getRefundStatus());
-        lqw.eq(bo.getPayStatus() != null, TopOrderGoods::getPayStatus, bo.getPayStatus());
-        lqw.eq(bo.getEducationTypeId() != null, TopOrderGoods::getEducationTypeId, bo.getEducationTypeId());
-        lqw.eq(bo.getBusinessId() != null, TopOrderGoods::getBusinessId, bo.getBusinessId());
-        lqw.eq(bo.getMajorId() != null, TopOrderGoods::getMajorId, bo.getMajorId());
-        lqw.eq(bo.getProjectId() != null, TopOrderGoods::getProjectId, bo.getProjectId());
-        lqw.eq(StrUtil.isNotBlank(bo.getSubjectIds()), TopOrderGoods::getSubjectIds, bo.getSubjectIds());
-        lqw.like(StrUtil.isNotBlank(bo.getMajorName()), TopOrderGoods::getMajorName, bo.getMajorName());
-        lqw.like(StrUtil.isNotBlank(bo.getGoodsName()), TopOrderGoods::getGoodsName, bo.getGoodsName());
-        lqw.like(StrUtil.isNotBlank(bo.getBusinessName()), TopOrderGoods::getBusinessName, bo.getBusinessName());
-        lqw.eq(bo.getStudyStatus() != null, TopOrderGoods::getStudyStatus, bo.getStudyStatus());
-        return entity2Vo(this.list(lqw));
-    }
-
-    /**
-    * 实体类转化成视图对象
-    *
-    * @param collection 实体类集合
-    * @return
-    */
-    private List<TopOrderGoodsVo> entity2Vo(Collection<TopOrderGoods> collection) {
-        List<TopOrderGoodsVo> voList = collection.stream()
-                .map(any -> BeanUtil.toBean(any, TopOrderGoodsVo.class))
-                .collect(Collectors.toList());
-        if (collection instanceof Page) {
-            Page<TopOrderGoods> page = (Page<TopOrderGoods>)collection;
-            Page<TopOrderGoodsVo> pageVo = new Page<>();
-            BeanUtil.copyProperties(page,pageVo);
-            pageVo.addAll(voList);
-            voList = pageVo;
-        }
-        return voList;
-    }
-
-    @Override
-    public Boolean insertByAddBo(TopOrderGoodsAddBo bo) {
-        TopOrderGoods add = BeanUtil.toBean(bo, TopOrderGoods.class);
-        validEntityBeforeSave(add);
-        add.setCreateTime(DateUtils.getNowTime());
-        add.setUpdateTime(DateUtils.getNowTime());
-        return this.save(add);
-    }
-
-    @Override
-    public Boolean updateByEditBo(TopOrderGoodsEditBo bo) {
-        TopOrderGoods update = BeanUtil.toBean(bo, TopOrderGoods.class);
-        validEntityBeforeSave(update);
-        update.setUpdateTime(DateUtils.getNowTime());
-        return this.updateById(update);
-    }
-
-    /**
-     * 保存前的数据校验
-     *
-     * @param entity 实体类数据
-     */
-    private void validEntityBeforeSave(TopOrderGoods entity){
-        //TODO 做一些数据校验,如唯一约束
-    }
-
-    @Override
-    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
-        if(isValid){
-            //TODO 做一些业务上的校验,判断是否需要校验
-        }
-        return this.removeByIds(ids);
-    }
-
-    @Override
-    public List<TopOrderGoodsListVo> getListByQuery(TopOrderGoodsQuery query) {
-        return baseMapper.getListByQuery(query);
-    }
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/vo/TopOrderAttachmentVo.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/vo/TopOldOrderAttachmentVo.java

@@ -14,7 +14,7 @@ import lombok.Data;
  */
 @Data
 @ApiModel("订单附件视图对象")
-public class TopOrderAttachmentVo {
+public class TopOldOrderAttachmentVo {
 	private static final long serialVersionUID = 1L;
 
 	/** 主键 */

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/vo/TopOrderGoodsListVo.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/vo/TopOldOrderGoodsListVo.java

@@ -16,7 +16,7 @@ import java.math.BigDecimal;
  */
 @Data
 @ApiModel("订单商品视图对象")
-public class TopOrderGoodsListVo {
+public class TopOldOrderGoodsListVo {
 	private static final long serialVersionUID = 1L;
 
 	/** $pkColumn.columnComment */

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/vo/TopOrderGoodsVo.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/vo/TopOldOrderGoodsVo.java

@@ -16,7 +16,7 @@ import java.math.BigDecimal;
  */
 @Data
 @ApiModel("订单商品视图对象")
-public class TopOrderGoodsVo {
+public class TopOldOrderGoodsVo {
 	private static final long serialVersionUID = 1L;
 
 	/** $pkColumn.columnComment */

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

@@ -1,7 +1,6 @@
 package com.zhongzheng.modules.top.goods.vo;
 
 import com.zhongzheng.common.annotation.Excel;
-import com.zhongzheng.modules.top.goods.domain.TopOrderAttachment;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -18,7 +17,7 @@ import java.util.List;
  */
 @Data
 @ApiModel("订单视图对象")
-public class TopOrderVo {
+public class TopOldOrderVo {
 	private static final long serialVersionUID = 1L;
 
 	/** $pkColumn.columnComment */
@@ -105,6 +104,9 @@ public class TopOrderVo {
 	@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已完成")
@@ -166,7 +168,7 @@ public class TopOrderVo {
 	@ApiModelProperty("预付款时间")
 	private Integer predictPayTime;
 	@ApiModelProperty("订单附件集合")
-	private List<TopOrderAttachmentVo> attachmentList;
+	private List<TopOldOrderAttachmentVo> attachmentList;
 	@ApiModelProperty("订单业务类型")
 	private List<String> businessNames;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/user/mapper/TopSysUserMapper.java

@@ -3,6 +3,7 @@ package com.zhongzheng.modules.top.user.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zhongzheng.common.core.domain.entity.TopSysUser;
 import com.zhongzheng.modules.course.bo.CourseBusinessQueryBo;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -41,4 +42,5 @@ public interface TopSysUserMapper extends BaseMapper<TopSysUser> {
      */
     TopSysUser selectUserById(Long userId);
 
+    List<String> getRoleKeyById(@Param("userId") Long userId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/user/service/ITopSysUserService.java

@@ -143,4 +143,6 @@ public interface ITopSysUserService extends IService<TopSysUser> {
 	 int updateUserStatus(TopSysUser user);
 
     TopSysUser getTopSysUser(Long createTopSysUserId);
+
+    List<String> getRoleKeyById(Long loginId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/user/service/impl/TopSysUserServiceImpl.java

@@ -323,6 +323,11 @@ public class TopSysUserServiceImpl extends ServiceImpl<TopSysUserMapper, TopSysU
         return getById(createTopSysUserId);
     }
 
+    @Override
+    public List<String> getRoleKeyById(Long loginId) {
+        return baseMapper.getRoleKeyById(loginId);
+    }
+
 
     /**
      * 新增用户角色信息

zhongzheng-system/src/main/resources/mapper/modules/order/OrderGoodsMapper.xml

@@ -786,7 +786,7 @@
             AND g.goods_id = #{goodsId}
             LIMIT 1
     </select>
-    <resultMap id="getlist" type="com.zhongzheng.modules.top.goods.vo.TopOrderGoodsListVo">
+    <resultMap id="getlist" type="com.zhongzheng.modules.top.goods.vo.TopOldOrderGoodsListVo">
         <result property="orderGoodsId" column="order_goods_id"/>
         <result property="gradeId" column="grade_id"/>
         <result property="userId" column="user_id" />
@@ -801,7 +801,7 @@
         <result property="goodsRealPrice" column="goods_real_price"/>
     </resultMap>
 
-    <select id="listByOrderSn" parameterType="com.zhongzheng.modules.top.goods.bo.TopOrderGoodsQuery" resultMap="getlist">
+    <select id="listByOrderSn" parameterType="com.zhongzheng.modules.top.goods.bo.TopOldOrderGoodsQuery" resultMap="getlist">
         SELECT
             og.order_goods_id,
             og.grade_id,

zhongzheng-system/src/main/resources/mapper/modules/top/TopOrderAttachmentMapper.xml → zhongzheng-system/src/main/resources/mapper/modules/top/TopOldOrderAttachmentMapper.xml

@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zhongzheng.modules.top.goods.mapper.TopOrderAttachmentMapper">
+<mapper namespace="com.zhongzheng.modules.top.goods.mapper.TopOldOrderAttachmentMapper">
 
-    <resultMap type="com.zhongzheng.modules.top.goods.domain.TopOrderAttachment" id="TopOrderAttachmentResult">
+    <resultMap type="com.zhongzheng.modules.top.goods.domain.TopOldOrderAttachment" id="TopOrderAttachmentResult">
         <result property="id" column="id"/>
         <result property="orderSn" column="order_sn"/>
         <result property="attachmentUrl" column="attachment_url"/>

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

@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zhongzheng.modules.top.goods.mapper.TopOrderGoodsMapper">
+<mapper namespace="com.zhongzheng.modules.top.goods.mapper.TopOldOrderGoodsMapper">
 
-    <resultMap type="com.zhongzheng.modules.top.goods.domain.TopOrderGoods" id="TopOrderGoodsResult">
+    <resultMap type="com.zhongzheng.modules.top.goods.domain.TopOldOrderGoods" id="TopOrderGoodsResult">
         <result property="orderGoodsId" column="order_goods_id"/>
         <result property="orderSn" column="order_sn"/>
         <result property="goodsId" column="goods_id"/>
@@ -28,7 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="studyStatus" column="study_status"/>
     </resultMap>
 
-    <resultMap id="getlist" type="com.zhongzheng.modules.top.goods.vo.TopOrderGoodsListVo">
+    <resultMap id="getlist" type="com.zhongzheng.modules.top.goods.vo.TopOldOrderGoodsListVo">
         <result property="orderGoodsId" column="order_goods_id"/>
         <result property="userName" column="user_name"/>
         <result property="userCard" column="user_card" typeHandler="com.zhongzheng.common.type.EncryptHandler"/>
@@ -40,7 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="goodsRealPrice" column="goods_real_price"/>
     </resultMap>
 
-    <select id="getListByQuery" parameterType="com.zhongzheng.modules.top.goods.bo.TopOrderGoodsQuery" resultMap="getlist">
+    <select id="getListByQuery" parameterType="com.zhongzheng.modules.top.goods.bo.TopOldOrderGoodsQuery" resultMap="getlist">
         SELECT
             order_goods_id,
             user_name,

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

@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zhongzheng.modules.top.goods.mapper.TopOrderMapper">
+<mapper namespace="com.zhongzheng.modules.top.goods.mapper.TopOldOrderMapper">
 
-    <resultMap type="com.zhongzheng.modules.top.goods.domain.TopOrder" id="TopOrderResult">
+    <resultMap type="com.zhongzheng.modules.top.goods.domain.TopOldOrder" id="TopOrderResult">
         <result property="orderId" column="order_id"/>
         <result property="orderSn" column="order_sn"/>
         <result property="userId" column="user_id"/>
@@ -26,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createSysUserId" column="create_sys_user_id"/>
         <result property="inputOrderSn" column="input_order_sn"/>
         <result property="payStatus" column="pay_status"/>
-        <result property="checkStaus" column="check_staus"/>
+        <result property="checkStatus" column="check_status"/>
         <result property="refundStatus" column="refund_status"/>
         <result property="creditStatus" column="credit_status"/>
         <result property="invoiceStatus" column="invoice_status"/>
@@ -41,18 +41,35 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="costJson" column="cost_json"/>
     </resultMap>
 
-    <select id="queryList" parameterType="com.zhongzheng.modules.top.goods.bo.TopOrderQueryBo" resultType="com.zhongzheng.modules.top.goods.vo.TopOrderVo">
+    <select id="queryList" parameterType="com.zhongzheng.modules.top.goods.bo.TopOldOrderQueryBo" resultType="com.zhongzheng.modules.top.goods.vo.TopOldOrderVo">
         SELECT
             vto.*
         FROM
-                ( SELECT order_sn FROM `v_top_order_business` where 1=1
-                <if test="businessFullName != null and businessFullName != ''">
-                    AND business_full_name = #{businessFullName}
+                ( SELECT DISTINCT order_sn
+                <if test="businessFullName != null and businessFullName != '' and (userCard == null or userCard == '')">
+                    FROM `v_top_order_business`  where business_full_name = #{businessFullName}
                 </if>
-                <if test="userCard != null and userCard != ''">
-                    AND vto.id_card LIKE CONCAT( '%', #{userCard}, '%' )
+                <if test="userCard != null and userCard != '' and (businessFullName == null and businessFullName == '')">
+                    FROM `v_top_order_card`  where user_card = #{userCard,typeHandler=com.zhongzheng.common.type.EncryptHandler}
                 </if>
-                GROUP BY order_sn ) a
+                <if test="userCard != null and userCard != '' and businessFullName != null and businessFullName != ''">
+                    FROM (
+                    SELECT
+                    DISTINCT order_sn
+                    FROM
+                    ( SELECT order_sn FROM v_top_order_business WHERE business_full_name = #{businessFullName} UNION ALL SELECT order_sn FROM v_top_order_card
+                    WHERE user_card = #{userCard,typeHandler=com.zhongzheng.common.type.EncryptHandler}) b
+                    ) m
+                </if>
+                <if test="(userCard == null or userCard == '') and (businessFullName == null or businessFullName == '')">
+                    FROM (
+                    SELECT
+                    DISTINCT order_sn
+                    FROM
+                    ( SELECT order_sn FROM v_top_order_business UNION ALL SELECT order_sn FROM v_top_order_card) b
+                    ) m
+                </if>
+                 ) a
                     LEFT JOIN v_top_order vto ON a.order_sn = vto.order_sn
         WHERE vto.`status` = 1
         <if test="checkStatus != null and checkStatus != ''">
@@ -85,7 +102,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
     </select>
 
-    <select id="queryById" parameterType="java.lang.String" resultType="com.zhongzheng.modules.top.goods.vo.TopOrderVo">
+    <select id="queryById" parameterType="java.lang.String" resultType="com.zhongzheng.modules.top.goods.vo.TopOldOrderVo">
         SELECT * FROM v_top_order WHERE order_sn = #{orderSn}
     </select>
 

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

@@ -126,4 +126,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where u.`status` = 1
 
     </select>
+
+    <select id="getRoleKeyById" parameterType="java.lang.Long"  resultType="java.lang.String">
+        SELECT r.role_key FROM top_sys_user_role ur LEFT JOIN top_sys_role r ON ur.role_id = r.role_id WHERE ur.user_id = #{userId}
+    </select>
 </mapper>