From 5faeb96553f03ea9f16876d39d3d3ac9704cddb7 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期二, 04 六月 2024 18:36:44 +0800
Subject: [PATCH] 用户端商品
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CustomConfigController.java | 20 +++
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/SysUserClient.java | 7
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IOrderReturnRequestService.java | 6 +
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java | 2
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceServiceImpl.java | 21 ---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICustomConfigService.java | 2
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/OrderReturnDTO.java | 35 +++++++
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/SysUserFallbackFactory.java | 6 +
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CustomConfigMapper.java | 2
ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml | 10 +-
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CustomConfigServiceImpl.java | 2
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/CustomConfig.java | 2
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/forepart/ForepartOrderReturnRequestController.java | 44 ++++++++
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysConfigController.java | 6 +
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysConfig.java | 2
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/management/dto/GoodsSkuDTO.java | 1
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/forepart/ForepartMemberInvoiceController.java | 2
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderReturnRequestServiceImpl.java | 53 ++++++++++
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java | 2
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/OrderReturnRequest.java | 18 +++
22 files changed, 210 insertions(+), 37 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CustomConfig.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/CustomConfig.java
similarity index 97%
rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CustomConfig.java
rename to ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/CustomConfig.java
index 3070cad..b881d37 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CustomConfig.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/CustomConfig.java
@@ -1,4 +1,4 @@
-package com.ruoyi.system.domain;
+package com.ruoyi.system.api.domain;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysConfig.java
similarity index 98%
rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java
rename to ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysConfig.java
index 81d8f1a..59619c6 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysConfig.java
@@ -1,4 +1,4 @@
-package com.ruoyi.system.domain;
+package com.ruoyi.system.api.domain;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/OrderReturnDTO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/OrderReturnDTO.java
new file mode 100644
index 0000000..1e67a86
--- /dev/null
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/OrderReturnDTO.java
@@ -0,0 +1,35 @@
+package com.ruoyi.system.api.domain.dto;
+
+import com.ruoyi.common.core.enums.RequestTypeEnum;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.time.LocalDateTime;
+
+@Data
+public class OrderReturnDTO {
+ @ApiModelProperty(value = "数据id")
+ private Integer id;
+
+ @ApiModelProperty(value = "备注")
+ private String remark;
+
+ @ApiModelProperty(value = "订单id")
+ private Long orderId;
+
+ @ApiModelProperty(value = "售后类型 1=退款 2=退款退货")
+ private RequestTypeEnum requestType;
+
+ @ApiModelProperty(value = "申请原因")
+ private String requestReason;
+
+ @ApiModelProperty(value = "详情图，不超过五张图片")
+ private MultipartFile[] album;
+
+ @ApiModelProperty(value = "快递单号")
+ private String courierNumber;
+
+
+
+}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/SysUserFallbackFactory.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/SysUserFallbackFactory.java
index 0deabfe..fba595e 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/SysUserFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/SysUserFallbackFactory.java
@@ -1,6 +1,7 @@
package com.ruoyi.system.api.factory;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.system.api.domain.CustomConfig;
import com.ruoyi.system.api.domain.DelayTask;
import com.ruoyi.system.api.domain.SysRole;
import com.ruoyi.system.api.domain.SysUser;
@@ -77,6 +78,11 @@
public R<?> deleteDelayTask(String key, String source) {
return R.fail("删除延时任务失败:" + cause.getMessage());
}
+
+ @Override
+ public R<CustomConfig> getconfig(String configId) {
+ return R.fail("获取系统配置失败:" + cause.getMessage());
+ }
};
}
}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/SysUserClient.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/SysUserClient.java
index d6392fd..b1c3c33 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/SysUserClient.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/SysUserClient.java
@@ -3,9 +3,7 @@
import com.ruoyi.common.core.constant.SecurityConstants;
import com.ruoyi.common.core.constant.ServiceNameConstants;
import com.ruoyi.common.core.domain.R;
-import com.ruoyi.system.api.domain.DelayTask;
-import com.ruoyi.system.api.domain.SysRole;
-import com.ruoyi.system.api.domain.SysUser;
+import com.ruoyi.system.api.domain.*;
import com.ruoyi.system.api.factory.SysUserFallbackFactory;
import java.util.List;
import org.springframework.cloud.openfeign.FeignClient;
@@ -88,4 +86,7 @@
@PostMapping("/delay-task/deleteDelayTask")
public R<?> deleteDelayTask(@RequestBody String key,
@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+ @GetMapping("/custom-config/{configId}")
+ R<CustomConfig> getconfig(@PathVariable("configId") String configId);
}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/management/dto/GoodsSkuDTO.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/management/dto/GoodsSkuDTO.java
index 6c6ba49..862e2e3 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/management/dto/GoodsSkuDTO.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/management/dto/GoodsSkuDTO.java
@@ -11,6 +11,7 @@
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import lombok.Data;
+import com.ruoyi.goods.controller.management.dto.GoodsInfoTitleValueDTO;
/**
* @author mitao
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/forepart/ForepartMemberInvoiceController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/forepart/ForepartMemberInvoiceController.java
index d52e50c..a6c8fd7 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/forepart/ForepartMemberInvoiceController.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/forepart/ForepartMemberInvoiceController.java
@@ -32,7 +32,7 @@
private IMemberInvoiceService iMemberInvoiceService;
@PostMapping("/saveMemberInvoice")
- @ApiOperation(value = "用户端-用户添加发票")
+ @ApiOperation(value = "用户端-用户去发票")
public R saveMemberInvoice(@RequestBody MemberInvoiceDTO memberInvoiceDTO) {
iMemberInvoiceService.saveMemberInvoice(memberInvoiceDTO);
return R.ok();
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/forepart/ForepartOrderReturnRequestController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/forepart/ForepartOrderReturnRequestController.java
new file mode 100644
index 0000000..ae56064
--- /dev/null
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/forepart/ForepartOrderReturnRequestController.java
@@ -0,0 +1,44 @@
+package com.ruoyi.order.controller.forepart;
+
+
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.order.service.IMemberInvoiceRiseService;
+import com.ruoyi.order.service.IOrderReturnRequestService;
+import com.ruoyi.system.api.domain.dto.OrderReturnDTO;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * <p>
+ * 售后表 前端控制器
+ * </p>
+ *
+ * @author mitao
+ * @since 2024-05-16
+ */
+@RestController
+@RequestMapping("/forepart/order-return-request")
+public class ForepartOrderReturnRequestController {
+ @Resource
+ private IOrderReturnRequestService OrderReturnRequestService;
+
+ @PostMapping("/saveOrderReturnRequest")
+ @ApiOperation(value = "用户端-申请订单售后")
+ public R saveOrderReturnRequest(@RequestBody OrderReturnDTO OrderReturnDTO) {
+ OrderReturnRequestService.saveOrderReturnRequest(OrderReturnDTO);
+ return R.ok();
+ }
+
+ @PostMapping("/updOrderReturnRequest")
+ @ApiOperation(value = "修改用户端-修改订单售后")
+ public R updOrderReturnRequest(@RequestBody OrderReturnDTO OrderReturnDTO) {
+ OrderReturnRequestService.updOrderReturnRequest(OrderReturnDTO);
+ return R.ok();
+ }
+
+}
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/OrderReturnRequest.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/OrderReturnRequest.java
index d710d80..f8d4507 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/OrderReturnRequest.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/OrderReturnRequest.java
@@ -79,5 +79,23 @@
@TableLogic
private Integer delFlag;
+ @ApiModelProperty(value = "详情图，不超过五张图片")
+ private String album;
+
+ @ApiModelProperty(value = "收件人姓名")
+ private String recipientName;
+
+ @ApiModelProperty(value = "收件人电话")
+ private String recipientPhone;
+
+ @ApiModelProperty(value = "详细地址")
+ private String detailedAddress;
+
+ @ApiModelProperty(value = "备注")
+ private String remark;
+
+ @ApiModelProperty(value = "快递单号")
+ private String courierNumber;
+
}
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IOrderReturnRequestService.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IOrderReturnRequestService.java
index 4b324ac..297e5be 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IOrderReturnRequestService.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IOrderReturnRequestService.java
@@ -2,6 +2,8 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.order.domain.OrderReturnRequest;
+import com.ruoyi.system.api.domain.dto.OrderReturnDTO;
+import org.springframework.web.bind.annotation.RequestBody;
/**
* <p>
@@ -13,4 +15,8 @@
*/
public interface IOrderReturnRequestService extends IService<OrderReturnRequest> {
+ void saveOrderReturnRequest(OrderReturnDTO OrderReturnDTO);
+ void updOrderReturnRequest(@RequestBody OrderReturnDTO OrderReturnDTO);
+
+
}
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceServiceImpl.java
index 9578167..d837dd0 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceServiceImpl.java
@@ -72,28 +72,13 @@
for (Integer memberInvoiceOrder:memberInvoiceOrderList){
MemberInvoiceOrder memberInvoiceOrder1=new MemberInvoiceOrder();
Order order= iOrderService.getById(memberInvoiceOrder);
+ order.setInvoiceStatus(1);
+ iOrderService.updateById(order);
memberInvoiceOrder1.setInvoiceId(memberInvoice.getId());
memberInvoiceOrder1.setOrderMoney(order.getTotalAmount());
memberInvoiceOrder1.setOrderNo(order.getOrderNo());
String OrderName="";
- if (order.getOrderFrom().equals(OrderFromEnum.COMMODITY_ORDER)||order.getOrderFrom().equals(OrderFromEnum.SNAP_ORDERS)||order.getOrderFrom().equals(OrderFromEnum.GROUP_PURCHASE_ORDERS)){
- R<GoodsSku> goodsSkuR = goodsSkuClient.getGoodsSkuOne(order.getGoodsSkuId(),
- SecurityConstants.INNER);
- GoodsSku goodsSku=goodsSkuR.getData();
- OrderName=goodsSku.getSkuName();
- }else{
- LambdaQueryWrapper<OrderAuction> wrapper = Wrappers.lambdaQuery();
- wrapper.eq(OrderAuction::getOrderId, order.getId());
- wrapper.eq(OrderAuction::getDelFlag, 0);
- OrderAuction orderAuction=iOrderAuctionService.getOne(wrapper);
- R<GoodsSeckill> goodsSeckillR = goodsSkuClient.getGoodsSeckillOne(
- orderAuction.getSalesroomGoodsId(), SecurityConstants.INNER);
- GoodsSeckill goodsSeckill=goodsSeckillR.getData();
- R<GoodsSku> goodsSkuR = goodsSkuClient.getGoodsSkuOne(goodsSeckill.getGoodsSkuId(),
- SecurityConstants.INNER);
- GoodsSku goodsSku=goodsSkuR.getData();
- OrderName=goodsSku.getSkuName();
- }
+ OrderName=order.getSkuName();
memberInvoiceOrder1.setOrderName(OrderName);
iMemberInvoiceOrderService.save(memberInvoiceOrder1);
}
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderReturnRequestServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderReturnRequestServiceImpl.java
index 409850d..312fed7 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderReturnRequestServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderReturnRequestServiceImpl.java
@@ -1,10 +1,23 @@
package com.ruoyi.order.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.core.enums.AuditStatusEnum;
+import com.ruoyi.common.core.enums.ReturnRequestStatusEnum;
import com.ruoyi.order.domain.OrderReturnRequest;
import com.ruoyi.order.mapper.OrderReturnRequestMapper;
import com.ruoyi.order.service.IOrderReturnRequestService;
+import com.ruoyi.system.api.domain.CustomConfig;
+import com.ruoyi.system.api.domain.dto.OrderReturnDTO;
+import com.ruoyi.system.api.feignClient.SysUserClient;
+import com.ruoyi.system.api.util.HuaWeiOBSUtil;
import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import java.io.IOException;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
/**
* <p>
@@ -16,5 +29,45 @@
*/
@Service
public class OrderReturnRequestServiceImpl extends ServiceImpl<OrderReturnRequestMapper, OrderReturnRequest> implements IOrderReturnRequestService {
+ @Resource
+ private SysUserClient sysUserClient;
+ @Override
+ public void saveOrderReturnRequest(OrderReturnDTO OrderReturnDTO) {
+ OrderReturnRequest orderReturnRequest = new OrderReturnRequest();
+ orderReturnRequest.setOrderId(OrderReturnDTO.getOrderId());
+ orderReturnRequest.setRequestTime(LocalDateTime.now());
+ orderReturnRequest.setRequestType(OrderReturnDTO.getRequestType());
+ orderReturnRequest.setRequestReason(OrderReturnDTO.getRequestReason());
+ orderReturnRequest.setStatus(ReturnRequestStatusEnum.TO_BE_REVIEWED);
+ orderReturnRequest.setAuditStatus(AuditStatusEnum.TO_BE_REVIEWED);
+ List<String> urlList = new ArrayList<>();
+ if (OrderReturnDTO.getAlbum().length > 0) {
+ for (MultipartFile file : OrderReturnDTO.getAlbum()) {
+ try {
+ String url = HuaWeiOBSUtil.obsUpload(file);
+ urlList.add(url);
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ orderReturnRequest.setAlbum(urlList.toString());
+ }
+
+ CustomConfig returnAddressUserName = sysUserClient.getconfig("RETURN_ADDRESS_USER_NAME").getData();
+ orderReturnRequest.setRecipientName(returnAddressUserName.getConfigName());
+ CustomConfig returnAddressUserPhone = sysUserClient.getconfig("RETURN_ADDRESS_USER_PHONE").getData();
+ orderReturnRequest.setRecipientPhone(returnAddressUserPhone.getConfigName());
+ CustomConfig returnAddressUserAddress = sysUserClient.getconfig("RETURN_ADDRESS_USER_ADDRESS").getData();
+ orderReturnRequest.setDetailedAddress(returnAddressUserAddress.getConfigName());
+ this.save(orderReturnRequest);
+
+ }
+
+ @Override
+ public void updOrderReturnRequest(OrderReturnDTO OrderReturnDTO) {
+ OrderReturnRequest byId = this.getById(OrderReturnDTO.getId());
+ byId.setCourierNumber(OrderReturnDTO.getCourierNumber());
+ this.updateById(byId);
+ }
}
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
index da967ba..1f65ef3 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
@@ -535,6 +535,7 @@
Order order = baseMapper.selectById(memberOrderListDTO.getId());
if (order.getOrderFrom().getCode()==4){
order.setOrderStatus(OrderStatusEnum.FINISHED);
+ order.setReceiveTime(LocalDateTime.now());
baseMapper.updateById(order);
LambdaQueryWrapper<OrderAuctionBond> wrapper= Wrappers.lambdaQuery();
@@ -573,6 +574,7 @@
}
}else{
order.setOrderStatus(OrderStatusEnum.FINISHED);
+ order.setReceiveTime(LocalDateTime.now());
baseMapper.updateById(order);
}
}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CustomConfigController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CustomConfigController.java
index bb5de76..3299eba 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CustomConfigController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CustomConfigController.java
@@ -1,9 +1,18 @@
package com.ruoyi.system.controller;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.system.api.domain.CustomConfig;
+import com.ruoyi.system.service.ICustomConfigService;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
/**
* <p>
@@ -16,5 +25,14 @@
@RestController
@RequestMapping("/custom-config")
public class CustomConfigController {
-
+ @Resource
+ private ICustomConfigService iCustomConfigService;
+ @GetMapping(value = "/{configId}")
+ public R<CustomConfig> getconfig(@PathVariable String configId)
+ {
+ LambdaQueryWrapper<CustomConfig> wrapper = Wrappers.lambdaQuery();
+ wrapper.eq(CustomConfig::getConfigKey, configId);
+ CustomConfig one = iCustomConfigService.getOne(wrapper);
+ return R.ok(one);
+ }
}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysConfigController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysConfigController.java
index 2408762..64e30ae 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysConfigController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysConfigController.java
@@ -3,7 +3,8 @@
import java.util.List;
import javax.servlet.http.HttpServletResponse;
-import com.ruoyi.system.domain.SysConfig;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.system.api.domain.SysConfig;
import com.ruoyi.system.service.ISysConfigService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
@@ -67,6 +68,9 @@
return success(configService.selectConfigById(configId));
}
+
+
+
/**
* 根据参数键名查询参数值
*/
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CustomConfigMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CustomConfigMapper.java
index 608c82a..ef4ef3f 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CustomConfigMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CustomConfigMapper.java
@@ -1,7 +1,7 @@
package com.ruoyi.system.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.system.domain.CustomConfig;
+import com.ruoyi.system.api.domain.CustomConfig;
/**
* <p>
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java
index 39ea778..99b26aa 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java
@@ -1,7 +1,7 @@
package com.ruoyi.system.mapper;
import java.util.List;
-import com.ruoyi.system.domain.SysConfig;
+import com.ruoyi.system.api.domain.SysConfig;
import org.apache.ibatis.annotations.Mapper;
/**
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICustomConfigService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICustomConfigService.java
index 99ac2e5..bb5dcec 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICustomConfigService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICustomConfigService.java
@@ -1,7 +1,7 @@
package com.ruoyi.system.service;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.system.domain.CustomConfig;
+import com.ruoyi.system.api.domain.CustomConfig;
/**
* <p>
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java
index 52a3b00..be0d2d6 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java
@@ -1,7 +1,7 @@
package com.ruoyi.system.service;
import java.util.List;
-import com.ruoyi.system.domain.SysConfig;
+import com.ruoyi.system.api.domain.SysConfig;
/**
* 参数配置 服务层
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CustomConfigServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CustomConfigServiceImpl.java
index 109d295..caf3178 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CustomConfigServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CustomConfigServiceImpl.java
@@ -1,7 +1,7 @@
package com.ruoyi.system.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.system.domain.CustomConfig;
+import com.ruoyi.system.api.domain.CustomConfig;
import com.ruoyi.system.mapper.CustomConfigMapper;
import com.ruoyi.system.service.ICustomConfigService;
import org.springframework.stereotype.Service;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
index d48cbfe..8207bdf 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
@@ -4,7 +4,7 @@
import java.util.List;
import javax.annotation.PostConstruct;
-import com.ruoyi.system.domain.SysConfig;
+import com.ruoyi.system.api.domain.SysConfig;
import com.ruoyi.system.mapper.SysConfigMapper;
import com.ruoyi.system.service.ISysConfigService;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml
index bd0f900..da9735e 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.SysConfigMapper">
- <resultMap type="com.ruoyi.system.domain.SysConfig" id="SysConfigResult">
+ <resultMap type="com.ruoyi.system.api.domain.SysConfig" id="SysConfigResult">
<id property="configId" column="config_id" />
<result property="configName" column="config_name" />
<result property="configKey" column="config_key" />
@@ -33,12 +33,12 @@
</where>
</sql>
- <select id="selectConfig" parameterType="com.ruoyi.system.domain.SysConfig" resultMap="SysConfigResult">
+ <select id="selectConfig" parameterType="com.ruoyi.system.api.domain.SysConfig" resultMap="SysConfigResult">
<include refid="selectConfigVo"/>
<include refid="sqlwhereSearch"/>
</select>
- <select id="selectConfigList" parameterType="com.ruoyi.system.domain.SysConfig" resultMap="SysConfigResult">
+ <select id="selectConfigList" parameterType="com.ruoyi.system.api.domain.SysConfig" resultMap="SysConfigResult">
<include refid="selectConfigVo"/>
<where>
<if test="configName != null and configName != ''">
@@ -69,7 +69,7 @@
where config_key = #{configKey} limit 1
</select>
- <insert id="insertConfig" parameterType="com.ruoyi.system.domain.SysConfig">
+ <insert id="insertConfig" parameterType="com.ruoyi.system.api.domain.SysConfig">
insert into sys_config (
<if test="configName != null and configName != '' ">config_name,</if>
<if test="configKey != null and configKey != '' ">config_key,</if>
@@ -89,7 +89,7 @@
)
</insert>
- <update id="updateConfig" parameterType="com.ruoyi.system.domain.SysConfig">
+ <update id="updateConfig" parameterType="com.ruoyi.system.api.domain.SysConfig">
update sys_config
<set>
<if test="configName != null and configName != ''">config_name = #{configName},</if>
--
Gitblit v1.7.1