fix: 接站登记接口

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

@@ -80,8 +80,6 @@ public class AppOtcTradeOrderController {
     @Resource
     private OtcTradeOrderService otcTradeOrderService;
 
-    @Resource
-    private OrderJzDetailService orderJzDetailService;
 
 
     @RequestDecryption
@@ -186,11 +184,11 @@ public class AppOtcTradeOrderController {
     }
 
     @PostMapping("/miniApp/sign")
-    @Operation(summary = "查询行程详情")
+    @Operation(summary = "接站登记")
     @PreAuthenticated
     @OperateLog(type = API)
-    public CommonResult<Long> createOrderJzDetail(@Valid @RequestBody List<OrderJzDetailSaveReqVO> createReqVOList) {
-        return success(orderJzDetailService.createOrderJzDetail(createReqVOList));
+    public CommonResult<Long> createOrderJzDetail(@Valid @RequestBody AppOrderJzReqVO reqVO) {
+        return success(appOtcTradeOrderService.appCreateOrderJzDetail(reqVO));
     }
 
 

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

@@ -17,6 +17,9 @@ public class AppItineraryDetailVO {
     @Schema(description = "订单编号")
     private String orderNo;
 
+    @Schema(description = "航向")
+    private Integer direction;
+
     @Schema(description = "订单状态")
     private String statusDesc;
 

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

@@ -15,6 +15,9 @@ public class AppMyItineraryVO {
     @Schema(description = "订单编号")
     private String orderNo;
 
+    @Schema(description = "航向")
+    private Integer direction;
+    
     @Schema(description = "船id")
     private Long shipId;
 

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

@@ -0,0 +1,25 @@
+package com.yc.ship.module.trade.controller.app.otc.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+public class AppOrderJzReqVO {
+
+    @Schema(description = "接站时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "18565")
+    private String arriveTime;
+
+    @Schema(description = "接站地址")
+    private String address;
+
+    @Schema(description = "接站联系人", example = "李四")
+    private String name;
+
+    @Schema(description = "接站联系电话")
+    private String phone;
+
+    @Schema(description = "备注车次航班", example = "随便")
+    private String remark;
+
+    private String oid;
+}

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

@@ -1,5 +1,6 @@
 package com.yc.ship.module.trade.dal.mysql.order;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yc.ship.framework.common.pojo.PageResult;
 import com.yc.ship.framework.mybatis.core.mapper.BaseMapperX;
@@ -99,4 +100,8 @@ public interface TradeVisitorMapper extends BaseMapperX<TradeVisitorDO> {
      * 获取小程序行程详情中的同行人员
      */
     List<AppItineraryPersonVO> selectPersonListByOrderId(@Param("orderId") Long orderId);
+
+    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/otc/AppOtcTradeOrderService.java

@@ -8,10 +8,7 @@ import com.yc.ship.module.trade.controller.admin.order.vo.order.MiniTradeOrderCr
 import com.yc.ship.module.trade.controller.admin.order.vo.order.OtcTradeOrderCreateRespVO;
 import com.yc.ship.module.trade.controller.admin.order.vo.order.PayOrderReqVO;
 import com.yc.ship.module.trade.controller.admin.order.vo.order.PayOrderRespVO;
-import com.yc.ship.module.trade.controller.app.otc.vo.AppItineraryDetailVO;
-import com.yc.ship.module.trade.controller.app.otc.vo.AppMyItineraryVO;
-import com.yc.ship.module.trade.controller.app.otc.vo.AppTradeOrderPageReqVO;
-import com.yc.ship.module.trade.controller.app.otc.vo.AppTradeOrderRespVO;
+import com.yc.ship.module.trade.controller.app.otc.vo.*;
 
 import java.util.List;
 
@@ -57,4 +54,11 @@ public interface AppOtcTradeOrderService {
      * 小程序查询行程详情
      */
     AppItineraryDetailVO getItineraryDetail(Long orderId);
+
+    /**
+     * app接站登记
+     * @param reqVO
+     * @return
+     */
+    Long appCreateOrderJzDetail(AppOrderJzReqVO reqVO);
 }

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

@@ -23,21 +23,22 @@ import com.yc.ship.module.resource.api.ship.ShipApi;
 import com.yc.ship.module.resource.api.ship.dto.ShipRespDTO;
 import com.yc.ship.module.trade.api.dto.TradeOrderRespDTO;
 import com.yc.ship.module.trade.controller.admin.order.vo.order.*;
-import com.yc.ship.module.trade.controller.app.otc.vo.AppItineraryDetailVO;
-import com.yc.ship.module.trade.controller.app.otc.vo.AppMyItineraryVO;
-import com.yc.ship.module.trade.controller.app.otc.vo.AppTradeOrderPageReqVO;
-import com.yc.ship.module.trade.controller.app.otc.vo.AppTradeOrderRespVO;
+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.convert.order.TradeOrderConvert;
 import com.yc.ship.module.trade.dal.dataobject.order.TradeOrderRoomModelDO;
 import com.yc.ship.module.trade.dal.dataobject.order.TradeOrderTotalDO;
+import com.yc.ship.module.trade.dal.dataobject.order.TradeVisitorDO;
 import com.yc.ship.module.trade.dal.mysql.order.TradeOrderRoomModelMapper;
 import com.yc.ship.module.trade.dal.mysql.order.TradeOrderTotalMapper;
+import com.yc.ship.module.trade.dal.mysql.order.TradeVisitorMapper;
 import com.yc.ship.module.trade.enums.PayAccountTypeEnum;
 import com.yc.ship.module.trade.enums.SellMethodEnum;
 import com.yc.ship.module.trade.enums.TradeOrderOperateTypeEnum;
 import com.yc.ship.module.trade.framework.annotation.TradeOrderLog;
 import com.yc.ship.module.trade.framework.mq.TradePublishUtils;
 import com.yc.ship.module.trade.service.order.TradeOrderService;
+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.service.pay.TradeOrderPayService;
@@ -102,6 +103,12 @@ public class AppOtcTradeOrderServiceImpl implements AppOtcTradeOrderService {
     @Resource
     private TradePublishUtils tradePublishUtils;
 
+    @Resource
+    private TradeVisitorMapper tradeVisitorMapper;
+
+    @Resource
+    private OrderJzDetailService orderJzDetailService;
+
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -356,4 +363,26 @@ public class AppOtcTradeOrderServiceImpl implements AppOtcTradeOrderService {
         return detailVO;
     }
 
+    @Override
+    public Long appCreateOrderJzDetail(AppOrderJzReqVO reqVO) {
+        String oid = reqVO.getOid();
+        List<TradeVisitorDO> visitorDOList = tradeVisitorMapper.selectListByOrderId(Long.valueOf(oid));
+        if (visitorDOList != null && !visitorDOList.isEmpty()) {
+            List<OrderJzDetailSaveReqVO> list = new ArrayList<>();
+            visitorDOList.stream().forEach(visitorDO -> {
+                OrderJzDetailSaveReqVO vo = new OrderJzDetailSaveReqVO();
+                vo.setName(visitorDO.getName());
+                vo.setIdCard(visitorDO.getCredentialNo());
+                vo.setPhone(visitorDO.getMobile());
+                vo.setArriveTime(reqVO.getArriveTime());
+                vo.setAddress(reqVO.getAddress());
+                vo.setOid(oid);
+                vo.setRemark(reqVO.getRemark());
+                list.add(vo);
+            });
+            orderJzDetailService.createOrderJzDetail(list);
+        }
+        return 0L;
+    }
+
 }

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

@@ -2489,7 +2489,8 @@
             t3.`name` route_name,
             t2.boarding_time,
             t2.start_time,
-            t2.leave_time
+            t2.leave_time,
+            t3.direction
         FROM
             trade_order t1
                 LEFT JOIN product_voyage t2 ON t1.voyage_id = t2.id