diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/client/IndexController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/client/IndexController.java index 83c4da8..a8a9902 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/client/IndexController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/client/IndexController.java @@ -5,8 +5,10 @@ import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.entity.MusicInfo; import com.ruoyi.common.core.domain.entity.Notifications; +import com.ruoyi.common.core.domain.entity.PlaStatus; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.system.mapper.PlaStatusMapper; import com.ruoyi.system.service.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -93,4 +95,13 @@ public class IndexController extends BaseController { List result = notificationsService.selectNotificationsByUserId(userId); return AjaxResult.success(result); } + + @Autowired + private PlaStatusMapper plaStatusMapper; + + @GetMapping("/palStatus") + public AjaxResult palStatus(){ + PlaStatus plaStatus = plaStatusMapper.selectPlaStatusById(1L); + return AjaxResult.success(plaStatus.getShareStatus()); + } } diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index ad9a171..98c8f42 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -1,4 +1,4 @@ spring: profiles: - active: dev + active: pro diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/PlaStatus.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/PlaStatus.java new file mode 100644 index 0000000..cd2b05d --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/PlaStatus.java @@ -0,0 +1,27 @@ +package com.ruoyi.common.core.domain.entity; + +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; +import lombok.Data; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +/** + * 【请填写功能名称】对象 pla_status + * + * @author ruoyi + * @date 2025-11-30 + */ +@Data +public class PlaStatus extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** $column.columnComment */ + private Long id; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Boolean shareStatus; + +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java index 20574cf..793fa85 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java @@ -146,7 +146,8 @@ public class SecurityConfig "/client/version/getLastVersion","/client/search/list","/client/music/find","/client" + "/index/getCategory","/client/index/cate/music/**","/client/consult/list", "/client/index/re/music/**","/client/share/list","/file/download/**", - "/client/music/getMusicInfo/**","/client/music/getPrevMusicId","/client/music/getNextMusicId").permitAll() + "/client/music/getMusicInfo/**","/client/music/getPrevMusicId","/client/music" + + "/getNextMusicId","/client/index/palStatus").permitAll() // 静态资源,可匿名访问 .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll() .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll() diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/PlaStatusMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/PlaStatusMapper.java new file mode 100644 index 0000000..e89b5f3 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/PlaStatusMapper.java @@ -0,0 +1,62 @@ +package com.ruoyi.system.mapper; + +import com.ruoyi.common.core.domain.entity.PlaStatus; + +import java.util.List; + +/** + * 【请填写功能名称】Mapper接口 + * + * @author ruoyi + * @date 2025-11-30 + */ +public interface PlaStatusMapper +{ + /** + * 查询【请填写功能名称】 + * + * @param id 【请填写功能名称】主键 + * @return 【请填写功能名称】 + */ + public PlaStatus selectPlaStatusById(Long id); + + /** + * 查询【请填写功能名称】列表 + * + * @param plaStatus 【请填写功能名称】 + * @return 【请填写功能名称】集合 + */ + public List selectPlaStatusList(PlaStatus plaStatus); + + /** + * 新增【请填写功能名称】 + * + * @param plaStatus 【请填写功能名称】 + * @return 结果 + */ + public int insertPlaStatus(PlaStatus plaStatus); + + /** + * 修改【请填写功能名称】 + * + * @param plaStatus 【请填写功能名称】 + * @return 结果 + */ + public int updatePlaStatus(PlaStatus plaStatus); + + /** + * 删除【请填写功能名称】 + * + * @param id 【请填写功能名称】主键 + * @return 结果 + */ + public int deletePlaStatusById(Long id); + + /** + * 批量删除【请填写功能名称】 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deletePlaStatusByIds(Long[] ids); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OrderInfoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OrderInfoServiceImpl.java index 77bab38..4850b7c 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OrderInfoServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OrderInfoServiceImpl.java @@ -156,7 +156,6 @@ public class OrderInfoServiceImpl implements IOrderInfoService orderInfo.setOrderName(request.getOrderName()); orderInfo.setUserId(loginUser.getUserId()); Product product = productMapper.selectProductByPageType(request.getPackageType()); - orderInfo.setAmount(product.getCurrentPrice()); orderInfo.setPayType(request.getPayType()); orderInfo.setPackageType(request.getPackageType()); diff --git a/ruoyi-system/src/main/resources/mapper/system/PlaStatusMapper.xml b/ruoyi-system/src/main/resources/mapper/system/PlaStatusMapper.xml new file mode 100644 index 0000000..7eae31d --- /dev/null +++ b/ruoyi-system/src/main/resources/mapper/system/PlaStatusMapper.xml @@ -0,0 +1,56 @@ + + + + + + + + + + + select id, share_status from pla_status + + + + + + + + insert into pla_status + + share_status, + + + #{shareStatus}, + + + + + update pla_status + + share_status = #{shareStatus}, + + where id = #{id} + + + + delete from pla_status where id = #{id} + + + + delete from pla_status where id in + + #{id} + + + \ No newline at end of file