Merge remote-tracking branch 'origin/main'

ship-module-miniapplet/src/main/java/com/yc/ship/module/miniapplet/controller/admin/advert/AdvertController.java

@@ -52,7 +52,7 @@ public class AdvertController {
     @Operation(summary = "创建广告管理")
     @PreAuthorize("@ss.hasPermission('applet:advert:create')")
     public CommonResult<Long> createAdvert(@Valid @RequestBody AdvertSaveReqVO createReqVO) {
-        verifyAdsense(null, createReqVO.getAdsenseId());
+//        verifyAdsense(null, createReqVO.getAdsenseId());
         return success(advertService.createAdvert(createReqVO));
     }
 
@@ -60,7 +60,7 @@ public class AdvertController {
     @Operation(summary = "更新广告管理")
     @PreAuthorize("@ss.hasPermission('applet:advert:update')")
     public CommonResult<Boolean> updateAdvert(@Valid @RequestBody AdvertSaveReqVO updateReqVO) {
-        verifyAdsense(updateReqVO.getId(), updateReqVO.getAdsenseId());
+//        verifyAdsense(updateReqVO.getId(), updateReqVO.getAdsenseId());
         advertService.updateAdvert(updateReqVO);
         return success(true);
     }

ship-module-miniapplet/src/main/java/com/yc/ship/module/miniapplet/controller/app/content/vo/AppContentRespVO.java

@@ -51,5 +51,22 @@ public class AppContentRespVO {
 
     @Schema(description = "创建时间")
     private LocalDateTime createTime;
+    /**
+     * 作者
+     */
+    @Schema(description = "作者")
+    private String author;
+
+    /**
+     * 作者头像
+     */
+    @Schema(description = "作者头像")
+    private String authorHead;
+    /**
+     * 阅读数
+     */
+    @Schema(description = "阅读数")
+    private Integer views;
+
 
 }

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

@@ -20,10 +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.app.otc.vo.AppTradeOrderPageReqNewVO;
-import com.yc.ship.module.trade.controller.app.otc.vo.AppTradeOrderPageReqVO;
-import com.yc.ship.module.trade.controller.app.otc.vo.AppTradeOrderRespNewVO;
-import com.yc.ship.module.trade.controller.app.otc.vo.AppTradeOrderRespVO;
+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;
 import com.yc.ship.module.trade.enums.RefundChannelEnum;
@@ -51,6 +48,7 @@ import static com.yc.ship.framework.operatelog.core.enums.OperateTypeEnum.API;
 import static com.yc.ship.framework.operatelog.core.enums.OperateTypeEnum.TRADE;
 import static com.yc.ship.framework.security.core.util.SecurityFrameworkUtils.getLoginUser;
 import static com.yc.ship.framework.web.core.util.WebFrameworkUtils.getLoginUserId;
+import static com.yc.ship.framework.web.core.util.WebFrameworkUtils.getTenantId;
 
 
 /**
@@ -83,6 +81,7 @@ public class AppOtcTradeOrderController {
     @RequestDecryption
     @PostMapping("/miniApp/createOrder")
     @Operation(summary = "小程序创建订单")
+    @PreAuthenticated
     @OperateLog(type = TRADE)
     public CommonResult<OtcTradeOrderCreateRespVO> miniAppCreateOrder(@Valid @RequestBody MiniTradeOrderCreateReqVO otcTradeOrderCreateReqVO) {
         LoginUser loginUser = getLoginUser();
@@ -92,14 +91,15 @@ public class AppOtcTradeOrderController {
     @RequestDecryption
     @PostMapping("/miniApp/payOrder")
     @Operation(summary = "小程序支付订单")
+    @PreAuthenticated
     @OperateLog(type = TRADE)
     public CommonResult<PayOrderRespVO> miniAppPayOrder(@Valid @RequestBody PayOrderReqVO payOrderReqVO) {
-
         return appOtcTradeOrderService.miniAppPayOrder(getLoginUser(), payOrderReqVO);
     }
 
     @PostMapping("/miniApp/refund")
     @Operation(summary = "小程序退款")
+    @PreAuthenticated
     @OperateLog(type = TRADE)
     public CommonResult<TradeRefundCreateRespVO> miniAppRefund(@Valid @RequestBody TradeRefundCreateReqVO refundCreateReqVO) {
         refundCreateReqVO.setRefundChannel(RefundChannelEnum.MINI_APP.getType());
@@ -143,9 +143,9 @@ public class AppOtcTradeOrderController {
     @RequestDecryption
     @PutMapping("/miniApp/cancelOrder")
     @Operation(summary = "小程序取消订单")
+    @PreAuthenticated
     @OperateLog(type = TRADE)
     public CommonResult<?> miniAppCancelOrder(@RequestParam("orderId") Long orderId) {
-
         return appOtcTradeOrderService.miniAppCancelOrder(getLoginUser(), orderId);
     }
 
@@ -157,5 +157,15 @@ public class AppOtcTradeOrderController {
         return adminTradeOrderService.calculateRefundAmount(agencyAuthUtils.getAgencyLoginUser(), refundCreateReqVO);
     }
 
+    // 查询我的行程
+    @GetMapping("/miniApp/getMyItinerary")
+    @Operation(summary = "查询我的行程")
+    @OperateLog(type = API)
+    public CommonResult<List<AppMyItineraryVO>> getMyItinerary(@RequestParam("status") Integer status) {
+        Long loginUserId = getLoginUserId();
+        List<AppMyItineraryVO> list = appOtcTradeOrderService.getMyItinerary(loginUserId, status);
+        return CommonResult.success(list);
+    }
+
 
 }

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

@@ -0,0 +1,56 @@
+package com.yc.ship.module.trade.controller.app.otc.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Schema(description = "APP-我的行程")
+@Data
+public class AppMyItineraryVO {
+
+    @Schema(description = "订单id")
+    private Long orderId;
+
+    @Schema(description = "订单编号")
+    private String orderNo;
+
+    @Schema(description = "船id")
+    private Long shipId;
+
+    @Schema(description = "船名称")
+    private String shipName;
+
+    @Schema(description = "航程id")
+    private Long voyageId;
+
+    @Schema(description = "航程名称")
+    private String voyageName;
+
+    @Schema(description = "订单状态")
+    private String statusDesc;
+
+    @Schema(description = "线路id")
+    private String routeId;
+
+    @Schema(description = "线路名称")
+    private String routeName;
+
+    @Schema(description = "出发时间")
+    private LocalDateTime boardingTime;
+
+    @Schema(description = "开始时间")
+    private LocalDateTime startTime;
+
+    @Schema(description = "结束时间")
+    private LocalDateTime leaveTime;
+
+    @Schema(description = "出行人数")
+    private String personDesc;
+
+    @Schema(description = "房间数")
+    private String roomDesc;
+
+
+
+}

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

@@ -15,10 +15,7 @@ import com.yc.ship.module.trade.controller.admin.order.vo.refund.RefundRecordPag
 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.rule.MarketingPageReqVO;
-import com.yc.ship.module.trade.controller.app.otc.vo.AppTradeOrderPageReqNewVO;
-import com.yc.ship.module.trade.controller.app.otc.vo.AppTradeOrderPageReqVO;
-import com.yc.ship.module.trade.controller.app.otc.vo.AppTradeOrderRespNewVO;
-import com.yc.ship.module.trade.controller.app.otc.vo.AppTradeOrderRespVO;
+import com.yc.ship.module.trade.controller.app.otc.vo.*;
 import com.yc.ship.module.trade.controller.app.pda.vo.SupplierCheckOrderPageVO;
 import com.yc.ship.module.trade.dal.dataobject.order.TradeOrderDO;
 import com.yc.ship.module.trade.service.order.bo.TradeBindOrderQueryBO;
@@ -206,4 +203,11 @@ public interface TradeOrderMapper extends BaseMapperX<TradeOrderDO> {
      * @return
      */
     PageResult<AppTradeOrderRespNewVO> selectAppPage(IPage<TradeOrderDO> iPage, @Param("pageReqVO") AppTradeOrderPageReqNewVO pageReqVO);
+    /**
+     * 我的行程
+     * @param loginUserId
+     * @param status
+     * @return
+     */
+    List<AppMyItineraryVO> selectMyItinerary(Long loginUserId, Integer status);
 }

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

@@ -8,10 +8,7 @@ import com.yc.ship.module.trade.api.dto.TradeModifyVisitorReqDTO;
 import com.yc.ship.module.trade.api.dto.TradeOrderCreateReqDTO;
 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.AppTradeOrderPageReqNewVO;
-import com.yc.ship.module.trade.controller.app.otc.vo.AppTradeOrderPageReqVO;
-import com.yc.ship.module.trade.controller.app.otc.vo.AppTradeOrderRespNewVO;
-import com.yc.ship.module.trade.controller.app.otc.vo.AppTradeOrderRespVO;
+import com.yc.ship.module.trade.controller.app.otc.vo.*;
 import com.yc.ship.module.trade.dal.dataobject.order.TradeOrderDO;
 
 import java.io.File;
@@ -86,4 +83,12 @@ public interface TradeOrderService {
      * @return
      */
     PageResult<AppTradeOrderRespNewVO> getAppOrderPage(AppTradeOrderPageReqNewVO pageReqVO);
+
+    /**
+     * 获取小程序我的行程
+     * @param loginUserId
+     * @param status
+     * @return
+     */
+    List<AppMyItineraryVO> getMyItinerary(Long loginUserId, Integer status);
 }

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

@@ -40,10 +40,7 @@ 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.*;
 import com.yc.ship.module.trade.controller.admin.order.vo.order.*;
-import com.yc.ship.module.trade.controller.app.otc.vo.AppTradeOrderPageReqNewVO;
-import com.yc.ship.module.trade.controller.app.otc.vo.AppTradeOrderPageReqVO;
-import com.yc.ship.module.trade.controller.app.otc.vo.AppTradeOrderRespNewVO;
-import com.yc.ship.module.trade.controller.app.otc.vo.AppTradeOrderRespVO;
+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.*;
 import com.yc.ship.module.trade.dal.dataobject.orderjz.OrderJzDO;
@@ -1397,6 +1394,12 @@ public class TradeOrderServiceImpl implements TradeOrderService {
         return pageResult;
     }
 
+    @Override
+    public List<AppMyItineraryVO> getMyItinerary(Long loginUserId, Integer status) {
+        List<AppMyItineraryVO> list = tradeOrderMapper.selectMyItinerary(loginUserId, status);
+        return list;
+    }
+
 
     private List<TradeDetailPriceDO> buildTradeDetailPrice(TradeOrderDO tradeOrderDO, List<TradeOrderCreateReqDTO.DetailPrice> tradeDetailPriceList, TradeDetailDO tradeDetailDO) {
         if (ObjectUtils.equalsAny(tradeOrderDO.getSellMethod(), SellMethodEnum.MINI_APP.getType()) && ObjectUtil.equal(tradeDetailDO.getCateType(), ProductTypeEnum.Hotel.getValue())) {

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

@@ -8,9 +8,12 @@ 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.AppMyItineraryVO;
 import com.yc.ship.module.trade.controller.app.otc.vo.AppTradeOrderPageReqVO;
 import com.yc.ship.module.trade.controller.app.otc.vo.AppTradeOrderRespVO;
 
+import java.util.List;
+
 
 /**
  * @Description 旅行社订单交易service接口
@@ -45,5 +48,8 @@ public interface AppOtcTradeOrderService {
     String getConfigValue(String key);
 
     CommonResult<?> miniAppCancelOrder(LoginUser loginUser, Long orderId);
-
+    /**
+     * 小程序查询我的行程
+     */
+    List<AppMyItineraryVO> getMyItinerary(Long loginUserId, Integer status);
 }

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

@@ -23,6 +23,7 @@ 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.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.convert.order.TradeOrderConvert;
@@ -54,6 +55,7 @@ import java.util.Date;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
+import static com.yc.ship.framework.security.core.util.SecurityFrameworkUtils.getLoginUserNickname;
 import static com.yc.ship.module.trade.enums.ErrorCodeConstants.ORDER_PAY_TENAND_FAIL;
 
 
@@ -275,6 +277,7 @@ public class AppOtcTradeOrderServiceImpl implements AppOtcTradeOrderService {
     private void setShipOrderPropertyFromLoginUser(LoginUser loginUser, ShipTradeOrderCreateReqVO.OrderProperty orderProperty) {
         orderProperty.setSellerId(loginUser.getId().toString());
         orderProperty.setSellMethod(SellMethodEnum.MINI_APP.getType());
+        orderProperty.setMemberId(loginUser.getId().toString());
     }
 
     private static ShipTradeOrderCreateReqVO.@NotNull Visitor getVisitor1(TradeVistorReqVO tradeVistorReqVO) {
@@ -298,7 +301,8 @@ public class AppOtcTradeOrderServiceImpl implements AppOtcTradeOrderService {
         if (loginUser == null) {
             return CommonResult.error(ORDER_PAY_TENAND_FAIL);
         }
-        payOrderReqVO.setAccountType(PayAccountTypeEnum.OTC.getType());
+        payOrderReqVO.setAccountType(PayAccountTypeEnum.MEMBER.getType());
+        payOrderReqVO.setAccountName(getLoginUserNickname());
         return tradeOrderPayService.payOrder(payOrderReqVO);
     }
 
@@ -327,4 +331,10 @@ public class AppOtcTradeOrderServiceImpl implements AppOtcTradeOrderService {
         return tradeOrderPayService.cancelOrder(orderId);
     }
 
+    @Override
+    public List<AppMyItineraryVO> getMyItinerary(Long loginUserId, Integer status) {
+        List<AppMyItineraryVO> list = tradeOrderService.getMyItinerary(loginUserId, status);
+        return list;
+    }
+
 }

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

@@ -2179,5 +2179,9 @@
             and order_status = #{pageReqVO.orderStatus}
         </if>
     </select>
+    <select id="selectMyItinerary"
+            resultType="com.yc.ship.module.trade.controller.app.otc.vo.AppMyItineraryVO">
+        select t1.id, t1.order_no, t3.img, t1.ship_id, t3.`name` ship_name, t3.short_name ship_short_name,t4.`name` route_name, t4.direction, t1.voyage_id, t2.`name` voyage_name,t2.boarding_time,t2.start_time,t2.leave_time, t1.order_status, t1.amount price from trade_order t1 LEFT JOIN product_voyage t2 on t1.voyage_
+    </select>
 </mapper>