修改小程序商家商品新增 花城社区查询没结果

lidongdong

2023-08-30 445a7ec2340636e64b6897ae4d4124df8bbf7b7b

修改小程序商家商品新增  花城社区查询没结果

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/VolunteerActivitiesPeopleApi.java

@@ -294,6 +294,11 @@
    @PostMapping("/VolunteerIntegralMerchant/insertVolunteer")
    public R VolunteerIntegralMerchantInsertVolunteer(@RequestBody VolunteerIntegralMerchantVO vimVO)
    {
        if(StringUtils.isEmpty(vimVO.getMerchantId()))
        {
            return R.fail("商家id不能为空");
        }

        vimVO.setGoodType("1");
        return volunteerActivitiesPeople.VolunteerIntegralMerchantInsertVolunteer(vimVO);
    }
@@ -301,6 +306,11 @@
    @PostMapping("/VolunteerIntegralMerchant/updateById")
    public R  VolunteerIntegralMerchantUpdateById(@RequestBody VolunteerIntegralMerchantVO vimVO)
    {
        if(StringUtils.isEmpty(vimVO.getMerchantId()))
        {
            return R.fail("商家id不能为空");
        }

        vimVO.setGoodType("1");
        return volunteerActivitiesPeople.VolunteerIntegralMerchantUpdateById(vimVO);
    }

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/VolunteerIntegralMerchantApi.java

@@ -53,14 +53,22 @@
    @PostMapping("/insertVolunteer")
    public R VolunteerIntegralMerchantInsertVolunteer(@RequestBody VolunteerIntegralMerchantVO vimVO)
    {
        vimVO.setGoodType("1");
        if(StringUtils.isEmpty(vimVO.getCommodityValue()))
        {
            return R.fail("商品价值不能为空");
        }
        vimVO.setGoodType("0");
        return merchantService.VolunteerIntegralMerchantInsertVolunteer(vimVO);
    }

    @PostMapping("/updateById")
    public R  VolunteerIntegralMerchantUpdateById(@RequestBody VolunteerIntegralMerchantVO vimVO)
    {
        vimVO.setGoodType("1");
        if(StringUtils.isEmpty(vimVO.getCommodityValue()))
        {
            return R.fail("商品价值不能为空");
        }
        vimVO.setGoodType("0");
        return merchantService.VolunteerIntegralMerchantUpdateById(vimVO);
    }


 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/VolunteerIntegralMerchantApi.java

@@ -84,10 +84,7 @@
            return R.fail("商品所需积分不能为空");
        }

        if(StringUtils.isEmpty(vimVO.getCommodityValue()))
        {
            return R.fail("商品价值不能为空");
        }


        if(StringUtils.isEmpty(vimVO.getGoodNum()))
        {
@@ -131,11 +128,6 @@
        if(StringUtils.isEmpty(vimVO.getIntegral()))
        {
            return R.fail("商品所需积分不能为空");
        }

        if(StringUtils.isEmpty(vimVO.getCommodityValue()))
        {
            return R.fail("商品价值不能为空");
        }

        int num= merchantService.updateById(vimVO);

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

@@ -66,7 +66,7 @@
        SELECT t1.id, t1.title, t1.cover, t2.`name` AS typeName
        FROM com_act_dyn t1
        LEFT JOIN com_act_dyn_type t2 ON t1.type = t2.id
        WHERE 1=1
        WHERE 1=1 and cadt.area='2'
        <if test="pageBaseDTO.communityIds != null and pageBaseDTO.communityIds.size > 0">
            AND t1.community_id IN
            <foreach collection="pageBaseDTO.communityIds" item="item" open="(" separator="," close=")">
@@ -165,7 +165,7 @@
        LEFT JOIN com_act_dyn_type AS cadt ON cadt.id = d.type
        LEFT JOIN com_act ca ON d.community_id = ca.community_id
        WHERE
        1 = 1
        1 = 1 and cadt.area='2'
        <if test='comActDynVO.choice == 0 '>
            AND d.community_id in (${comActDynVO.communityId})
        </if>
@@ -202,7 +202,7 @@
        LEFT JOIN com_act_dyn_user u ON d.id = u.dyn_id
        LEFT JOIN com_act_dyn_type as cadt ON cadt.id = d.type
        LEFT JOIN com_act ca ON d.community_id = ca.community_id
        WHERE 1=1
        WHERE 1=1 and cadt.area='2'
        <if test="comActDynVO.communityId != null and comActDynVO.communityId != '' ">
            and d.community_id in (${comActDynVO.communityId})
        </if>