#feat 调试问题修改

yanghui

2022-11-25 462c84a3f6c4319e262736259eab7949a33c5c4c

#feat 调试问题修改

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComFlowerOrderListDTO.java

@@ -30,6 +30,10 @@
    @ApiModelProperty(value = "配送单id")
    private Long deliveryId;

    @ApiModelProperty(value = "配送方式（1.自提 2.快递）")
    private Integer deliveryType;


    @ApiModelProperty(value = "用户id", hidden = true)
    private Long userId;
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopFlowerOrderDAO.java

@@ -81,6 +81,7 @@

    /**
     * 获取商家可结算额度 15天以前的完成的订单
     *
     * @param storeId
     * @return
     */
@@ -90,6 +91,7 @@

    /**
     * 查询近15天的订单量
     *
     * @param storeId
     * @return
     */
@@ -97,8 +99,11 @@

    /**
     * 查询当年月份的订单量
     *
     * @param storeId
     * @return
     */
    List<ComShopOrderStoreIdCountVO> selectCountOrderMonthByStoreId(@Param("storeId") Long storeId);

    IPage<ComShopFlowerOrderStoreListVO> pageOrderByDeliveryNo(@Param("page") Page page, @Param("comOrderListDTO") PageComFlowerOrderListDTO comOrderListDTO);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerOrderDeliveryServiceImpl.java

@@ -83,7 +83,7 @@
            return R.fail("不存在该配送单");
        }
        comShopFlowerOrderDeliveryDO.setServiceTime(new Date());
        comShopFlowerOrderDeliveryDO.setDeleteStatus(ComShopFlowerOrderDeliveryDO.deliveryStatus.ysd);
        comShopFlowerOrderDeliveryDO.setDeliveryStatus(ComShopFlowerOrderDeliveryDO.deliveryStatus.ysd);
        int update = this.baseMapper.updateById(comShopFlowerOrderDeliveryDO);
        if (update > 0){
            comShopFlowerOrderDAO.updateOrderStatus(comShopFlowerOrderDeliveryDO.getId(),comShopFlowerOrderDeliveryDO.getServiceTime(),ComShopFlowerOrderDO.status.dsh);

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerOrderServiceImpl.java

@@ -1048,7 +1048,7 @@
    @Override
    public R pageOrderByDeliveryNo(PageComFlowerOrderListDTO pageComFlowerOrderListDTO) {
        Page page = new Page(pageComFlowerOrderListDTO.getPageNum(), pageComFlowerOrderListDTO.getPageSize());
        IPage<ComShopFlowerOrderStoreListVO> orderPageVOIPage = this.baseMapper.pageOrderByStoreId(page, pageComFlowerOrderListDTO);
        IPage<ComShopFlowerOrderStoreListVO> orderPageVOIPage = this.baseMapper.pageOrderByDeliveryNo(page, pageComFlowerOrderListDTO);
        ComShopFlowerOrderDeliveryNoListVO comShopFlowerOrderDeliveryNoListVO = new ComShopFlowerOrderDeliveryNoListVO();
        ComShopFlowerOrderDeliveryDO comShopFlowerOrderDeliveryDO = comShopFlowerOrderDeliveryDAO.selectById(pageComFlowerOrderListDTO.getDeliveryId());
        ComShopFlowerOrderDeliveryVO comShopFlowerOrderDeliveryVO = new ComShopFlowerOrderDeliveryVO();

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComShopFlowerOrderDAO.xml

@@ -44,9 +44,11 @@

    <select id="pageOrderList" resultType="com.panzhihua.common.model.vos.shop.ComShopFlowerOrderPageVO">
        select id as orderId,order_no,store_id,`status`,pay_status,receiver_id,total_amount as
        orderTotal,pay_amount,delivery_type,remark,create_at from com_shop_flower_order as cso where 1=1 and
        cso.delete_status = 1
        and cso.user_id = #{comOrderListDTO.userId}
        orderTotal,pay_amount,delivery_type,remark,create_at from com_shop_flower_order as cso
        where  cso.delete_status = 1
        <if test="comOrderListDTO.userId != null">
            and cso.user_id = #{comOrderListDTO.userId}
        </if>
        <if test='comOrderListDTO.status != null'>
            AND cso.status =  #{comOrderListDTO.status}
         </if>
@@ -162,7 +164,42 @@
                com_shop_flower_order o
                LEFT JOIN com_shop_flower_order_goods g ON o.id = g.order_id
                LEFT JOIN com_shop_flower_user_address a ON a.id = o.receiver_id
            WHERE 1=1 and o.delivery_type = 2
            WHERE 1=1
        <if test="comOrderListDTO.deliveryType != null">
            and o.delivery_type = #{comOrderListDTO.deliveryType}
        </if>
        <if test="comOrderListDTO.storeId != null">
            and o.store_id = #{comOrderListDTO.storeId}
        </if>
        <if test="comOrderListDTO.deliveryId != null">
            and o.delivery_id = #{comOrderListDTO.deliveryId}
        </if>

    </select>
    <select id="pageOrderByDeliveryNo" resultType="com.panzhihua.common.model.vos.shop.ComShopFlowerOrderStoreListVO">
        SELECT
        o.id order_id,
        o.order_no,
        o.delivery_type,
        o.`status`,
        g.goods_name,
        g.goods_attr_name,
        g.amount,
        g.goods_attr_price,
        g.goods_attr_pic,
        o.total_amount,
        a.`name`,
        a.phone,
        a.province_name,
        a.city_name,
        a.district_name,
        a.detail_address,
        o.point_id
        FROM
        com_shop_flower_order o
        LEFT JOIN com_shop_flower_order_goods g ON o.id = g.order_id
        LEFT JOIN com_shop_flower_user_address a ON a.id = o.receiver_id
        WHERE 1=1 and o.delivery_type = 1
        <if test="comOrderListDTO.storeId != null">
            and o.store_id = #{comOrderListDTO.storeId}
        </if>