lidongdong
2023-09-07 428b89b441a0bb2234c6661c233b4537271db7ec
修改上下架社区商品  问题
4个文件已修改
10 ■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/VolunteerMerchantVO.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/VolunteerMerchantApi.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/VolunteerMerchant.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/VolunteerMerchantMapper.xml 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/VolunteerMerchantVO.java
@@ -146,6 +146,8 @@
    @ApiModelProperty(value = "商家类型名称")
    private String merchantTypeName;
    @ApiModelProperty(value = "商家评分")
    private String merchantGrade;
    @ApiModelProperty(value = "商家积分")
    private String merchantIntegral;
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/VolunteerMerchantApi.java
@@ -186,7 +186,6 @@
    @PostMapping("/unmount")
    public R  VolunteerIntegralMerchantUnmount(@RequestBody VolunteerIntegralMerchantVO vimVO)
    {
        vimVO.setGoodType("1");
        return vtService.VolunteerIntegralMerchantUnmount(vimVO);
    }
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/VolunteerMerchant.java
@@ -150,6 +150,10 @@
    @ApiModelProperty(value = "商家类型名称")
    private String merchantTypeName;
    @TableField(exist = false)
    @ApiModelProperty(value = "商家评分")
    private String merchantGrade;
    @ApiModelProperty(value = "商家积分")
    private String merchantIntegral;
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/VolunteerMerchantMapper.xml
@@ -40,6 +40,7 @@
        (select su.phone from sys_user as su where su.user_id=volunteer_merchant.user_id) as merchantPhone,
        (select su.name from sys_user as su where su.user_id=volunteer_merchant.user_id) as merchantLinkman,
        (select vt.name from volunteer_type as vt where vt.id=volunteer_merchant.merchant_type) as merchantTypeName,
        (SELECT ROUND(AVG(vme.evaluate_grade), 1) FROM volunteer_merchant_evaluate as vme WHERE vme.merchant_id=volunteer_merchant.id) as merchantGrade,
        service_call,
        merchant_content,
        merchant_url,
@@ -83,7 +84,7 @@
                and (volunteer_merchant.name like concat('%',#{name},'%'))
            </if>
        </where>
        order by creation_time desc
        order by merchantGrade desc,creation_time desc
    </select>
    <insert id="insertData">