Merge remote-tracking branch 'origin/main'

ship-module-miniapplet/src/main/java/com/yc/ship/module/miniapplet/service/adsense/AdsenseServiceImpl.java

@@ -44,7 +44,7 @@ public class AdsenseServiceImpl implements AdsenseService {
         // 插入
         AdsenseDO adsense = BeanUtils.toBean(createReqVO, AdsenseDO.class);
         adsense.setId(IdWorker.getId(adsense));
-        AdsenseDO adsenseDO = getAdsenseByCode(createReqVO.getAdsenseCode());
+        AdsenseDO adsenseDO = getAdsenseByCodeN(createReqVO.getAdsenseCode());
         if (adsenseDO != null) {
             throw exception(ADSENSE_CODE_EXISTS);
         }
@@ -59,7 +59,7 @@ public class AdsenseServiceImpl implements AdsenseService {
         validateAdsenseExists(updateReqVO.getId());
         // 更新
         AdsenseDO updateObj = BeanUtils.toBean(updateReqVO, AdsenseDO.class);
-        AdsenseDO adsenseDO = getAdsenseByCode(updateReqVO.getAdsenseCode());
+        AdsenseDO adsenseDO = getAdsenseByCodeN(updateReqVO.getAdsenseCode());
         if (adsenseDO != null) {
             if (!Objects.equals(adsenseDO.getId(), updateReqVO.getId())) {
                 throw exception(ADSENSE_CODE_EXISTS);
@@ -86,6 +86,10 @@ public class AdsenseServiceImpl implements AdsenseService {
         }
     }
 
+    private AdsenseDO getAdsenseByCodeN(String code) {
+        AdsenseDO adsenseDO = adsenseMapper.selectByCode(code);
+        return adsenseDO;
+    }
     @Override
     public AdsenseDO getAdsense(Long id) {
         return adsenseMapper.selectById(id);

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/app/otc/AppOtcTradeOrderController.java

@@ -166,7 +166,7 @@ public class AppOtcTradeOrderController {
     @Operation(summary = "查询我的行程")
     @PreAuthenticated
     @OperateLog(type = API)
-    public CommonResult<List<AppMyItineraryVO>> getMyItinerary(@RequestParam("status") Integer status, @RequestParam("keyword") String keyword) {
+    public CommonResult<List<AppMyItineraryVO>> getMyItinerary(@RequestParam("status") Integer status, @RequestParam(value = "keyword", required = false) String keyword) {
         Long loginUserId = getLoginUserId();
         List<AppMyItineraryVO> list = appOtcTradeOrderService.getMyItinerary(loginUserId, status, keyword);
         return CommonResult.success(list);
@@ -178,8 +178,8 @@ public class AppOtcTradeOrderController {
     @Operation(summary = "查询行程详情")
     @PreAuthenticated
     @OperateLog(type = API)
-    public CommonResult<AppItineraryDetailVO> getItineraryDetail(@RequestParam("id") Long orderId) {
-        AppItineraryDetailVO detailVO = appOtcTradeOrderService.getItineraryDetail(orderId);
+    public CommonResult<AppItineraryDetailVO> getItineraryDetail(@RequestParam("id") Long orderId, @RequestParam(value = "keyword", required = false) String keyword) {
+        AppItineraryDetailVO detailVO = appOtcTradeOrderService.getItineraryDetail(orderId, keyword);
         return CommonResult.success(detailVO);
     }
 

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/app/otc/vo/AppMyItineraryVO.java

@@ -54,6 +54,9 @@ public class AppMyItineraryVO {
     @Schema(description = "房间数")
     private String roomDesc;
 
+    @Schema(description = "关键字")
+    private String keyword;
+
 
 
 }

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/dal/mysql/order/TradeOrderRoomModelMapper.java

@@ -45,7 +45,7 @@ public interface TradeOrderRoomModelMapper extends BaseMapperX<TradeOrderRoomMod
     List<OrderShareVO> selectOrderShareStatsByOrderIds(@Param("orderIds") List<Long> orderIds);
     List<OrderShareVO> selectOrderShareStatsByOrderIds1(@Param("orderIds") List<Long> orderIds);
 
-    List<AppRoomDescVO> selectRoomDesc(@Param("orderIds") List<Long> orderIds);
+    List<AppRoomDescVO> selectRoomDesc(@Param("orderIds") List<Long> orderIds, @Param("keyword") String keyword);
     /**
      * 统计订单房型数据
      * @param orderIds

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/dal/mysql/order/TradeVisitorMapper.java

@@ -86,7 +86,7 @@ public interface TradeVisitorMapper extends BaseMapperX<TradeVisitorDO> {
      */
     List<TouristExportVisitorVO> selectTouristExportVisitor(@Param("vo") TradeOrderPageReqVO reqVO);
 
-    List<AppPersonDescVO> selectPersonDesc(@Param("orderIds") List<Long> orderIds);
+    List<AppPersonDescVO> selectPersonDesc(@Param("orderIds") List<Long> orderIds, @Param("keyword") String keyword);
     /**
      * 获取订单陪同和领队男女统计
      */
@@ -99,7 +99,7 @@ public interface TradeVisitorMapper extends BaseMapperX<TradeVisitorDO> {
     /**
      * 获取小程序行程详情中的同行人员
      */
-    List<AppItineraryPersonVO> selectPersonListByOrderId(@Param("orderId") Long orderId);
+    List<AppItineraryPersonVO> selectPersonListByOrderId(@Param("orderId") Long orderId, @Param("keyword") String keyword);
 
     default List<TradeVisitorDO> selectListByOrderId(Long orderId) {
         return selectList(new LambdaQueryWrapper<TradeVisitorDO>().eq(TradeVisitorDO::getOrderId, orderId));

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

@@ -96,7 +96,7 @@ public interface TradeOrderService {
      * @param orderId
      * @return
      */
-    AppItineraryDetailVO getItineraryDetail(Long orderId);
+    AppItineraryDetailVO getItineraryDetail(Long orderId, String keyword);
 
     /**
      *

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

@@ -1422,11 +1422,12 @@ public class TradeOrderServiceImpl implements TradeOrderService {
         if (CollectionUtils.isAnyEmpty(orderIds)) {
             return list;
         }
-        List<AppPersonDescVO> personDescVOS = tradeVisitorMapper.selectPersonDesc(orderIds);
+        List<AppPersonDescVO> personDescVOS = tradeVisitorMapper.selectPersonDesc(orderIds, keyword);
         Map<Long, AppPersonDescVO> personDescMap = CollectionUtils.convertMap(personDescVOS, AppPersonDescVO::getOrderId);
-        List<AppRoomDescVO> roomDescVOS = tradeOrderRoomModelMapper.selectRoomDesc(orderIds);
+        List<AppRoomDescVO> roomDescVOS = tradeOrderRoomModelMapper.selectRoomDesc(orderIds, keyword);
         Map<Long, AppRoomDescVO> roomDescMap = CollectionUtils.convertMap(roomDescVOS, AppRoomDescVO::getOrderId);
         list.forEach(item -> {
+            item.setKeyword(keyword);
             String statusDesc = formatStatus(status, item.getBoardingTime());
             item.setStatusDesc(statusDesc);
             MapUtils.findAndThen(personDescMap, item.getOrderId(), personDescVO -> {
@@ -1440,9 +1441,9 @@ public class TradeOrderServiceImpl implements TradeOrderService {
     }
 
     @Override
-    public AppItineraryDetailVO getItineraryDetail(Long orderId) {
+    public AppItineraryDetailVO getItineraryDetail(Long orderId, String keyword) {
         AppItineraryDetailVO detailVO = tradeOrderMapper.selectItineraryDetail(orderId);
-        List<AppItineraryPersonVO> persons = tradeVisitorMapper.selectPersonListByOrderId(orderId);
+        List<AppItineraryPersonVO> persons = tradeVisitorMapper.selectPersonListByOrderId(orderId, keyword);
         detailVO.setPersons(persons);
         ResourceRouteDO route = resourceRouteService.getRoute(detailVO.getRouteId());
         if (route != null) {

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/otc/AppOtcTradeOrderService.java

@@ -53,7 +53,7 @@ public interface AppOtcTradeOrderService {
     /**
      * 小程序查询行程详情
      */
-    AppItineraryDetailVO getItineraryDetail(Long orderId);
+    AppItineraryDetailVO getItineraryDetail(Long orderId, String keyword);
 
     /**
      * app接站登记

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/otc/impl/AppOtcTradeOrderServiceImpl.java

@@ -356,8 +356,8 @@ public class AppOtcTradeOrderServiceImpl implements AppOtcTradeOrderService {
     }
 
     @Override
-    public AppItineraryDetailVO getItineraryDetail(Long orderId) {
-        AppItineraryDetailVO detailVO = tradeOrderService.getItineraryDetail(orderId);
+    public AppItineraryDetailVO getItineraryDetail(Long orderId, String keyword) {
+        AppItineraryDetailVO detailVO = tradeOrderService.getItineraryDetail(orderId, keyword);
         return detailVO;
     }
 
@@ -371,7 +371,7 @@ public class AppOtcTradeOrderServiceImpl implements AppOtcTradeOrderService {
                 OrderJzDetailSaveReqVO vo = new OrderJzDetailSaveReqVO();
                 vo.setName(visitorDO.getName());
                 vo.setIdCard(visitorDO.getCredentialNo());
-                vo.setPhone(visitorDO.getMobile());
+                vo.setPhone(visitorDO.getMobile() == null ? reqVO.getPhone() : visitorDO.getMobile());
                 vo.setArriveTime(reqVO.getArriveTime());
                 vo.setAddress(reqVO.getAddress());
                 vo.setOid(oid);

ship-module-trade/ship-module-trade-biz/src/main/resources/mapper/order/TradeOrderRoomModelMapper.xml

@@ -45,7 +45,7 @@
     <select id="selectRoomDesc" resultType="com.yc.ship.module.trade.controller.app.otc.vo.AppRoomDescVO">
         SELECT
             t1.order_id,
-            t1.floor,
+            t4.floor,
             t2.NAME room_model_name,
             t3.room_num
         FROM
@@ -53,8 +53,12 @@
              <foreach item="item" collection="orderIds" separator="," open="(" close=")" index="index">
                  #{item}
              </foreach>
+            <if test="keyword != null and keyword != ''">
+                and (mobile = #{keyword} or credential_no = #{keyword})
+            </if>
              GROUP BY room_index_id ) t1
-                LEFT JOIN resource_room_model t2 ON t1.room_model_id = t2.id
+                LEFT JOIN trade_order_room_model t4 on t1.room_index_id = t4.room_index_id
+                LEFT JOIN resource_room_model t2 ON t4.room_model_id = t2.id
                 LEFT JOIN resource_room t3 ON t1.room_id = t2.id
     </select>
     <select id="selectOrderRoomModelStatsByOrderIds"

ship-module-trade/ship-module-trade-biz/src/main/resources/mapper/order/TradeVisitorMapper.xml

@@ -368,6 +368,9 @@
         <foreach item="item" collection="orderIds" separator="," open="(" close=")">
             #{item}
         </foreach>
+        <if test="keyword != null and keyword != ''">
+            and (mobile = #{keyword} or credential_no = #{keyword})
+        </if>
         GROUP BY order_id
     </select>
     <select id="selectWithLeaderStatsByOrderIds"
@@ -496,5 +499,8 @@
         WHERE
             t1.deleted = 0
           AND t1.order_id = #{orderId}
+        <if test="keyword != null and keyword != ''">
+            AND (t1.mobile = #{keyword} or t1.credential_no = #{keyword})
+        </if>
     </select>
 </mapper>