yanghui
2022-11-28 33a80f6b0585a320872477f85a50aa10ca1d20b1
Merge branch 'local_20221104' into huacheng_test
4个文件已修改
18 ■■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerGoodsVO.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopFlowerEvaluateDAO.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerGoodsServiceImpl.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComShopFlowerEvaluateDAO.xml 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerGoodsVO.java
@@ -135,7 +135,15 @@
    /**
     * 浏览量
     */
    @ApiModelProperty("浏览量")
    private Integer viewNum;
    /**
     * 评价数量
     */
    @ApiModelProperty("评价数量")
    private Integer evaluateNum;
    /**
     * 商品规格列表
@@ -147,3 +155,5 @@
    @NotEmpty(groups = {AddGroup.class}, message = "商品分类不能为空")
    private List<Long> categoryIds;
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopFlowerEvaluateDAO.java
@@ -47,4 +47,6 @@
     * @return
     */
    BigDecimal statisticsScore(@Param("storeId")  Long storeId);
    Integer selectCountByGoodsId(@Param("goodsId") Long goodsId);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerGoodsServiceImpl.java
@@ -222,6 +222,8 @@
        shopGoods.setOrderNum(orderNum);
        List<ComShopFlowerEvaluateVO> comShopFlowerEvaluateVOList = comShopFlowerEvaluateDAO.selectListLimit(goodsId);
        shopGoods.setShopFlowerEvaluateVOList(comShopFlowerEvaluateVOList);
        Integer evaluateNum = comShopFlowerEvaluateDAO.selectCountByGoodsId(goodsId);
        shopGoods.setEvaluateNum(evaluateNum);
        List<Long> categoryIds = convenientGoodsCategoryDAO.selectCategoryIdsForGoods(goodsId);
        shopGoods.setCategoryIds(categoryIds);
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComShopFlowerEvaluateDAO.xml
@@ -44,6 +44,8 @@
    <select id="statisticsScore" resultType="java.math.BigDecimal">
        SELECT (sum(e.evaluate_type)/count(1)) AS pf FROM `com_shop_flower_evaluate` e LEFT JOIN com_shop_flower_goods g ON e.goods_id = g.id WHERE g.store_id = #{storeId} GROUP BY g.store_id
    </select>
    <select id="selectCountByGoodsId" resultType="java.lang.Integer">
        SELECT  count(1) FROM com_shop_flower_evaluate e  WHERE e.goods_id = #{goodsId}
    </select>
</mapper>