ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/OrderActivityInfo.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.Api; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -66,5 +67,12 @@ @TableField("discount") private BigDecimal discount; @ApiModelProperty(value = "是否上架：0否 1是") @TableField("is_shelf") private Integer isShelf; @ApiModelProperty(value = "活动状态:0未开始，1已开始") @TableField(exist = false) private Integer status; } ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/dto/LogisticsSetDto.java
New file @@ -0,0 +1,39 @@ package com.ruoyi.other.api.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data @ApiModel(description = "物流设置") public class LogisticsSetDto { /** * 物流查询时间间隔 */ @ApiModelProperty(value = "物流查询时间间隔") private Integer waitTime; /** * 订单运费 */ @ApiModelProperty(value = "订单运费") private Integer freight; /** * 包邮订单金额 */ @ApiModelProperty(value = "包邮订单金额") private Integer freeFreight; /** * 包邮订单积分 */ @ApiModelProperty(value = "包邮订单积分") private Integer freeIntegral; /** * 包邮会员等级要求：1普通会员，2黄金会员，3钻石会员，4准代理，5代理，6总代，7合伙人 */ @ApiModelProperty(value = "包邮会员等级要求：1普通会员，2黄金会员，3钻石会员，4准代理，5代理，6总代，7合伙人") private Integer freeVip; } ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/BaseSettingController.java
@@ -1,9 +1,11 @@ package com.ruoyi.other.controller; import com.alibaba.fastjson2.JSONObject; import com.ruoyi.common.core.domain.R; import com.ruoyi.other.api.domain.BaseSetting; import com.ruoyi.other.service.BaseSettingService; import io.swagger.annotations.Api; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -18,6 +20,7 @@ */ @RestController @RequestMapping("/base-setting") @Api("基础配置") public class BaseSettingController { @Resource @@ -36,6 +39,19 @@ return R.ok(baseSetting); } /** * 保存设置 */ @PostMapping("/save") public R saveActivityConfig(@RequestBody String json){ JSONObject jsonObject = JSONObject.parseObject(json); Integer id = jsonObject.getInteger("id"); BaseSetting baseSetting = baseSettingService.getById(id); baseSetting.setContent(jsonObject.getString("content")); baseSettingService.saveOrUpdate(baseSetting); return R.ok(); }
@@ -2,12 +2,21 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.other.api.domain.OrderActivityInfo; import com.ruoyi.other.service.OrderActivityInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; /** * <p> @@ -19,6 +28,7 @@ */ @RestController @RequestMapping("/order-activity-info") @Api("订单优惠活动") public class OrderActivityInfoController { @Resource @@ -38,6 +48,62 @@ return R.ok(one); } /** * 添加活动 */ @PostMapping("/save") @ApiOperation(value = "添加活动", tags = {"后台管理-活动管理-订单优惠活动"}) public R<Void> saveActivityConfig(@RequestBody OrderActivityInfo orderActivityInfo){ orderActivityInfoService.save(orderActivityInfo); return R.ok(); } /** * 删除活动 */ @PostMapping("/delete") @ApiOperation(value = "删除活动", tags = {"后台管理-活动管理-订单优惠活动"}) public R<Void> deleteActivityConfig(@RequestParam("id") Long id){ orderActivityInfoService.removeById(id); return R.ok(); } /** * 修改活动 */ @PostMapping("/update") @ApiOperation(value = "修改活动", tags = {"后台管理-活动管理-订单优惠活动"}) public R<Void> updateActivityConfig(@RequestBody OrderActivityInfo orderActivityInfo){ orderActivityInfoService.updateById(orderActivityInfo); return R.ok(); } /** * 获取活动列表 */ @GetMapping("/list") @ApiOperation(value = "获取活动列表", tags = {"后台管理-活动管理-订单优惠活动"}) public R<Page<OrderActivityInfo>> list(@ApiParam("页码") @RequestParam Integer pageNum, @ApiParam("每一页数据大小") Integer pageSize, OrderActivityInfo orderActivityInfo){ return R.ok(orderActivityInfoService.page(Page.of(pageNum, pageSize), new LambdaQueryWrapper<OrderActivityInfo>() .eq(orderActivityInfo.getId() != null, OrderActivityInfo::getId, orderActivityInfo.getId()) .eq(StringUtils.isNotEmpty(orderActivityInfo.getActivityName()), OrderActivityInfo::getActivityName, orderActivityInfo.getActivityName()) .lt(orderActivityInfo.getStatus() == 0, OrderActivityInfo::getStartTime, orderActivityInfo.getStartTime()) .ge(orderActivityInfo.getStatus() == 1, OrderActivityInfo::getEndTime, orderActivityInfo.getStartTime()) .eq(orderActivityInfo.getIsShelf() != null, OrderActivityInfo::getIsShelf, orderActivityInfo.getIsShelf()))); } /** * 获取活动详情 */ @GetMapping("/getDetailById") @ApiOperation(value = "获取活动详情", tags = {"后台管理-活动管理-订单优惠活动"}) public R<OrderActivityInfo> getDetailById(@RequestParam("id") Long id){ return R.ok(orderActivityInfoService.getById(id)); } }
@@ -6,6 +6,7 @@ import com.ruoyi.common.core.domain.R; import com.ruoyi.other.api.domain.SystemConfig; import com.ruoyi.other.api.dto.IndexConfigSetDto; import com.ruoyi.other.api.dto.LogisticsSetDto; import com.ruoyi.other.api.dto.StartPageSetDto; import com.ruoyi.other.service.SystemConfigService; import org.springframework.web.bind.annotation.*; @@ -89,6 +90,35 @@ return R.ok(); } /** * 订单包邮设置 */ @PostMapping("/logistics/add") @ApiOperation(value = "添加", tags = {"后台管理-商品管理-订单包邮设置"}) public R add(@RequestBody LogisticsSetDto logisticsSetDto){ List<SystemConfig> list = systemConfigService.lambdaQuery().eq(SystemConfig::getType, 3).list(); systemConfigService.removeBatchByIds(list); SystemConfig systemConfig = new SystemConfig(); systemConfig.setType(3); systemConfig.setContent(JSON.toJSONString(logisticsSetDto)); systemConfigService.save(systemConfig); return R.ok(); } /** * 获取订单包邮设置 */ @GetMapping("/logistics/detail") @ApiOperation(value = "订单包邮设置", tags = {"后台管理-商品管理-订单包邮设置"}) public R<LogisticsSetDto> logisticsDetail(){ SystemConfig one = systemConfigService.lambdaQuery().eq(SystemConfig::getType, 3).one(); if (one==null){ return R.ok(); } LogisticsSetDto logisticsSetDto = JSONObject.parseObject(one.getContent(), LogisticsSetDto.class); return R.ok(logisticsSetDto); } }
