fix: 修改行程查询，添加接站登记接口

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/controller/admin/scenic/vo/ResourceScenicSaveReqVO.java

@@ -2,6 +2,8 @@ package com.yc.ship.module.resource.controller.admin.scenic.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
+
+import java.math.BigDecimal;
 import java.util.*;
 import javax.validation.constraints.*;
 
@@ -67,4 +69,22 @@ public class ResourceScenicSaveReqVO {
     @NotNull(message = "状态不能为空")
     private Integer status;
 
+    /**
+     * 建议游玩时间
+     */
+    @Schema(description = "建议游玩时间")
+    private String playTime;
+
+    /**
+     * 景区价格
+     */
+    @Schema(description = "景区价格")
+    private BigDecimal price;
+
+    /**
+     * 评分
+     */
+    @Schema(description = "评分")
+    private BigDecimal score;
+
 }

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

@@ -20,6 +20,7 @@ import com.yc.ship.module.trade.controller.admin.order.vo.order.*;
 import com.yc.ship.module.trade.controller.admin.order.vo.refund.TradeRefundCalculateRespVO;
 import com.yc.ship.module.trade.controller.admin.order.vo.refund.TradeRefundCreateReqVO;
 import com.yc.ship.module.trade.controller.admin.order.vo.refund.TradeRefundCreateRespVO;
+import com.yc.ship.module.trade.controller.admin.orderjzdetail.vo.OrderJzDetailSaveReqVO;
 import com.yc.ship.module.trade.controller.app.otc.vo.*;
 import com.yc.ship.module.trade.dal.dataobject.order.TradeOrderCountryDO;
 import com.yc.ship.module.trade.dal.dataobject.order.TradeOrderTotalDO;
@@ -29,6 +30,7 @@ import com.yc.ship.module.trade.service.order.AdminTradeOrderService;
 import com.yc.ship.module.trade.service.order.TradeOrderCountryService;
 import com.yc.ship.module.trade.service.order.TradeOrderService;
 import com.yc.ship.module.trade.service.order.TradeOrderTotalService;
+import com.yc.ship.module.trade.service.orderjzdetail.OrderJzDetailService;
 import com.yc.ship.module.trade.service.otc.AppOtcTradeOrderService;
 import com.yc.ship.module.trade.service.otc.OtcTradeOrderService;
 import com.yc.ship.module.trade.utils.AgencyAuthUtils;
@@ -39,6 +41,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import javax.annotation.security.PermitAll;
 import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
@@ -77,6 +80,9 @@ public class AppOtcTradeOrderController {
     @Resource
     private OtcTradeOrderService otcTradeOrderService;
 
+    @Resource
+    private OrderJzDetailService orderJzDetailService;
+
 
     @RequestDecryption
     @PostMapping("/miniApp/createOrder")
@@ -162,9 +168,9 @@ public class AppOtcTradeOrderController {
     @Operation(summary = "查询我的行程")
     @PreAuthenticated
     @OperateLog(type = API)
-    public CommonResult<List<AppMyItineraryVO>> getMyItinerary(@RequestParam("status") Integer status) {
+    public CommonResult<List<AppMyItineraryVO>> getMyItinerary(@RequestParam("status") Integer status, @RequestParam("keyword") String keyword) {
         Long loginUserId = getLoginUserId();
-        List<AppMyItineraryVO> list = appOtcTradeOrderService.getMyItinerary(loginUserId, status);
+        List<AppMyItineraryVO> list = appOtcTradeOrderService.getMyItinerary(loginUserId, status, keyword);
         return CommonResult.success(list);
     }
 
@@ -179,5 +185,13 @@ public class AppOtcTradeOrderController {
         return CommonResult.success(detailVO);
     }
 
+    @PostMapping("/miniApp/sign")
+    @Operation(summary = "查询行程详情")
+    @PreAuthenticated
+    @OperateLog(type = API)
+    public CommonResult<Long> createOrderJzDetail(@Valid @RequestBody List<OrderJzDetailSaveReqVO> createReqVOList) {
+        return success(orderJzDetailService.createOrderJzDetail(createReqVOList));
+    }
+
 
 }

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

@@ -216,10 +216,10 @@ public interface TradeOrderMapper extends BaseMapperX<TradeOrderDO> {
      * @param status
      * @return
      */
-    List<AppMyItineraryVO> selectMyItinerary(@Param("memberId") Long memberId, @Param("status") Integer status);
+    List<AppMyItineraryVO> selectMyItinerary(@Param("memberId") Long memberId, @Param("status") Integer status, @Param("keyword") String keyword);
     /**
      * 统计另外的订单合计
-     * @param orderId
+     * @param orderIds
      * @return
      */
     OrderTotalRespVO selectTotal1ByOrderIds(@Param("orderIds") List<Long> orderIds);

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

@@ -90,7 +90,7 @@ public interface TradeOrderService {
      * @param status
      * @return
      */
-    List<AppMyItineraryVO> getMyItinerary(Long loginUserId, Integer status);
+    List<AppMyItineraryVO> getMyItinerary(Long loginUserId, Integer status, String keyword);
     /**
      * 获取小程序行程详情
      * @param orderId

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

@@ -1418,8 +1418,8 @@ public class TradeOrderServiceImpl implements TradeOrderService {
     }
 
     @Override
-    public List<AppMyItineraryVO> getMyItinerary(Long loginUserId, Integer status) {
-        List<AppMyItineraryVO> list = tradeOrderMapper.selectMyItinerary(loginUserId, status);
+    public List<AppMyItineraryVO> getMyItinerary(Long loginUserId, Integer status, String keyword) {
+        List<AppMyItineraryVO> list = tradeOrderMapper.selectMyItinerary(loginUserId, status, keyword);
         List<Long> orderIds = CollectionUtils.convertList(list, AppMyItineraryVO::getOrderId);
         if(CollectionUtils.isAnyEmpty(orderIds)) {
             return list;

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

@@ -52,7 +52,7 @@ public interface AppOtcTradeOrderService {
     /**
      * 小程序查询我的行程
      */
-    List<AppMyItineraryVO> getMyItinerary(Long loginUserId, Integer status);
+    List<AppMyItineraryVO> getMyItinerary(Long loginUserId, Integer status, String keyword);
     /**
      * 小程序查询行程详情
      */

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

@@ -345,8 +345,8 @@ public class AppOtcTradeOrderServiceImpl implements AppOtcTradeOrderService {
     }
 
     @Override
-    public List<AppMyItineraryVO> getMyItinerary(Long loginUserId, Integer status) {
-        List<AppMyItineraryVO> list = tradeOrderService.getMyItinerary(loginUserId, status);
+    public List<AppMyItineraryVO> getMyItinerary(Long loginUserId, Integer status, String keyword) {
+        List<AppMyItineraryVO> list = tradeOrderService.getMyItinerary(loginUserId, status, keyword);
         return list;
     }
 

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

@@ -2495,10 +2495,18 @@
                 LEFT JOIN product_voyage t2 ON t1.voyage_id = t2.id
                 LEFT JOIN resource_route t3 ON t2.route_id = t3.id
                 LEFT JOIN resource_ship t4 ON t2.ship_id = t4.id
+                left join trade_visitor t5 on t1.id = t5.order_id
         WHERE
             t1.deleted = 0
           and t1.order_status in (3,6,7,8,9)
-          and member_id = #{memberId}
+          <choose>
+              <when test="keyword != null and keyword != ''">
+                  and (t5.mobile = #{keyword} or t5.credential_no = #{keyword})
+              </when>
+              <otherwise>
+                  and member_id = #{memberId}
+              </otherwise>
+          </choose>
           <if test="status != null and status != ''">
               <if test="status == '1' or status == 1">
                   and t2.boarding_time > now()