20210625 商品分类

xiaoyong931011

2021-06-25 6e34d77e0f49c901bf57286f6507246aafe8b2f4

20210625 商品分类

 gc-shop/src/main/java/com/xzx/gc/shop/dto/QueryOrderListDto.java

@@ -15,7 +15,7 @@
    @ApiModelProperty(value="客户姓名")
    private String name;

    @ApiModelProperty(value="状态 2-待收货3-已完成4-已取消")
    @ApiModelProperty(value="状态 1-待发货2-待收货3-已收货4-已完成5-已评价6-已取消")
    private Integer status;

    @JsonFormat(shape=JsonFormat.Shape.STRING,pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")

 gc-shop/src/main/java/com/xzx/gc/shop/service/GoodsService.java

@@ -184,6 +184,7 @@
            ObjectMapper objectMapper = new ObjectMapper();
            objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
            viewGoodsVo = objectMapper.convertValue(scoreGoods, ViewGoodsVo.class);
            viewGoodsVo.setCreateTime(scoreGoods.getCreatedTime());
            //轮播图
            List<String> goodsImages = scoreGoodsImagesMapper.selectScoreGoodsImagesByGoodsId(id);
            viewGoodsVo.setGoodsImages(goodsImages);

 gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryGoodsCategoryListVo.java

@@ -21,9 +21,9 @@
    private Long parentId;


    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value="创建时间")
    private Date createdTime;
    private String createTime;

    @ApiModelProperty(value="创建人")
    private String createdBy;

 gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryGoodsListVo.java

@@ -46,12 +46,12 @@
    private Integer isQg;

    @ApiModelProperty(value="抢购开始时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date qgStartTime;
//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private String qgStartTime;

    @ApiModelProperty(value="抢购结束时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date qgEndTime;
//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private String qgEndTime;

    @ApiModelProperty(value="是否上架 1/是 2/否")
    private Integer isSale;
@@ -66,6 +66,6 @@
    private short delFlag;

    @ApiModelProperty(value="创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createdTime;
//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private String createTime;
}

 gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryOrderListVo.java

@@ -15,7 +15,7 @@
    @ApiModelProperty(value="客户手机号")
    private String phone;
    @ApiModelProperty(value="下单时间")
    private String createdTime;
    private String createTime;
    @ApiModelProperty(value="订单总价")
    private String totalPrice;
    @ApiModelProperty(value="数量")

 gc-shop/src/main/java/com/xzx/gc/shop/vo/ViewGoodsVo.java

@@ -79,5 +79,5 @@

    @ApiModelProperty(value="创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createdTime;
    private Date createTime;
}

 gc-shop/src/main/java/com/xzx/gc/shop/vo/ViewOrderVo.java

@@ -33,7 +33,7 @@
    /**
     * 2-待收货3-已完成4-已取消
     */
    @ApiModelProperty(value="状态 2-待收货3-已完成4-已取消")
    @ApiModelProperty(value="状态 1-待发货2-待收货3-已收货4-已完成5-已评价6-已取消")
    private Integer status;

    @ApiModelProperty(value="备注")

 gc-shop/src/main/resources/mapper/shop/ScoreGoodsCategoryMapper.xml

@@ -19,7 +19,8 @@

    <select id="queryGoodsCategoryList" resultType="com.xzx.gc.shop.vo.QueryGoodsCategoryListVo">
        SELECT
               *
               a.*,
        a.CREATED_TIME createTime
        FROM
        xzx_score_goods_category a
        WHERE 1 = 1
@@ -37,7 +38,8 @@

    <select id="viewGoodsCategoryOneList" resultType="com.xzx.gc.shop.vo.ViewGoodsCategoryListVo">
        SELECT
        *
        a.*,
        a.CREATED_TIME createTime
        FROM
        xzx_score_goods_category a
        WHERE 1 = 1
@@ -46,7 +48,8 @@

    <select id="viewGoodsCategoryList" resultType="com.xzx.gc.shop.vo.ViewGoodsCategoryListVo">
        SELECT
            a.*,
            a.*,,
            a.CREATED_TIME createTime,
               (select name from xzx_score_goods_category where a.parent_id = id) parentName
        FROM
            xzx_score_goods_category a

 gc-shop/src/main/resources/mapper/shop/ScoreGoodsMapper.xml

@@ -4,7 +4,8 @@

    <select id="queryGoodsList" resultType="com.xzx.gc.shop.vo.QueryGoodsListVo">
        SELECT
               *
               a.*,
        a.CREATED_TIME createTime
        FROM
        xzx_score_goods a
        WHERE 1 = 1

 gc-shop/src/main/resources/mapper/shop/ScoreOrderMapper.xml

@@ -5,15 +5,15 @@
    <select id="queryOrderList" resultType="com.xzx.gc.shop.vo.QueryOrderListVo">
        SELECT
               a.*,
               a.CREATED_TIME createTime,
               b.name name,
               b.mobile_phone phone,
               d.express_com expressCom,
               d.express_no expressNo,
               d.express_no expressNo
        FROM
        xzx_score_order a
        left join xzx_user_info b where b.user_id = a.user_id
--         left join xzx_score_order_details c where c.order_id = a.id
        left join xzx_score_express_info d where d.order_id = a.id
        left join xzx_user_info b on b.user_id = a.user_id
        left join xzx_score_express_info d on d.order_id = a.id
        WHERE 1 = 1
        <if test="orderNo != null and orderNo != ''">
            and a.order_no like concat('%',#{orderNo},'%')