Merge branch 'dev' into test

This commit is contained in:
2024-08-19 17:26:01 +08:00
21 changed files with 546 additions and 63 deletions

View File

@@ -10,23 +10,24 @@ import java.util.List;
@Component
@Mapper
public interface TbProductGroupMapper {
int deleteByPrimaryKey(Integer id);
// int deleteByPrimaryKey(Integer id);
int insert(TbProductGroup record);
// int insert(TbProductGroup record);
int insertSelective(TbProductGroup record);
// int insertSelective(TbProductGroup record);
TbProductGroup selectByPrimaryKey(Integer id);
int updateByPrimaryKeySelective(TbProductGroup record);
// int updateByPrimaryKeySelective(TbProductGroup record);
int updateByPrimaryKeyWithBLOBs(TbProductGroup record);
// int updateByPrimaryKeyWithBLOBs(TbProductGroup record);
int updateByPrimaryKey(TbProductGroup record);
// int updateByPrimaryKey(TbProductGroup record);
List<TbProductGroup> selectByIdAndShopId(@Param("code") String code);
List<TbProductGroup> selectByQrcode(@Param("qrCode") String qrCode,@Param("groupId") Integer groupId);
List<TbProductGroup> selectByShopId(@Param("shopId") String shopId,@Param("groupId") Integer groupId);
List<TbProductGroup> selectByProductId(@Param("shopId") String shopId,@Param("productId") String productId);
}

View File

@@ -38,4 +38,16 @@ public interface TbShopOpenIdMapper {
@Update("update tb_shop_open_id set nickname=#{nickName}, avatar=#{avatar} where open_id=#{openId} and status=1 ")
int updateBaseInfoByOpenId(@Param("openId") String openId, @Param("nickName") String nickName, @Param("avatar") String avatar);
@Select("select count(*) from tb_shop_open_id where shop_id=#{shopId} and status=1;")
int selectStateByShopId(@Param("shopId") String shopId);
@Select("select count(*) from tb_shop_open_id where shop_id=#{shopId} and status=1 and type=#{type};")
int countStateByShopIdAndType(@Param("shopId") String shopId, @Param("type") int type);
@Select("select * from tb_shop_open_id where shop_id=#{shopId} and status=1 and (type=#{type} or type=-1) group by open_id;")
List<TbShopOpenId> selectStateByShopIdAndType(@Param("shopId") String shopId, @Param("type") int type);
@Select("select * from tb_shop_open_id where shop_id=#{shopId} and open_id=#{openId};")
List<TbShopOpenId> selectStateByShopIdAndOpenId(@Param("openId") String openId, @Param("shopId") String shopId);
}