Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop

xiaoyong931011

2021-06-29 d397b54e3924c55e80782a80d9f19d616d40ccba

Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop


 Conflicts:

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

 gc-core/src/main/java/com/xzx/gc/entity/JhyInfo.java

@@ -32,11 +32,14 @@
     * 是否集物员 1-是 2-否
     */
    private String isJhy;
    public static final String IS_JHY_Y = "1";
    public static final String IS_JHY_N = "2";

    /**
     * 审核状态 1-待审核 2-审核通过 3-审核拒绝
     */
    private Integer status;
    public static final Integer CHECK_WAIT = 1;
    public static final Integer CHECK_PASS = 2;
    public static final Integer CHECK_REFUSE = 3;
}

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

@@ -35,4 +35,7 @@
    @ApiModelProperty(hidden = true)
    private String userId;

    @ApiModelProperty(value = "排序 1-综合 2-销量 3-价格")
    private int sort = 1;

}

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

@@ -59,7 +59,15 @@
            </if>
        </where>
        group by a.id
        order by a.id desc
        <if test="record.sort == 1">
            order by a.id desc
        </if>
        <if test="record.sort == 2">
            order by quantity desc
        </if>
        <if test="record.sort == 3">
            order by a.present_price desc
        </if>
    </select>

    <resultMap id="goodsDetailsMap" type="com.xzx.gc.shop.vo.XcxGoodsDetailVo">

 gc-user/src/main/java/com/xzx/gc/user/service/JhyInfoService.java

@@ -42,6 +42,9 @@
        JhyInfo jhyInfo = new JhyInfo();
        BeanUtil.copyProperties(applyDto, jhyInfo);
        jhyInfo.setCreatedTime(new Date());
        jhyInfo.setIsJhy(JhyInfo.IS_JHY_N);
        jhyInfo.setCardPos(applyDto.getCardPos());
        jhyInfo.setStatus(JhyInfo.CHECK_WAIT);
        jhyInfoMapper.insert(jhyInfo);
    }