diff --git a/.feisuan/.ymlignore b/.feisuan/.ymlignore new file mode 100644 index 000000000..1640b548a --- /dev/null +++ b/.feisuan/.ymlignore @@ -0,0 +1,2 @@ +spring.datasource.username +spring.datasource.password diff --git a/ruoyi-admin/src/main/java/org/dromara/app/AppProductCategoryController.java b/ruoyi-admin/src/main/java/org/dromara/app/AppProductCategoryController.java new file mode 100644 index 000000000..58aebf51b --- /dev/null +++ b/ruoyi-admin/src/main/java/org/dromara/app/AppProductCategoryController.java @@ -0,0 +1,34 @@ +package org.dromara.app; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.wzj.soopin.goods.convert.ProductCategoryConvert; +import com.wzj.soopin.goods.domain.bo.ProductCategoryBo; +import com.wzj.soopin.goods.domain.entity.ProductCategory; +import com.wzj.soopin.goods.domain.vo.ProductCategoryVO; +import com.wzj.soopin.goods.service.impl.ProductCategoryServiceImpl; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.R; +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; + +@Tag(name ="商品分类接口列表") +@RestController +@RequestMapping("/app/productCategory") +@RequiredArgsConstructor +public class AppProductCategoryController { + + + private final ProductCategoryServiceImpl service; + private final ProductCategoryConvert convert; + + @Tag(name ="查询商品分类列表") + @PostMapping("page") + public R> page(@RequestBody ProductCategoryBo query, Page page) { + Page productCategoryPage = service.page(page,query.toWrapper()); + return R.ok(convert.toVO(productCategoryPage)); + } + +} diff --git a/ruoyi-admin/src/main/java/org/dromara/app/AppProductController.java b/ruoyi-admin/src/main/java/org/dromara/app/AppProductController.java new file mode 100644 index 000000000..3c7747bde --- /dev/null +++ b/ruoyi-admin/src/main/java/org/dromara/app/AppProductController.java @@ -0,0 +1,39 @@ +package org.dromara.app; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.wzj.soopin.goods.convert.ProductConvert; +import com.wzj.soopin.goods.domain.bo.ProductBo; +import com.wzj.soopin.goods.domain.entity.Product; +import com.wzj.soopin.goods.domain.vo.ProductVO; +import com.wzj.soopin.goods.service.ProductService; +import com.wzj.soopin.goods.service.impl.ProductServiceImpl; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.R; +import org.springframework.web.bind.annotation.*; + +@Tag(name ="商品信息接口列表") +@RestController +@RequestMapping("/app/product") +@RequiredArgsConstructor +public class AppProductController { + + private final ProductServiceImpl service; + private final ProductConvert convert; + private final ProductService productService; + + @Tag(name ="查询商品信息列表") + @PostMapping("page") + public R> page(@RequestBody ProductBo query, Page page) { + Page productCategoryPage = service.page(page,query.toWrapper()); + return R.ok(convert.toVO(productCategoryPage)); + } + + @Tag(name ="获取商品信息详细信息") + @GetMapping(value = "/{id}") + public R getInfo(@PathVariable("id") Long id) { + return R.ok(service.selectById(id)); + } + +} diff --git a/ruoyi-admin/src/main/java/org/dromara/app/AppVersionController.java b/ruoyi-admin/src/main/java/org/dromara/app/AppVersionController.java new file mode 100644 index 000000000..feef243be --- /dev/null +++ b/ruoyi-admin/src/main/java/org/dromara/app/AppVersionController.java @@ -0,0 +1,33 @@ +package org.dromara.app; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.R; +import org.dromara.system.domain.SysVersion; +import org.dromara.system.domain.bo.SysVersionBo; +import org.dromara.system.domain.vo.SysVersionVo; +import org.dromara.system.service.ISysVerisonService; +import org.springframework.validation.annotation.Validated; +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; + +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/app/version") +public class AppVersionController { + + + private final ISysVerisonService sysVerisonService; + + @Tag(name ="查询app版本管理") + @PostMapping("/page") + public R> list(@RequestBody SysVersionBo query, Page page){ + return R.ok(sysVerisonService.getList(page,query)); + } + +} diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 8bdd06d52..14c9ec0e4 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -185,8 +185,8 @@ tenant: - sys_commission_rate_range - oms_red_packet - oms_red_packet_receive - - commission_template - - commission_rate_range + - sys_commission_template + - sys_commission_rate_range - cont_article - cont_article_category diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/controller/ProductCategoryController.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/controller/ProductCategoryController.java index c759a2861..452fe957e 100644 --- a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/controller/ProductCategoryController.java +++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/controller/ProductCategoryController.java @@ -29,16 +29,11 @@ import java.util.List; @RequiredArgsConstructor public class ProductCategoryController extends BaseController { + + private final ProductCategoryServiceImpl service; private final ProductCategoryConvert convert; - @Tag(name ="查询商品分类列表") - @PostMapping("page") - public R> page(@RequestBody ProductCategoryBo query, Page page) { - Page productCategoryPage = service.page(page,query.toWrapper()); - return R.ok(convert.toVO(productCategoryPage)); - } - @Tag(name ="查询商品分类列表") @PostMapping("list") public R> list(@RequestBody ProductCategoryBo query) { diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/controller/ProductController.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/controller/ProductController.java index 3e5c26f92..e24c090fe 100644 --- a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/controller/ProductController.java +++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/controller/ProductController.java @@ -46,13 +46,6 @@ public class ProductController extends BaseController { private final ProductService productService; - @Tag(name ="查询商品信息列表app") - @PostMapping("page") - public R> page(@RequestBody ProductBo query, Page page) { - Page productCategoryPage = service.page(page,query.toWrapper()); - return R.ok(convert.toVO(productCategoryPage)); - } - @Tag(name ="查询商品信息列表") @PostMapping("list") public R> list(@RequestBody ProductBo query, @RequestBody Page page) { diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/po/MemberAccountChangeRecord.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/po/MemberAccountChangeRecord.java index 8416eea53..4e83dac47 100644 --- a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/po/MemberAccountChangeRecord.java +++ b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/po/MemberAccountChangeRecord.java @@ -54,7 +54,7 @@ public class MemberAccountChangeRecord extends BaseAudit { private String changeDesc; @Schema(description ="来源") - private Integer source; + private String source; } diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/controller/OrderController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/controller/OrderController.java index 8d20f3e7b..3bb8fc607 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/controller/OrderController.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/controller/OrderController.java @@ -158,4 +158,11 @@ public class OrderController extends BaseController { } } + @Tag(name = "订单退款") + @GetMapping("/refund") + public R refund(@RequestParam Long orderId, @RequestParam(required = false) String reason) { + log.info("订单退款开始，订单ID: {}", orderId); + return service.refund(orderId,reason); + } + } diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/impl/AftersaleServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/impl/AftersaleServiceImpl.java index 54b2677d0..911978bc5 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/impl/AftersaleServiceImpl.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/impl/AftersaleServiceImpl.java @@ -386,6 +386,7 @@ public class AftersaleServiceImpl extends ServiceImpl implements private final MemberWechatMapper memberWechatMapper; private final WechatPaymentHistoryMapper wechatPaymentHistoryMapper; private final RedisService redisService; + private final AftersaleMapper aftersaleMapper; @Autowired(required = false) @@ -519,5 +520,48 @@ public class OrderServiceImpl extends ServiceImpl implements } } + /** + * 处理退款逻辑 + * @param orderId 订单ID + * @return 操作结果 + */ + public R refund(Long orderId, String reason) { + if (orderId == null) { + return R.fail("订单ID不能为空"); + } + + try { + // 根据订单ID获取订单信息 + Order order = orderMapper.selectById(orderId); + if (order == null) { + return R.fail("未找到对应订单"); + } + if (order.getAftersaleStatus() !=1){ + return R.fail("订单未处于待售后状态"); + } + + // // 设置售后状态 + order.setAftersaleStatus(2); + orderMapper.updateById(order); + + // 创建售后记录 + Aftersale aftersale = new Aftersale(); + aftersale.setMemberId(order.getMemberId()); + aftersale.setOrderId(orderId); + aftersale.setReturnAmount(order.getPayAmount()); + aftersale.setQuantity(1); + aftersale.setType(1); + aftersale.setStatus(0); + aftersale.setReason(reason); + aftersale.setAuthFlag(0); + + aftersaleMapper.insert(aftersale); + + return R.ok("退款申请已提交",aftersale); + } catch (Exception e) { + log.error("处理退款时出错，订单ID: " + orderId, e); + return R.fail("退款处理失败: " + e.getMessage()); + } + } } diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/impl/RedPacketServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/impl/RedPacketServiceImpl.java index 00a6471e7..6e4df4e45 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/impl/RedPacketServiceImpl.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/impl/RedPacketServiceImpl.java @@ -49,10 +49,10 @@ public class RedPacketServiceImpl extends ServiceImpl toWrapper() { + return new LambdaQueryWrapper() + .eq(platformType != null, SysVersion::getPlatformType, platformType) + .eq(versionCode != null, SysVersion::getVersionCode, versionCode) + .eq(versionName != null, SysVersion::getVersionName, versionName) + .eq(status != null, SysVersion::getStatus, status); + } }