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

# Conflicts:
#	ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/otc/OtcTradeOrderService.java
#	ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/otc/impl/OtcTradeOrderServiceImpl.java

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/admin/order/OtcTradeOrderController.java

@@ -20,9 +20,27 @@ import com.yc.ship.module.product.service.voyage.VoyageService;
 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.contract.dto.group.WindowCreateOrderGroup;
-import com.yc.ship.module.trade.controller.admin.order.vo.order.*;
+import com.yc.ship.module.trade.controller.admin.order.vo.order.OrderPayAmountRespVO;
+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.admin.order.vo.order.TradeOrderConfirmationVO;
+import com.yc.ship.module.trade.controller.admin.order.vo.order.TradeOrderCountryBaseVO;
+import com.yc.ship.module.trade.controller.admin.order.vo.order.TradeOrderOtcCreateVO;
+import com.yc.ship.module.trade.controller.admin.order.vo.order.TradeOrderPageReqVO;
+import com.yc.ship.module.trade.controller.admin.order.vo.order.TradeOrderRespNewVO;
+import com.yc.ship.module.trade.controller.admin.order.vo.order.TradeOrderRespVO;
+import com.yc.ship.module.trade.controller.admin.order.vo.order.TradeOrderRoomModelVO;
+import com.yc.ship.module.trade.controller.admin.order.vo.order.TradeOrderTotalVO;
 import com.yc.ship.module.trade.controller.admin.order.vo.otc.PrintRespVO;
-import com.yc.ship.module.trade.controller.admin.order.vo.refund.*;
+import com.yc.ship.module.trade.controller.admin.order.vo.refund.RefundDetailRespVO;
+import com.yc.ship.module.trade.controller.admin.order.vo.refund.RefundPageReqVO;
+import com.yc.ship.module.trade.controller.admin.order.vo.refund.RefundRecordPageReqVO;
+import com.yc.ship.module.trade.controller.admin.order.vo.refund.RefundRecordRespVO;
+import com.yc.ship.module.trade.controller.admin.order.vo.refund.RefundRespVO;
+import com.yc.ship.module.trade.controller.admin.order.vo.refund.TradeRefundAuditReqVO;
+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.app.otc.vo.AppTradeOrderPageReqVO;
 import com.yc.ship.module.trade.controller.app.otc.vo.AppTradeOrderRespVO;
 import com.yc.ship.module.trade.dal.dataobject.contract.ContractDO;
@@ -34,7 +52,11 @@ import com.yc.ship.module.trade.dal.dataobject.order.TradeOrderTotalDO;
 import com.yc.ship.module.trade.framework.annotation.PlatTenantEnv;
 import com.yc.ship.module.trade.framework.annotation.RequestDecryption;
 import com.yc.ship.module.trade.framework.annotation.TradeRateLimit;
-import com.yc.ship.module.trade.service.order.*;
+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.TradeOrderRoomModelService;
+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.otc.AppOtcTradeOrderService;
 import com.yc.ship.module.trade.service.otc.OtcTradeOrderService;
 import com.yc.ship.module.trade.service.pay.TradeOrderPayService;
@@ -43,8 +65,14 @@ import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.IOUtils;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
@@ -60,7 +88,9 @@ import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
 
 import static com.yc.ship.framework.common.pojo.CommonResult.success;
-import static com.yc.ship.framework.operatelog.core.enums.OperateTypeEnum.*;
+import static com.yc.ship.framework.operatelog.core.enums.OperateTypeEnum.API;
+import static com.yc.ship.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
+import static com.yc.ship.framework.operatelog.core.enums.OperateTypeEnum.TRADE;
 
 
 /***
@@ -590,4 +620,15 @@ public class OtcTradeOrderController {
         InputStream is = Files.newInputStream(tempFile.toPath());
         IOUtils.copy(is, response.getOutputStream());
     }
+
+
+    @GetMapping("/window/update-status")
+    @OperateLog(type = API)
+    @Operation(summary = "win-订单列表[分页]", description = "修改订单状态")
+    @PreAuthorize("@ss.hasPermission('trade:order:status-update')")
+    public CommonResult<?> updateStatus(@RequestParam Long orderId, @RequestParam Integer status) {
+        return success(otcTradeOrderService.updateStatus(orderId, status));
+    }
+
+
 }

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/admin/orderjzdetail/OrderJzDetailController.java

@@ -177,11 +177,20 @@ public class OrderJzDetailController {
   @GetMapping("/visitor/query")
   @Operation(summary = "获得订单接站人员名单分页")
   @PreAuthorize("@ss.hasPermission('trade:order-jz-detail-sign:query')")
-  public CommonResult<PageResult<OrderJzDetailRespVO>> queryOrderJzDetailPage(@Valid OrderJzDetailPageReqVO pageReqVO) {
+  public CommonResult<PageResult<OrderJzDetailRespVO>> queryOrderVisitorPage(@Valid OrderJzDetailPageReqVO pageReqVO) {
     PageResult<OrderJzDetailDO> pageResult = orderJzDetailService.getOrderJzDetailPage2(pageReqVO);
     return success(BeanUtils.toBean(pageResult, OrderJzDetailRespVO.class));
   }
 
+
+  @GetMapping("/order/query")
+  @Operation(summary = "获得订单接站人员订单分页")
+  @PreAuthorize("@ss.hasPermission('trade:order-jz-detail-sign:query')")
+  public CommonResult<PageResult<?>> queryOrderPage(@Valid OrderJzDetailPageReqVO pageReqVO) {
+    PageResult<?> pageResult = orderJzDetailService.getOrderJzDetailPage3(pageReqVO);
+    return success(pageResult);
+  }
+
   @PostMapping("/visitor/sign")
   @Operation(summary = "游客登记")
   @PreAuthorize("@ss.hasPermission('trade:order-jz-detail-sign:save')")

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/admin/orderjzdetail/vo/OrderJzDetailPageReqVO.java

@@ -52,6 +52,7 @@ public class OrderJzDetailPageReqVO extends PageParam {
      */
     private String voyageId;
 
-
     private String oid;
+
+    private String queryCode;
 }

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/dal/mysql/orderjzdetail/OrderJzDetailMapper.java

@@ -11,6 +11,7 @@ import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 订单接站人员名单 Mapper
@@ -56,5 +57,7 @@ public interface OrderJzDetailMapper extends BaseMapperX<OrderJzDetailDO> {
 
   IPage<OrderJzDetailDO> selectPage2(IPage<OrderJzDetailDO> page, @Param("vo") OrderJzDetailPageReqVO vo);
 
+  IPage<Map> selectPage3(IPage<Map> page, @Param("vo") OrderJzDetailPageReqVO vo);
+
   Long cleanSign(@Param("id") String id);
 }

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/orderjzdetail/OrderJzDetailService.java

@@ -64,4 +64,6 @@ public interface OrderJzDetailService {
   Long signOrderJzDetail(OrderJzDetailSaveReqVO createReqVO);
 
   PageResult<OrderJzDetailDO> getOrderJzDetailPage2(OrderJzDetailPageReqVO pageReqVO);
+
+  PageResult<?> getOrderJzDetailPage3(OrderJzDetailPageReqVO pageReqVO);
 }

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/orderjzdetail/OrderJzDetailServiceImpl.java

@@ -26,6 +26,7 @@ import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 import static com.yc.ship.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static com.yc.ship.framework.security.core.util.SecurityFrameworkUtils.getLoginUser;
@@ -174,17 +175,51 @@ public class OrderJzDetailServiceImpl implements OrderJzDetailService {
   @Override
   public Long signOrderJzDetail(OrderJzDetailSaveReqVO createReqVO) {
     OrderJzDetailDO detail = getOrderJzDetail(createReqVO.getId());
-    if(detail != null) {
-      detail.setSignTime(DateUtils.format(new Date(), DatePattern.NORM_DATETIME_PATTERN));
-      // 当前登录人
-      LoginUser loginUser = getLoginUser();
-      detail.setSignMan(MapUtils.getString(loginUser.getInfo(), LoginUser.INFO_KEY_NICKNAME));
-      detail.setSignRemark(createReqVO.getSignRemark());
-      detail.setSignImage(createReqVO.getSignImage());
+    // 如果ID为空，则为补登游客，按订单来查询
+    if(detail == null) {
+      // 查询是否有接站头表
+      List<OrderJzDO> orderJzDOList  = orderJzMapper.selectList(new LambdaQueryWrapper<OrderJzDO>().eq(OrderJzDO::getOrderId, createReqVO.getOid()));
+      OrderJzDO orderJzDO = null;
+      if (orderJzDOList == null || orderJzDOList.size() == 0) { // 创建一条
+        TradeOrderDO orderDo = tradeOrderMapper.selectById(createReqVO.getOid());
+        if (orderDo == null) {
+          throw new RuntimeException("未查询到相关订单");
+        }
+        orderJzDO = new OrderJzDO();
+        orderJzDO.setId(IdUtil.getSnowflake(0, 0).nextId());
+        orderJzDO.setIsJz(1);
+        orderJzDO.setJzAddress("");
+        orderJzDO.setJzLinkName("");
+        orderJzDO.setJzLinkPhone("");
+        orderJzDO.setOrderId(Long.valueOf(createReqVO.getOid()));
+        orderJzMapper.insert(orderJzDO);
+      } else {
+        orderJzDO = orderJzDOList.get(0);
+      }
+      detail = new OrderJzDetailDO();
+      detail.setJzId(orderJzDO.getId());
+      detail.setBatchNo(IdUtil.getSnowflake(0, 0).nextIdStr());
+      detail.setArriveTime(createReqVO.getArriveTime());
+      detail.setAddress(createReqVO.getAddress());
+      detail.setName(createReqVO.getName());
+      detail.setIdCard(createReqVO.getIdCard());
+      detail.setPhone(createReqVO.getPhone());
+      detail.setRemark("接站补登");
+      detail.setStatus(1);
+    }
+    detail.setSignTime(DateUtils.format(new Date(), DatePattern.NORM_DATETIME_PATTERN));
+    // 当前登录人
+    LoginUser loginUser = getLoginUser();
+    detail.setSignMan(MapUtils.getString(loginUser.getInfo(), LoginUser.INFO_KEY_NICKNAME));
+    detail.setSignRemark(createReqVO.getSignRemark());
+    detail.setSignImage(createReqVO.getSignImage());
+
+    if(detail.getId() == null) {
+      orderJzDetailMapper.insert(detail);
+    } else {
       orderJzDetailMapper.updateById(detail);
-      return detail.getId();
     }
-    return 0L;
+    return detail.getId();
   }
 
   @Override
@@ -193,4 +228,12 @@ public class OrderJzDetailServiceImpl implements OrderJzDetailService {
     IPage<OrderJzDetailDO> iPage = orderJzDetailMapper.selectPage2(page, pageReqVO);
     return new PageResult<>(iPage.getRecords(), iPage.getTotal());
   }
+
+
+  @Override
+  public PageResult<?> getOrderJzDetailPage3(OrderJzDetailPageReqVO pageReqVO) {
+    IPage<Map> page = new Page<>(pageReqVO.getPageNo(), pageReqVO.getPageSize());
+    IPage<?> iPage = orderJzDetailMapper.selectPage3(page, pageReqVO);
+    return new PageResult<>(iPage.getRecords(), iPage.getTotal());
+  }
 }

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

@@ -6,9 +6,24 @@ import com.yc.ship.framework.common.pojo.PageResult;
 import com.yc.ship.framework.security.core.LoginUser;
 import com.yc.ship.module.product.api.dto.CategoryRespDTO;
 import com.yc.ship.module.product.api.dto.ProductSpuRespDTO;
-import com.yc.ship.module.trade.controller.admin.order.vo.order.*;
+import com.yc.ship.module.trade.controller.admin.order.vo.order.OrderPayAmountRespVO;
+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.admin.order.vo.order.TradeDetailPageReqVO;
+import com.yc.ship.module.trade.controller.admin.order.vo.order.TradeDetailRespVO;
+import com.yc.ship.module.trade.controller.admin.order.vo.order.TradeOrderConfirmationVO;
+import com.yc.ship.module.trade.controller.admin.order.vo.order.TradeOrderOtcCreateVO;
+import com.yc.ship.module.trade.controller.admin.order.vo.order.TradeOrderPageReqVO;
+import com.yc.ship.module.trade.controller.admin.order.vo.order.TradeOrderPdaRespVO;
+import com.yc.ship.module.trade.controller.admin.order.vo.order.TradeOrderRespNewVO;
+import com.yc.ship.module.trade.controller.admin.order.vo.order.TradeOrderRespVO;
+import com.yc.ship.module.trade.controller.admin.order.vo.order.TradeStaticReqVO;
 import com.yc.ship.module.trade.controller.admin.order.vo.otc.PrintRespVO;
-import com.yc.ship.module.trade.controller.admin.order.vo.refund.*;
+import com.yc.ship.module.trade.controller.admin.order.vo.refund.RefundDetailRespVO;
+import com.yc.ship.module.trade.controller.admin.order.vo.refund.RefundPageReqVO;
+import com.yc.ship.module.trade.controller.admin.order.vo.refund.RefundRecordPageReqVO;
+import com.yc.ship.module.trade.controller.admin.order.vo.refund.RefundRecordRespVO;
+import com.yc.ship.module.trade.controller.admin.order.vo.refund.RefundRespVO;
 import com.yc.ship.module.trade.dal.dataobject.contract.ContractDO;
 import com.yc.ship.module.trade.dal.dataobject.insurance.InsuranceDO;
 import com.yc.ship.module.trade.dal.dataobject.order.TradeDetailBaseDO;
@@ -138,4 +153,6 @@ public interface OtcTradeOrderService {
     CommonResult<?> orderRead(Long orderId);
 
     CommonResult<?> cancelAudit(Long orderId, Integer auditStatus);
+
+    CommonResult<?> updateStatus(Long orderId, Integer  status);
 }

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

@@ -48,7 +48,18 @@ import com.yc.ship.module.otc.api.store.StoreApi;
 import com.yc.ship.module.otc.api.store.dto.StoreInfoRespDTO;
 import com.yc.ship.module.product.api.ProductApi;
 import com.yc.ship.module.product.api.VoyageApi;
-import com.yc.ship.module.product.api.dto.*;
+import com.yc.ship.module.product.api.dto.CategoryRespDTO;
+import com.yc.ship.module.product.api.dto.OrderRoomUseDTO;
+import com.yc.ship.module.product.api.dto.ProductBasicRuleRespDTO;
+import com.yc.ship.module.product.api.dto.ProductGroupRespDTO;
+import com.yc.ship.module.product.api.dto.ProductOtherRuleRespDTO;
+import com.yc.ship.module.product.api.dto.ProductRefundRuleRespDTO;
+import com.yc.ship.module.product.api.dto.ProductSaleRuleRespDTO;
+import com.yc.ship.module.product.api.dto.ProductSkuRespDTO;
+import com.yc.ship.module.product.api.dto.ProductSpuRespDTO;
+import com.yc.ship.module.product.api.dto.ProductTakeRuleRespDTO;
+import com.yc.ship.module.product.api.dto.ReduceStockReqDTO;
+import com.yc.ship.module.product.api.dto.VoyageRespDTO;
 import com.yc.ship.module.product.controller.admin.voyage.vo.VoyageRespVO;
 import com.yc.ship.module.product.dal.dataobject.priceroommodeltype.PriceRoomModelTypeDO;
 import com.yc.ship.module.product.dal.dataobject.voyage.VoyageDO;
@@ -73,26 +84,82 @@ import com.yc.ship.module.system.api.user.AdminUserApi;
 import com.yc.ship.module.system.api.user.dto.AdminUserRespDTO;
 import com.yc.ship.module.trade.api.dto.TradeOrderPayDTO;
 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.admin.order.vo.order.OrderPayAmountRespVO;
+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.admin.order.vo.order.ShipTradeOrderCreateReqVO;
+import com.yc.ship.module.trade.controller.admin.order.vo.order.TradeDetailPageReqVO;
+import com.yc.ship.module.trade.controller.admin.order.vo.order.TradeDetailRespVO;
+import com.yc.ship.module.trade.controller.admin.order.vo.order.TradeHotelBookingRespVO;
+import com.yc.ship.module.trade.controller.admin.order.vo.order.TradeOrderConfirmationCountryRespVO;
+import com.yc.ship.module.trade.controller.admin.order.vo.order.TradeOrderConfirmationVO;
+import com.yc.ship.module.trade.controller.admin.order.vo.order.TradeOrderDetailCountRespVO;
+import com.yc.ship.module.trade.controller.admin.order.vo.order.TradeOrderLogRespVO;
+import com.yc.ship.module.trade.controller.admin.order.vo.order.TradeOrderOtcCreateVO;
+import com.yc.ship.module.trade.controller.admin.order.vo.order.TradeOrderPageReqVO;
+import com.yc.ship.module.trade.controller.admin.order.vo.order.TradeOrderPdaRespVO;
+import com.yc.ship.module.trade.controller.admin.order.vo.order.TradeOrderPolicyReqVO;
+import com.yc.ship.module.trade.controller.admin.order.vo.order.TradeOrderRespNewVO;
+import com.yc.ship.module.trade.controller.admin.order.vo.order.TradeOrderRespVO;
+import com.yc.ship.module.trade.controller.admin.order.vo.order.TradeOrderRoomModelVO;
+import com.yc.ship.module.trade.controller.admin.order.vo.order.TradeOrderTotalVO;
+import com.yc.ship.module.trade.controller.admin.order.vo.order.TradeOrderVO;
+import com.yc.ship.module.trade.controller.admin.order.vo.order.TradeSpuReqVO;
+import com.yc.ship.module.trade.controller.admin.order.vo.order.TradeStaticReqVO;
+import com.yc.ship.module.trade.controller.admin.order.vo.order.TradeVistorReqVO;
 import com.yc.ship.module.trade.controller.admin.order.vo.otc.PrintRespVO;
-import com.yc.ship.module.trade.controller.admin.order.vo.refund.*;
+import com.yc.ship.module.trade.controller.admin.order.vo.refund.RefundDetailRespVO;
+import com.yc.ship.module.trade.controller.admin.order.vo.refund.RefundPageReqVO;
+import com.yc.ship.module.trade.controller.admin.order.vo.refund.RefundRecordPageReqVO;
+import com.yc.ship.module.trade.controller.admin.order.vo.refund.RefundRecordRespVO;
+import com.yc.ship.module.trade.controller.admin.order.vo.refund.RefundRespVO;
 import com.yc.ship.module.trade.convert.order.TradeOrderConvert;
 import com.yc.ship.module.trade.dal.dataobject.audituser.AuditUserDO;
 import com.yc.ship.module.trade.dal.dataobject.contract.ContractDO;
 import com.yc.ship.module.trade.dal.dataobject.insurance.InsuranceDO;
 import com.yc.ship.module.trade.dal.dataobject.invoice.InvoiceDO;
-import com.yc.ship.module.trade.dal.dataobject.order.*;
+import com.yc.ship.module.trade.dal.dataobject.order.CategoryRespVO;
+import com.yc.ship.module.trade.dal.dataobject.order.TradeDetailBaseDO;
+import com.yc.ship.module.trade.dal.dataobject.order.TradeOrderBindDO;
+import com.yc.ship.module.trade.dal.dataobject.order.TradeOrderCountryDO;
+import com.yc.ship.module.trade.dal.dataobject.order.TradeOrderDO;
+import com.yc.ship.module.trade.dal.dataobject.order.TradeOrderDeliveryDO;
+import com.yc.ship.module.trade.dal.dataobject.order.TradeOrderDeliveryVO;
+import com.yc.ship.module.trade.dal.dataobject.order.TradeOrderHotelDO;
+import com.yc.ship.module.trade.dal.dataobject.order.TradeOrderLogDO;
+import com.yc.ship.module.trade.dal.dataobject.order.TradeOrderPayDO;
+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.dataobject.orderjz.OrderJzDO;
 import com.yc.ship.module.trade.dal.dataobject.orderpolicy.OrderPolicyDO;
 import com.yc.ship.module.trade.dal.dataobject.tradeOrderaudit.TradeOrderAuditDO;
 import com.yc.ship.module.trade.dal.mysql.audituser.AuditUserMapper;
 import com.yc.ship.module.trade.dal.mysql.contract.ContractMapper;
 import com.yc.ship.module.trade.dal.mysql.insurance.InsuranceMapper;
-import com.yc.ship.module.trade.dal.mysql.order.*;
+import com.yc.ship.module.trade.dal.mysql.order.TradeDetailBaseMapper;
+import com.yc.ship.module.trade.dal.mysql.order.TradeDetailMapper;
+import com.yc.ship.module.trade.dal.mysql.order.TradeOrderCountryMapper;
+import com.yc.ship.module.trade.dal.mysql.order.TradeOrderDeliveryMapper;
+import com.yc.ship.module.trade.dal.mysql.order.TradeOrderFloorMapper;
+import com.yc.ship.module.trade.dal.mysql.order.TradeOrderLogMapper;
+import com.yc.ship.module.trade.dal.mysql.order.TradeOrderMapper;
+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.TradeOrderUserMapper;
+import com.yc.ship.module.trade.dal.mysql.order.TradeVisitorMapper;
 import com.yc.ship.module.trade.dal.mysql.orderjz.OrderJzMapper;
 import com.yc.ship.module.trade.dal.mysql.orderpolicy.OrderPolicyMapper;
 import com.yc.ship.module.trade.dal.mysql.tradeOrderaudit.TradeOrderAuditMapper;
-import com.yc.ship.module.trade.enums.*;
+import com.yc.ship.module.trade.enums.ErrorCodeConstants;
+import com.yc.ship.module.trade.enums.PayAccountTypeEnum;
+import com.yc.ship.module.trade.enums.PayTypeEnum;
+import com.yc.ship.module.trade.enums.SellMethodEnum;
+import com.yc.ship.module.trade.enums.TradeOrderBindEnum;
+import com.yc.ship.module.trade.enums.TradeOrderOperateTypeEnum;
+import com.yc.ship.module.trade.enums.TradeOrderStatusEnum;
+import com.yc.ship.module.trade.enums.VoucherStatusEnum;
 import com.yc.ship.module.trade.framework.annotation.TradeOrderLog;
 import com.yc.ship.module.trade.framework.common.ThreadLocalUtil;
 import com.yc.ship.module.trade.framework.common.TradeOrderLogUtils;
@@ -121,15 +188,30 @@ import java.io.InputStream;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.StringJoiner;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
 
 import static com.yc.ship.framework.common.util.collection.CollectionUtils.convertList;
-import static com.yc.ship.framework.security.core.util.SecurityFrameworkUtils.*;
+import static com.yc.ship.framework.security.core.util.SecurityFrameworkUtils.getLoginUser;
+import static com.yc.ship.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
+import static com.yc.ship.framework.security.core.util.SecurityFrameworkUtils.getLoginUserNickname;
 import static com.yc.ship.module.trade.enums.ApiConstants.ORDER_CHANGE_TYPE_NEW;
-import static com.yc.ship.module.trade.enums.ErrorCodeConstants.*;
+import static com.yc.ship.module.trade.enums.ErrorCodeConstants.ORDER_NOT_EXIST;
+import static com.yc.ship.module.trade.enums.ErrorCodeConstants.ORDER_OTC_FAIL;
+import static com.yc.ship.module.trade.enums.ErrorCodeConstants.ORDER_OTC_NONE;
 
 
 /**
@@ -2391,4 +2473,18 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
             }
         }
     }
+
+    @Override
+    public CommonResult<?> updateStatus(Long orderId, Integer  status) {
+        TradeOrderDO tradeOrderDO = tradeOrderMapper.selectById(orderId);
+        if (tradeOrderDO == null) {
+            return CommonResult.error(ORDER_NOT_EXIST);
+        }
+        tradeOrderMapper.update(Wrappers.<TradeOrderDO>lambdaUpdate()
+          .set(TradeOrderDO::getOrderStatus, status)
+          .set(TradeOrderDO::getUpdateTime, LocalDateTime.now())
+          .eq(TradeOrderDO::getId, orderId)
+        );
+        return CommonResult.success("修改成功");
+    }
 }

ship-module-trade/ship-module-trade-biz/src/main/resources/mapper/orderjzdetail/OrderJzDetailMapper.xml

@@ -23,6 +23,16 @@
         </if>
         order by d.address asc, d.arrive_time asc, d.batch_no asc
     </select>
+    <select id="selectPage3" resultType="map">
+        select o.id, o.order_no, r.direction , v.name, v.credential_no, v.mobile
+        from trade_order o
+        inner join product_voyage p on o.voyage_id = p.id
+        inner join resource_route r on p.route_id = r.id
+        inner join trade_visitor v on o.id = v.order_id
+        where o.deleted = 0 and p.deleted = 0 and r.deleted = 0 and v.deleted = 0
+        and  o.voyage_id =  #{vo.voyageId}
+        and (v.credential_no like concat('%', #{vo.queryCode}, '%') or v.mobile like concat('%', #{vo.queryCode}, '%')  or o.order_no like concat('%', #{vo.queryCode}, '%'))
+    </select>
 
     <update id="cleanSign">
         update trade_order_jz_detail set sign_time = null, sign_man = null, sign_remark = null, sign_image = null