订单查询问题

peng

4 天以前 015f6921c0cc90566eb46b3bed48e7d71714ca61

订单查询问题

 buyer-api/src/main/java/cn/lili/controller/order/OrderBuyerController.java

@@ -12,6 +12,7 @@
import cn.lili.modules.order.order.entity.dos.Order;
import cn.lili.modules.order.order.entity.dos.OrderPackage;
import cn.lili.modules.order.order.entity.dto.OrderSearchParams;
import cn.lili.modules.order.order.entity.dto.OrderSearchXcxParams;
import cn.lili.modules.order.order.entity.enums.OrderStatusEnum;
import cn.lili.modules.order.order.entity.vo.OrderDetailVO;
import cn.lili.modules.order.order.entity.vo.OrderSimpleVO;
@@ -85,7 +86,7 @@

    @ApiOperation(value = "查询会员订单列表")
    @GetMapping("/xcx")
    public ResultMessage<IPage<OrderSimpleXcxVO>> queryXcxMineOrder(OrderSearchParams orderSearchParams) {
    public ResultMessage<IPage<OrderSimpleXcxVO>> queryXcxMineOrder(OrderSearchXcxParams orderSearchParams) {
        AuthUser currentUser = Objects.requireNonNull(UserContext.getCurrentUser());
        orderSearchParams.setMemberId(currentUser.getId());
        return ResultUtil.data(orderService.queryByXcxParams(orderSearchParams));

 framework/src/main/java/cn/lili/modules/lmk/domain/query/VideoQuery.java

@@ -28,10 +28,10 @@
    @ApiModelProperty("视频来源：recommend推荐、author某作者的视频、collect某作者收藏的视频、like某作者点赞的视频、search搜索、goodsSimilarly查挂同一商品的视频")
    private String videoFrom;

    @ApiModelProperty("视频id")
    private String videoId;




    
    /**
     * @see cn.lili.modules.lmk.enums.general.VideoTypeEnum
     */

 framework/src/main/java/cn/lili/modules/lmk/mapper/VideoMapper.java

@@ -47,6 +47,8 @@
     */
    IPage recommendVideo(IPage page, @Param("query") VideoQuery query);

    WxVideoVO recommendVideoByVideoId( @Param("query") VideoQuery query);

    List<WxVideoVO> recommendVideoList(@Param("query") VideoQuery query);

    IPage recommendHealthVideo(IPage page, @Param("query") WxHealthVideoQuery query);

 framework/src/main/java/cn/lili/modules/lmk/service/impl/VideoServiceImpl.java

@@ -558,8 +558,15 @@
            case "recommend":// 加载推荐视频
                baseMapper.recommendVideo(page, query);
                //推荐视频重新排序
                WxVideoVO wxVideoVO = null;
                if (StringUtils.isNotBlank(query.getVideoId())) {
                    wxVideoVO  = baseMapper.recommendVideoByVideoId(query);
                }
                List<WxVideoVO> records = page.getRecords();
                Collections.shuffle(records);
                if (wxVideoVO!=null) {
                    records.set(0, wxVideoVO);
                }
                break;
            case "author":  // 加载视频主页我发布的视频
                AuthorVideoQuery query1 = new AuthorVideoQuery();

 framework/src/main/java/cn/lili/modules/order/order/service/OrderService.java

@@ -3,10 +3,7 @@
import cn.lili.modules.member.entity.dto.MemberAddressDTO;
import cn.lili.modules.order.cart.entity.dto.TradeDTO;
import cn.lili.modules.order.order.entity.dos.Order;
import cn.lili.modules.order.order.entity.dto.OrderMessage;
import cn.lili.modules.order.order.entity.dto.OrderSearchParams;
import cn.lili.modules.order.order.entity.dto.PartDeliveryParamsDTO;
import cn.lili.modules.order.order.entity.dto.SupplierOrderSearchParams;
import cn.lili.modules.order.order.entity.dto.*;
import cn.lili.modules.order.order.entity.vo.OrderDetailVO;
import cn.lili.modules.order.order.entity.vo.OrderSimpleVO;
import cn.lili.modules.order.order.entity.vo.OrderSimpleXcxVO;
@@ -60,7 +57,7 @@
     * @param orderSearchParams 查询参数
     * @return 简短订单分页
     */
    IPage<OrderSimpleXcxVO> queryByXcxParams(OrderSearchParams orderSearchParams);
    IPage<OrderSimpleXcxVO> queryByXcxParams(OrderSearchXcxParams orderSearchParams);

    IPage<OrderSimpleXcxVO> querySupplierOrderParams(SupplierOrderSearchParams orderSearchParams);


 framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java

@@ -237,7 +237,7 @@
    }

    @Override
    public IPage<OrderSimpleXcxVO> queryByXcxParams(OrderSearchParams orderSearchParams) {
    public IPage<OrderSimpleXcxVO> queryByXcxParams(OrderSearchXcxParams orderSearchParams) {
        QueryWrapper queryWrapper = orderSearchParams.queryWrapper();
        queryWrapper.groupBy("o.id");
        queryWrapper.orderByDesc("o.id");

 framework/src/main/java/cn/lili/modules/store/mapper/StoreDetailMapper.java

@@ -73,6 +73,13 @@
            "OR settlement_cycle LIKE concat('%,',#{day})"+
            "OR settlement_cycle = #{day}")
    List<StoreSettlementDay> getSettlementStore(int day);
    /**
     * 获取待结算店铺列表
     *
     * @return 待结算店铺列表
     */
    @Select("SELECT store_id,settlement_day FROM li_store_detail ")
    List<StoreSettlementDay> getAllSettlementStore();

    /**
     * 修改店铺的结算日

 framework/src/main/java/cn/lili/modules/store/service/StoreDetailService.java

@@ -131,6 +131,8 @@
     */
    List<StoreSettlementDay> getSettlementStore(int day);

    List<StoreSettlementDay> getAllSettlementStore();

    /**
     * 修改店铺的结算日
     *

 framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreDetailServiceImpl.java

@@ -142,6 +142,10 @@
    public List<StoreSettlementDay> getSettlementStore(int day) {
        return this.baseMapper.getSettlementStore(day);
    }
    @Override
    public List<StoreSettlementDay> getAllSettlementStore() {
        return this.baseMapper.getAllSettlementStore();
    }

    @Override
    public StoreDeliverGoodsAddressDTO getStoreDeliverGoodsAddressDto() {

 framework/src/main/resources/mapper/lmk/VideoMapper.xml

@@ -267,6 +267,40 @@
        ORDER BY
            LV.create_time DESC
    </select>
    <select id="recommendVideoByVideoId" resultMap="WxResultMap">
        SELECT
            LV.author_id,
            LV.cover_url,
            LV.video_fit,
            LV.video_duration,
            LV.video_file_key,
            LV.title,
            LV.goods_view_num,
            LV.goods_order_num,
            LV.recommend,
            LV.status,
            LV.play_num,
            LV.comment_num,
            LV.collect_num,
            LV.thumbs_up_num,
            LV.weight,
            LV.audit_pass_time,
            LV.update_time,
            LV.create_time,
            LV.video_content_type,
            LV.video_type,
            LV.video_imgs,
            LV.id,
            LM.nick_name as authorName,
            LM.face as authorAvatar
        FROM
            lmk_video LV
                LEFT JOIN li_member LM ON LV.author_id = LM.id
        WHERE
            LV.delete_flag = 0 AND LV.status = '1' AND LV.id = #{query.videoId}
        ORDER BY
            LV.create_time DESC
    </select>
    <select id="recommendVideoList" resultMap="WxResultMap">
        SELECT
            LV.author_id,

 lmk-job/src/main/java/cn/lili/handler/impl/order/OrderEveryDayTaskExecute.java

@@ -269,7 +269,9 @@
        int day = DateUtil.date().dayOfMonth();

        //获取待结算商家列表
        List<StoreSettlementDay> storeList = storeDetailService.getSettlementStore(day);
//        List<StoreSettlementDay> storeList = storeDetailService.getSettlementStore(day);
        //直接从所有商家中去结算不在根据天数去结算
        List<StoreSettlementDay> storeList = storeDetailService.getAllSettlementStore();

        //获取当前时间
        DateTime endTime = DateUtil.date();