优化

module-his/module-his-biz/src/main/java/com/yc/ship/module/his/controller/admin/tradedetail/HisTradeDetailController.java

@@ -35,20 +35,20 @@ import com.yc.ship.module.his.service.tradedetail.HisTradeDetailService;
 public class HisTradeDetailController {
 
     @Resource
-    private HisTradeDetailService hisTradeDetailService;
+    private HisTradeDetailService tradeDetailService;
 
     @PostMapping("/create")
     @Operation(summary = "创建订单明细历史")
     @PreAuthorize("@ss.hasPermission('his:trade-detail:create')")
     public CommonResult<Long> createTradeDetail(@Valid @RequestBody TradeDetailSaveReqVO createReqVO) {
-        return success(hisTradeDetailService.createTradeDetail(createReqVO));
+        return success(tradeDetailService.createTradeDetail(createReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新订单明细历史")
     @PreAuthorize("@ss.hasPermission('his:trade-detail:update')")
     public CommonResult<Boolean> updateTradeDetail(@Valid @RequestBody TradeDetailSaveReqVO updateReqVO) {
-        hisTradeDetailService.updateTradeDetail(updateReqVO);
+        tradeDetailService.updateTradeDetail(updateReqVO);
         return success(true);
     }
 
@@ -57,7 +57,7 @@ public class HisTradeDetailController {
     @Parameter(name = "id", description = "编号", required = true)
     @PreAuthorize("@ss.hasPermission('his:trade-detail:delete')")
     public CommonResult<Boolean> deleteTradeDetail(@RequestParam("id") Long id) {
-        hisTradeDetailService.deleteTradeDetail(id);
+        tradeDetailService.deleteTradeDetail(id);
         return success(true);
     }
 
@@ -66,7 +66,7 @@ public class HisTradeDetailController {
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
     @PreAuthorize("@ss.hasPermission('his:trade-detail:query')")
     public CommonResult<TradeDetailRespVO> getTradeDetail(@RequestParam("id") Long id) {
-        HisTradeDetailDO tradeDetail = hisTradeDetailService.getTradeDetail(id);
+        HisTradeDetailDO tradeDetail = tradeDetailService.getTradeDetail(id);
         return success(BeanUtils.toBean(tradeDetail, TradeDetailRespVO.class));
     }
 
@@ -74,7 +74,7 @@ public class HisTradeDetailController {
     @Operation(summary = "获得订单明细历史分页")
     @PreAuthorize("@ss.hasPermission('his:trade-detail:query')")
     public CommonResult<PageResult<TradeDetailRespVO>> getTradeDetailPage(@Valid TradeDetailPageReqVO pageReqVO) {
-        PageResult<HisTradeDetailDO> pageResult = hisTradeDetailService.getTradeDetailPage(pageReqVO);
+        PageResult<HisTradeDetailDO> pageResult = tradeDetailService.getTradeDetailPage(pageReqVO);
         return success(BeanUtils.toBean(pageResult, TradeDetailRespVO.class));
     }
 
@@ -85,7 +85,7 @@ public class HisTradeDetailController {
     public void exportTradeDetailExcel(@Valid TradeDetailPageReqVO pageReqVO,
               HttpServletResponse response) throws IOException {
         pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<HisTradeDetailDO> list = hisTradeDetailService.getTradeDetailPage(pageReqVO).getList();
+        List<HisTradeDetailDO> list = tradeDetailService.getTradeDetailPage(pageReqVO).getList();
         // 导出 Excel
         ExcelUtils.write(response, "订单明细历史.xls", "数据", TradeDetailRespVO.class,
                         BeanUtils.toBean(list, TradeDetailRespVO.class));

module-his/module-his-biz/src/main/java/com/yc/ship/module/his/controller/admin/tradedetail/TradeDetailController.java

@@ -1,94 +0,0 @@
-package com.yc.ship.module.his.controller.admin.tradedetail;
-
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.security.access.prepost.PreAuthorize;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Operation;
-
-import javax.validation.*;
-import javax.servlet.http.*;
-import java.util.*;
-import java.io.IOException;
-
-import com.yc.ship.framework.common.pojo.PageParam;
-import com.yc.ship.framework.common.pojo.PageResult;
-import com.yc.ship.framework.common.pojo.CommonResult;
-import com.yc.ship.framework.common.util.object.BeanUtils;
-import static com.yc.ship.framework.common.pojo.CommonResult.success;
-
-import com.yc.ship.framework.excel.core.util.ExcelUtils;
-
-import com.yc.ship.framework.apilog.core.annotation.ApiAccessLog;
-import static com.yc.ship.framework.apilog.core.enums.OperateTypeEnum.*;
-
-import com.yc.ship.module.his.controller.admin.tradedetail.vo.*;
-import com.yc.ship.module.his.dal.dataobject.tradedetail.HisTradeDetailDO;
-import com.yc.ship.module.his.service.tradedetail.HisTradeDetailService;
-
-@Tag(name = "管理后台 - 订单明细历史")
-@RestController
-@RequestMapping("/his/trade-detail")
-@Validated
-public class TradeDetailController {
-
-    @Resource
-    private HisTradeDetailService tradeDetailService;
-
-    @PostMapping("/create")
-    @Operation(summary = "创建订单明细历史")
-    @PreAuthorize("@ss.hasPermission('his:trade-detail:create')")
-    public CommonResult<Long> createTradeDetail(@Valid @RequestBody TradeDetailSaveReqVO createReqVO) {
-        return success(tradeDetailService.createTradeDetail(createReqVO));
-    }
-
-    @PutMapping("/update")
-    @Operation(summary = "更新订单明细历史")
-    @PreAuthorize("@ss.hasPermission('his:trade-detail:update')")
-    public CommonResult<Boolean> updateTradeDetail(@Valid @RequestBody TradeDetailSaveReqVO updateReqVO) {
-        tradeDetailService.updateTradeDetail(updateReqVO);
-        return success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除订单明细历史")
-    @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('his:trade-detail:delete')")
-    public CommonResult<Boolean> deleteTradeDetail(@RequestParam("id") Long id) {
-        tradeDetailService.deleteTradeDetail(id);
-        return success(true);
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "获得订单明细历史")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('his:trade-detail:query')")
-    public CommonResult<TradeDetailRespVO> getTradeDetail(@RequestParam("id") Long id) {
-        HisTradeDetailDO tradeDetail = tradeDetailService.getTradeDetail(id);
-        return success(BeanUtils.toBean(tradeDetail, TradeDetailRespVO.class));
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "获得订单明细历史分页")
-    @PreAuthorize("@ss.hasPermission('his:trade-detail:query')")
-    public CommonResult<PageResult<TradeDetailRespVO>> getTradeDetailPage(@Valid TradeDetailPageReqVO pageReqVO) {
-        PageResult<HisTradeDetailDO> pageResult = tradeDetailService.getTradeDetailPage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, TradeDetailRespVO.class));
-    }
-
-    @GetMapping("/export-excel")
-    @Operation(summary = "导出订单明细历史 Excel")
-    @PreAuthorize("@ss.hasPermission('his:trade-detail:export')")
-    @ApiAccessLog(operateType = EXPORT)
-    public void exportTradeDetailExcel(@Valid TradeDetailPageReqVO pageReqVO,
-              HttpServletResponse response) throws IOException {
-        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<HisTradeDetailDO> list = tradeDetailService.getTradeDetailPage(pageReqVO).getList();
-        // 导出 Excel
-        ExcelUtils.write(response, "订单明细历史.xls", "数据", TradeDetailRespVO.class,
-                        BeanUtils.toBean(list, TradeDetailRespVO.class));
-    }
-
-}

module-his/module-his-biz/src/main/java/com/yc/ship/module/his/controller/admin/tradedetailbase/HisTradeDetailBaseController.java

@@ -35,20 +35,20 @@ import com.yc.ship.module.his.service.tradedetailbase.HisTradeDetailBaseService;
 public class HisTradeDetailBaseController {
 
     @Resource
-    private HisTradeDetailBaseService hisTradeDetailBaseService;
+    private HisTradeDetailBaseService tradeDetailBaseService;
 
     @PostMapping("/create")
     @Operation(summary = "创建订单明细基础历史")
     @PreAuthorize("@ss.hasPermission('his:trade-detail-base:create')")
     public CommonResult<Long> createTradeDetailBase(@Valid @RequestBody TradeDetailBaseSaveReqVO createReqVO) {
-        return success(hisTradeDetailBaseService.createTradeDetailBase(createReqVO));
+        return success(tradeDetailBaseService.createTradeDetailBase(createReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新订单明细基础历史")
     @PreAuthorize("@ss.hasPermission('his:trade-detail-base:update')")
     public CommonResult<Boolean> updateTradeDetailBase(@Valid @RequestBody TradeDetailBaseSaveReqVO updateReqVO) {
-        hisTradeDetailBaseService.updateTradeDetailBase(updateReqVO);
+        tradeDetailBaseService.updateTradeDetailBase(updateReqVO);
         return success(true);
     }
 
@@ -57,7 +57,7 @@ public class HisTradeDetailBaseController {
     @Parameter(name = "id", description = "编号", required = true)
     @PreAuthorize("@ss.hasPermission('his:trade-detail-base:delete')")
     public CommonResult<Boolean> deleteTradeDetailBase(@RequestParam("id") Long id) {
-        hisTradeDetailBaseService.deleteTradeDetailBase(id);
+        tradeDetailBaseService.deleteTradeDetailBase(id);
         return success(true);
     }
 
@@ -66,7 +66,7 @@ public class HisTradeDetailBaseController {
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
     @PreAuthorize("@ss.hasPermission('his:trade-detail-base:query')")
     public CommonResult<TradeDetailBaseRespVO> getTradeDetailBase(@RequestParam("id") Long id) {
-        HisTradeDetailBaseDO tradeDetailBase = hisTradeDetailBaseService.getTradeDetailBase(id);
+        HisTradeDetailBaseDO tradeDetailBase = tradeDetailBaseService.getTradeDetailBase(id);
         return success(BeanUtils.toBean(tradeDetailBase, TradeDetailBaseRespVO.class));
     }
 
@@ -74,7 +74,7 @@ public class HisTradeDetailBaseController {
     @Operation(summary = "获得订单明细基础历史分页")
     @PreAuthorize("@ss.hasPermission('his:trade-detail-base:query')")
     public CommonResult<PageResult<TradeDetailBaseRespVO>> getTradeDetailBasePage(@Valid TradeDetailBasePageReqVO pageReqVO) {
-        PageResult<HisTradeDetailBaseDO> pageResult = hisTradeDetailBaseService.getTradeDetailBasePage(pageReqVO);
+        PageResult<HisTradeDetailBaseDO> pageResult = tradeDetailBaseService.getTradeDetailBasePage(pageReqVO);
         return success(BeanUtils.toBean(pageResult, TradeDetailBaseRespVO.class));
     }
 
@@ -85,7 +85,7 @@ public class HisTradeDetailBaseController {
     public void exportTradeDetailBaseExcel(@Valid TradeDetailBasePageReqVO pageReqVO,
               HttpServletResponse response) throws IOException {
         pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<HisTradeDetailBaseDO> list = hisTradeDetailBaseService.getTradeDetailBasePage(pageReqVO).getList();
+        List<HisTradeDetailBaseDO> list = tradeDetailBaseService.getTradeDetailBasePage(pageReqVO).getList();
         // 导出 Excel
         ExcelUtils.write(response, "订单明细基础历史.xls", "数据", TradeDetailBaseRespVO.class,
                         BeanUtils.toBean(list, TradeDetailBaseRespVO.class));

module-his/module-his-biz/src/main/java/com/yc/ship/module/his/controller/admin/tradedetailbase/TradeDetailBaseController.java

@@ -1,94 +0,0 @@
-package com.yc.ship.module.his.controller.admin.tradedetailbase;
-
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.security.access.prepost.PreAuthorize;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Operation;
-
-import javax.validation.*;
-import javax.servlet.http.*;
-import java.util.*;
-import java.io.IOException;
-
-import com.yc.ship.framework.common.pojo.PageParam;
-import com.yc.ship.framework.common.pojo.PageResult;
-import com.yc.ship.framework.common.pojo.CommonResult;
-import com.yc.ship.framework.common.util.object.BeanUtils;
-import static com.yc.ship.framework.common.pojo.CommonResult.success;
-
-import com.yc.ship.framework.excel.core.util.ExcelUtils;
-
-import com.yc.ship.framework.apilog.core.annotation.ApiAccessLog;
-import static com.yc.ship.framework.apilog.core.enums.OperateTypeEnum.*;
-
-import com.yc.ship.module.his.controller.admin.tradedetailbase.vo.*;
-import com.yc.ship.module.his.dal.dataobject.tradedetailbase.HisTradeDetailBaseDO;
-import com.yc.ship.module.his.service.tradedetailbase.HisTradeDetailBaseService;
-
-@Tag(name = "管理后台 - 订单明细基础历史")
-@RestController
-@RequestMapping("/his/trade-detail-base")
-@Validated
-public class TradeDetailBaseController {
-
-    @Resource
-    private HisTradeDetailBaseService tradeDetailBaseService;
-
-    @PostMapping("/create")
-    @Operation(summary = "创建订单明细基础历史")
-    @PreAuthorize("@ss.hasPermission('his:trade-detail-base:create')")
-    public CommonResult<Long> createTradeDetailBase(@Valid @RequestBody TradeDetailBaseSaveReqVO createReqVO) {
-        return success(tradeDetailBaseService.createTradeDetailBase(createReqVO));
-    }
-
-    @PutMapping("/update")
-    @Operation(summary = "更新订单明细基础历史")
-    @PreAuthorize("@ss.hasPermission('his:trade-detail-base:update')")
-    public CommonResult<Boolean> updateTradeDetailBase(@Valid @RequestBody TradeDetailBaseSaveReqVO updateReqVO) {
-        tradeDetailBaseService.updateTradeDetailBase(updateReqVO);
-        return success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除订单明细基础历史")
-    @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('his:trade-detail-base:delete')")
-    public CommonResult<Boolean> deleteTradeDetailBase(@RequestParam("id") Long id) {
-        tradeDetailBaseService.deleteTradeDetailBase(id);
-        return success(true);
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "获得订单明细基础历史")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('his:trade-detail-base:query')")
-    public CommonResult<TradeDetailBaseRespVO> getTradeDetailBase(@RequestParam("id") Long id) {
-        HisTradeDetailBaseDO tradeDetailBase = tradeDetailBaseService.getTradeDetailBase(id);
-        return success(BeanUtils.toBean(tradeDetailBase, TradeDetailBaseRespVO.class));
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "获得订单明细基础历史分页")
-    @PreAuthorize("@ss.hasPermission('his:trade-detail-base:query')")
-    public CommonResult<PageResult<TradeDetailBaseRespVO>> getTradeDetailBasePage(@Valid TradeDetailBasePageReqVO pageReqVO) {
-        PageResult<HisTradeDetailBaseDO> pageResult = tradeDetailBaseService.getTradeDetailBasePage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, TradeDetailBaseRespVO.class));
-    }
-
-    @GetMapping("/export-excel")
-    @Operation(summary = "导出订单明细基础历史 Excel")
-    @PreAuthorize("@ss.hasPermission('his:trade-detail-base:export')")
-    @ApiAccessLog(operateType = EXPORT)
-    public void exportTradeDetailBaseExcel(@Valid TradeDetailBasePageReqVO pageReqVO,
-              HttpServletResponse response) throws IOException {
-        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<HisTradeDetailBaseDO> list = tradeDetailBaseService.getTradeDetailBasePage(pageReqVO).getList();
-        // 导出 Excel
-        ExcelUtils.write(response, "订单明细基础历史.xls", "数据", TradeDetailBaseRespVO.class,
-                        BeanUtils.toBean(list, TradeDetailBaseRespVO.class));
-    }
-
-}

module-his/module-his-biz/src/main/java/com/yc/ship/module/his/controller/admin/tradeorder/HisTradeOrderController.java

@@ -35,20 +35,20 @@ import com.yc.ship.module.his.service.tradeorder.HisTradeOrderService;
 public class HisTradeOrderController {
 
     @Resource
-    private HisTradeOrderService hisTradeOrderService;
+    private HisTradeOrderService tradeOrderService;
 
     @PostMapping("/create")
     @Operation(summary = "创建交易订单历史")
     @PreAuthorize("@ss.hasPermission('his:trade-order:create')")
     public CommonResult<Long> createTradeOrder(@Valid @RequestBody TradeOrderSaveReqVO createReqVO) {
-        return success(hisTradeOrderService.createTradeOrder(createReqVO));
+        return success(tradeOrderService.createTradeOrder(createReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新交易订单历史")
     @PreAuthorize("@ss.hasPermission('his:trade-order:update')")
     public CommonResult<Boolean> updateTradeOrder(@Valid @RequestBody TradeOrderSaveReqVO updateReqVO) {
-        hisTradeOrderService.updateTradeOrder(updateReqVO);
+        tradeOrderService.updateTradeOrder(updateReqVO);
         return success(true);
     }
 
@@ -57,7 +57,7 @@ public class HisTradeOrderController {
     @Parameter(name = "id", description = "编号", required = true)
     @PreAuthorize("@ss.hasPermission('his:trade-order:delete')")
     public CommonResult<Boolean> deleteTradeOrder(@RequestParam("id") Long id) {
-        hisTradeOrderService.deleteTradeOrder(id);
+        tradeOrderService.deleteTradeOrder(id);
         return success(true);
     }
 
@@ -66,7 +66,7 @@ public class HisTradeOrderController {
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
     @PreAuthorize("@ss.hasPermission('his:trade-order:query')")
     public CommonResult<TradeOrderRespVO> getTradeOrder(@RequestParam("id") Long id) {
-        HisTradeOrderDO tradeOrder = hisTradeOrderService.getTradeOrder(id);
+        HisTradeOrderDO tradeOrder = tradeOrderService.getTradeOrder(id);
         return success(BeanUtils.toBean(tradeOrder, TradeOrderRespVO.class));
     }
 
@@ -74,7 +74,7 @@ public class HisTradeOrderController {
     @Operation(summary = "获得交易订单历史分页")
     @PreAuthorize("@ss.hasPermission('his:trade-order:query')")
     public CommonResult<PageResult<TradeOrderRespVO>> getTradeOrderPage(@Valid TradeOrderPageReqVO pageReqVO) {
-        PageResult<HisTradeOrderDO> pageResult = hisTradeOrderService.getTradeOrderPage(pageReqVO);
+        PageResult<HisTradeOrderDO> pageResult = tradeOrderService.getTradeOrderPage(pageReqVO);
         return success(BeanUtils.toBean(pageResult, TradeOrderRespVO.class));
     }
 
@@ -85,7 +85,7 @@ public class HisTradeOrderController {
     public void exportTradeOrderExcel(@Valid TradeOrderPageReqVO pageReqVO,
               HttpServletResponse response) throws IOException {
         pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<HisTradeOrderDO> list = hisTradeOrderService.getTradeOrderPage(pageReqVO).getList();
+        List<HisTradeOrderDO> list = tradeOrderService.getTradeOrderPage(pageReqVO).getList();
         // 导出 Excel
         ExcelUtils.write(response, "交易订单历史.xls", "数据", TradeOrderRespVO.class,
                         BeanUtils.toBean(list, TradeOrderRespVO.class));

module-his/module-his-biz/src/main/java/com/yc/ship/module/his/controller/admin/tradeorder/TradeOrderController.java

@@ -1,94 +0,0 @@
-package com.yc.ship.module.his.controller.admin.tradeorder;
-
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.security.access.prepost.PreAuthorize;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Operation;
-
-import javax.validation.*;
-import javax.servlet.http.*;
-import java.util.*;
-import java.io.IOException;
-
-import com.yc.ship.framework.common.pojo.PageParam;
-import com.yc.ship.framework.common.pojo.PageResult;
-import com.yc.ship.framework.common.pojo.CommonResult;
-import com.yc.ship.framework.common.util.object.BeanUtils;
-import static com.yc.ship.framework.common.pojo.CommonResult.success;
-
-import com.yc.ship.framework.excel.core.util.ExcelUtils;
-
-import com.yc.ship.framework.apilog.core.annotation.ApiAccessLog;
-import static com.yc.ship.framework.apilog.core.enums.OperateTypeEnum.*;
-
-import com.yc.ship.module.his.controller.admin.tradeorder.vo.*;
-import com.yc.ship.module.his.dal.dataobject.tradeorder.HisTradeOrderDO;
-import com.yc.ship.module.his.service.tradeorder.HisTradeOrderService;
-
-@Tag(name = "管理后台 - 交易订单历史")
-@RestController
-@RequestMapping("/his/trade-order")
-@Validated
-public class TradeOrderController {
-
-    @Resource
-    private HisTradeOrderService tradeOrderService;
-
-    @PostMapping("/create")
-    @Operation(summary = "创建交易订单历史")
-    @PreAuthorize("@ss.hasPermission('his:trade-order:create')")
-    public CommonResult<Long> createTradeOrder(@Valid @RequestBody TradeOrderSaveReqVO createReqVO) {
-        return success(tradeOrderService.createTradeOrder(createReqVO));
-    }
-
-    @PutMapping("/update")
-    @Operation(summary = "更新交易订单历史")
-    @PreAuthorize("@ss.hasPermission('his:trade-order:update')")
-    public CommonResult<Boolean> updateTradeOrder(@Valid @RequestBody TradeOrderSaveReqVO updateReqVO) {
-        tradeOrderService.updateTradeOrder(updateReqVO);
-        return success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除交易订单历史")
-    @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('his:trade-order:delete')")
-    public CommonResult<Boolean> deleteTradeOrder(@RequestParam("id") Long id) {
-        tradeOrderService.deleteTradeOrder(id);
-        return success(true);
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "获得交易订单历史")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('his:trade-order:query')")
-    public CommonResult<TradeOrderRespVO> getTradeOrder(@RequestParam("id") Long id) {
-        HisTradeOrderDO tradeOrder = tradeOrderService.getTradeOrder(id);
-        return success(BeanUtils.toBean(tradeOrder, TradeOrderRespVO.class));
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "获得交易订单历史分页")
-    @PreAuthorize("@ss.hasPermission('his:trade-order:query')")
-    public CommonResult<PageResult<TradeOrderRespVO>> getTradeOrderPage(@Valid TradeOrderPageReqVO pageReqVO) {
-        PageResult<HisTradeOrderDO> pageResult = tradeOrderService.getTradeOrderPage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, TradeOrderRespVO.class));
-    }
-
-    @GetMapping("/export-excel")
-    @Operation(summary = "导出交易订单历史 Excel")
-    @PreAuthorize("@ss.hasPermission('his:trade-order:export')")
-    @ApiAccessLog(operateType = EXPORT)
-    public void exportTradeOrderExcel(@Valid TradeOrderPageReqVO pageReqVO,
-              HttpServletResponse response) throws IOException {
-        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<HisTradeOrderDO> list = tradeOrderService.getTradeOrderPage(pageReqVO).getList();
-        // 导出 Excel
-        ExcelUtils.write(response, "交易订单历史.xls", "数据", TradeOrderRespVO.class,
-                        BeanUtils.toBean(list, TradeOrderRespVO.class));
-    }
-
-}

module-his/module-his-biz/src/main/java/com/yc/ship/module/his/controller/admin/tradeordercountry/HisTradeOrderCountryController.java

@@ -35,20 +35,20 @@ import com.yc.ship.module.his.service.tradeordercountry.HisTradeOrderCountryServ
 public class HisTradeOrderCountryController {
 
     @Resource
-    private HisTradeOrderCountryService hisTradeOrderCountryService;
+    private HisTradeOrderCountryService tradeOrderCountryService;
 
     @PostMapping("/create")
     @Operation(summary = "创建订单关联国籍数据历史")
     @PreAuthorize("@ss.hasPermission('his:trade-order-country:create')")
     public CommonResult<Long> createTradeOrderCountry(@Valid @RequestBody TradeOrderCountrySaveReqVO createReqVO) {
-        return success(hisTradeOrderCountryService.createTradeOrderCountry(createReqVO));
+        return success(tradeOrderCountryService.createTradeOrderCountry(createReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新订单关联国籍数据历史")
     @PreAuthorize("@ss.hasPermission('his:trade-order-country:update')")
     public CommonResult<Boolean> updateTradeOrderCountry(@Valid @RequestBody TradeOrderCountrySaveReqVO updateReqVO) {
-        hisTradeOrderCountryService.updateTradeOrderCountry(updateReqVO);
+        tradeOrderCountryService.updateTradeOrderCountry(updateReqVO);
         return success(true);
     }
 
@@ -57,7 +57,7 @@ public class HisTradeOrderCountryController {
     @Parameter(name = "id", description = "编号", required = true)
     @PreAuthorize("@ss.hasPermission('his:trade-order-country:delete')")
     public CommonResult<Boolean> deleteTradeOrderCountry(@RequestParam("id") Long id) {
-        hisTradeOrderCountryService.deleteTradeOrderCountry(id);
+        tradeOrderCountryService.deleteTradeOrderCountry(id);
         return success(true);
     }
 
@@ -66,7 +66,7 @@ public class HisTradeOrderCountryController {
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
     @PreAuthorize("@ss.hasPermission('his:trade-order-country:query')")
     public CommonResult<TradeOrderCountryRespVO> getTradeOrderCountry(@RequestParam("id") Long id) {
-        HisTradeOrderCountryDO tradeOrderCountry = hisTradeOrderCountryService.getTradeOrderCountry(id);
+        HisTradeOrderCountryDO tradeOrderCountry = tradeOrderCountryService.getTradeOrderCountry(id);
         return success(BeanUtils.toBean(tradeOrderCountry, TradeOrderCountryRespVO.class));
     }
 
@@ -74,7 +74,7 @@ public class HisTradeOrderCountryController {
     @Operation(summary = "获得订单关联国籍数据历史分页")
     @PreAuthorize("@ss.hasPermission('his:trade-order-country:query')")
     public CommonResult<PageResult<TradeOrderCountryRespVO>> getTradeOrderCountryPage(@Valid TradeOrderCountryPageReqVO pageReqVO) {
-        PageResult<HisTradeOrderCountryDO> pageResult = hisTradeOrderCountryService.getTradeOrderCountryPage(pageReqVO);
+        PageResult<HisTradeOrderCountryDO> pageResult = tradeOrderCountryService.getTradeOrderCountryPage(pageReqVO);
         return success(BeanUtils.toBean(pageResult, TradeOrderCountryRespVO.class));
     }
 
@@ -85,7 +85,7 @@ public class HisTradeOrderCountryController {
     public void exportTradeOrderCountryExcel(@Valid TradeOrderCountryPageReqVO pageReqVO,
               HttpServletResponse response) throws IOException {
         pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<HisTradeOrderCountryDO> list = hisTradeOrderCountryService.getTradeOrderCountryPage(pageReqVO).getList();
+        List<HisTradeOrderCountryDO> list = tradeOrderCountryService.getTradeOrderCountryPage(pageReqVO).getList();
         // 导出 Excel
         ExcelUtils.write(response, "订单关联国籍数据历史.xls", "数据", TradeOrderCountryRespVO.class,
                         BeanUtils.toBean(list, TradeOrderCountryRespVO.class));

module-his/module-his-biz/src/main/java/com/yc/ship/module/his/controller/admin/tradeordercountry/TradeOrderCountryController.java

@@ -1,94 +0,0 @@
-package com.yc.ship.module.his.controller.admin.tradeordercountry;
-
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.security.access.prepost.PreAuthorize;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Operation;
-
-import javax.validation.*;
-import javax.servlet.http.*;
-import java.util.*;
-import java.io.IOException;
-
-import com.yc.ship.framework.common.pojo.PageParam;
-import com.yc.ship.framework.common.pojo.PageResult;
-import com.yc.ship.framework.common.pojo.CommonResult;
-import com.yc.ship.framework.common.util.object.BeanUtils;
-import static com.yc.ship.framework.common.pojo.CommonResult.success;
-
-import com.yc.ship.framework.excel.core.util.ExcelUtils;
-
-import com.yc.ship.framework.apilog.core.annotation.ApiAccessLog;
-import static com.yc.ship.framework.apilog.core.enums.OperateTypeEnum.*;
-
-import com.yc.ship.module.his.controller.admin.tradeordercountry.vo.*;
-import com.yc.ship.module.his.dal.dataobject.tradeordercountry.HisTradeOrderCountryDO;
-import com.yc.ship.module.his.service.tradeordercountry.HisTradeOrderCountryService;
-
-@Tag(name = "管理后台 - 订单关联国籍数据历史")
-@RestController
-@RequestMapping("/his/trade-order-country")
-@Validated
-public class TradeOrderCountryController {
-
-    @Resource
-    private HisTradeOrderCountryService tradeOrderCountryService;
-
-    @PostMapping("/create")
-    @Operation(summary = "创建订单关联国籍数据历史")
-    @PreAuthorize("@ss.hasPermission('his:trade-order-country:create')")
-    public CommonResult<Long> createTradeOrderCountry(@Valid @RequestBody TradeOrderCountrySaveReqVO createReqVO) {
-        return success(tradeOrderCountryService.createTradeOrderCountry(createReqVO));
-    }
-
-    @PutMapping("/update")
-    @Operation(summary = "更新订单关联国籍数据历史")
-    @PreAuthorize("@ss.hasPermission('his:trade-order-country:update')")
-    public CommonResult<Boolean> updateTradeOrderCountry(@Valid @RequestBody TradeOrderCountrySaveReqVO updateReqVO) {
-        tradeOrderCountryService.updateTradeOrderCountry(updateReqVO);
-        return success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除订单关联国籍数据历史")
-    @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('his:trade-order-country:delete')")
-    public CommonResult<Boolean> deleteTradeOrderCountry(@RequestParam("id") Long id) {
-        tradeOrderCountryService.deleteTradeOrderCountry(id);
-        return success(true);
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "获得订单关联国籍数据历史")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('his:trade-order-country:query')")
-    public CommonResult<TradeOrderCountryRespVO> getTradeOrderCountry(@RequestParam("id") Long id) {
-        HisTradeOrderCountryDO tradeOrderCountry = tradeOrderCountryService.getTradeOrderCountry(id);
-        return success(BeanUtils.toBean(tradeOrderCountry, TradeOrderCountryRespVO.class));
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "获得订单关联国籍数据历史分页")
-    @PreAuthorize("@ss.hasPermission('his:trade-order-country:query')")
-    public CommonResult<PageResult<TradeOrderCountryRespVO>> getTradeOrderCountryPage(@Valid TradeOrderCountryPageReqVO pageReqVO) {
-        PageResult<HisTradeOrderCountryDO> pageResult = tradeOrderCountryService.getTradeOrderCountryPage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, TradeOrderCountryRespVO.class));
-    }
-
-    @GetMapping("/export-excel")
-    @Operation(summary = "导出订单关联国籍数据历史 Excel")
-    @PreAuthorize("@ss.hasPermission('his:trade-order-country:export')")
-    @ApiAccessLog(operateType = EXPORT)
-    public void exportTradeOrderCountryExcel(@Valid TradeOrderCountryPageReqVO pageReqVO,
-              HttpServletResponse response) throws IOException {
-        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<HisTradeOrderCountryDO> list = tradeOrderCountryService.getTradeOrderCountryPage(pageReqVO).getList();
-        // 导出 Excel
-        ExcelUtils.write(response, "订单关联国籍数据历史.xls", "数据", TradeOrderCountryRespVO.class,
-                        BeanUtils.toBean(list, TradeOrderCountryRespVO.class));
-    }
-
-}

module-his/module-his-biz/src/main/java/com/yc/ship/module/his/controller/admin/tradeorderfloor/HisTradeOrderFloorController.java

@@ -35,20 +35,20 @@ import com.yc.ship.module.his.service.tradeorderfloor.HisTradeOrderFloorService;
 public class HisTradeOrderFloorController {
 
     @Resource
-    private HisTradeOrderFloorService hisTradeOrderFloorService;
+    private HisTradeOrderFloorService tradeOrderFloorService;
 
     @PostMapping("/create")
     @Operation(summary = "创建订单楼层历史")
     @PreAuthorize("@ss.hasPermission('his:trade-order-floor:create')")
     public CommonResult<Long> createTradeOrderFloor(@Valid @RequestBody TradeOrderFloorSaveReqVO createReqVO) {
-        return success(hisTradeOrderFloorService.createTradeOrderFloor(createReqVO));
+        return success(tradeOrderFloorService.createTradeOrderFloor(createReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新订单楼层历史")
     @PreAuthorize("@ss.hasPermission('his:trade-order-floor:update')")
     public CommonResult<Boolean> updateTradeOrderFloor(@Valid @RequestBody TradeOrderFloorSaveReqVO updateReqVO) {
-        hisTradeOrderFloorService.updateTradeOrderFloor(updateReqVO);
+        tradeOrderFloorService.updateTradeOrderFloor(updateReqVO);
         return success(true);
     }
 
@@ -57,7 +57,7 @@ public class HisTradeOrderFloorController {
     @Parameter(name = "id", description = "编号", required = true)
     @PreAuthorize("@ss.hasPermission('his:trade-order-floor:delete')")
     public CommonResult<Boolean> deleteTradeOrderFloor(@RequestParam("id") Long id) {
-        hisTradeOrderFloorService.deleteTradeOrderFloor(id);
+        tradeOrderFloorService.deleteTradeOrderFloor(id);
         return success(true);
     }
 
@@ -66,7 +66,7 @@ public class HisTradeOrderFloorController {
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
     @PreAuthorize("@ss.hasPermission('his:trade-order-floor:query')")
     public CommonResult<TradeOrderFloorRespVO> getTradeOrderFloor(@RequestParam("id") Long id) {
-        HisTradeOrderFloorDO tradeOrderFloor = hisTradeOrderFloorService.getTradeOrderFloor(id);
+        HisTradeOrderFloorDO tradeOrderFloor = tradeOrderFloorService.getTradeOrderFloor(id);
         return success(BeanUtils.toBean(tradeOrderFloor, TradeOrderFloorRespVO.class));
     }
 
@@ -74,7 +74,7 @@ public class HisTradeOrderFloorController {
     @Operation(summary = "获得订单楼层历史分页")
     @PreAuthorize("@ss.hasPermission('his:trade-order-floor:query')")
     public CommonResult<PageResult<TradeOrderFloorRespVO>> getTradeOrderFloorPage(@Valid TradeOrderFloorPageReqVO pageReqVO) {
-        PageResult<HisTradeOrderFloorDO> pageResult = hisTradeOrderFloorService.getTradeOrderFloorPage(pageReqVO);
+        PageResult<HisTradeOrderFloorDO> pageResult = tradeOrderFloorService.getTradeOrderFloorPage(pageReqVO);
         return success(BeanUtils.toBean(pageResult, TradeOrderFloorRespVO.class));
     }
 
@@ -85,7 +85,7 @@ public class HisTradeOrderFloorController {
     public void exportTradeOrderFloorExcel(@Valid TradeOrderFloorPageReqVO pageReqVO,
               HttpServletResponse response) throws IOException {
         pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<HisTradeOrderFloorDO> list = hisTradeOrderFloorService.getTradeOrderFloorPage(pageReqVO).getList();
+        List<HisTradeOrderFloorDO> list = tradeOrderFloorService.getTradeOrderFloorPage(pageReqVO).getList();
         // 导出 Excel
         ExcelUtils.write(response, "订单楼层历史.xls", "数据", TradeOrderFloorRespVO.class,
                         BeanUtils.toBean(list, TradeOrderFloorRespVO.class));

module-his/module-his-biz/src/main/java/com/yc/ship/module/his/controller/admin/tradeorderfloor/TradeOrderFloorController.java

@@ -1,94 +0,0 @@
-package com.yc.ship.module.his.controller.admin.tradeorderfloor;
-
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.security.access.prepost.PreAuthorize;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Operation;
-
-import javax.validation.*;
-import javax.servlet.http.*;
-import java.util.*;
-import java.io.IOException;
-
-import com.yc.ship.framework.common.pojo.PageParam;
-import com.yc.ship.framework.common.pojo.PageResult;
-import com.yc.ship.framework.common.pojo.CommonResult;
-import com.yc.ship.framework.common.util.object.BeanUtils;
-import static com.yc.ship.framework.common.pojo.CommonResult.success;
-
-import com.yc.ship.framework.excel.core.util.ExcelUtils;
-
-import com.yc.ship.framework.apilog.core.annotation.ApiAccessLog;
-import static com.yc.ship.framework.apilog.core.enums.OperateTypeEnum.*;
-
-import com.yc.ship.module.his.controller.admin.tradeorderfloor.vo.*;
-import com.yc.ship.module.his.dal.dataobject.tradeorderfloor.HisTradeOrderFloorDO;
-import com.yc.ship.module.his.service.tradeorderfloor.HisTradeOrderFloorService;
-
-@Tag(name = "管理后台 - 订单楼层历史")
-@RestController
-@RequestMapping("/his/trade-order-floor")
-@Validated
-public class TradeOrderFloorController {
-
-    @Resource
-    private HisTradeOrderFloorService tradeOrderFloorService;
-
-    @PostMapping("/create")
-    @Operation(summary = "创建订单楼层历史")
-    @PreAuthorize("@ss.hasPermission('his:trade-order-floor:create')")
-    public CommonResult<Long> createTradeOrderFloor(@Valid @RequestBody TradeOrderFloorSaveReqVO createReqVO) {
-        return success(tradeOrderFloorService.createTradeOrderFloor(createReqVO));
-    }
-
-    @PutMapping("/update")
-    @Operation(summary = "更新订单楼层历史")
-    @PreAuthorize("@ss.hasPermission('his:trade-order-floor:update')")
-    public CommonResult<Boolean> updateTradeOrderFloor(@Valid @RequestBody TradeOrderFloorSaveReqVO updateReqVO) {
-        tradeOrderFloorService.updateTradeOrderFloor(updateReqVO);
-        return success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除订单楼层历史")
-    @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('his:trade-order-floor:delete')")
-    public CommonResult<Boolean> deleteTradeOrderFloor(@RequestParam("id") Long id) {
-        tradeOrderFloorService.deleteTradeOrderFloor(id);
-        return success(true);
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "获得订单楼层历史")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('his:trade-order-floor:query')")
-    public CommonResult<TradeOrderFloorRespVO> getTradeOrderFloor(@RequestParam("id") Long id) {
-        HisTradeOrderFloorDO tradeOrderFloor = tradeOrderFloorService.getTradeOrderFloor(id);
-        return success(BeanUtils.toBean(tradeOrderFloor, TradeOrderFloorRespVO.class));
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "获得订单楼层历史分页")
-    @PreAuthorize("@ss.hasPermission('his:trade-order-floor:query')")
-    public CommonResult<PageResult<TradeOrderFloorRespVO>> getTradeOrderFloorPage(@Valid TradeOrderFloorPageReqVO pageReqVO) {
-        PageResult<HisTradeOrderFloorDO> pageResult = tradeOrderFloorService.getTradeOrderFloorPage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, TradeOrderFloorRespVO.class));
-    }
-
-    @GetMapping("/export-excel")
-    @Operation(summary = "导出订单楼层历史 Excel")
-    @PreAuthorize("@ss.hasPermission('his:trade-order-floor:export')")
-    @ApiAccessLog(operateType = EXPORT)
-    public void exportTradeOrderFloorExcel(@Valid TradeOrderFloorPageReqVO pageReqVO,
-              HttpServletResponse response) throws IOException {
-        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<HisTradeOrderFloorDO> list = tradeOrderFloorService.getTradeOrderFloorPage(pageReqVO).getList();
-        // 导出 Excel
-        ExcelUtils.write(response, "订单楼层历史.xls", "数据", TradeOrderFloorRespVO.class,
-                        BeanUtils.toBean(list, TradeOrderFloorRespVO.class));
-    }
-
-}

module-his/module-his-biz/src/main/java/com/yc/ship/module/his/controller/admin/tradeorderroommodel/HisTradeOrderRoomModelController.java

@@ -35,20 +35,20 @@ import com.yc.ship.module.his.service.tradeorderroommodel.HisTradeOrderRoomModel
 public class HisTradeOrderRoomModelController {
 
     @Resource
-    private HisTradeOrderRoomModelService hisTradeOrderRoomModelService;
+    private HisTradeOrderRoomModelService tradeOrderRoomModelService;
 
     @PostMapping("/create")
     @Operation(summary = "创建订单关联房型数据历史")
     @PreAuthorize("@ss.hasPermission('his:trade-order-room-model:create')")
     public CommonResult<Long> createTradeOrderRoomModel(@Valid @RequestBody TradeOrderRoomModelSaveReqVO createReqVO) {
-        return success(hisTradeOrderRoomModelService.createTradeOrderRoomModel(createReqVO));
+        return success(tradeOrderRoomModelService.createTradeOrderRoomModel(createReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新订单关联房型数据历史")
     @PreAuthorize("@ss.hasPermission('his:trade-order-room-model:update')")
     public CommonResult<Boolean> updateTradeOrderRoomModel(@Valid @RequestBody TradeOrderRoomModelSaveReqVO updateReqVO) {
-        hisTradeOrderRoomModelService.updateTradeOrderRoomModel(updateReqVO);
+        tradeOrderRoomModelService.updateTradeOrderRoomModel(updateReqVO);
         return success(true);
     }
 
@@ -57,7 +57,7 @@ public class HisTradeOrderRoomModelController {
     @Parameter(name = "id", description = "编号", required = true)
     @PreAuthorize("@ss.hasPermission('his:trade-order-room-model:delete')")
     public CommonResult<Boolean> deleteTradeOrderRoomModel(@RequestParam("id") Long id) {
-        hisTradeOrderRoomModelService.deleteTradeOrderRoomModel(id);
+        tradeOrderRoomModelService.deleteTradeOrderRoomModel(id);
         return success(true);
     }
 
@@ -66,7 +66,7 @@ public class HisTradeOrderRoomModelController {
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
     @PreAuthorize("@ss.hasPermission('his:trade-order-room-model:query')")
     public CommonResult<TradeOrderRoomModelRespVO> getTradeOrderRoomModel(@RequestParam("id") Long id) {
-        HisTradeOrderRoomModelDO tradeOrderRoomModel = hisTradeOrderRoomModelService.getTradeOrderRoomModel(id);
+        HisTradeOrderRoomModelDO tradeOrderRoomModel = tradeOrderRoomModelService.getTradeOrderRoomModel(id);
         return success(BeanUtils.toBean(tradeOrderRoomModel, TradeOrderRoomModelRespVO.class));
     }
 
@@ -74,7 +74,7 @@ public class HisTradeOrderRoomModelController {
     @Operation(summary = "获得订单关联房型数据历史分页")
     @PreAuthorize("@ss.hasPermission('his:trade-order-room-model:query')")
     public CommonResult<PageResult<TradeOrderRoomModelRespVO>> getTradeOrderRoomModelPage(@Valid TradeOrderRoomModelPageReqVO pageReqVO) {
-        PageResult<HisTradeOrderRoomModelDO> pageResult = hisTradeOrderRoomModelService.getTradeOrderRoomModelPage(pageReqVO);
+        PageResult<HisTradeOrderRoomModelDO> pageResult = tradeOrderRoomModelService.getTradeOrderRoomModelPage(pageReqVO);
         return success(BeanUtils.toBean(pageResult, TradeOrderRoomModelRespVO.class));
     }
 
@@ -85,7 +85,7 @@ public class HisTradeOrderRoomModelController {
     public void exportTradeOrderRoomModelExcel(@Valid TradeOrderRoomModelPageReqVO pageReqVO,
               HttpServletResponse response) throws IOException {
         pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<HisTradeOrderRoomModelDO> list = hisTradeOrderRoomModelService.getTradeOrderRoomModelPage(pageReqVO).getList();
+        List<HisTradeOrderRoomModelDO> list = tradeOrderRoomModelService.getTradeOrderRoomModelPage(pageReqVO).getList();
         // 导出 Excel
         ExcelUtils.write(response, "订单关联房型数据历史.xls", "数据", TradeOrderRoomModelRespVO.class,
                         BeanUtils.toBean(list, TradeOrderRoomModelRespVO.class));

module-his/module-his-biz/src/main/java/com/yc/ship/module/his/controller/admin/tradeorderroommodel/TradeOrderRoomModelController.java

@@ -1,94 +0,0 @@
-package com.yc.ship.module.his.controller.admin.tradeorderroommodel;
-
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.security.access.prepost.PreAuthorize;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Operation;
-
-import javax.validation.*;
-import javax.servlet.http.*;
-import java.util.*;
-import java.io.IOException;
-
-import com.yc.ship.framework.common.pojo.PageParam;
-import com.yc.ship.framework.common.pojo.PageResult;
-import com.yc.ship.framework.common.pojo.CommonResult;
-import com.yc.ship.framework.common.util.object.BeanUtils;
-import static com.yc.ship.framework.common.pojo.CommonResult.success;
-
-import com.yc.ship.framework.excel.core.util.ExcelUtils;
-
-import com.yc.ship.framework.apilog.core.annotation.ApiAccessLog;
-import static com.yc.ship.framework.apilog.core.enums.OperateTypeEnum.*;
-
-import com.yc.ship.module.his.controller.admin.tradeorderroommodel.vo.*;
-import com.yc.ship.module.his.dal.dataobject.tradeorderroommodel.HisTradeOrderRoomModelDO;
-import com.yc.ship.module.his.service.tradeorderroommodel.HisTradeOrderRoomModelService;
-
-@Tag(name = "管理后台 - 订单关联房型数据历史")
-@RestController
-@RequestMapping("/his/trade-order-room-model")
-@Validated
-public class TradeOrderRoomModelController {
-
-    @Resource
-    private HisTradeOrderRoomModelService tradeOrderRoomModelService;
-
-    @PostMapping("/create")
-    @Operation(summary = "创建订单关联房型数据历史")
-    @PreAuthorize("@ss.hasPermission('his:trade-order-room-model:create')")
-    public CommonResult<Long> createTradeOrderRoomModel(@Valid @RequestBody TradeOrderRoomModelSaveReqVO createReqVO) {
-        return success(tradeOrderRoomModelService.createTradeOrderRoomModel(createReqVO));
-    }
-
-    @PutMapping("/update")
-    @Operation(summary = "更新订单关联房型数据历史")
-    @PreAuthorize("@ss.hasPermission('his:trade-order-room-model:update')")
-    public CommonResult<Boolean> updateTradeOrderRoomModel(@Valid @RequestBody TradeOrderRoomModelSaveReqVO updateReqVO) {
-        tradeOrderRoomModelService.updateTradeOrderRoomModel(updateReqVO);
-        return success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除订单关联房型数据历史")
-    @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('his:trade-order-room-model:delete')")
-    public CommonResult<Boolean> deleteTradeOrderRoomModel(@RequestParam("id") Long id) {
-        tradeOrderRoomModelService.deleteTradeOrderRoomModel(id);
-        return success(true);
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "获得订单关联房型数据历史")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('his:trade-order-room-model:query')")
-    public CommonResult<TradeOrderRoomModelRespVO> getTradeOrderRoomModel(@RequestParam("id") Long id) {
-        HisTradeOrderRoomModelDO tradeOrderRoomModel = tradeOrderRoomModelService.getTradeOrderRoomModel(id);
-        return success(BeanUtils.toBean(tradeOrderRoomModel, TradeOrderRoomModelRespVO.class));
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "获得订单关联房型数据历史分页")
-    @PreAuthorize("@ss.hasPermission('his:trade-order-room-model:query')")
-    public CommonResult<PageResult<TradeOrderRoomModelRespVO>> getTradeOrderRoomModelPage(@Valid TradeOrderRoomModelPageReqVO pageReqVO) {
-        PageResult<HisTradeOrderRoomModelDO> pageResult = tradeOrderRoomModelService.getTradeOrderRoomModelPage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, TradeOrderRoomModelRespVO.class));
-    }
-
-    @GetMapping("/export-excel")
-    @Operation(summary = "导出订单关联房型数据历史 Excel")
-    @PreAuthorize("@ss.hasPermission('his:trade-order-room-model:export')")
-    @ApiAccessLog(operateType = EXPORT)
-    public void exportTradeOrderRoomModelExcel(@Valid TradeOrderRoomModelPageReqVO pageReqVO,
-              HttpServletResponse response) throws IOException {
-        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<HisTradeOrderRoomModelDO> list = tradeOrderRoomModelService.getTradeOrderRoomModelPage(pageReqVO).getList();
-        // 导出 Excel
-        ExcelUtils.write(response, "订单关联房型数据历史.xls", "数据", TradeOrderRoomModelRespVO.class,
-                        BeanUtils.toBean(list, TradeOrderRoomModelRespVO.class));
-    }
-
-}

module-his/module-his-biz/src/main/java/com/yc/ship/module/his/controller/admin/tradeordertotal/HisTradeOrderTotalController.java

@@ -35,20 +35,20 @@ import com.yc.ship.module.his.service.tradeordertotal.HisTradeOrderTotalService;
 public class HisTradeOrderTotalController {
 
     @Resource
-    private HisTradeOrderTotalService hisTradeOrderTotalService;
+    private HisTradeOrderTotalService tradeOrderTotalService;
 
     @PostMapping("/create")
     @Operation(summary = "创建订单汇总表历史")
     @PreAuthorize("@ss.hasPermission('his:trade-order-total:create')")
     public CommonResult<Long> createTradeOrderTotal(@Valid @RequestBody TradeOrderTotalSaveReqVO createReqVO) {
-        return success(hisTradeOrderTotalService.createTradeOrderTotal(createReqVO));
+        return success(tradeOrderTotalService.createTradeOrderTotal(createReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新订单汇总表历史")
     @PreAuthorize("@ss.hasPermission('his:trade-order-total:update')")
     public CommonResult<Boolean> updateTradeOrderTotal(@Valid @RequestBody TradeOrderTotalSaveReqVO updateReqVO) {
-        hisTradeOrderTotalService.updateTradeOrderTotal(updateReqVO);
+        tradeOrderTotalService.updateTradeOrderTotal(updateReqVO);
         return success(true);
     }
 
@@ -57,7 +57,7 @@ public class HisTradeOrderTotalController {
     @Parameter(name = "id", description = "编号", required = true)
     @PreAuthorize("@ss.hasPermission('his:trade-order-total:delete')")
     public CommonResult<Boolean> deleteTradeOrderTotal(@RequestParam("id") Long id) {
-        hisTradeOrderTotalService.deleteTradeOrderTotal(id);
+        tradeOrderTotalService.deleteTradeOrderTotal(id);
         return success(true);
     }
 
@@ -66,7 +66,7 @@ public class HisTradeOrderTotalController {
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
     @PreAuthorize("@ss.hasPermission('his:trade-order-total:query')")
     public CommonResult<TradeOrderTotalRespVO> getTradeOrderTotal(@RequestParam("id") Long id) {
-        HisTradeOrderTotalDO tradeOrderTotal = hisTradeOrderTotalService.getTradeOrderTotal(id);
+        HisTradeOrderTotalDO tradeOrderTotal = tradeOrderTotalService.getTradeOrderTotal(id);
         return success(BeanUtils.toBean(tradeOrderTotal, TradeOrderTotalRespVO.class));
     }
 
@@ -74,7 +74,7 @@ public class HisTradeOrderTotalController {
     @Operation(summary = "获得订单汇总表历史分页")
     @PreAuthorize("@ss.hasPermission('his:trade-order-total:query')")
     public CommonResult<PageResult<TradeOrderTotalRespVO>> getTradeOrderTotalPage(@Valid TradeOrderTotalPageReqVO pageReqVO) {
-        PageResult<HisTradeOrderTotalDO> pageResult = hisTradeOrderTotalService.getTradeOrderTotalPage(pageReqVO);
+        PageResult<HisTradeOrderTotalDO> pageResult = tradeOrderTotalService.getTradeOrderTotalPage(pageReqVO);
         return success(BeanUtils.toBean(pageResult, TradeOrderTotalRespVO.class));
     }
 
@@ -85,7 +85,7 @@ public class HisTradeOrderTotalController {
     public void exportTradeOrderTotalExcel(@Valid TradeOrderTotalPageReqVO pageReqVO,
               HttpServletResponse response) throws IOException {
         pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<HisTradeOrderTotalDO> list = hisTradeOrderTotalService.getTradeOrderTotalPage(pageReqVO).getList();
+        List<HisTradeOrderTotalDO> list = tradeOrderTotalService.getTradeOrderTotalPage(pageReqVO).getList();
         // 导出 Excel
         ExcelUtils.write(response, "订单汇总表历史.xls", "数据", TradeOrderTotalRespVO.class,
                         BeanUtils.toBean(list, TradeOrderTotalRespVO.class));

module-his/module-his-biz/src/main/java/com/yc/ship/module/his/controller/admin/tradeordertotal/TradeOrderTotalController.java

@@ -1,94 +0,0 @@
-package com.yc.ship.module.his.controller.admin.tradeordertotal;
-
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.security.access.prepost.PreAuthorize;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Operation;
-
-import javax.validation.*;
-import javax.servlet.http.*;
-import java.util.*;
-import java.io.IOException;
-
-import com.yc.ship.framework.common.pojo.PageParam;
-import com.yc.ship.framework.common.pojo.PageResult;
-import com.yc.ship.framework.common.pojo.CommonResult;
-import com.yc.ship.framework.common.util.object.BeanUtils;
-import static com.yc.ship.framework.common.pojo.CommonResult.success;
-
-import com.yc.ship.framework.excel.core.util.ExcelUtils;
-
-import com.yc.ship.framework.apilog.core.annotation.ApiAccessLog;
-import static com.yc.ship.framework.apilog.core.enums.OperateTypeEnum.*;
-
-import com.yc.ship.module.his.controller.admin.tradeordertotal.vo.*;
-import com.yc.ship.module.his.dal.dataobject.tradeordertotal.HisTradeOrderTotalDO;
-import com.yc.ship.module.his.service.tradeordertotal.HisTradeOrderTotalService;
-
-@Tag(name = "管理后台 - 订单汇总表历史")
-@RestController
-@RequestMapping("/his/trade-order-total")
-@Validated
-public class TradeOrderTotalController {
-
-    @Resource
-    private HisTradeOrderTotalService tradeOrderTotalService;
-
-    @PostMapping("/create")
-    @Operation(summary = "创建订单汇总表历史")
-    @PreAuthorize("@ss.hasPermission('his:trade-order-total:create')")
-    public CommonResult<Long> createTradeOrderTotal(@Valid @RequestBody TradeOrderTotalSaveReqVO createReqVO) {
-        return success(tradeOrderTotalService.createTradeOrderTotal(createReqVO));
-    }
-
-    @PutMapping("/update")
-    @Operation(summary = "更新订单汇总表历史")
-    @PreAuthorize("@ss.hasPermission('his:trade-order-total:update')")
-    public CommonResult<Boolean> updateTradeOrderTotal(@Valid @RequestBody TradeOrderTotalSaveReqVO updateReqVO) {
-        tradeOrderTotalService.updateTradeOrderTotal(updateReqVO);
-        return success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除订单汇总表历史")
-    @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('his:trade-order-total:delete')")
-    public CommonResult<Boolean> deleteTradeOrderTotal(@RequestParam("id") Long id) {
-        tradeOrderTotalService.deleteTradeOrderTotal(id);
-        return success(true);
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "获得订单汇总表历史")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('his:trade-order-total:query')")
-    public CommonResult<TradeOrderTotalRespVO> getTradeOrderTotal(@RequestParam("id") Long id) {
-        HisTradeOrderTotalDO tradeOrderTotal = tradeOrderTotalService.getTradeOrderTotal(id);
-        return success(BeanUtils.toBean(tradeOrderTotal, TradeOrderTotalRespVO.class));
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "获得订单汇总表历史分页")
-    @PreAuthorize("@ss.hasPermission('his:trade-order-total:query')")
-    public CommonResult<PageResult<TradeOrderTotalRespVO>> getTradeOrderTotalPage(@Valid TradeOrderTotalPageReqVO pageReqVO) {
-        PageResult<HisTradeOrderTotalDO> pageResult = tradeOrderTotalService.getTradeOrderTotalPage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, TradeOrderTotalRespVO.class));
-    }
-
-    @GetMapping("/export-excel")
-    @Operation(summary = "导出订单汇总表历史 Excel")
-    @PreAuthorize("@ss.hasPermission('his:trade-order-total:export')")
-    @ApiAccessLog(operateType = EXPORT)
-    public void exportTradeOrderTotalExcel(@Valid TradeOrderTotalPageReqVO pageReqVO,
-              HttpServletResponse response) throws IOException {
-        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<HisTradeOrderTotalDO> list = tradeOrderTotalService.getTradeOrderTotalPage(pageReqVO).getList();
-        // 导出 Excel
-        ExcelUtils.write(response, "订单汇总表历史.xls", "数据", TradeOrderTotalRespVO.class,
-                        BeanUtils.toBean(list, TradeOrderTotalRespVO.class));
-    }
-
-}

module-his/module-his-biz/src/main/java/com/yc/ship/module/his/controller/admin/tradeorderuser/HisTradeOrderUserController.java

@@ -35,19 +35,20 @@ import com.yc.ship.module.his.service.tradeorderuser.HisTradeOrderUserService;
 public class HisTradeOrderUserController {
 
     @Resource
-    private HisTradeOrderUserService hisTradeOrderUserService;
+    private HisTradeOrderUserService tradeOrderUserService;
+
     @PostMapping("/create")
     @Operation(summary = "创建订单联系人历史")
     @PreAuthorize("@ss.hasPermission('his:trade-order-user:create')")
     public CommonResult<Long> createTradeOrderUser(@Valid @RequestBody TradeOrderUserSaveReqVO createReqVO) {
-        return success(hisTradeOrderUserService.createTradeOrderUser(createReqVO));
+        return success(tradeOrderUserService.createTradeOrderUser(createReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新订单联系人历史")
     @PreAuthorize("@ss.hasPermission('his:trade-order-user:update')")
     public CommonResult<Boolean> updateTradeOrderUser(@Valid @RequestBody TradeOrderUserSaveReqVO updateReqVO) {
-        hisTradeOrderUserService.updateTradeOrderUser(updateReqVO);
+        tradeOrderUserService.updateTradeOrderUser(updateReqVO);
         return success(true);
     }
 
@@ -56,7 +57,7 @@ public class HisTradeOrderUserController {
     @Parameter(name = "id", description = "编号", required = true)
     @PreAuthorize("@ss.hasPermission('his:trade-order-user:delete')")
     public CommonResult<Boolean> deleteTradeOrderUser(@RequestParam("id") Long id) {
-        hisTradeOrderUserService.deleteTradeOrderUser(id);
+        tradeOrderUserService.deleteTradeOrderUser(id);
         return success(true);
     }
 
@@ -65,7 +66,7 @@ public class HisTradeOrderUserController {
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
     @PreAuthorize("@ss.hasPermission('his:trade-order-user:query')")
     public CommonResult<TradeOrderUserRespVO> getTradeOrderUser(@RequestParam("id") Long id) {
-        HisTradeOrderUserDO tradeOrderUser = hisTradeOrderUserService.getTradeOrderUser(id);
+        HisTradeOrderUserDO tradeOrderUser = tradeOrderUserService.getTradeOrderUser(id);
         return success(BeanUtils.toBean(tradeOrderUser, TradeOrderUserRespVO.class));
     }
 
@@ -73,7 +74,7 @@ public class HisTradeOrderUserController {
     @Operation(summary = "获得订单联系人历史分页")
     @PreAuthorize("@ss.hasPermission('his:trade-order-user:query')")
     public CommonResult<PageResult<TradeOrderUserRespVO>> getTradeOrderUserPage(@Valid TradeOrderUserPageReqVO pageReqVO) {
-        PageResult<HisTradeOrderUserDO> pageResult = hisTradeOrderUserService.getTradeOrderUserPage(pageReqVO);
+        PageResult<HisTradeOrderUserDO> pageResult = tradeOrderUserService.getTradeOrderUserPage(pageReqVO);
         return success(BeanUtils.toBean(pageResult, TradeOrderUserRespVO.class));
     }
 
@@ -84,7 +85,7 @@ public class HisTradeOrderUserController {
     public void exportTradeOrderUserExcel(@Valid TradeOrderUserPageReqVO pageReqVO,
               HttpServletResponse response) throws IOException {
         pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<HisTradeOrderUserDO> list = hisTradeOrderUserService.getTradeOrderUserPage(pageReqVO).getList();
+        List<HisTradeOrderUserDO> list = tradeOrderUserService.getTradeOrderUserPage(pageReqVO).getList();
         // 导出 Excel
         ExcelUtils.write(response, "订单联系人历史.xls", "数据", TradeOrderUserRespVO.class,
                         BeanUtils.toBean(list, TradeOrderUserRespVO.class));

module-his/module-his-biz/src/main/java/com/yc/ship/module/his/controller/admin/tradeorderuser/TradeOrderUserController.java

@@ -1,94 +0,0 @@
-package com.yc.ship.module.his.controller.admin.tradeorderuser;
-
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.security.access.prepost.PreAuthorize;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Operation;
-
-import javax.validation.*;
-import javax.servlet.http.*;
-import java.util.*;
-import java.io.IOException;
-
-import com.yc.ship.framework.common.pojo.PageParam;
-import com.yc.ship.framework.common.pojo.PageResult;
-import com.yc.ship.framework.common.pojo.CommonResult;
-import com.yc.ship.framework.common.util.object.BeanUtils;
-import static com.yc.ship.framework.common.pojo.CommonResult.success;
-
-import com.yc.ship.framework.excel.core.util.ExcelUtils;
-
-import com.yc.ship.framework.apilog.core.annotation.ApiAccessLog;
-import static com.yc.ship.framework.apilog.core.enums.OperateTypeEnum.*;
-
-import com.yc.ship.module.his.controller.admin.tradeorderuser.vo.*;
-import com.yc.ship.module.his.dal.dataobject.tradeorderuser.HisTradeOrderUserDO;
-import com.yc.ship.module.his.service.tradeorderuser.HisTradeOrderUserService;
-
-@Tag(name = "管理后台 - 订单联系人历史")
-@RestController
-@RequestMapping("/his/trade-order-user")
-@Validated
-public class TradeOrderUserController {
-
-    @Resource
-    private HisTradeOrderUserService tradeOrderUserService;
-
-    @PostMapping("/create")
-    @Operation(summary = "创建订单联系人历史")
-    @PreAuthorize("@ss.hasPermission('his:trade-order-user:create')")
-    public CommonResult<Long> createTradeOrderUser(@Valid @RequestBody TradeOrderUserSaveReqVO createReqVO) {
-        return success(tradeOrderUserService.createTradeOrderUser(createReqVO));
-    }
-
-    @PutMapping("/update")
-    @Operation(summary = "更新订单联系人历史")
-    @PreAuthorize("@ss.hasPermission('his:trade-order-user:update')")
-    public CommonResult<Boolean> updateTradeOrderUser(@Valid @RequestBody TradeOrderUserSaveReqVO updateReqVO) {
-        tradeOrderUserService.updateTradeOrderUser(updateReqVO);
-        return success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除订单联系人历史")
-    @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('his:trade-order-user:delete')")
-    public CommonResult<Boolean> deleteTradeOrderUser(@RequestParam("id") Long id) {
-        tradeOrderUserService.deleteTradeOrderUser(id);
-        return success(true);
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "获得订单联系人历史")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('his:trade-order-user:query')")
-    public CommonResult<TradeOrderUserRespVO> getTradeOrderUser(@RequestParam("id") Long id) {
-        HisTradeOrderUserDO tradeOrderUser = tradeOrderUserService.getTradeOrderUser(id);
-        return success(BeanUtils.toBean(tradeOrderUser, TradeOrderUserRespVO.class));
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "获得订单联系人历史分页")
-    @PreAuthorize("@ss.hasPermission('his:trade-order-user:query')")
-    public CommonResult<PageResult<TradeOrderUserRespVO>> getTradeOrderUserPage(@Valid TradeOrderUserPageReqVO pageReqVO) {
-        PageResult<HisTradeOrderUserDO> pageResult = tradeOrderUserService.getTradeOrderUserPage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, TradeOrderUserRespVO.class));
-    }
-
-    @GetMapping("/export-excel")
-    @Operation(summary = "导出订单联系人历史 Excel")
-    @PreAuthorize("@ss.hasPermission('his:trade-order-user:export')")
-    @ApiAccessLog(operateType = EXPORT)
-    public void exportTradeOrderUserExcel(@Valid TradeOrderUserPageReqVO pageReqVO,
-              HttpServletResponse response) throws IOException {
-        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<HisTradeOrderUserDO> list = tradeOrderUserService.getTradeOrderUserPage(pageReqVO).getList();
-        // 导出 Excel
-        ExcelUtils.write(response, "订单联系人历史.xls", "数据", TradeOrderUserRespVO.class,
-                        BeanUtils.toBean(list, TradeOrderUserRespVO.class));
-    }
-
-}

module-his/module-his-biz/src/main/java/com/yc/ship/module/his/controller/admin/tradevisitor/HisTradeVisitorController.java

@@ -35,20 +35,20 @@ import com.yc.ship.module.his.service.tradevisitor.HisTradeVisitorService;
 public class HisTradeVisitorController {
 
     @Resource
-    private HisTradeVisitorService hisTradeVisitorService;
+    private HisTradeVisitorService tradeVisitorService;
 
     @PostMapping("/create")
     @Operation(summary = "创建游客历史")
     @PreAuthorize("@ss.hasPermission('his:trade-visitor:create')")
     public CommonResult<Long> createTradeVisitor(@Valid @RequestBody TradeVisitorSaveReqVO createReqVO) {
-        return success(hisTradeVisitorService.createTradeVisitor(createReqVO));
+        return success(tradeVisitorService.createTradeVisitor(createReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新游客历史")
     @PreAuthorize("@ss.hasPermission('his:trade-visitor:update')")
     public CommonResult<Boolean> updateTradeVisitor(@Valid @RequestBody TradeVisitorSaveReqVO updateReqVO) {
-        hisTradeVisitorService.updateTradeVisitor(updateReqVO);
+        tradeVisitorService.updateTradeVisitor(updateReqVO);
         return success(true);
     }
 
@@ -57,7 +57,7 @@ public class HisTradeVisitorController {
     @Parameter(name = "id", description = "编号", required = true)
     @PreAuthorize("@ss.hasPermission('his:trade-visitor:delete')")
     public CommonResult<Boolean> deleteTradeVisitor(@RequestParam("id") Long id) {
-        hisTradeVisitorService.deleteTradeVisitor(id);
+        tradeVisitorService.deleteTradeVisitor(id);
         return success(true);
     }
 
@@ -66,7 +66,7 @@ public class HisTradeVisitorController {
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
     @PreAuthorize("@ss.hasPermission('his:trade-visitor:query')")
     public CommonResult<TradeVisitorRespVO> getTradeVisitor(@RequestParam("id") Long id) {
-        HisTradeVisitorDO tradeVisitor = hisTradeVisitorService.getTradeVisitor(id);
+        HisTradeVisitorDO tradeVisitor = tradeVisitorService.getTradeVisitor(id);
         return success(BeanUtils.toBean(tradeVisitor, TradeVisitorRespVO.class));
     }
 
@@ -74,7 +74,7 @@ public class HisTradeVisitorController {
     @Operation(summary = "获得游客历史分页")
     @PreAuthorize("@ss.hasPermission('his:trade-visitor:query')")
     public CommonResult<PageResult<TradeVisitorRespVO>> getTradeVisitorPage(@Valid TradeVisitorPageReqVO pageReqVO) {
-        PageResult<HisTradeVisitorDO> pageResult = hisTradeVisitorService.getTradeVisitorPage(pageReqVO);
+        PageResult<HisTradeVisitorDO> pageResult = tradeVisitorService.getTradeVisitorPage(pageReqVO);
         return success(BeanUtils.toBean(pageResult, TradeVisitorRespVO.class));
     }
 
@@ -85,7 +85,7 @@ public class HisTradeVisitorController {
     public void exportTradeVisitorExcel(@Valid TradeVisitorPageReqVO pageReqVO,
               HttpServletResponse response) throws IOException {
         pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<HisTradeVisitorDO> list = hisTradeVisitorService.getTradeVisitorPage(pageReqVO).getList();
+        List<HisTradeVisitorDO> list = tradeVisitorService.getTradeVisitorPage(pageReqVO).getList();
         // 导出 Excel
         ExcelUtils.write(response, "游客历史.xls", "数据", TradeVisitorRespVO.class,
                         BeanUtils.toBean(list, TradeVisitorRespVO.class));

module-his/module-his-biz/src/main/java/com/yc/ship/module/his/controller/admin/tradevisitor/TradeVisitorController.java

@@ -1,94 +0,0 @@
-package com.yc.ship.module.his.controller.admin.tradevisitor;
-
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.security.access.prepost.PreAuthorize;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Operation;
-
-import javax.validation.*;
-import javax.servlet.http.*;
-import java.util.*;
-import java.io.IOException;
-
-import com.yc.ship.framework.common.pojo.PageParam;
-import com.yc.ship.framework.common.pojo.PageResult;
-import com.yc.ship.framework.common.pojo.CommonResult;
-import com.yc.ship.framework.common.util.object.BeanUtils;
-import static com.yc.ship.framework.common.pojo.CommonResult.success;
-
-import com.yc.ship.framework.excel.core.util.ExcelUtils;
-
-import com.yc.ship.framework.apilog.core.annotation.ApiAccessLog;
-import static com.yc.ship.framework.apilog.core.enums.OperateTypeEnum.*;
-
-import com.yc.ship.module.his.controller.admin.tradevisitor.vo.*;
-import com.yc.ship.module.his.dal.dataobject.tradevisitor.HisTradeVisitorDO;
-import com.yc.ship.module.his.service.tradevisitor.HisTradeVisitorService;
-
-@Tag(name = "管理后台 - 游客历史")
-@RestController
-@RequestMapping("/his/trade-visitor")
-@Validated
-public class TradeVisitorController {
-
-    @Resource
-    private HisTradeVisitorService tradeVisitorService;
-
-    @PostMapping("/create")
-    @Operation(summary = "创建游客历史")
-    @PreAuthorize("@ss.hasPermission('his:trade-visitor:create')")
-    public CommonResult<Long> createTradeVisitor(@Valid @RequestBody TradeVisitorSaveReqVO createReqVO) {
-        return success(tradeVisitorService.createTradeVisitor(createReqVO));
-    }
-
-    @PutMapping("/update")
-    @Operation(summary = "更新游客历史")
-    @PreAuthorize("@ss.hasPermission('his:trade-visitor:update')")
-    public CommonResult<Boolean> updateTradeVisitor(@Valid @RequestBody TradeVisitorSaveReqVO updateReqVO) {
-        tradeVisitorService.updateTradeVisitor(updateReqVO);
-        return success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除游客历史")
-    @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('his:trade-visitor:delete')")
-    public CommonResult<Boolean> deleteTradeVisitor(@RequestParam("id") Long id) {
-        tradeVisitorService.deleteTradeVisitor(id);
-        return success(true);
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "获得游客历史")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('his:trade-visitor:query')")
-    public CommonResult<TradeVisitorRespVO> getTradeVisitor(@RequestParam("id") Long id) {
-        HisTradeVisitorDO tradeVisitor = tradeVisitorService.getTradeVisitor(id);
-        return success(BeanUtils.toBean(tradeVisitor, TradeVisitorRespVO.class));
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "获得游客历史分页")
-    @PreAuthorize("@ss.hasPermission('his:trade-visitor:query')")
-    public CommonResult<PageResult<TradeVisitorRespVO>> getTradeVisitorPage(@Valid TradeVisitorPageReqVO pageReqVO) {
-        PageResult<HisTradeVisitorDO> pageResult = tradeVisitorService.getTradeVisitorPage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, TradeVisitorRespVO.class));
-    }
-
-    @GetMapping("/export-excel")
-    @Operation(summary = "导出游客历史 Excel")
-    @PreAuthorize("@ss.hasPermission('his:trade-visitor:export')")
-    @ApiAccessLog(operateType = EXPORT)
-    public void exportTradeVisitorExcel(@Valid TradeVisitorPageReqVO pageReqVO,
-              HttpServletResponse response) throws IOException {
-        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<HisTradeVisitorDO> list = tradeVisitorService.getTradeVisitorPage(pageReqVO).getList();
-        // 导出 Excel
-        ExcelUtils.write(response, "游客历史.xls", "数据", TradeVisitorRespVO.class,
-                        BeanUtils.toBean(list, TradeVisitorRespVO.class));
-    }
-
-}

module-his/module-his-biz/src/main/java/com/yc/ship/module/his/controller/admin/tradevisitor/vo/TradeVisitorPageReqVO.java

@@ -141,9 +141,6 @@ public class TradeVisitorPageReqVO extends PageParam {
     @Schema(description = "")
     private String area;
 
-    @Schema(description = "")
-    private String area;
-
     @Schema(description = "游客编号")
     private String visitorNo;
 

module-his/module-his-biz/src/main/java/com/yc/ship/module/his/controller/admin/tradevisitor/vo/TradeVisitorRespVO.java

@@ -180,10 +180,6 @@ public class TradeVisitorRespVO {
     @ExcelProperty("")
     private String area;
 
-    @Schema(description = "")
-    @ExcelProperty("")
-    private String area;
-
     @Schema(description = "游客编号")
     @ExcelProperty("游客编号")
     private String visitorNo;

module-his/module-his-biz/src/main/java/com/yc/ship/module/his/controller/admin/tradevisitor/vo/TradeVisitorSaveReqVO.java

@@ -135,9 +135,6 @@ public class TradeVisitorSaveReqVO {
     @Schema(description = "")
     private String area;
 
-    @Schema(description = "")
-    private String area;
-
     @Schema(description = "游客编号")
     private String visitorNo;
 

module-his/module-his-biz/src/main/java/com/yc/ship/module/his/dal/dataobject/tradevisitor/HisTradeVisitorDO.java

@@ -187,10 +187,6 @@ public class HisTradeVisitorDO extends BaseDO {
      * 
      */
     private String area;
-    /**
-     * 
-     */
-    private String area;
     /**
      * 游客编号
      */

module-his/module-his-biz/src/main/java/com/yc/ship/module/his/dal/mysql/tradedetail/HisTradeDetailMapper.java

@@ -41,7 +41,7 @@ public interface HisTradeDetailMapper extends BaseMapperX<HisTradeDetailDO> {
                 .eqIfPresent(HisTradeDetailDO::getPrice, reqVO.getPrice())
                 .eqIfPresent(HisTradeDetailDO::getActualPrice, reqVO.getActualPrice())
                 .eqIfPresent(HisTradeDetailDO::getQuantityOfOne, reqVO.getQuantityOfOne())
-                .likeIfPresent(HisTradeDetailDO::getUseRealName, reqVO.getUseRealName())
+                .eqIfPresent(HisTradeDetailDO::getUseRealName, reqVO.getUseRealName())
                 .betweenIfPresent(HisTradeDetailDO::getCreateTime, reqVO.getCreateTime())
                 .eqIfPresent(HisTradeDetailDO::getFaceimg, reqVO.getFaceimg())
                 .eqIfPresent(HisTradeDetailDO::getRoutePlanId, reqVO.getRoutePlanId())