Merge branch 'main' of http://47.98.207.247:3000/lsq/ship-ota-server into main

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/controller/admin/roommodel/vo/ResourceRoomModelRespVO.java

@@ -159,6 +159,9 @@ public class ResourceRoomModelRespVO {
     @Schema(description = "房型面积")
     private String roomArea;
 
+    @Schema(description = "排序")
+    private Long sort;
+
     @Schema(description = "房型服务设施")
     private List<ResourceRoomModelServiceRespVO> services;
 

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/controller/admin/roommodel/vo/ResourceRoomModelSaveReqVO.java

@@ -109,6 +109,9 @@ public class ResourceRoomModelSaveReqVO {
     @Schema(description = "最大入住儿童人数")
     private Integer maxChildNum;
 
+    @Schema(description = "排序")
+    private Long sort;
+
     @Schema(description = "是否可售", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     @NotNull(message = "是否可售不能为空")
     private Integer canSale;

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/dal/dataobject/roommodel/ResourceRoomModelDO.java

@@ -148,6 +148,11 @@ public class ResourceRoomModelDO extends TenantBaseDO {
      */
     private String roomArea;
 
+    /**
+     * 排序
+     */
+    private Long sort;
+
     public String getShowName() {
         if(StringUtils.isNotBlank(shortName)) {
             return shortName;

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/dal/mysql/roommodel/ResourceRoomModelMapper.java

@@ -34,7 +34,8 @@ public interface ResourceRoomModelMapper extends BaseMapperX<ResourceRoomModelDO
     default List<ResourceRoomModelDO> selectListByShipId(String shipId) {
         return selectList(new LambdaQueryWrapperX<ResourceRoomModelDO>()
                 .eqIfPresent(ResourceRoomModelDO::getShipId, shipId)
-                .eq(ResourceRoomModelDO::getStatus, CommonStatusEnum.ENABLE.getStatus()));
+                .eq(ResourceRoomModelDO::getStatus, CommonStatusEnum.ENABLE.getStatus())
+                .orderByAsc(ResourceRoomModelDO::getSort));
     }
 
     default List<ResourceRoomModelDO> selectRoomModelCanSaleListByShipId(String shipId) {

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/order/impl/TradeOrderServiceImpl.java

@@ -804,11 +804,11 @@ public class TradeOrderServiceImpl implements TradeOrderService {
                     tradeDetailDO.setPrice(orderDetail.getOriginPrice()==null?BigDecimal.ZERO:orderDetail.getOriginPrice());
                     tradeDetailDO.setActualPrice(orderDetail.getPrice()==null?BigDecimal.ZERO:orderDetail.getPrice());
                     tradeDetailDO.setSpecType(orderDetail.getSpecType());
-                    if(orderDetail.getId()!=null){
-                        tradeDetailDO.setId(orderDetail.getId());
-                    }else{
+//                    if(orderDetail.getId()!=null){
+//                        tradeDetailDO.setId(orderDetail.getId());
+//                    }else{
                         tradeDetailDO.setId(IdWorker.getId());
-                    }
+//                    }
                     tradeDetailDO.setValidityStartDate(LocalDateTimeUtil.of(orderDetail.getBoardingTime()));
                     tradeDetailDO.setValidityEndDate(LocalDateTimeUtil.of(orderDetail.getLeaveTime()));
                     tradeDetailDO.setProductType(orderDetail.getProductType());

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/utils/IdCardProvinceUtil.java

@@ -108,9 +108,9 @@ public class IdCardProvinceUtil {
         map.put("63", "青海");
         map.put("64", "宁夏");
         map.put("65", "新疆");
-        map.put("71", "台湾");
-        map.put("81", "香港");
-        map.put("82", "澳门");
+        //map.put("71", "台湾");
+        //map.put("81", "香港");
+        // map.put("82", "澳门");
         // 91开头的为国外身份证件，无对应省份
         PROVINCE_MAP = Collections.unmodifiableMap(map);
 
@@ -220,7 +220,7 @@ public class IdCardProvinceUtil {
         cityMap.put("6530", "克孜勒苏"); cityMap.put("6531", "喀什"); cityMap.put("6532", "和田"); cityMap.put("6540", "伊犁");
         cityMap.put("6542", "塔城"); cityMap.put("6543", "阿勒泰"); cityMap.put("6590", "自治区直辖县级");
         // 港澳台
-        cityMap.put("7100", "台湾"); cityMap.put("8100", "香港"); cityMap.put("8200", "澳门");
+        // cityMap.put("7100", "台湾"); cityMap.put("8100", "香港"); cityMap.put("8200", "澳门");
         CITY_MAP = Collections.unmodifiableMap(cityMap);
     }
 
@@ -243,7 +243,7 @@ public class IdCardProvinceUtil {
             return "台湾";
         }*/
 
-        if ("中国台湾".equals(nationalityName)) {
+        /*if ("中国台湾".equals(nationalityName)) {
             return "台湾";
         }
 
@@ -253,9 +253,9 @@ public class IdCardProvinceUtil {
 
         if (nationalityName.contains("澳门")) {
             return "澳门";
-        }
+        }*/
 
-        if (credentialType == null) {
+        if (credentialType == null && !"中国".equals(nationalityName)) {
             return "";
         }
 

ship-module-trade/ship-module-trade-biz/src/main/resources/mapper/report/VoyageStockBoardMapper.xml

@@ -426,7 +426,7 @@
         SELECT
             pv.id as voyageId,
             pv.name as voyageName,
-            pv.start_time as startTime,
+            pv.boarding_time as startTime,
             rs.name as shipName,
             rr.direction as direction,
             CASE rr.direction