修改商家添加 新增判断是否是商家判断接口

lidongdong

2023-11-24 85f63ceeb3f9e5e57b538d56407e94a4b19f6211

修改商家添加   新增判断是否是商家判断接口

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

@@ -789,4 +789,13 @@
        return communityService.getIntegralUserRank(getCommunityId(),getUserId());
    }


    @ApiOperation(value = "是否是商家   如果是商家返回商家id")
    @GetMapping("/selectUserBind")
    public R selectUserBind()
    {
        return newStriveForFeign.selectUserBind(getCommunityId()+"",getUserId()+"");
    }


}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/building/NewFightConvenientMerchantVO.java

@@ -79,4 +79,8 @@

    @ApiModelProperty("社区id")
    private String communityId;


    @ApiModelProperty("绑定用户id")
    private String userId;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/NewStriveForFeign.java

@@ -382,6 +382,11 @@
    public R selectUserList(@RequestParam("communityId") String communityId,
                            @RequestParam("phoneOrname") String phoneOrname);


    @GetMapping("/FightConvenient/selectUserBind")
    public R selectUserBind(@RequestParam("communityId") String communityId,
                            @RequestParam("userId") String userId);

    /*****************************************************************************************************
     *
     *                                       用户积分任务完成情况

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/NewFightConvenientMerchantApi.java

@@ -87,6 +87,11 @@
        return merchantService.selectUserList(communityId,phoneOrname);
    }


    @GetMapping("/selectUserBind")
    public R selectUserBind(@RequestParam("communityId") String communityId,
                            @RequestParam("userId") String userId)
    {
        return merchantService.selectUserBind(communityId,userId);
    }

}

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/NewFightConvenientMerchantDao.java

@@ -69,4 +69,8 @@
    List<SysUserVO> selectUserList(@Param("communityId") String communityId,
                                   @Param("phoneOrname") String phoneOrname);


    String selectUserBind(@Param("communityId") String communityId,
                          @Param("userId") String userId);

}

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/entity/NewFightConvenientMerchant.java

@@ -91,6 +91,9 @@
    @ApiModelProperty("社区id")
    private String communityId;

    @ApiModelProperty("绑定用户")
    private String userId;





 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/NewFightConvenientMerchantService.java

@@ -2,11 +2,7 @@

import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.building.NewFightConvenientMerchantVO;
import com.panzhihua.common.model.vos.user.SysUserVO;
import com.panzhihua.service_dangjian.entity.NewFightConvenientMerchant;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -64,4 +60,6 @@

    R selectUserList(String communityId,String phoneOrname);


    R selectUserBind(String communityId, String userId);
}

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NewFightConvenientMerchantServiceImpl.java

@@ -79,4 +79,9 @@
        return R.ok(baseMapper.selectUserList(communityId,phoneOrname));
    }

    @Override
    public R selectUserBind(String communityId, String userId) {
        return R.ok(baseMapper.selectUserBind(communityId,userId));
    }

}

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/NewFightComConvenientMerchantsMapper.xml

@@ -22,6 +22,7 @@
        <id column="status" property="status" />
        <id column="business_credit" property="businessCredit" />
        <id column="community_id" property="communityId" />
        <id column="user_id" property="userId" />
    </resultMap>

    <!-- 通用查询结果列 -->
@@ -44,6 +45,7 @@
            status,
            business_credit,
            community_id,
            user_id,
            img_url
        FROM  new_fight_com_convenient_merchants ccm
        <where>
@@ -87,6 +89,7 @@
            status,
            business_credit,
            community_id,
            user_id,
            img_url
        FROM  new_fight_com_convenient_merchants ccm
        WHERE ccm.id = #{merchantId}
@@ -157,6 +160,9 @@
            <if test="item.communityId != null and item.communityId != '' ">
                community_id,
            </if>
            <if test="item.userId != null and item.userId != '' ">
                user_id,
            </if>
            created_at
        </trim>
        values
@@ -208,6 +214,9 @@
            </if>
            <if test="item.communityId != null and item.communityId != '' ">
                #{item.communityId},
            </if>
            <if test="item.userId != null and item.userId != '' ">
                #{item.userId},
            </if>
            sysdate()
        </trim>
@@ -264,6 +273,9 @@
            <if test="item.communityId != null and item.communityId != '' ">
                community_id=#{item.communityId},
            </if>
            <if test="item.userId != null and item.userId != '' ">
                user_id=#{item.userId},
            </if>
            updated_at=sysdate()
        </set>
        where id = #{item.id}
@@ -287,7 +299,18 @@
    </select>



    <select id="selectUserBind" resultType="String">
        select id from new_fight_com_convenient_merchants
        <where>
            1=1
            <if test="communityId!=null and communityId !='' ">
                and community_id=#{communityId}
            </if>
            <if test="userId!=null and userId !='' ">
                and user_id=#{userId}
            </if>
        </where>
    </select>