优化

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

@@ -32,7 +32,7 @@ import com.yc.ship.module.his.service.tradedetail.HisTradeDetailService;
 @RestController
 @RequestMapping("/his/trade-detail")
 @Validated
-public class TradeDetailController {
+public class HisTradeDetailController {
 
     @Resource
     private HisTradeDetailService tradeDetailService;

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

@@ -32,7 +32,7 @@ import com.yc.ship.module.his.service.tradedetailbase.HisTradeDetailBaseService;
 @RestController
 @RequestMapping("/his/trade-detail-base")
 @Validated
-public class TradeDetailBaseController {
+public class HisTradeDetailBaseController {
 
     @Resource
     private HisTradeDetailBaseService tradeDetailBaseService;

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

@@ -32,7 +32,7 @@ import com.yc.ship.module.his.service.tradeorder.HisTradeOrderService;
 @RestController
 @RequestMapping("/his/trade-order")
 @Validated
-public class TradeOrderController {
+public class HisTradeOrderController {
 
     @Resource
     private HisTradeOrderService tradeOrderService;

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

@@ -32,7 +32,7 @@ import com.yc.ship.module.his.service.tradeordercountry.HisTradeOrderCountryServ
 @RestController
 @RequestMapping("/his/trade-order-country")
 @Validated
-public class TradeOrderCountryController {
+public class HisTradeOrderCountryController {
 
     @Resource
     private HisTradeOrderCountryService tradeOrderCountryService;

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

@@ -32,7 +32,7 @@ import com.yc.ship.module.his.service.tradeorderfloor.HisTradeOrderFloorService;
 @RestController
 @RequestMapping("/his/trade-order-floor")
 @Validated
-public class TradeOrderFloorController {
+public class HisTradeOrderFloorController {
 
     @Resource
     private HisTradeOrderFloorService tradeOrderFloorService;

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

@@ -32,7 +32,7 @@ import com.yc.ship.module.his.service.tradeorderroommodel.HisTradeOrderRoomModel
 @RestController
 @RequestMapping("/his/trade-order-room-model")
 @Validated
-public class TradeOrderRoomModelController {
+public class HisTradeOrderRoomModelController {
 
     @Resource
     private HisTradeOrderRoomModelService tradeOrderRoomModelService;

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

@@ -32,7 +32,7 @@ import com.yc.ship.module.his.service.tradeordertotal.HisTradeOrderTotalService;
 @RestController
 @RequestMapping("/his/trade-order-total")
 @Validated
-public class TradeOrderTotalController {
+public class HisTradeOrderTotalController {
 
     @Resource
     private HisTradeOrderTotalService tradeOrderTotalService;

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

@@ -32,7 +32,7 @@ import com.yc.ship.module.his.service.tradeorderuser.HisTradeOrderUserService;
 @RestController
 @RequestMapping("/his/trade-order-user")
 @Validated
-public class TradeOrderUserController {
+public class HisTradeOrderUserController {
 
     @Resource
     private HisTradeOrderUserService tradeOrderUserService;

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

@@ -32,7 +32,7 @@ import com.yc.ship.module.his.service.tradevisitor.HisTradeVisitorService;
 @RestController
 @RequestMapping("/his/trade-visitor")
 @Validated
-public class TradeVisitorController {
+public class HisTradeVisitorController {
 
     @Resource
     private HisTradeVisitorService tradeVisitorService;

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

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

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

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

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

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

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

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

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

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

ship-module-trade/ship-module-trade-biz/pom.xml

@@ -150,6 +150,12 @@
             <version>1.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.yc.ship</groupId>
+            <artifactId>module-his-biz</artifactId>
+            <version>1.0.0</version>
+            <scope>compile</scope>
+        </dependency>
         <dependency>
             <groupId>com.yc.ship</groupId>
             <artifactId>ship-module-resource-biz</artifactId>