Browse Source

新增订单相关历史表

ZhangShuling 1 month ago
parent
commit
63bb98a33e
22 changed files with 917 additions and 57 deletions
  1. 94 0
      module-his/module-his-biz/src/main/java/com/yc/ship/module/his/controller/admin/tradedetail/TradeDetailController.java
  2. 94 0
      module-his/module-his-biz/src/main/java/com/yc/ship/module/his/controller/admin/tradedetailbase/TradeDetailBaseController.java
  3. 94 0
      module-his/module-his-biz/src/main/java/com/yc/ship/module/his/controller/admin/tradeorder/TradeOrderController.java
  4. 94 0
      module-his/module-his-biz/src/main/java/com/yc/ship/module/his/controller/admin/tradeordercountry/TradeOrderCountryController.java
  5. 94 0
      module-his/module-his-biz/src/main/java/com/yc/ship/module/his/controller/admin/tradeorderfloor/TradeOrderFloorController.java
  6. 94 0
      module-his/module-his-biz/src/main/java/com/yc/ship/module/his/controller/admin/tradeorderroommodel/TradeOrderRoomModelController.java
  7. 94 0
      module-his/module-his-biz/src/main/java/com/yc/ship/module/his/controller/admin/tradeordertotal/TradeOrderTotalController.java
  8. 94 0
      module-his/module-his-biz/src/main/java/com/yc/ship/module/his/controller/admin/tradeorderuser/TradeOrderUserController.java
  9. 94 0
      module-his/module-his-biz/src/main/java/com/yc/ship/module/his/controller/admin/tradevisitor/TradeVisitorController.java
  10. 3 0
      module-his/module-his-biz/src/main/java/com/yc/ship/module/his/controller/admin/tradevisitor/vo/TradeVisitorPageReqVO.java
  11. 4 0
      module-his/module-his-biz/src/main/java/com/yc/ship/module/his/controller/admin/tradevisitor/vo/TradeVisitorRespVO.java
  12. 3 0
      module-his/module-his-biz/src/main/java/com/yc/ship/module/his/controller/admin/tradevisitor/vo/TradeVisitorSaveReqVO.java
  13. 4 0
      module-his/module-his-biz/src/main/java/com/yc/ship/module/his/dal/dataobject/tradevisitor/HisTradeVisitorDO.java
  14. 1 1
      module-his/module-his-biz/src/main/java/com/yc/ship/module/his/dal/mysql/tradedetail/HisTradeDetailMapper.java
  15. 7 7
      module-his/module-his-biz/src/main/java/com/yc/ship/module/his/service/tradedetail/HisTradeDetailServiceImpl.java
  16. 7 7
      module-his/module-his-biz/src/main/java/com/yc/ship/module/his/service/tradeorder/HisTradeOrderServiceImpl.java
  17. 7 7
      module-his/module-his-biz/src/main/java/com/yc/ship/module/his/service/tradeordercountry/HisTradeOrderCountryServiceImpl.java
  18. 7 7
      module-his/module-his-biz/src/main/java/com/yc/ship/module/his/service/tradeorderfloor/HisTradeOrderFloorServiceImpl.java
  19. 7 7
      module-his/module-his-biz/src/main/java/com/yc/ship/module/his/service/tradeorderroommodel/HisTradeOrderRoomModelServiceImpl.java
  20. 7 7
      module-his/module-his-biz/src/main/java/com/yc/ship/module/his/service/tradeordertotal/HisTradeOrderTotalServiceImpl.java
  21. 7 7
      module-his/module-his-biz/src/main/java/com/yc/ship/module/his/service/tradeorderuser/HisTradeOrderUserServiceImpl.java
  22. 7 7
      module-his/module-his-biz/src/main/java/com/yc/ship/module/his/service/tradevisitor/HisTradeVisitorServiceImpl.java

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

@@ -0,0 +1,94 @@
+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));
+    }
+
+}

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

@@ -0,0 +1,94 @@
+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));
+    }
+
+}

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

@@ -0,0 +1,94 @@
+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));
+    }
+
+}

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

@@ -0,0 +1,94 @@
+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));
+    }
+
+}

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

@@ -0,0 +1,94 @@
+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));
+    }
+
+}

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

@@ -0,0 +1,94 @@
+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));
+    }
+
+}

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

@@ -0,0 +1,94 @@
+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));
+    }
+
+}

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

@@ -0,0 +1,94 @@
+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));
+    }
+
+}

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

@@ -0,0 +1,94 @@
+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));
+    }
+
+}

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

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

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

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

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

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

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

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

+ 1 - 1
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())
-                .eqIfPresent(HisTradeDetailDO::getUseRealName, reqVO.getUseRealName())
+                .likeIfPresent(HisTradeDetailDO::getUseRealName, reqVO.getUseRealName())
                 .betweenIfPresent(HisTradeDetailDO::getCreateTime, reqVO.getCreateTime())
                 .eqIfPresent(HisTradeDetailDO::getFaceimg, reqVO.getFaceimg())
                 .eqIfPresent(HisTradeDetailDO::getRoutePlanId, reqVO.getRoutePlanId())

+ 7 - 7
module-his/module-his-biz/src/main/java/com/yc/ship/module/his/service/tradedetail/HisTradeDetailServiceImpl.java

@@ -24,13 +24,13 @@ import static com.yc.ship.module.his.enums.ErrorCodeConstants.*;
 public class HisTradeDetailServiceImpl implements HisTradeDetailService {
 
     @Resource
-    private HisTradeDetailMapper hisTradeDetailMapper;
+    private HisTradeDetailMapper tradeDetailMapper;
 
     @Override
     public Long createTradeDetail(TradeDetailSaveReqVO createReqVO) {
         // 插入
         HisTradeDetailDO tradeDetail = BeanUtils.toBean(createReqVO, HisTradeDetailDO.class);
-        hisTradeDetailMapper.insert(tradeDetail);
+        tradeDetailMapper.insert(tradeDetail);
         // 返回
         return tradeDetail.getId();
     }
@@ -41,7 +41,7 @@ public class HisTradeDetailServiceImpl implements HisTradeDetailService {
         validateTradeDetailExists(updateReqVO.getId());
         // 更新
         HisTradeDetailDO updateObj = BeanUtils.toBean(updateReqVO, HisTradeDetailDO.class);
-        hisTradeDetailMapper.updateById(updateObj);
+        tradeDetailMapper.updateById(updateObj);
     }
 
     @Override
@@ -49,23 +49,23 @@ public class HisTradeDetailServiceImpl implements HisTradeDetailService {
         // 校验存在
         validateTradeDetailExists(id);
         // 删除
-        hisTradeDetailMapper.deleteById(id);
+        tradeDetailMapper.deleteById(id);
     }
 
     private void validateTradeDetailExists(Long id) {
-        if (hisTradeDetailMapper.selectById(id) == null) {
+        if (tradeDetailMapper.selectById(id) == null) {
             throw exception(TRADE_DETAIL_NOT_EXISTS);
         }
     }
 
     @Override
     public HisTradeDetailDO getTradeDetail(Long id) {
-        return hisTradeDetailMapper.selectById(id);
+        return tradeDetailMapper.selectById(id);
     }
 
     @Override
     public PageResult<HisTradeDetailDO> getTradeDetailPage(TradeDetailPageReqVO pageReqVO) {
-        return hisTradeDetailMapper.selectPage(pageReqVO);
+        return tradeDetailMapper.selectPage(pageReqVO);
     }
 
 }

+ 7 - 7
module-his/module-his-biz/src/main/java/com/yc/ship/module/his/service/tradeorder/HisTradeOrderServiceImpl.java

@@ -24,13 +24,13 @@ import static com.yc.ship.module.his.enums.ErrorCodeConstants.*;
 public class HisTradeOrderServiceImpl implements HisTradeOrderService {
 
     @Resource
-    private HisTradeOrderMapper hisTradeOrderMapper;
+    private HisTradeOrderMapper tradeOrderMapper;
 
     @Override
     public Long createTradeOrder(TradeOrderSaveReqVO createReqVO) {
         // 插入
         HisTradeOrderDO tradeOrder = BeanUtils.toBean(createReqVO, HisTradeOrderDO.class);
-        hisTradeOrderMapper.insert(tradeOrder);
+        tradeOrderMapper.insert(tradeOrder);
         // 返回
         return tradeOrder.getId();
     }
@@ -41,7 +41,7 @@ public class HisTradeOrderServiceImpl implements HisTradeOrderService {
         validateTradeOrderExists(updateReqVO.getId());
         // 更新
         HisTradeOrderDO updateObj = BeanUtils.toBean(updateReqVO, HisTradeOrderDO.class);
-        hisTradeOrderMapper.updateById(updateObj);
+        tradeOrderMapper.updateById(updateObj);
     }
 
     @Override
@@ -49,23 +49,23 @@ public class HisTradeOrderServiceImpl implements HisTradeOrderService {
         // 校验存在
         validateTradeOrderExists(id);
         // 删除
-        hisTradeOrderMapper.deleteById(id);
+        tradeOrderMapper.deleteById(id);
     }
 
     private void validateTradeOrderExists(Long id) {
-        if (hisTradeOrderMapper.selectById(id) == null) {
+        if (tradeOrderMapper.selectById(id) == null) {
             throw exception(TRADE_ORDER_NOT_EXISTS);
         }
     }
 
     @Override
     public HisTradeOrderDO getTradeOrder(Long id) {
-        return hisTradeOrderMapper.selectById(id);
+        return tradeOrderMapper.selectById(id);
     }
 
     @Override
     public PageResult<HisTradeOrderDO> getTradeOrderPage(TradeOrderPageReqVO pageReqVO) {
-        return hisTradeOrderMapper.selectPage(pageReqVO);
+        return tradeOrderMapper.selectPage(pageReqVO);
     }
 
 }

+ 7 - 7
module-his/module-his-biz/src/main/java/com/yc/ship/module/his/service/tradeordercountry/HisTradeOrderCountryServiceImpl.java

@@ -24,13 +24,13 @@ import static com.yc.ship.module.his.enums.ErrorCodeConstants.*;
 public class HisTradeOrderCountryServiceImpl implements HisTradeOrderCountryService {
 
     @Resource
-    private HisTradeOrderCountryMapper hisTradeOrderCountryMapper;
+    private HisTradeOrderCountryMapper tradeOrderCountryMapper;
 
     @Override
     public Long createTradeOrderCountry(TradeOrderCountrySaveReqVO createReqVO) {
         // 插入
         HisTradeOrderCountryDO tradeOrderCountry = BeanUtils.toBean(createReqVO, HisTradeOrderCountryDO.class);
-        hisTradeOrderCountryMapper.insert(tradeOrderCountry);
+        tradeOrderCountryMapper.insert(tradeOrderCountry);
         // 返回
         return tradeOrderCountry.getId();
     }
@@ -41,7 +41,7 @@ public class HisTradeOrderCountryServiceImpl implements HisTradeOrderCountryServ
         validateTradeOrderCountryExists(updateReqVO.getId());
         // 更新
         HisTradeOrderCountryDO updateObj = BeanUtils.toBean(updateReqVO, HisTradeOrderCountryDO.class);
-        hisTradeOrderCountryMapper.updateById(updateObj);
+        tradeOrderCountryMapper.updateById(updateObj);
     }
 
     @Override
@@ -49,23 +49,23 @@ public class HisTradeOrderCountryServiceImpl implements HisTradeOrderCountryServ
         // 校验存在
         validateTradeOrderCountryExists(id);
         // 删除
-        hisTradeOrderCountryMapper.deleteById(id);
+        tradeOrderCountryMapper.deleteById(id);
     }
 
     private void validateTradeOrderCountryExists(Long id) {
-        if (hisTradeOrderCountryMapper.selectById(id) == null) {
+        if (tradeOrderCountryMapper.selectById(id) == null) {
             throw exception(TRADE_ORDER_COUNTRY_NOT_EXISTS);
         }
     }
 
     @Override
     public HisTradeOrderCountryDO getTradeOrderCountry(Long id) {
-        return hisTradeOrderCountryMapper.selectById(id);
+        return tradeOrderCountryMapper.selectById(id);
     }
 
     @Override
     public PageResult<HisTradeOrderCountryDO> getTradeOrderCountryPage(TradeOrderCountryPageReqVO pageReqVO) {
-        return hisTradeOrderCountryMapper.selectPage(pageReqVO);
+        return tradeOrderCountryMapper.selectPage(pageReqVO);
     }
 
 }

+ 7 - 7
module-his/module-his-biz/src/main/java/com/yc/ship/module/his/service/tradeorderfloor/HisTradeOrderFloorServiceImpl.java

@@ -24,13 +24,13 @@ import static com.yc.ship.module.his.enums.ErrorCodeConstants.*;
 public class HisTradeOrderFloorServiceImpl implements HisTradeOrderFloorService {
 
     @Resource
-    private HisTradeOrderFloorMapper hisTradeOrderFloorMapper;
+    private HisTradeOrderFloorMapper tradeOrderFloorMapper;
 
     @Override
     public Long createTradeOrderFloor(TradeOrderFloorSaveReqVO createReqVO) {
         // 插入
         HisTradeOrderFloorDO tradeOrderFloor = BeanUtils.toBean(createReqVO, HisTradeOrderFloorDO.class);
-        hisTradeOrderFloorMapper.insert(tradeOrderFloor);
+        tradeOrderFloorMapper.insert(tradeOrderFloor);
         // 返回
         return tradeOrderFloor.getId();
     }
@@ -41,7 +41,7 @@ public class HisTradeOrderFloorServiceImpl implements HisTradeOrderFloorService
         validateTradeOrderFloorExists(updateReqVO.getId());
         // 更新
         HisTradeOrderFloorDO updateObj = BeanUtils.toBean(updateReqVO, HisTradeOrderFloorDO.class);
-        hisTradeOrderFloorMapper.updateById(updateObj);
+        tradeOrderFloorMapper.updateById(updateObj);
     }
 
     @Override
@@ -49,23 +49,23 @@ public class HisTradeOrderFloorServiceImpl implements HisTradeOrderFloorService
         // 校验存在
         validateTradeOrderFloorExists(id);
         // 删除
-        hisTradeOrderFloorMapper.deleteById(id);
+        tradeOrderFloorMapper.deleteById(id);
     }
 
     private void validateTradeOrderFloorExists(Long id) {
-        if (hisTradeOrderFloorMapper.selectById(id) == null) {
+        if (tradeOrderFloorMapper.selectById(id) == null) {
             throw exception(TRADE_ORDER_FLOOR_NOT_EXISTS);
         }
     }
 
     @Override
     public HisTradeOrderFloorDO getTradeOrderFloor(Long id) {
-        return hisTradeOrderFloorMapper.selectById(id);
+        return tradeOrderFloorMapper.selectById(id);
     }
 
     @Override
     public PageResult<HisTradeOrderFloorDO> getTradeOrderFloorPage(TradeOrderFloorPageReqVO pageReqVO) {
-        return hisTradeOrderFloorMapper.selectPage(pageReqVO);
+        return tradeOrderFloorMapper.selectPage(pageReqVO);
     }
 
 }

+ 7 - 7
module-his/module-his-biz/src/main/java/com/yc/ship/module/his/service/tradeorderroommodel/HisTradeOrderRoomModelServiceImpl.java

@@ -24,13 +24,13 @@ import static com.yc.ship.module.his.enums.ErrorCodeConstants.*;
 public class HisTradeOrderRoomModelServiceImpl implements HisTradeOrderRoomModelService {
 
     @Resource
-    private HisTradeOrderRoomModelMapper hisTradeOrderRoomModelMapper;
+    private HisTradeOrderRoomModelMapper tradeOrderRoomModelMapper;
 
     @Override
     public Long createTradeOrderRoomModel(TradeOrderRoomModelSaveReqVO createReqVO) {
         // 插入
         HisTradeOrderRoomModelDO tradeOrderRoomModel = BeanUtils.toBean(createReqVO, HisTradeOrderRoomModelDO.class);
-        hisTradeOrderRoomModelMapper.insert(tradeOrderRoomModel);
+        tradeOrderRoomModelMapper.insert(tradeOrderRoomModel);
         // 返回
         return tradeOrderRoomModel.getId();
     }
@@ -41,7 +41,7 @@ public class HisTradeOrderRoomModelServiceImpl implements HisTradeOrderRoomModel
         validateTradeOrderRoomModelExists(updateReqVO.getId());
         // 更新
         HisTradeOrderRoomModelDO updateObj = BeanUtils.toBean(updateReqVO, HisTradeOrderRoomModelDO.class);
-        hisTradeOrderRoomModelMapper.updateById(updateObj);
+        tradeOrderRoomModelMapper.updateById(updateObj);
     }
 
     @Override
@@ -49,23 +49,23 @@ public class HisTradeOrderRoomModelServiceImpl implements HisTradeOrderRoomModel
         // 校验存在
         validateTradeOrderRoomModelExists(id);
         // 删除
-        hisTradeOrderRoomModelMapper.deleteById(id);
+        tradeOrderRoomModelMapper.deleteById(id);
     }
 
     private void validateTradeOrderRoomModelExists(Long id) {
-        if (hisTradeOrderRoomModelMapper.selectById(id) == null) {
+        if (tradeOrderRoomModelMapper.selectById(id) == null) {
             throw exception(TRADE_ORDER_ROOM_MODEL_NOT_EXISTS);
         }
     }
 
     @Override
     public HisTradeOrderRoomModelDO getTradeOrderRoomModel(Long id) {
-        return hisTradeOrderRoomModelMapper.selectById(id);
+        return tradeOrderRoomModelMapper.selectById(id);
     }
 
     @Override
     public PageResult<HisTradeOrderRoomModelDO> getTradeOrderRoomModelPage(TradeOrderRoomModelPageReqVO pageReqVO) {
-        return hisTradeOrderRoomModelMapper.selectPage(pageReqVO);
+        return tradeOrderRoomModelMapper.selectPage(pageReqVO);
     }
 
 }

+ 7 - 7
module-his/module-his-biz/src/main/java/com/yc/ship/module/his/service/tradeordertotal/HisTradeOrderTotalServiceImpl.java

@@ -24,13 +24,13 @@ import static com.yc.ship.module.his.enums.ErrorCodeConstants.*;
 public class HisTradeOrderTotalServiceImpl implements HisTradeOrderTotalService {
 
     @Resource
-    private HisTradeOrderTotalMapper hisTradeOrderTotalMapper;
+    private HisTradeOrderTotalMapper tradeOrderTotalMapper;
 
     @Override
     public Long createTradeOrderTotal(TradeOrderTotalSaveReqVO createReqVO) {
         // 插入
         HisTradeOrderTotalDO tradeOrderTotal = BeanUtils.toBean(createReqVO, HisTradeOrderTotalDO.class);
-        hisTradeOrderTotalMapper.insert(tradeOrderTotal);
+        tradeOrderTotalMapper.insert(tradeOrderTotal);
         // 返回
         return tradeOrderTotal.getId();
     }
@@ -41,7 +41,7 @@ public class HisTradeOrderTotalServiceImpl implements HisTradeOrderTotalService
         validateTradeOrderTotalExists(updateReqVO.getId());
         // 更新
         HisTradeOrderTotalDO updateObj = BeanUtils.toBean(updateReqVO, HisTradeOrderTotalDO.class);
-        hisTradeOrderTotalMapper.updateById(updateObj);
+        tradeOrderTotalMapper.updateById(updateObj);
     }
 
     @Override
@@ -49,23 +49,23 @@ public class HisTradeOrderTotalServiceImpl implements HisTradeOrderTotalService
         // 校验存在
         validateTradeOrderTotalExists(id);
         // 删除
-        hisTradeOrderTotalMapper.deleteById(id);
+        tradeOrderTotalMapper.deleteById(id);
     }
 
     private void validateTradeOrderTotalExists(Long id) {
-        if (hisTradeOrderTotalMapper.selectById(id) == null) {
+        if (tradeOrderTotalMapper.selectById(id) == null) {
             throw exception(TRADE_ORDER_TOTAL_NOT_EXISTS);
         }
     }
 
     @Override
     public HisTradeOrderTotalDO getTradeOrderTotal(Long id) {
-        return hisTradeOrderTotalMapper.selectById(id);
+        return tradeOrderTotalMapper.selectById(id);
     }
 
     @Override
     public PageResult<HisTradeOrderTotalDO> getTradeOrderTotalPage(TradeOrderTotalPageReqVO pageReqVO) {
-        return hisTradeOrderTotalMapper.selectPage(pageReqVO);
+        return tradeOrderTotalMapper.selectPage(pageReqVO);
     }
 
 }

+ 7 - 7
module-his/module-his-biz/src/main/java/com/yc/ship/module/his/service/tradeorderuser/HisTradeOrderUserServiceImpl.java

@@ -24,13 +24,13 @@ import static com.yc.ship.module.his.enums.ErrorCodeConstants.*;
 public class HisTradeOrderUserServiceImpl implements HisTradeOrderUserService {
 
     @Resource
-    private HisTradeOrderUserMapper hisTradeOrderUserMapper;
+    private HisTradeOrderUserMapper tradeOrderUserMapper;
 
     @Override
     public Long createTradeOrderUser(TradeOrderUserSaveReqVO createReqVO) {
         // 插入
         HisTradeOrderUserDO tradeOrderUser = BeanUtils.toBean(createReqVO, HisTradeOrderUserDO.class);
-        hisTradeOrderUserMapper.insert(tradeOrderUser);
+        tradeOrderUserMapper.insert(tradeOrderUser);
         // 返回
         return tradeOrderUser.getId();
     }
@@ -41,7 +41,7 @@ public class HisTradeOrderUserServiceImpl implements HisTradeOrderUserService {
         validateTradeOrderUserExists(updateReqVO.getId());
         // 更新
         HisTradeOrderUserDO updateObj = BeanUtils.toBean(updateReqVO, HisTradeOrderUserDO.class);
-        hisTradeOrderUserMapper.updateById(updateObj);
+        tradeOrderUserMapper.updateById(updateObj);
     }
 
     @Override
@@ -49,23 +49,23 @@ public class HisTradeOrderUserServiceImpl implements HisTradeOrderUserService {
         // 校验存在
         validateTradeOrderUserExists(id);
         // 删除
-        hisTradeOrderUserMapper.deleteById(id);
+        tradeOrderUserMapper.deleteById(id);
     }
 
     private void validateTradeOrderUserExists(Long id) {
-        if (hisTradeOrderUserMapper.selectById(id) == null) {
+        if (tradeOrderUserMapper.selectById(id) == null) {
             throw exception(TRADE_ORDER_USER_NOT_EXISTS);
         }
     }
 
     @Override
     public HisTradeOrderUserDO getTradeOrderUser(Long id) {
-        return hisTradeOrderUserMapper.selectById(id);
+        return tradeOrderUserMapper.selectById(id);
     }
 
     @Override
     public PageResult<HisTradeOrderUserDO> getTradeOrderUserPage(TradeOrderUserPageReqVO pageReqVO) {
-        return hisTradeOrderUserMapper.selectPage(pageReqVO);
+        return tradeOrderUserMapper.selectPage(pageReqVO);
     }
 
 }

+ 7 - 7
module-his/module-his-biz/src/main/java/com/yc/ship/module/his/service/tradevisitor/HisTradeVisitorServiceImpl.java

@@ -24,13 +24,13 @@ import static com.yc.ship.module.his.enums.ErrorCodeConstants.*;
 public class HisTradeVisitorServiceImpl implements HisTradeVisitorService {
 
     @Resource
-    private HisTradeVisitorMapper hisTradeVisitorMapper;
+    private HisTradeVisitorMapper tradeVisitorMapper;
 
     @Override
     public Long createTradeVisitor(TradeVisitorSaveReqVO createReqVO) {
         // 插入
         HisTradeVisitorDO tradeVisitor = BeanUtils.toBean(createReqVO, HisTradeVisitorDO.class);
-        hisTradeVisitorMapper.insert(tradeVisitor);
+        tradeVisitorMapper.insert(tradeVisitor);
         // 返回
         return tradeVisitor.getId();
     }
@@ -41,7 +41,7 @@ public class HisTradeVisitorServiceImpl implements HisTradeVisitorService {
         validateTradeVisitorExists(updateReqVO.getId());
         // 更新
         HisTradeVisitorDO updateObj = BeanUtils.toBean(updateReqVO, HisTradeVisitorDO.class);
-        hisTradeVisitorMapper.updateById(updateObj);
+        tradeVisitorMapper.updateById(updateObj);
     }
 
     @Override
@@ -49,23 +49,23 @@ public class HisTradeVisitorServiceImpl implements HisTradeVisitorService {
         // 校验存在
         validateTradeVisitorExists(id);
         // 删除
-        hisTradeVisitorMapper.deleteById(id);
+        tradeVisitorMapper.deleteById(id);
     }
 
     private void validateTradeVisitorExists(Long id) {
-        if (hisTradeVisitorMapper.selectById(id) == null) {
+        if (tradeVisitorMapper.selectById(id) == null) {
             throw exception(TRADE_VISITOR_NOT_EXISTS);
         }
     }
 
     @Override
     public HisTradeVisitorDO getTradeVisitor(Long id) {
-        return hisTradeVisitorMapper.selectById(id);
+        return tradeVisitorMapper.selectById(id);
     }
 
     @Override
     public PageResult<HisTradeVisitorDO> getTradeVisitorPage(TradeVisitorPageReqVO pageReqVO) {
-        return hisTradeVisitorMapper.selectPage(pageReqVO);
+        return tradeVisitorMapper.selectPage(pageReqVO);
     }
 
 }