优化

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 tradeDetailService;
+    private HisTradeDetailService hisTradeDetailService;
 
     @PostMapping("/create")
     @Operation(summary = "创建订单明细历史")
     @PreAuthorize("@ss.hasPermission('his:trade-detail:create')")
     public CommonResult<Long> createTradeDetail(@Valid @RequestBody TradeDetailSaveReqVO createReqVO) {
-        return success(tradeDetailService.createTradeDetail(createReqVO));
+        return success(hisTradeDetailService.createTradeDetail(createReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新订单明细历史")
     @PreAuthorize("@ss.hasPermission('his:trade-detail:update')")
     public CommonResult<Boolean> updateTradeDetail(@Valid @RequestBody TradeDetailSaveReqVO updateReqVO) {
-        tradeDetailService.updateTradeDetail(updateReqVO);
+        hisTradeDetailService.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) {
-        tradeDetailService.deleteTradeDetail(id);
+        hisTradeDetailService.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 = tradeDetailService.getTradeDetail(id);
+        HisTradeDetailDO tradeDetail = hisTradeDetailService.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 = tradeDetailService.getTradeDetailPage(pageReqVO);
+        PageResult<HisTradeDetailDO> pageResult = hisTradeDetailService.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 = tradeDetailService.getTradeDetailPage(pageReqVO).getList();
+        List<HisTradeDetailDO> list = hisTradeDetailService.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 tradeDetailBaseService;
+    private HisTradeDetailBaseService hisTradeDetailBaseService;
 
     @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));
+        return success(hisTradeDetailBaseService.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);
+        hisTradeDetailBaseService.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) {
-        tradeDetailBaseService.deleteTradeDetailBase(id);
+        hisTradeDetailBaseService.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 = tradeDetailBaseService.getTradeDetailBase(id);
+        HisTradeDetailBaseDO tradeDetailBase = hisTradeDetailBaseService.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 = tradeDetailBaseService.getTradeDetailBasePage(pageReqVO);
+        PageResult<HisTradeDetailBaseDO> pageResult = hisTradeDetailBaseService.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 = tradeDetailBaseService.getTradeDetailBasePage(pageReqVO).getList();
+        List<HisTradeDetailBaseDO> list = hisTradeDetailBaseService.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 tradeOrderService;
+    private HisTradeOrderService hisTradeOrderService;
 
     @PostMapping("/create")
     @Operation(summary = "创建交易订单历史")
     @PreAuthorize("@ss.hasPermission('his:trade-order:create')")
     public CommonResult<Long> createTradeOrder(@Valid @RequestBody TradeOrderSaveReqVO createReqVO) {
-        return success(tradeOrderService.createTradeOrder(createReqVO));
+        return success(hisTradeOrderService.createTradeOrder(createReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新交易订单历史")
     @PreAuthorize("@ss.hasPermission('his:trade-order:update')")
     public CommonResult<Boolean> updateTradeOrder(@Valid @RequestBody TradeOrderSaveReqVO updateReqVO) {
-        tradeOrderService.updateTradeOrder(updateReqVO);
+        hisTradeOrderService.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) {
-        tradeOrderService.deleteTradeOrder(id);
+        hisTradeOrderService.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 = tradeOrderService.getTradeOrder(id);
+        HisTradeOrderDO tradeOrder = hisTradeOrderService.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 = tradeOrderService.getTradeOrderPage(pageReqVO);
+        PageResult<HisTradeOrderDO> pageResult = hisTradeOrderService.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 = tradeOrderService.getTradeOrderPage(pageReqVO).getList();
+        List<HisTradeOrderDO> list = hisTradeOrderService.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 tradeOrderCountryService;
+    private HisTradeOrderCountryService hisTradeOrderCountryService;
 
     @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));
+        return success(hisTradeOrderCountryService.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);
+        hisTradeOrderCountryService.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) {
-        tradeOrderCountryService.deleteTradeOrderCountry(id);
+        hisTradeOrderCountryService.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 = tradeOrderCountryService.getTradeOrderCountry(id);
+        HisTradeOrderCountryDO tradeOrderCountry = hisTradeOrderCountryService.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 = tradeOrderCountryService.getTradeOrderCountryPage(pageReqVO);
+        PageResult<HisTradeOrderCountryDO> pageResult = hisTradeOrderCountryService.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 = tradeOrderCountryService.getTradeOrderCountryPage(pageReqVO).getList();
+        List<HisTradeOrderCountryDO> list = hisTradeOrderCountryService.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 tradeOrderFloorService;
+    private HisTradeOrderFloorService hisTradeOrderFloorService;
 
     @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));
+        return success(hisTradeOrderFloorService.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);
+        hisTradeOrderFloorService.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) {
-        tradeOrderFloorService.deleteTradeOrderFloor(id);
+        hisTradeOrderFloorService.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 = tradeOrderFloorService.getTradeOrderFloor(id);
+        HisTradeOrderFloorDO tradeOrderFloor = hisTradeOrderFloorService.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 = tradeOrderFloorService.getTradeOrderFloorPage(pageReqVO);
+        PageResult<HisTradeOrderFloorDO> pageResult = hisTradeOrderFloorService.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 = tradeOrderFloorService.getTradeOrderFloorPage(pageReqVO).getList();
+        List<HisTradeOrderFloorDO> list = hisTradeOrderFloorService.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 tradeOrderRoomModelService;
+    private HisTradeOrderRoomModelService hisTradeOrderRoomModelService;
 
     @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));
+        return success(hisTradeOrderRoomModelService.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);
+        hisTradeOrderRoomModelService.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) {
-        tradeOrderRoomModelService.deleteTradeOrderRoomModel(id);
+        hisTradeOrderRoomModelService.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 = tradeOrderRoomModelService.getTradeOrderRoomModel(id);
+        HisTradeOrderRoomModelDO tradeOrderRoomModel = hisTradeOrderRoomModelService.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 = tradeOrderRoomModelService.getTradeOrderRoomModelPage(pageReqVO);
+        PageResult<HisTradeOrderRoomModelDO> pageResult = hisTradeOrderRoomModelService.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 = tradeOrderRoomModelService.getTradeOrderRoomModelPage(pageReqVO).getList();
+        List<HisTradeOrderRoomModelDO> list = hisTradeOrderRoomModelService.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 tradeOrderTotalService;
+    private HisTradeOrderTotalService hisTradeOrderTotalService;
 
     @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));
+        return success(hisTradeOrderTotalService.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);
+        hisTradeOrderTotalService.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) {
-        tradeOrderTotalService.deleteTradeOrderTotal(id);
+        hisTradeOrderTotalService.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 = tradeOrderTotalService.getTradeOrderTotal(id);
+        HisTradeOrderTotalDO tradeOrderTotal = hisTradeOrderTotalService.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 = tradeOrderTotalService.getTradeOrderTotalPage(pageReqVO);
+        PageResult<HisTradeOrderTotalDO> pageResult = hisTradeOrderTotalService.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 = tradeOrderTotalService.getTradeOrderTotalPage(pageReqVO).getList();
+        List<HisTradeOrderTotalDO> list = hisTradeOrderTotalService.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,20 +35,19 @@ import com.yc.ship.module.his.service.tradeorderuser.HisTradeOrderUserService;
 public class HisTradeOrderUserController {
 
     @Resource
-    private HisTradeOrderUserService tradeOrderUserService;
-
+    private HisTradeOrderUserService hisTradeOrderUserService;
     @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));
+        return success(hisTradeOrderUserService.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);
+        hisTradeOrderUserService.updateTradeOrderUser(updateReqVO);
         return success(true);
     }
 
@@ -57,7 +56,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) {
-        tradeOrderUserService.deleteTradeOrderUser(id);
+        hisTradeOrderUserService.deleteTradeOrderUser(id);
         return success(true);
     }
 
@@ -66,7 +65,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 = tradeOrderUserService.getTradeOrderUser(id);
+        HisTradeOrderUserDO tradeOrderUser = hisTradeOrderUserService.getTradeOrderUser(id);
         return success(BeanUtils.toBean(tradeOrderUser, TradeOrderUserRespVO.class));
     }
 
@@ -74,7 +73,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 = tradeOrderUserService.getTradeOrderUserPage(pageReqVO);
+        PageResult<HisTradeOrderUserDO> pageResult = hisTradeOrderUserService.getTradeOrderUserPage(pageReqVO);
         return success(BeanUtils.toBean(pageResult, TradeOrderUserRespVO.class));
     }
 
@@ -85,7 +84,7 @@ public class HisTradeOrderUserController {
     public void exportTradeOrderUserExcel(@Valid TradeOrderUserPageReqVO pageReqVO,
               HttpServletResponse response) throws IOException {
         pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<HisTradeOrderUserDO> list = tradeOrderUserService.getTradeOrderUserPage(pageReqVO).getList();
+        List<HisTradeOrderUserDO> list = hisTradeOrderUserService.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 tradeVisitorService;
+    private HisTradeVisitorService hisTradeVisitorService;
 
     @PostMapping("/create")
     @Operation(summary = "创建游客历史")
     @PreAuthorize("@ss.hasPermission('his:trade-visitor:create')")
     public CommonResult<Long> createTradeVisitor(@Valid @RequestBody TradeVisitorSaveReqVO createReqVO) {
-        return success(tradeVisitorService.createTradeVisitor(createReqVO));
+        return success(hisTradeVisitorService.createTradeVisitor(createReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新游客历史")
     @PreAuthorize("@ss.hasPermission('his:trade-visitor:update')")
     public CommonResult<Boolean> updateTradeVisitor(@Valid @RequestBody TradeVisitorSaveReqVO updateReqVO) {
-        tradeVisitorService.updateTradeVisitor(updateReqVO);
+        hisTradeVisitorService.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) {
-        tradeVisitorService.deleteTradeVisitor(id);
+        hisTradeVisitorService.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 = tradeVisitorService.getTradeVisitor(id);
+        HisTradeVisitorDO tradeVisitor = hisTradeVisitorService.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 = tradeVisitorService.getTradeVisitorPage(pageReqVO);
+        PageResult<HisTradeVisitorDO> pageResult = hisTradeVisitorService.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 = tradeVisitorService.getTradeVisitorPage(pageReqVO).getList();
+        List<HisTradeVisitorDO> list = hisTradeVisitorService.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/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 tradeDetailMapper;
+    private HisTradeDetailMapper hisTradeDetailMapper;
 
     @Override
     public Long createTradeDetail(TradeDetailSaveReqVO createReqVO) {
         // 插入
         HisTradeDetailDO tradeDetail = BeanUtils.toBean(createReqVO, HisTradeDetailDO.class);
-        tradeDetailMapper.insert(tradeDetail);
+        hisTradeDetailMapper.insert(tradeDetail);
         // 返回
         return tradeDetail.getId();
     }
@@ -41,7 +41,7 @@ public class HisTradeDetailServiceImpl implements HisTradeDetailService {
         validateTradeDetailExists(updateReqVO.getId());
         // 更新
         HisTradeDetailDO updateObj = BeanUtils.toBean(updateReqVO, HisTradeDetailDO.class);
-        tradeDetailMapper.updateById(updateObj);
+        hisTradeDetailMapper.updateById(updateObj);
     }
 
     @Override
@@ -49,23 +49,23 @@ public class HisTradeDetailServiceImpl implements HisTradeDetailService {
         // 校验存在
         validateTradeDetailExists(id);
         // 删除
-        tradeDetailMapper.deleteById(id);
+        hisTradeDetailMapper.deleteById(id);
     }
 
     private void validateTradeDetailExists(Long id) {
-        if (tradeDetailMapper.selectById(id) == null) {
+        if (hisTradeDetailMapper.selectById(id) == null) {
             throw exception(TRADE_DETAIL_NOT_EXISTS);
         }
     }
 
     @Override
     public HisTradeDetailDO getTradeDetail(Long id) {
-        return tradeDetailMapper.selectById(id);
+        return hisTradeDetailMapper.selectById(id);
     }
 
     @Override
     public PageResult<HisTradeDetailDO> getTradeDetailPage(TradeDetailPageReqVO pageReqVO) {
-        return tradeDetailMapper.selectPage(pageReqVO);
+        return hisTradeDetailMapper.selectPage(pageReqVO);
     }
 
 }

module-his/module-his-biz/src/main/java/com/yc/ship/module/his/service/tradedetailbase/HisTradeDetailBaseServiceImpl.java

@@ -24,13 +24,13 @@ import static com.yc.ship.module.his.enums.ErrorCodeConstants.*;
 public class HisTradeDetailBaseServiceImpl implements HisTradeDetailBaseService {
 
     @Resource
-    private HisTradeDetailBaseMapper tradeDetailBaseMapper;
+    private HisTradeDetailBaseMapper hisTradeDetailBaseMapper;
 
     @Override
     public Long createTradeDetailBase(TradeDetailBaseSaveReqVO createReqVO) {
         // 插入
         HisTradeDetailBaseDO tradeDetailBase = BeanUtils.toBean(createReqVO, HisTradeDetailBaseDO.class);
-        tradeDetailBaseMapper.insert(tradeDetailBase);
+        hisTradeDetailBaseMapper.insert(tradeDetailBase);
         // 返回
         return tradeDetailBase.getId();
     }
@@ -41,7 +41,7 @@ public class HisTradeDetailBaseServiceImpl implements HisTradeDetailBaseService
         validateTradeDetailBaseExists(updateReqVO.getId());
         // 更新
         HisTradeDetailBaseDO updateObj = BeanUtils.toBean(updateReqVO, HisTradeDetailBaseDO.class);
-        tradeDetailBaseMapper.updateById(updateObj);
+        hisTradeDetailBaseMapper.updateById(updateObj);
     }
 
     @Override
@@ -49,23 +49,23 @@ public class HisTradeDetailBaseServiceImpl implements HisTradeDetailBaseService
         // 校验存在
         validateTradeDetailBaseExists(id);
         // 删除
-        tradeDetailBaseMapper.deleteById(id);
+        hisTradeDetailBaseMapper.deleteById(id);
     }
 
     private void validateTradeDetailBaseExists(Long id) {
-        if (tradeDetailBaseMapper.selectById(id) == null) {
+        if (hisTradeDetailBaseMapper.selectById(id) == null) {
             throw exception(TRADE_DETAIL_BASE_NOT_EXISTS);
         }
     }
 
     @Override
     public HisTradeDetailBaseDO getTradeDetailBase(Long id) {
-        return tradeDetailBaseMapper.selectById(id);
+        return hisTradeDetailBaseMapper.selectById(id);
     }
 
     @Override
     public PageResult<HisTradeDetailBaseDO> getTradeDetailBasePage(TradeDetailBasePageReqVO pageReqVO) {
-        return tradeDetailBaseMapper.selectPage(pageReqVO);
+        return hisTradeDetailBaseMapper.selectPage(pageReqVO);
     }
 
 }

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

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 tradeOrderCountryMapper;
+    private HisTradeOrderCountryMapper hisTradeOrderCountryMapper;
 
     @Override
     public Long createTradeOrderCountry(TradeOrderCountrySaveReqVO createReqVO) {
         // 插入
         HisTradeOrderCountryDO tradeOrderCountry = BeanUtils.toBean(createReqVO, HisTradeOrderCountryDO.class);
-        tradeOrderCountryMapper.insert(tradeOrderCountry);
+        hisTradeOrderCountryMapper.insert(tradeOrderCountry);
         // 返回
         return tradeOrderCountry.getId();
     }
@@ -41,7 +41,7 @@ public class HisTradeOrderCountryServiceImpl implements HisTradeOrderCountryServ
         validateTradeOrderCountryExists(updateReqVO.getId());
         // 更新
         HisTradeOrderCountryDO updateObj = BeanUtils.toBean(updateReqVO, HisTradeOrderCountryDO.class);
-        tradeOrderCountryMapper.updateById(updateObj);
+        hisTradeOrderCountryMapper.updateById(updateObj);
     }
 
     @Override
@@ -49,23 +49,23 @@ public class HisTradeOrderCountryServiceImpl implements HisTradeOrderCountryServ
         // 校验存在
         validateTradeOrderCountryExists(id);
         // 删除
-        tradeOrderCountryMapper.deleteById(id);
+        hisTradeOrderCountryMapper.deleteById(id);
     }
 
     private void validateTradeOrderCountryExists(Long id) {
-        if (tradeOrderCountryMapper.selectById(id) == null) {
+        if (hisTradeOrderCountryMapper.selectById(id) == null) {
             throw exception(TRADE_ORDER_COUNTRY_NOT_EXISTS);
         }
     }
 
     @Override
     public HisTradeOrderCountryDO getTradeOrderCountry(Long id) {
-        return tradeOrderCountryMapper.selectById(id);
+        return hisTradeOrderCountryMapper.selectById(id);
     }
 
     @Override
     public PageResult<HisTradeOrderCountryDO> getTradeOrderCountryPage(TradeOrderCountryPageReqVO pageReqVO) {
-        return tradeOrderCountryMapper.selectPage(pageReqVO);
+        return hisTradeOrderCountryMapper.selectPage(pageReqVO);
     }
 
 }

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

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 tradeOrderRoomModelMapper;
+    private HisTradeOrderRoomModelMapper hisTradeOrderRoomModelMapper;
 
     @Override
     public Long createTradeOrderRoomModel(TradeOrderRoomModelSaveReqVO createReqVO) {
         // 插入
         HisTradeOrderRoomModelDO tradeOrderRoomModel = BeanUtils.toBean(createReqVO, HisTradeOrderRoomModelDO.class);
-        tradeOrderRoomModelMapper.insert(tradeOrderRoomModel);
+        hisTradeOrderRoomModelMapper.insert(tradeOrderRoomModel);
         // 返回
         return tradeOrderRoomModel.getId();
     }
@@ -41,7 +41,7 @@ public class HisTradeOrderRoomModelServiceImpl implements HisTradeOrderRoomModel
         validateTradeOrderRoomModelExists(updateReqVO.getId());
         // 更新
         HisTradeOrderRoomModelDO updateObj = BeanUtils.toBean(updateReqVO, HisTradeOrderRoomModelDO.class);
-        tradeOrderRoomModelMapper.updateById(updateObj);
+        hisTradeOrderRoomModelMapper.updateById(updateObj);
     }
 
     @Override
@@ -49,23 +49,23 @@ public class HisTradeOrderRoomModelServiceImpl implements HisTradeOrderRoomModel
         // 校验存在
         validateTradeOrderRoomModelExists(id);
         // 删除
-        tradeOrderRoomModelMapper.deleteById(id);
+        hisTradeOrderRoomModelMapper.deleteById(id);
     }
 
     private void validateTradeOrderRoomModelExists(Long id) {
-        if (tradeOrderRoomModelMapper.selectById(id) == null) {
+        if (hisTradeOrderRoomModelMapper.selectById(id) == null) {
             throw exception(TRADE_ORDER_ROOM_MODEL_NOT_EXISTS);
         }
     }
 
     @Override
     public HisTradeOrderRoomModelDO getTradeOrderRoomModel(Long id) {
-        return tradeOrderRoomModelMapper.selectById(id);
+        return hisTradeOrderRoomModelMapper.selectById(id);
     }
 
     @Override
     public PageResult<HisTradeOrderRoomModelDO> getTradeOrderRoomModelPage(TradeOrderRoomModelPageReqVO pageReqVO) {
-        return tradeOrderRoomModelMapper.selectPage(pageReqVO);
+        return hisTradeOrderRoomModelMapper.selectPage(pageReqVO);
     }
 
 }

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

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

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