From 5728732f45cc45f3c5cbde0abe7a7c5efee605b9 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 09 十二月 2024 15:31:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/RefundPassServiceImpl.java | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/RefundPassServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/RefundPassServiceImpl.java
index a06c6bb..b468e51 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/RefundPassServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/RefundPassServiceImpl.java
@@ -1,5 +1,7 @@
package com.ruoyi.order.service.impl;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.domain.R;
@@ -9,6 +11,8 @@
import com.ruoyi.order.service.OrderService;
import com.ruoyi.order.service.RefundPassService;
import com.ruoyi.order.vo.ApplyRefundPass;
+import com.ruoyi.other.api.domain.BaseSetting;
+import com.ruoyi.other.api.feignClient.BaseSettingClient;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -28,6 +32,12 @@
@Resource
private OrderService orderService;
+
+ @Resource
+ private BaseSettingClient baseSettingClient;
+
+
+
/**
@@ -60,6 +70,11 @@
refundPass.setPassStatus(1);
refundPass.setDelFlag(0);
refundPass.setCreateTime(LocalDateTime.now());
+ BaseSetting baseSetting = baseSettingClient.getBaseSetting(5).getData();
+ JSONObject jsonObject = JSON.parseObject(baseSetting.getContent());
+ refundPass.setName(jsonObject.getString("name"));
+ refundPass.setPhone(jsonObject.getString("phone"));
+ refundPass.setAddress(jsonObject.getString("address"));
this.save(refundPass);
order.setOrderStatus(7);
orderService.updateById(order);
--
Gitblit v1.7.1