> cache;
+
+ /**
+ * 程序启动时，获取最新的需要过滤的敏感词
+ *
+ * 这里即便缓存中为空也没关系，定时任务会定时重新加载敏感词
+ *
+ * @param args 启动参数
+ */
+ @Override
+ public void run(ApplicationArguments args) {
+ List sensitives = cache.get(CachePrefix.SENSITIVE.getPrefix());
+ log.info("系统初始化敏感词");
+ if (sensitives == null || sensitives.isEmpty()) {
+ return;
+ }
+ SensitiveWordsFilter.init(sensitives);
+ }
+
+}
diff --git a/framework/src/main/java/cn/lili/common/sensitive/quartz/QuartzConfig.java b/framework/src/main/java/cn/lili/common/sensitive/quartz/QuartzConfig.java
new file mode 100644
index 00000000..9d971984
--- /dev/null
+++ b/framework/src/main/java/cn/lili/common/sensitive/quartz/QuartzConfig.java
@@ -0,0 +1,31 @@
+package cn.lili.common.sensitive.quartz;
+
+import org.quartz.*;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * 定时执行配置
+ *
+ * @author Chopper
+ * @version v1.0
+ * 2021-11-23 16:30
+ */
+@Configuration
+public class QuartzConfig {
+ @Bean
+ public JobDetail sensitiveQuartzDetail() {
+ return JobBuilder.newJob(SensitiveQuartz.class).withIdentity("sensitiveQuartz").storeDurably().build();
+ }
+
+ @Bean
+ public Trigger sensitiveQuartzTrigger() {
+ SimpleScheduleBuilder scheduleBuilder = SimpleScheduleBuilder.simpleSchedule()
+ .withIntervalInSeconds(3600)
+ .repeatForever();
+ return TriggerBuilder.newTrigger().forJob(sensitiveQuartzDetail())
+ .withIdentity("sensitiveQuartz")
+ .withSchedule(scheduleBuilder)
+ .build();
+ }
+}
\ No newline at end of file
diff --git a/framework/src/main/java/cn/lili/common/sensitive/quartz/SensitiveQuartz.java b/framework/src/main/java/cn/lili/common/sensitive/quartz/SensitiveQuartz.java
new file mode 100644
index 00000000..ab1f2bcc
--- /dev/null
+++ b/framework/src/main/java/cn/lili/common/sensitive/quartz/SensitiveQuartz.java
@@ -0,0 +1,41 @@
+package cn.lili.common.sensitive.quartz;
+
+import cn.lili.cache.Cache;
+import cn.lili.cache.CachePrefix;
+import cn.lili.common.sensitive.SensitiveWordsFilter;
+import lombok.extern.slf4j.Slf4j;
+import org.quartz.JobExecutionContext;
+import org.quartz.JobExecutionException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.quartz.QuartzJobBean;
+
+import java.util.List;
+
+/**
+ * 间隔更新敏感词
+ *
+ * @author Chopper
+ * @version v1.0
+ * 2021-11-23 16:31
+ */
+@Slf4j
+public class SensitiveQuartz extends QuartzJobBean {
+
+ @Autowired
+ private Cache> cache;
+
+ /**
+ * 定时更新敏感词信息
+ *
+ * @param jobExecutionContext
+ */
+ @Override
+ protected void executeInternal(JobExecutionContext jobExecutionContext) {
+ log.info("敏感词定时更新");
+ List sensitives = cache.get(CachePrefix.SENSITIVE.getPrefix());
+ if (sensitives == null || sensitives.isEmpty()) {
+ return;
+ }
+ SensitiveWordsFilter.init(sensitives);
+ }
+}
\ No newline at end of file
diff --git a/framework/src/main/java/cn/lili/common/utils/CurrencyUtil.java b/framework/src/main/java/cn/lili/common/utils/CurrencyUtil.java
index eabf1df9..e0d9ec1a 100644
--- a/framework/src/main/java/cn/lili/common/utils/CurrencyUtil.java
+++ b/framework/src/main/java/cn/lili/common/utils/CurrencyUtil.java
@@ -1,6 +1,7 @@
package cn.lili.common.utils;
import java.math.BigDecimal;
+import java.math.RoundingMode;
/**
* 金额计算工具
@@ -30,7 +31,7 @@ public final class CurrencyUtil {
public static Double add(double v1, double v2) {
BigDecimal b1 = new BigDecimal(v1);
BigDecimal b2 = new BigDecimal(v2);
- return b1.add(b2).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
+ return b1.add(b2).setScale(2, RoundingMode.HALF_UP).doubleValue();
}
/**
@@ -43,7 +44,7 @@ public final class CurrencyUtil {
public static double sub(double v1, double v2) {
BigDecimal b1 = new BigDecimal(v1);
BigDecimal b2 = new BigDecimal(v2);
- return b1.subtract(b2).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
+ return b1.subtract(b2).setScale(2, RoundingMode.HALF_UP).doubleValue();
}
/**
@@ -56,7 +57,7 @@ public final class CurrencyUtil {
public static Double mul(double v1, double v2) {
BigDecimal b1 = new BigDecimal(v1);
BigDecimal b2 = new BigDecimal(v2);
- return b1.multiply(b2).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
+ return b1.multiply(b2).setScale(2, RoundingMode.HALF_UP).doubleValue();
}
/**
@@ -74,7 +75,7 @@ public final class CurrencyUtil {
}
BigDecimal b1 = new BigDecimal(v1);
BigDecimal b2 = new BigDecimal(v2);
- return b1.multiply(b2).setScale(scale, BigDecimal.ROUND_HALF_UP).doubleValue();
+ return b1.multiply(b2).setScale(scale, RoundingMode.HALF_UP).doubleValue();
}
/**
@@ -107,7 +108,7 @@ public final class CurrencyUtil {
}
BigDecimal b1 = new BigDecimal(v1);
BigDecimal b2 = new BigDecimal(v2);
- return b1.divide(b2, scale, BigDecimal.ROUND_HALF_UP).doubleValue();
+ return b1.divide(b2, scale, RoundingMode.HALF_UP).doubleValue();
}
/**
@@ -124,7 +125,7 @@ public final class CurrencyUtil {
}
BigDecimal b = new BigDecimal(v);
BigDecimal one = new BigDecimal("1");
- return b.divide(one, scale, BigDecimal.ROUND_HALF_UP).doubleValue();
+ return b.divide(one, scale, RoundingMode.HALF_UP).doubleValue();
}
/**
@@ -145,7 +146,6 @@ public final class CurrencyUtil {
* @return double类型分
*/
public static double reversalFen(Double money) {
- double price = div(money, 100);
- return price;
+ return div(money, 100);
}
}
\ No newline at end of file
diff --git a/framework/src/main/java/cn/lili/common/utils/HttpUtils.java b/framework/src/main/java/cn/lili/common/utils/HttpUtils.java
index 4f8e7a3e..706e805c 100644
--- a/framework/src/main/java/cn/lili/common/utils/HttpUtils.java
+++ b/framework/src/main/java/cn/lili/common/utils/HttpUtils.java
@@ -1,19 +1,25 @@
package cn.lili.common.utils;
+import com.alibaba.fastjson.JSONObject;
import com.xkcoding.http.HttpUtil;
import com.xkcoding.http.config.HttpConfig;
import com.xkcoding.http.support.HttpHeader;
import com.xkcoding.http.support.httpclient.HttpClientImpl;
+import lombok.extern.slf4j.Slf4j;
+import java.io.*;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.util.Iterator;
import java.util.Map;
/**
- * HttpUtil 工具，统一处理 http 请求，方便对 simple-http 做定制
- *
- * @author yadong.zhang (yadong.zhang0415(a)gmail.com)
- * @version 4.1
- * @since 1.0.0
+ * HTTP 工具类
+ * @author liushuai
*/
+@Slf4j
public class HttpUtils {
public HttpUtils(HttpConfig config) {
@@ -105,4 +111,258 @@ public class HttpUtils {
public String post(String url, Map params, HttpHeader header, boolean encode) {
return HttpUtil.post(url, params, header, encode);
}
+
+
+ /**
+ * 静态方法运行参数
+ */
+ public static final int HTTP_CONN_TIMEOUT = 100000;
+ public static final int HTTP_SOCKET_TIMEOUT = 100000;
+
+ /**
+ * POST 静态方法请求
+ *
+ * @param reqUrl
+ * @param parameters
+ * @param encoding
+ * @param connectTimeout
+ * @param readTimeout
+ * @return
+ */
+ public static String doPost(String reqUrl, Map parameters, String encoding, int connectTimeout,
+ int readTimeout) {
+ HttpURLConnection urlConn = null;
+ try {
+ urlConn = sendPost(reqUrl, parameters, encoding, connectTimeout, readTimeout);
+ String responseContent = getContent(urlConn, encoding);
+ return responseContent.trim();
+ } finally {
+ if (urlConn != null) {
+ urlConn.disconnect();
+
+ }
+ }
+ }
+
+ /**
+ * post携带json请求 静态方法
+ *
+ * @param reqUrl 请求地址
+ * @param jsonParameters 参数
+ * @return
+ */
+ public static String doPostWithJson(String reqUrl, Map jsonParameters) {
+
+ BufferedReader reader = null;
+ try {
+ //创建连接
+ URL url = new URL(reqUrl);
+ HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+ connection.setDoOutput(true);
+ connection.setDoInput(true);
+ connection.setUseCaches(false);
+ connection.setInstanceFollowRedirects(true);
+ //设置请求方式
+ connection.setRequestMethod("POST");
+ //设置发送数据的格式
+ connection.setRequestProperty("Content-Type", "application/json");
+ connection.connect();
+ //一定要用BufferedReader 来接收响应， 使用字节来接收响应的方法是接收不到内容的
+ //utf-8编码
+ OutputStreamWriter out = new OutputStreamWriter(connection.getOutputStream(), StandardCharsets.UTF_8);
+ out.append(JSONObject.toJSONString(jsonParameters));
+ out.flush();
+ out.close();
+ //读取响应
+ reader = new BufferedReader(new InputStreamReader(connection.getInputStream(), StandardCharsets.UTF_8));
+ String line;
+ String res = "";
+ while ((line = reader.readLine()) != null) {
+ res += line;
+ }
+ reader.close();
+
+ return res;
+ } catch (IOException e) {
+ log.error("post请求错误", e);
+ }
+ //自定义错误信息
+ return "error";
+
+ }
+
+ /**
+ * post携带json请求 静态方法
+ *
+ * @param reqUrl 请求地址
+ * @param object 对象
+ * @return
+ */
+ public static String doPostWithJson(String reqUrl, Object object) {
+
+ BufferedReader reader = null;
+ try {
+ //创建连接
+ URL url = new URL(reqUrl);
+ HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+ connection.setDoOutput(true);
+ connection.setDoInput(true);
+ connection.setUseCaches(false);
+ connection.setInstanceFollowRedirects(true);
+ //设置请求方式
+ connection.setRequestMethod("POST");
+ //设置发送数据的格式
+ connection.setRequestProperty("Content-Type", "application/json");
+ connection.connect();
+ //一定要用BufferedReader 来接收响应， 使用字节来接收响应的方法是接收不到内容的
+ //utf-8编码
+ OutputStreamWriter out = new OutputStreamWriter(connection.getOutputStream(), StandardCharsets.UTF_8);
+ out.append(JSONObject.toJSONString(object));
+ out.flush();
+ out.close();
+ //读取响应
+ reader = new BufferedReader(new InputStreamReader(connection.getInputStream(), StandardCharsets.UTF_8));
+ String line;
+ String res = "";
+ while ((line = reader.readLine()) != null) {
+ res += line;
+ }
+ reader.close();
+
+ return res;
+ } catch (IOException e) {
+ log.error("post错误", e);
+ }
+ //自定义错误信息
+ return "error";
+
+ }
+
+ /**
+ * 发送post请求
+ *
+ * @param reqUrl
+ * @param parameters
+ * @param encoding
+ * @param connectTimeout
+ * @param readTimeout
+ * @return
+ */
+ private static HttpURLConnection sendPost(String reqUrl,
+ Map parameters, String encoding, int connectTimeout, int readTimeout) {
+ HttpURLConnection urlConn = null;
+ try {
+ String params = generatorParamString(parameters, encoding);
+ URL url = new URL(reqUrl);
+ urlConn = (HttpURLConnection) url.openConnection();
+ urlConn.setRequestMethod("POST");
+ //（单位：毫秒）jdk
+ urlConn.setConnectTimeout(connectTimeout);
+ //（单位：毫秒）jdk 1.5换成这个,读操作超时
+ urlConn.setReadTimeout(readTimeout);
+ urlConn.setDoOutput(true);
+ //String按照字节处理是一个好方法
+ byte[] b = params.getBytes(encoding);
+ urlConn.getOutputStream().write(b, 0, b.length);
+ urlConn.getOutputStream().flush();
+ urlConn.getOutputStream().close();
+ } catch (Exception e) {
+ throw new RuntimeException(e.getMessage(), e);
+ }
+ return urlConn;
+ }
+
+ /**
+ * get 请求 静态方法
+ *
+ * @param urlConn
+ * @param encoding
+ * @return
+ */
+ private static String getContent(HttpURLConnection urlConn, String encoding) {
+ try {
+ String responseContent = null;
+ InputStream in = urlConn.getInputStream();
+ BufferedReader rd = new BufferedReader(new InputStreamReader(in, encoding));
+ String tempLine = rd.readLine();
+ StringBuffer tempStr = new StringBuffer();
+ String crlf = System.getProperty("line.separator");
+ while (tempLine != null) {
+ tempStr.append(tempLine);
+ tempStr.append(crlf);
+ tempLine = rd.readLine();
+ }
+ responseContent = tempStr.toString();
+ rd.close();
+ in.close();
+ return responseContent;
+ } catch (Exception e) {
+ throw new RuntimeException(e.getMessage(), e);
+ }
+ }
+
+ /**
+ * get 请求 静态方法
+ *
+ * @param link
+ * @param encoding
+ * @return
+ */
+ public static String doGet(String link, String encoding, int connectTimeout, int readTimeout) {
+ HttpURLConnection conn = null;
+ try {
+ URL url = new URL(link);
+ conn = (HttpURLConnection) url.openConnection();
+ conn.setRequestMethod("GET");
+ conn.setConnectTimeout(connectTimeout);
+ conn.setReadTimeout(readTimeout);
+ BufferedInputStream in = new BufferedInputStream(
+ conn.getInputStream());
+ ByteArrayOutputStream out = new ByteArrayOutputStream();
+ byte[] buf = new byte[1024];
+ for (int i = 0; (i = in.read(buf)) > 0; ) {
+ out.write(buf, 0, i);
+ }
+ out.flush();
+ String s = out.toString(encoding);
+ return s;
+ } catch (Exception e) {
+ throw new RuntimeException(e.getMessage(), e);
+ } finally {
+ if (conn != null) {
+ conn.disconnect();
+ conn = null;
+ }
+ }
+ }
+
+ /**
+ * 将parameters中数据转换成用"&"链接的http请求参数形式
+ *
+ * @param parameters
+ * @return
+ */
+ private static String generatorParamString(Map parameters, String encoding) {
+ StringBuffer params = new StringBuffer();
+ if (parameters != null) {
+ for (Iterator iter = parameters.keySet().iterator(); iter
+ .hasNext(); ) {
+ String name = iter.next();
+ String value = parameters.get(name);
+ params.append(name + "=");
+ try {
+ params.append(URLEncoder.encode(value, encoding));
+ } catch (UnsupportedEncodingException e) {
+ throw new RuntimeException(e.getMessage(), e);
+ } catch (Exception e) {
+ String message = String.format("'%s'='%s'", name, value);
+ throw new RuntimeException(message, e);
+ }
+ if (iter.hasNext()) {
+ params.append("&");
+ }
+ }
+ }
+ return params.toString();
+ }
}
diff --git a/framework/src/main/java/cn/lili/modules/connect/util/UuidUtils.java b/framework/src/main/java/cn/lili/common/utils/UuidUtils.java
similarity index 98%
rename from framework/src/main/java/cn/lili/modules/connect/util/UuidUtils.java
rename to framework/src/main/java/cn/lili/common/utils/UuidUtils.java
index af9b2cdd..b9f17bcb 100644
--- a/framework/src/main/java/cn/lili/modules/connect/util/UuidUtils.java
+++ b/framework/src/main/java/cn/lili/common/utils/UuidUtils.java
@@ -1,4 +1,4 @@
-package cn.lili.modules.connect.util;
+package cn.lili.common.utils;
import java.nio.charset.StandardCharsets;
import java.util.concurrent.ThreadLocalRandom;
diff --git a/framework/src/main/java/cn/lili/modules/connect/request/BaseAuthRequest.java b/framework/src/main/java/cn/lili/modules/connect/request/BaseAuthRequest.java
index 9e1274dc..51f0aa96 100644
--- a/framework/src/main/java/cn/lili/modules/connect/request/BaseAuthRequest.java
+++ b/framework/src/main/java/cn/lili/modules/connect/request/BaseAuthRequest.java
@@ -13,7 +13,7 @@ import cn.lili.modules.connect.entity.enums.AuthResponseStatus;
import cn.lili.modules.connect.exception.AuthException;
import cn.lili.modules.connect.util.AuthChecker;
import cn.lili.common.utils.HttpUtils;
-import cn.lili.modules.connect.util.UuidUtils;
+import cn.lili.common.utils.UuidUtils;
import com.xkcoding.http.util.UrlUtil;
import lombok.extern.slf4j.Slf4j;
diff --git a/framework/src/main/java/cn/lili/modules/connect/serviceimpl/ConnectServiceImpl.java b/framework/src/main/java/cn/lili/modules/connect/serviceimpl/ConnectServiceImpl.java
index 68ca20b6..d5e03307 100644
--- a/framework/src/main/java/cn/lili/modules/connect/serviceimpl/ConnectServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/connect/serviceimpl/ConnectServiceImpl.java
@@ -12,6 +12,7 @@ import cn.lili.common.security.AuthUser;
import cn.lili.common.security.context.UserContext;
import cn.lili.common.security.token.Token;
import cn.lili.common.utils.CookieUtil;
+import cn.lili.common.utils.HttpUtils;
import cn.lili.common.utils.StringUtils;
import cn.lili.modules.connect.entity.Connect;
import cn.lili.modules.connect.entity.dto.ConnectAuthUser;
@@ -27,7 +28,6 @@ import cn.lili.modules.system.entity.dto.connect.WechatConnectSetting;
import cn.lili.modules.system.entity.dto.connect.dto.WechatConnectSettingItem;
import cn.lili.modules.system.entity.enums.SettingEnum;
import cn.lili.modules.system.service.SettingService;
-import cn.lili.modules.system.utils.HttpUtils;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.extern.slf4j.Slf4j;
diff --git a/framework/src/main/java/cn/lili/modules/distribution/entity/dos/DistributionCash.java b/framework/src/main/java/cn/lili/modules/distribution/entity/dos/DistributionCash.java
index b648f323..e04a5ff6 100644
--- a/framework/src/main/java/cn/lili/modules/distribution/entity/dos/DistributionCash.java
+++ b/framework/src/main/java/cn/lili/modules/distribution/entity/dos/DistributionCash.java
@@ -1,6 +1,6 @@
package cn.lili.modules.distribution.entity.dos;
-import cn.lili.modules.member.entity.enums.WithdrawStatusEnum;
+import cn.lili.modules.wallet.entity.enums.WithdrawStatusEnum;
import cn.lili.mybatis.BaseEntity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionCashServiceImpl.java b/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionCashServiceImpl.java
index 8e3cefab..76c48943 100644
--- a/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionCashServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionCashServiceImpl.java
@@ -2,7 +2,7 @@ package cn.lili.modules.distribution.serviceimpl;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.exception.ServiceException;
-import cn.lili.modules.member.entity.enums.WithdrawStatusEnum;
+import cn.lili.modules.wallet.entity.enums.WithdrawStatusEnum;
import cn.lili.rocketmq.RocketmqSendCallbackBuilder;
import cn.lili.rocketmq.tags.MemberTagsEnum;
import cn.lili.common.utils.CurrencyUtil;
@@ -17,10 +17,10 @@ import cn.lili.modules.distribution.entity.vos.DistributionCashSearchParams;
import cn.lili.modules.distribution.mapper.DistributionCashMapper;
import cn.lili.modules.distribution.service.DistributionCashService;
import cn.lili.modules.distribution.service.DistributionService;
-import cn.lili.modules.member.entity.dto.MemberWithdrawalMessage;
-import cn.lili.modules.member.entity.enums.MemberWithdrawalDestinationEnum;
-import cn.lili.modules.member.service.MemberWalletService;
-import cn.lili.modules.order.trade.entity.enums.DepositServiceTypeEnum;
+import cn.lili.modules.wallet.entity.dto.MemberWithdrawalMessage;
+import cn.lili.modules.wallet.entity.enums.MemberWithdrawalDestinationEnum;
+import cn.lili.modules.wallet.service.MemberWalletService;
+import cn.lili.modules.wallet.entity.enums.DepositServiceTypeEnum;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
diff --git a/framework/src/main/java/cn/lili/modules/file/plugin/FileManagerPlugin.java b/framework/src/main/java/cn/lili/modules/file/plugin/FileManagerPlugin.java
index 7aacc714..bd279d05 100644
--- a/framework/src/main/java/cn/lili/modules/file/plugin/FileManagerPlugin.java
+++ b/framework/src/main/java/cn/lili/modules/file/plugin/FileManagerPlugin.java
@@ -37,13 +37,4 @@ public interface FileManagerPlugin {
*/
void deleteFile(List key);
- /**
- * 根据原图生成规定尺寸的图片
- *
- * @param url 连接
- * @param width 宽
- * @param height 高
- * @return
- */
- String getUrl(String url, Integer width, Integer height);
}
diff --git a/framework/src/main/java/cn/lili/modules/file/plugin/impl/AliFileManagerPlugin.java b/framework/src/main/java/cn/lili/modules/file/plugin/impl/AliFileManagerPlugin.java
index e28bfc88..4ddbf899 100644
--- a/framework/src/main/java/cn/lili/modules/file/plugin/impl/AliFileManagerPlugin.java
+++ b/framework/src/main/java/cn/lili/modules/file/plugin/impl/AliFileManagerPlugin.java
@@ -183,11 +183,4 @@ public class AliFileManagerPlugin implements FileManagerPlugin {
ossClient.shutdown();
}
}
-
- @Override
- public String getUrl(String url, Integer width, Integer height) {
- //缩略图全路径
- //返回缩略图全路径
- return url + "?x-oss-process=style/" + width + "X" + height;
- }
}
diff --git a/framework/src/main/java/cn/lili/modules/file/util/FileUtil.java b/framework/src/main/java/cn/lili/modules/file/util/FileUtil.java
new file mode 100644
index 00000000..46cbf51f
--- /dev/null
+++ b/framework/src/main/java/cn/lili/modules/file/util/FileUtil.java
@@ -0,0 +1,24 @@
+package cn.lili.modules.file.util;
+
+/**
+ * FileUtil
+ *
+ * @author Chopper
+ * @version v1.0
+ * 2021-11-22 11:19
+ */
+public class FileUtil {
+
+ /**
+ * 根据原图生成规定尺寸的图片
+ *
+ * @param url 连接
+ * @param width 宽
+ * @param height 高
+ * @return
+ */
+ public static String getUrl(String url, Integer width, Integer height) {
+ //缩略图全路径
+ return url + "?x-oss-process=style/" + width + "X" + height;
+ }
+}
diff --git a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsGalleryServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsGalleryServiceImpl.java
index 5537adf6..e1727397 100644
--- a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsGalleryServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsGalleryServiceImpl.java
@@ -1,7 +1,7 @@
package cn.lili.modules.goods.serviceimpl;
import cn.hutool.json.JSONUtil;
-import cn.lili.modules.file.plugin.FileManagerPlugin;
+import cn.lili.modules.file.util.FileUtil;
import cn.lili.modules.goods.entity.dos.GoodsGallery;
import cn.lili.modules.goods.mapper.GoodsGalleryMapper;
import cn.lili.modules.goods.service.GoodsGalleryService;
@@ -29,11 +29,6 @@ import java.util.List;
@Service
@Transactional(rollbackFor = Exception.class)
public class GoodsGalleryServiceImpl extends ServiceImpl implements GoodsGalleryService {
- /**
- * 文件
- */
- @Autowired
- private FileManagerPlugin fileManagerPlugin;
/**
* 设置
*/
@@ -65,9 +60,9 @@ public class GoodsGalleryServiceImpl extends ServiceImpl impleme
}
//过滤会员昵称敏感词
if (com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotBlank(managerMemberEditDTO.getNickName())) {
- managerMemberEditDTO.setNickName(SensitiveWordsFilter.filter(managerMemberEditDTO.getNickName(), CharacterConstant.WILDCARD_STAR));
+ managerMemberEditDTO.setNickName(SensitiveWordsFilter.filter(managerMemberEditDTO.getNickName()));
}
//如果密码不为空则加密密码
if (com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotBlank(managerMemberEditDTO.getPassword())) {
diff --git a/framework/src/main/java/cn/lili/modules/message/entity/dos/SmsSign.java b/framework/src/main/java/cn/lili/modules/message/entity/dos/SmsSign.java
index e0bc8092..2e54b1e5 100644
--- a/framework/src/main/java/cn/lili/modules/message/entity/dos/SmsSign.java
+++ b/framework/src/main/java/cn/lili/modules/message/entity/dos/SmsSign.java
@@ -1,5 +1,6 @@
package cn.lili.modules.message.entity.dos;
+import cn.lili.mybatis.BaseIdEntity;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -15,7 +16,7 @@ import lombok.Data;
@Data
@TableName("li_sms_sign")
@ApiModel(value = "短信签名")
-public class SmsSign {
+public class SmsSign extends BaseIdEntity {
@ApiModelProperty(value = "签名名称", required = true)
private String signName;
diff --git a/framework/src/main/java/cn/lili/modules/message/serviceimpl/SmsSignServiceImpl.java b/framework/src/main/java/cn/lili/modules/message/serviceimpl/SmsSignServiceImpl.java
index 06717a3a..3cb086b8 100644
--- a/framework/src/main/java/cn/lili/modules/message/serviceimpl/SmsSignServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/message/serviceimpl/SmsSignServiceImpl.java
@@ -65,7 +65,7 @@ public class SmsSignServiceImpl extends ServiceImpl impl
try {
Map map = new HashMap<>(16);
//获取未审核通过的签名列表
- List list = list(new LambdaQueryWrapper().eq(SmsSign::getSignStatus, 0));
+ List list = list(new LambdaQueryWrapper().ne(SmsSign::getSignStatus, 1));
//查询签名状态
for (SmsSign smsSign : list) {
map = aliSmsUtil.querySmsSign(smsSign.getSignName());
diff --git a/framework/src/main/java/cn/lili/modules/message/serviceimpl/WechatMPMessageServiceImpl.java b/framework/src/main/java/cn/lili/modules/message/serviceimpl/WechatMPMessageServiceImpl.java
index a10a752a..ea351055 100644
--- a/framework/src/main/java/cn/lili/modules/message/serviceimpl/WechatMPMessageServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/message/serviceimpl/WechatMPMessageServiceImpl.java
@@ -7,6 +7,7 @@ import cn.hutool.json.JSONUtil;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.exception.ServiceException;
import cn.lili.common.enums.ClientTypeEnum;
+import cn.lili.common.utils.HttpUtils;
import cn.lili.modules.message.entity.dos.WechatMPMessage;
import cn.lili.modules.message.entity.enums.WechatMessageItemEnums;
import cn.lili.modules.message.mapper.WechatMPMessageMapper;
@@ -14,7 +15,6 @@ import cn.lili.modules.message.service.WechatMPMessageService;
import cn.lili.modules.message.util.WechatAccessTokenUtil;
import cn.lili.modules.message.util.WechatMessageUtil;
import cn.lili.modules.order.order.entity.enums.OrderStatusEnum;
-import cn.lili.modules.system.utils.HttpUtils;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.AllArgsConstructor;
import lombok.Data;
diff --git a/framework/src/main/java/cn/lili/modules/message/serviceimpl/WechatMessageServiceImpl.java b/framework/src/main/java/cn/lili/modules/message/serviceimpl/WechatMessageServiceImpl.java
index b2d78cb1..f64ce75a 100644
--- a/framework/src/main/java/cn/lili/modules/message/serviceimpl/WechatMessageServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/message/serviceimpl/WechatMessageServiceImpl.java
@@ -6,6 +6,7 @@ import cn.hutool.json.JSONUtil;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.exception.ServiceException;
import cn.lili.common.enums.ClientTypeEnum;
+import cn.lili.common.utils.HttpUtils;
import cn.lili.modules.message.entity.dos.WechatMessage;
import cn.lili.modules.message.entity.enums.WechatMessageItemEnums;
import cn.lili.modules.message.mapper.WechatMessageMapper;
@@ -13,7 +14,6 @@ import cn.lili.modules.message.service.WechatMessageService;
import cn.lili.modules.message.util.WechatAccessTokenUtil;
import cn.lili.modules.message.util.WechatMessageUtil;
import cn.lili.modules.order.order.entity.enums.OrderStatusEnum;
-import cn.lili.modules.system.utils.HttpUtils;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.AllArgsConstructor;
import lombok.Data;
diff --git a/framework/src/main/java/cn/lili/modules/message/util/WechatMessageUtil.java b/framework/src/main/java/cn/lili/modules/message/util/WechatMessageUtil.java
index 2259b314..553ef7ba 100644
--- a/framework/src/main/java/cn/lili/modules/message/util/WechatMessageUtil.java
+++ b/framework/src/main/java/cn/lili/modules/message/util/WechatMessageUtil.java
@@ -20,7 +20,7 @@ import cn.lili.modules.order.order.entity.dos.Order;
import cn.lili.modules.order.order.entity.dos.OrderItem;
import cn.lili.modules.order.order.service.OrderItemService;
import cn.lili.modules.order.order.service.OrderService;
-import cn.lili.modules.system.utils.HttpUtils;
+import cn.lili.common.utils.HttpUtils;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import lombok.extern.slf4j.Slf4j;
diff --git a/framework/src/main/java/cn/lili/modules/order/order/aop/AfterSaleLogPoint.java b/framework/src/main/java/cn/lili/modules/order/aftersale/aop/AfterSaleLogPoint.java
similarity index 90%
rename from framework/src/main/java/cn/lili/modules/order/order/aop/AfterSaleLogPoint.java
rename to framework/src/main/java/cn/lili/modules/order/aftersale/aop/AfterSaleLogPoint.java
index 7e3dccbe..1e6c2965 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/aop/AfterSaleLogPoint.java
+++ b/framework/src/main/java/cn/lili/modules/order/aftersale/aop/AfterSaleLogPoint.java
@@ -1,4 +1,4 @@
-package cn.lili.modules.order.order.aop;
+package cn.lili.modules.order.aftersale.aop;
import java.lang.annotation.*;
diff --git a/framework/src/main/java/cn/lili/modules/order/order/aop/AfterSaleOperationLogAspect.java b/framework/src/main/java/cn/lili/modules/order/aftersale/aop/AfterSaleOperationLogAspect.java
similarity index 93%
rename from framework/src/main/java/cn/lili/modules/order/order/aop/AfterSaleOperationLogAspect.java
rename to framework/src/main/java/cn/lili/modules/order/aftersale/aop/AfterSaleOperationLogAspect.java
index 43ee90aa..35487700 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/aop/AfterSaleOperationLogAspect.java
+++ b/framework/src/main/java/cn/lili/modules/order/aftersale/aop/AfterSaleOperationLogAspect.java
@@ -1,12 +1,12 @@
-package cn.lili.modules.order.order.aop;
+package cn.lili.modules.order.aftersale.aop;
import cn.lili.common.security.AuthUser;
import cn.lili.common.security.context.UserContext;
import cn.lili.common.security.enums.UserEnums;
import cn.lili.common.utils.SpelUtil;
import cn.lili.common.utils.ThreadPoolUtil;
-import cn.lili.modules.order.order.service.AfterSaleLogService;
-import cn.lili.modules.order.trade.entity.dos.AfterSaleLog;
+import cn.lili.modules.order.aftersale.service.AfterSaleLogService;
+import cn.lili.modules.order.aftersale.entity.dos.AfterSaleLog;
import lombok.extern.slf4j.Slf4j;
import org.aspectj.lang.JoinPoint;
import org.aspectj.lang.annotation.AfterReturning;
@@ -32,7 +32,7 @@ public class AfterSaleOperationLogAspect {
@Autowired
private AfterSaleLogService afterSaleLogService;
- @AfterReturning(returning = "rvt", pointcut = "@annotation(cn.lili.modules.order.order.aop.AfterSaleLogPoint)")
+ @AfterReturning(returning = "rvt", pointcut = "@annotation(cn.lili.modules.order.aftersale.aop.AfterSaleLogPoint)")
public void afterReturning(JoinPoint joinPoint, Object rvt) {
try {
AuthUser auth = UserContext.getCurrentUser();
diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/dos/AfterSale.java b/framework/src/main/java/cn/lili/modules/order/aftersale/entity/dos/AfterSale.java
similarity index 98%
rename from framework/src/main/java/cn/lili/modules/order/order/entity/dos/AfterSale.java
rename to framework/src/main/java/cn/lili/modules/order/aftersale/entity/dos/AfterSale.java
index 55ddb87a..8d668bc0 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/entity/dos/AfterSale.java
+++ b/framework/src/main/java/cn/lili/modules/order/aftersale/entity/dos/AfterSale.java
@@ -1,4 +1,4 @@
-package cn.lili.modules.order.order.entity.dos;
+package cn.lili.modules.order.aftersale.entity.dos;
import cn.lili.mybatis.BaseEntity;
import com.baomidou.mybatisplus.annotation.TableName;
diff --git a/framework/src/main/java/cn/lili/modules/order/trade/entity/dos/AfterSaleLog.java b/framework/src/main/java/cn/lili/modules/order/aftersale/entity/dos/AfterSaleLog.java
similarity index 97%
rename from framework/src/main/java/cn/lili/modules/order/trade/entity/dos/AfterSaleLog.java
rename to framework/src/main/java/cn/lili/modules/order/aftersale/entity/dos/AfterSaleLog.java
index 046391c7..af5bb3e1 100644
--- a/framework/src/main/java/cn/lili/modules/order/trade/entity/dos/AfterSaleLog.java
+++ b/framework/src/main/java/cn/lili/modules/order/aftersale/entity/dos/AfterSaleLog.java
@@ -1,4 +1,4 @@
-package cn.lili.modules.order.trade.entity.dos;
+package cn.lili.modules.order.aftersale.entity.dos;
import cn.lili.common.security.enums.UserEnums;
import cn.lili.mybatis.BaseIdEntity;
diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/dos/AfterSaleReason.java b/framework/src/main/java/cn/lili/modules/order/aftersale/entity/dos/AfterSaleReason.java
similarity index 93%
rename from framework/src/main/java/cn/lili/modules/order/order/entity/dos/AfterSaleReason.java
rename to framework/src/main/java/cn/lili/modules/order/aftersale/entity/dos/AfterSaleReason.java
index b9b0dd41..e0370f1e 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/entity/dos/AfterSaleReason.java
+++ b/framework/src/main/java/cn/lili/modules/order/aftersale/entity/dos/AfterSaleReason.java
@@ -1,4 +1,4 @@
-package cn.lili.modules.order.order.entity.dos;
+package cn.lili.modules.order.aftersale.entity.dos;
import cn.lili.mybatis.BaseEntity;
import com.baomidou.mybatisplus.annotation.TableName;
diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/dto/AfterSaleDTO.java b/framework/src/main/java/cn/lili/modules/order/aftersale/entity/dto/AfterSaleDTO.java
similarity index 96%
rename from framework/src/main/java/cn/lili/modules/order/order/entity/dto/AfterSaleDTO.java
rename to framework/src/main/java/cn/lili/modules/order/aftersale/entity/dto/AfterSaleDTO.java
index 20e110c7..09c39259 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/entity/dto/AfterSaleDTO.java
+++ b/framework/src/main/java/cn/lili/modules/order/aftersale/entity/dto/AfterSaleDTO.java
@@ -1,4 +1,4 @@
-package cn.lili.modules.order.order.entity.dto;
+package cn.lili.modules.order.aftersale.entity.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/dto/AfterSalePriceDetailDTO.java b/framework/src/main/java/cn/lili/modules/order/aftersale/entity/dto/AfterSalePriceDetailDTO.java
similarity index 97%
rename from framework/src/main/java/cn/lili/modules/order/order/entity/dto/AfterSalePriceDetailDTO.java
rename to framework/src/main/java/cn/lili/modules/order/aftersale/entity/dto/AfterSalePriceDetailDTO.java
index b442dd83..e901c862 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/entity/dto/AfterSalePriceDetailDTO.java
+++ b/framework/src/main/java/cn/lili/modules/order/aftersale/entity/dto/AfterSalePriceDetailDTO.java
@@ -1,4 +1,4 @@
-package cn.lili.modules.order.order.entity.dto;
+package cn.lili.modules.order.aftersale.entity.dto;
import cn.lili.modules.promotion.entity.dto.BasePromotion;
diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/enums/ComplaintStatusEnum.java b/framework/src/main/java/cn/lili/modules/order/aftersale/entity/enums/ComplaintStatusEnum.java
similarity index 92%
rename from framework/src/main/java/cn/lili/modules/order/order/entity/enums/ComplaintStatusEnum.java
rename to framework/src/main/java/cn/lili/modules/order/aftersale/entity/enums/ComplaintStatusEnum.java
index 6877ec75..67d173bf 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/entity/enums/ComplaintStatusEnum.java
+++ b/framework/src/main/java/cn/lili/modules/order/aftersale/entity/enums/ComplaintStatusEnum.java
@@ -1,4 +1,4 @@
-package cn.lili.modules.order.order.entity.enums;
+package cn.lili.modules.order.aftersale.entity.enums;
/**
* 交易投诉状态
diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/AfterSaleAllowOperation.java b/framework/src/main/java/cn/lili/modules/order/aftersale/entity/vo/AfterSaleAllowOperation.java
similarity index 94%
rename from framework/src/main/java/cn/lili/modules/order/order/entity/vo/AfterSaleAllowOperation.java
rename to framework/src/main/java/cn/lili/modules/order/aftersale/entity/vo/AfterSaleAllowOperation.java
index b830279a..cc449ad1 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/AfterSaleAllowOperation.java
+++ b/framework/src/main/java/cn/lili/modules/order/aftersale/entity/vo/AfterSaleAllowOperation.java
@@ -1,6 +1,6 @@
-package cn.lili.modules.order.order.entity.vo;
+package cn.lili.modules.order.aftersale.entity.vo;
-import cn.lili.modules.order.order.entity.dos.AfterSale;
+import cn.lili.modules.order.aftersale.entity.dos.AfterSale;
import cn.lili.modules.order.trade.entity.enums.AfterSaleStatusEnum;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/AfterSaleApplyVO.java b/framework/src/main/java/cn/lili/modules/order/aftersale/entity/vo/AfterSaleApplyVO.java
similarity index 96%
rename from framework/src/main/java/cn/lili/modules/order/order/entity/vo/AfterSaleApplyVO.java
rename to framework/src/main/java/cn/lili/modules/order/aftersale/entity/vo/AfterSaleApplyVO.java
index 9bd5ee45..9d6577af 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/AfterSaleApplyVO.java
+++ b/framework/src/main/java/cn/lili/modules/order/aftersale/entity/vo/AfterSaleApplyVO.java
@@ -1,4 +1,4 @@
-package cn.lili.modules.order.order.entity.vo;
+package cn.lili.modules.order.aftersale.entity.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/AfterSaleSearchParams.java b/framework/src/main/java/cn/lili/modules/order/aftersale/entity/vo/AfterSaleSearchParams.java
similarity index 98%
rename from framework/src/main/java/cn/lili/modules/order/order/entity/vo/AfterSaleSearchParams.java
rename to framework/src/main/java/cn/lili/modules/order/aftersale/entity/vo/AfterSaleSearchParams.java
index 1da92246..6c8bfcd1 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/AfterSaleSearchParams.java
+++ b/framework/src/main/java/cn/lili/modules/order/aftersale/entity/vo/AfterSaleSearchParams.java
@@ -1,4 +1,4 @@
-package cn.lili.modules.order.order.entity.vo;
+package cn.lili.modules.order.aftersale.entity.vo;
import cn.lili.common.security.context.UserContext;
import cn.lili.common.security.enums.UserEnums;
diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/AfterSaleVO.java b/framework/src/main/java/cn/lili/modules/order/aftersale/entity/vo/AfterSaleVO.java
similarity index 79%
rename from framework/src/main/java/cn/lili/modules/order/order/entity/vo/AfterSaleVO.java
rename to framework/src/main/java/cn/lili/modules/order/aftersale/entity/vo/AfterSaleVO.java
index 4fdc10b5..c5040db4 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/AfterSaleVO.java
+++ b/framework/src/main/java/cn/lili/modules/order/aftersale/entity/vo/AfterSaleVO.java
@@ -1,6 +1,6 @@
-package cn.lili.modules.order.order.entity.vo;
+package cn.lili.modules.order.aftersale.entity.vo;
-import cn.lili.modules.order.order.entity.dos.AfterSale;
+import cn.lili.modules.order.aftersale.entity.dos.AfterSale;
import jdk.nashorn.internal.objects.annotations.Getter;
import lombok.Data;
diff --git a/framework/src/main/java/cn/lili/modules/order/trade/mapper/AfterSaleLogMapper.java b/framework/src/main/java/cn/lili/modules/order/aftersale/mapper/AfterSaleLogMapper.java
similarity index 66%
rename from framework/src/main/java/cn/lili/modules/order/trade/mapper/AfterSaleLogMapper.java
rename to framework/src/main/java/cn/lili/modules/order/aftersale/mapper/AfterSaleLogMapper.java
index 4bb728e3..a1f59f19 100644
--- a/framework/src/main/java/cn/lili/modules/order/trade/mapper/AfterSaleLogMapper.java
+++ b/framework/src/main/java/cn/lili/modules/order/aftersale/mapper/AfterSaleLogMapper.java
@@ -1,6 +1,6 @@
-package cn.lili.modules.order.trade.mapper;
+package cn.lili.modules.order.aftersale.mapper;
-import cn.lili.modules.order.trade.entity.dos.AfterSaleLog;
+import cn.lili.modules.order.aftersale.entity.dos.AfterSaleLog;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
diff --git a/framework/src/main/java/cn/lili/modules/order/order/mapper/AfterSaleMapper.java b/framework/src/main/java/cn/lili/modules/order/aftersale/mapper/AfterSaleMapper.java
similarity index 85%
rename from framework/src/main/java/cn/lili/modules/order/order/mapper/AfterSaleMapper.java
rename to framework/src/main/java/cn/lili/modules/order/aftersale/mapper/AfterSaleMapper.java
index 9ee2ceb3..7cad30d5 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/mapper/AfterSaleMapper.java
+++ b/framework/src/main/java/cn/lili/modules/order/aftersale/mapper/AfterSaleMapper.java
@@ -1,7 +1,7 @@
-package cn.lili.modules.order.order.mapper;
+package cn.lili.modules.order.aftersale.mapper;
-import cn.lili.modules.order.order.entity.dos.AfterSale;
-import cn.lili.modules.order.order.entity.vo.AfterSaleVO;
+import cn.lili.modules.order.aftersale.entity.dos.AfterSale;
+import cn.lili.modules.order.aftersale.entity.vo.AfterSaleVO;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
diff --git a/framework/src/main/java/cn/lili/modules/order/order/mapper/AfterSaleReasonMapper.java b/framework/src/main/java/cn/lili/modules/order/aftersale/mapper/AfterSaleReasonMapper.java
similarity index 66%
rename from framework/src/main/java/cn/lili/modules/order/order/mapper/AfterSaleReasonMapper.java
rename to framework/src/main/java/cn/lili/modules/order/aftersale/mapper/AfterSaleReasonMapper.java
index 2cfe9d2f..a1298b83 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/mapper/AfterSaleReasonMapper.java
+++ b/framework/src/main/java/cn/lili/modules/order/aftersale/mapper/AfterSaleReasonMapper.java
@@ -1,6 +1,6 @@
-package cn.lili.modules.order.order.mapper;
+package cn.lili.modules.order.aftersale.mapper;
-import cn.lili.modules.order.order.entity.dos.AfterSaleReason;
+import cn.lili.modules.order.aftersale.entity.dos.AfterSaleReason;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
diff --git a/framework/src/main/java/cn/lili/modules/order/order/service/AfterSaleLogService.java b/framework/src/main/java/cn/lili/modules/order/aftersale/service/AfterSaleLogService.java
similarity index 78%
rename from framework/src/main/java/cn/lili/modules/order/order/service/AfterSaleLogService.java
rename to framework/src/main/java/cn/lili/modules/order/aftersale/service/AfterSaleLogService.java
index a5a19a7f..dc7ddf71 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/service/AfterSaleLogService.java
+++ b/framework/src/main/java/cn/lili/modules/order/aftersale/service/AfterSaleLogService.java
@@ -1,6 +1,6 @@
-package cn.lili.modules.order.order.service;
+package cn.lili.modules.order.aftersale.service;
-import cn.lili.modules.order.trade.entity.dos.AfterSaleLog;
+import cn.lili.modules.order.aftersale.entity.dos.AfterSaleLog;
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List;
diff --git a/framework/src/main/java/cn/lili/modules/order/order/service/AfterSaleReasonService.java b/framework/src/main/java/cn/lili/modules/order/aftersale/service/AfterSaleReasonService.java
similarity index 83%
rename from framework/src/main/java/cn/lili/modules/order/order/service/AfterSaleReasonService.java
rename to framework/src/main/java/cn/lili/modules/order/aftersale/service/AfterSaleReasonService.java
index 54ae530d..eee8437e 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/service/AfterSaleReasonService.java
+++ b/framework/src/main/java/cn/lili/modules/order/aftersale/service/AfterSaleReasonService.java
@@ -1,6 +1,6 @@
-package cn.lili.modules.order.order.service;
+package cn.lili.modules.order.aftersale.service;
-import cn.lili.modules.order.order.entity.dos.AfterSaleReason;
+import cn.lili.modules.order.aftersale.entity.dos.AfterSaleReason;
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List;
diff --git a/framework/src/main/java/cn/lili/modules/order/order/service/AfterSaleService.java b/framework/src/main/java/cn/lili/modules/order/aftersale/service/AfterSaleService.java
similarity index 91%
rename from framework/src/main/java/cn/lili/modules/order/order/service/AfterSaleService.java
rename to framework/src/main/java/cn/lili/modules/order/aftersale/service/AfterSaleService.java
index 6af2ebe2..5c4a87b4 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/service/AfterSaleService.java
+++ b/framework/src/main/java/cn/lili/modules/order/aftersale/service/AfterSaleService.java
@@ -1,12 +1,12 @@
-package cn.lili.modules.order.order.service;
+package cn.lili.modules.order.aftersale.service;
import cn.lili.common.vo.PageVO;
-import cn.lili.modules.order.order.entity.dos.AfterSale;
-import cn.lili.modules.order.order.entity.dto.AfterSaleDTO;
-import cn.lili.modules.order.order.entity.vo.AfterSaleApplyVO;
-import cn.lili.modules.order.order.entity.vo.AfterSaleSearchParams;
-import cn.lili.modules.order.order.entity.vo.AfterSaleVO;
+import cn.lili.modules.order.aftersale.entity.dos.AfterSale;
+import cn.lili.modules.order.aftersale.entity.dto.AfterSaleDTO;
+import cn.lili.modules.order.aftersale.entity.vo.AfterSaleApplyVO;
+import cn.lili.modules.order.aftersale.entity.vo.AfterSaleSearchParams;
+import cn.lili.modules.order.aftersale.entity.vo.AfterSaleVO;
import cn.lili.modules.statistics.entity.dto.StatisticsQueryParam;
import cn.lili.modules.store.entity.dto.StoreAfterSaleAddressDTO;
import cn.lili.modules.system.entity.vo.Traces;
diff --git a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/AfterSaleLogServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/aftersale/serviceimpl/AfterSaleLogServiceImpl.java
similarity index 76%
rename from framework/src/main/java/cn/lili/modules/order/order/serviceimpl/AfterSaleLogServiceImpl.java
rename to framework/src/main/java/cn/lili/modules/order/aftersale/serviceimpl/AfterSaleLogServiceImpl.java
index e35fd44f..219aee7a 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/AfterSaleLogServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/order/aftersale/serviceimpl/AfterSaleLogServiceImpl.java
@@ -1,8 +1,8 @@
-package cn.lili.modules.order.order.serviceimpl;
+package cn.lili.modules.order.aftersale.serviceimpl;
-import cn.lili.modules.order.order.service.AfterSaleLogService;
-import cn.lili.modules.order.trade.entity.dos.AfterSaleLog;
-import cn.lili.modules.order.trade.mapper.AfterSaleLogMapper;
+import cn.lili.modules.order.aftersale.service.AfterSaleLogService;
+import cn.lili.modules.order.aftersale.entity.dos.AfterSaleLog;
+import cn.lili.modules.order.aftersale.mapper.AfterSaleLogMapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
diff --git a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/AfterSaleReasonServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/aftersale/serviceimpl/AfterSaleReasonServiceImpl.java
similarity index 85%
rename from framework/src/main/java/cn/lili/modules/order/order/serviceimpl/AfterSaleReasonServiceImpl.java
rename to framework/src/main/java/cn/lili/modules/order/aftersale/serviceimpl/AfterSaleReasonServiceImpl.java
index 991b38dc..df094942 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/AfterSaleReasonServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/order/aftersale/serviceimpl/AfterSaleReasonServiceImpl.java
@@ -1,8 +1,8 @@
-package cn.lili.modules.order.order.serviceimpl;
+package cn.lili.modules.order.aftersale.serviceimpl;
-import cn.lili.modules.order.order.entity.dos.AfterSaleReason;
-import cn.lili.modules.order.order.mapper.AfterSaleReasonMapper;
-import cn.lili.modules.order.order.service.AfterSaleReasonService;
+import cn.lili.modules.order.aftersale.entity.dos.AfterSaleReason;
+import cn.lili.modules.order.aftersale.mapper.AfterSaleReasonMapper;
+import cn.lili.modules.order.aftersale.service.AfterSaleReasonService;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
diff --git a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/AfterSaleServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/aftersale/serviceimpl/AfterSaleServiceImpl.java
similarity index 97%
rename from framework/src/main/java/cn/lili/modules/order/order/serviceimpl/AfterSaleServiceImpl.java
rename to framework/src/main/java/cn/lili/modules/order/aftersale/serviceimpl/AfterSaleServiceImpl.java
index 2dc37ff6..4e6f3180 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/AfterSaleServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/order/aftersale/serviceimpl/AfterSaleServiceImpl.java
@@ -1,4 +1,4 @@
-package cn.lili.modules.order.order.serviceimpl;
+package cn.lili.modules.order.aftersale.serviceimpl;
import cn.hutool.core.text.CharSequenceUtil;
import cn.hutool.core.util.NumberUtil;
@@ -13,17 +13,21 @@ import cn.lili.common.utils.BeanUtil;
import cn.lili.common.utils.CurrencyUtil;
import cn.lili.common.utils.SnowFlake;
import cn.lili.common.vo.PageVO;
-import cn.lili.modules.order.order.aop.AfterSaleLogPoint;
-import cn.lili.modules.order.order.entity.dos.AfterSale;
+import cn.lili.modules.order.aftersale.aop.AfterSaleLogPoint;
+import cn.lili.modules.order.aftersale.entity.dos.AfterSale;
import cn.lili.modules.order.order.entity.dos.Order;
import cn.lili.modules.order.order.entity.dos.OrderItem;
-import cn.lili.modules.order.order.entity.dto.AfterSaleDTO;
import cn.lili.modules.order.order.entity.enums.*;
-import cn.lili.modules.order.order.entity.vo.AfterSaleApplyVO;
-import cn.lili.modules.order.order.entity.vo.AfterSaleSearchParams;
-import cn.lili.modules.order.order.entity.vo.AfterSaleVO;
-import cn.lili.modules.order.order.mapper.AfterSaleMapper;
-import cn.lili.modules.order.order.service.AfterSaleService;
+import cn.lili.modules.order.aftersale.entity.dto.AfterSaleDTO;
+import cn.lili.modules.order.order.entity.enums.OrderItemAfterSaleStatusEnum;
+import cn.lili.modules.order.order.entity.enums.OrderStatusEnum;
+import cn.lili.modules.order.order.entity.enums.OrderTypeEnum;
+import cn.lili.modules.order.order.entity.enums.PayStatusEnum;
+import cn.lili.modules.order.aftersale.entity.vo.AfterSaleApplyVO;
+import cn.lili.modules.order.aftersale.entity.vo.AfterSaleSearchParams;
+import cn.lili.modules.order.aftersale.entity.vo.AfterSaleVO;
+import cn.lili.modules.order.aftersale.mapper.AfterSaleMapper;
+import cn.lili.modules.order.aftersale.service.AfterSaleService;
import cn.lili.modules.order.order.service.OrderItemService;
import cn.lili.modules.order.order.service.OrderService;
import cn.lili.modules.order.trade.entity.enums.AfterSaleRefundWayEnum;
diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/dos/OrderComplaint.java b/framework/src/main/java/cn/lili/modules/order/order/entity/dos/OrderComplaint.java
index c125c8b6..9b3111de 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/entity/dos/OrderComplaint.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/entity/dos/OrderComplaint.java
@@ -1,6 +1,6 @@
package cn.lili.modules.order.order.entity.dos;
-import cn.lili.modules.order.order.entity.enums.ComplaintStatusEnum;
+import cn.lili.modules.order.aftersale.entity.enums.ComplaintStatusEnum;
import cn.lili.mybatis.BaseEntity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderComplaintSearchParams.java b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderComplaintSearchParams.java
index 025e54cd..3c6211a1 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderComplaintSearchParams.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderComplaintSearchParams.java
@@ -2,7 +2,7 @@ package cn.lili.modules.order.order.entity.vo;
import cn.hutool.core.util.StrUtil;
import cn.lili.modules.order.order.entity.dos.OrderComplaint;
-import cn.lili.modules.order.order.entity.enums.ComplaintStatusEnum;
+import cn.lili.modules.order.aftersale.entity.enums.ComplaintStatusEnum;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
diff --git a/framework/src/main/java/cn/lili/modules/order/order/service/OrderService.java b/framework/src/main/java/cn/lili/modules/order/order/service/OrderService.java
index 4fb1d04c..9fb0db50 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/service/OrderService.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/service/OrderService.java
@@ -9,10 +9,14 @@ import cn.lili.modules.order.order.entity.dto.OrderMessage;
import cn.lili.modules.order.order.entity.dto.OrderSearchParams;
import cn.lili.modules.order.order.entity.vo.OrderDetailVO;
import cn.lili.modules.order.order.entity.vo.OrderSimpleVO;
+import cn.lili.modules.order.order.entity.vo.PaymentLog;
import cn.lili.modules.statistics.entity.dto.StatisticsQueryParam;
import cn.lili.modules.system.entity.vo.Traces;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.service.IService;
+import org.apache.ibatis.annotations.Param;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
@@ -235,4 +239,13 @@ public interface OrderService extends IService {
* @return 金额
*/
Double getPaymentTotal(String orderSn);
+
+ /**
+ * 查询订单支付记录
+ *
+ * @param page 分页
+ * @param queryWrapper 查询条件
+ * @return 订单支付记录分页
+ */
+ IPage queryPaymentLogs(IPage page, Wrapper queryWrapper);
}
\ No newline at end of file
diff --git a/framework/src/main/java/cn/lili/modules/order/order/service/StoreFlowService.java b/framework/src/main/java/cn/lili/modules/order/order/service/StoreFlowService.java
index 83d07d57..c86a83e8 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/service/StoreFlowService.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/service/StoreFlowService.java
@@ -1,12 +1,19 @@
package cn.lili.modules.order.order.service;
import cn.lili.common.vo.PageVO;
-import cn.lili.modules.order.order.entity.dos.AfterSale;
+import cn.lili.modules.order.aftersale.entity.dos.AfterSale;
import cn.lili.modules.order.order.entity.dos.StoreFlow;
+import cn.lili.modules.store.entity.vos.StoreFlowPayDownloadVO;
+import cn.lili.modules.store.entity.vos.StoreFlowRefundDownloadVO;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.service.IService;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
import java.util.Date;
+import java.util.List;
/**
* 商家订单流水业务层
@@ -43,4 +50,20 @@ public interface StoreFlowService extends IService {
*/
IPage getStoreFlow(String storeId, String type, boolean distribution, PageVO pageVO, Date startTime, Date endTime);
+ /**
+ * 获取结算单的入账流水
+ *
+ * @param queryWrapper 查询条件
+ * @return 入账流水
+ */
+ List getStoreFlowPayDownloadVO(Wrapper queryWrapper);
+
+ /**
+ * 获取结算单的退款流水
+ *
+ * @param queryWrapper 查询条件
+ * @return 退款流水
+ */
+ List getStoreFlowRefundDownloadVO(Wrapper queryWrapper);
+
}
\ No newline at end of file
diff --git a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderComplaintServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderComplaintServiceImpl.java
index d5c2eb06..6631f714 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderComplaintServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderComplaintServiceImpl.java
@@ -15,7 +15,7 @@ import cn.lili.modules.order.order.entity.dos.OrderComplaint;
import cn.lili.modules.order.order.entity.dos.OrderComplaintCommunication;
import cn.lili.modules.order.order.entity.dos.OrderItem;
import cn.lili.modules.order.order.entity.dto.OrderComplaintDTO;
-import cn.lili.modules.order.order.entity.enums.ComplaintStatusEnum;
+import cn.lili.modules.order.aftersale.entity.enums.ComplaintStatusEnum;
import cn.lili.modules.order.order.entity.enums.OrderComplaintStatusEnum;
import cn.lili.modules.order.order.entity.vo.*;
import cn.lili.modules.order.order.mapper.OrderComplaintMapper;
diff --git a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java
index e618988a..09f1a64d 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java
@@ -31,6 +31,7 @@ import cn.lili.modules.order.order.entity.enums.*;
import cn.lili.modules.order.order.entity.vo.OrderDetailVO;
import cn.lili.modules.order.order.entity.vo.OrderSimpleVO;
import cn.lili.modules.order.order.entity.vo.OrderVO;
+import cn.lili.modules.order.order.entity.vo.PaymentLog;
import cn.lili.modules.order.order.mapper.OrderItemMapper;
import cn.lili.modules.order.order.mapper.OrderMapper;
import cn.lili.modules.order.order.service.*;
@@ -56,6 +57,7 @@ import cn.lili.trigger.message.PintuanOrderMessage;
import cn.lili.trigger.model.TimeExecuteConstant;
import cn.lili.trigger.model.TimeTriggerMsg;
import cn.lili.trigger.util.DelayQueueTools;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -598,6 +600,11 @@ public class OrderServiceImpl extends ServiceImpl implements
return order.getFlowPrice();
}
+ @Override
+ public IPage queryPaymentLogs(IPage page, Wrapper queryWrapper) {
+ return baseMapper.queryPaymentLogs(page, queryWrapper);
+ }
+
/**
* 循环检查批量发货订单列表
*
diff --git a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/StoreFlowServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/StoreFlowServiceImpl.java
index 9b9474b5..e9e1f321 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/StoreFlowServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/StoreFlowServiceImpl.java
@@ -2,7 +2,7 @@ package cn.lili.modules.order.order.serviceimpl;
import cn.lili.common.utils.*;
import cn.lili.common.vo.PageVO;
-import cn.lili.modules.order.order.entity.dos.AfterSale;
+import cn.lili.modules.order.aftersale.entity.dos.AfterSale;
import cn.lili.modules.order.order.entity.dos.Order;
import cn.lili.modules.order.order.entity.dos.OrderItem;
import cn.lili.modules.order.order.entity.dos.StoreFlow;
@@ -15,7 +15,10 @@ import cn.lili.modules.order.order.service.OrderService;
import cn.lili.modules.order.order.service.StoreFlowService;
import cn.lili.modules.payment.entity.RefundLog;
import cn.lili.modules.payment.service.RefundLogService;
+import cn.lili.modules.store.entity.vos.StoreFlowPayDownloadVO;
+import cn.lili.modules.store.entity.vos.StoreFlowRefundDownloadVO;
import cn.lili.mybatis.util.PageUtil;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -168,4 +171,14 @@ public class StoreFlowServiceImpl extends ServiceImpl getStoreFlowPayDownloadVO(Wrapper queryWrapper) {
+ return baseMapper.getStoreFlowPayDownloadVO(queryWrapper);
+ }
+
+ @Override
+ public List getStoreFlowRefundDownloadVO(Wrapper queryWrapper) {
+ return baseMapper.getStoreFlowRefundDownloadVO(queryWrapper);
+ }
}
\ No newline at end of file
diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/CashierSupport.java b/framework/src/main/java/cn/lili/modules/payment/kit/CashierSupport.java
index 3345d7c3..1004787a 100644
--- a/framework/src/main/java/cn/lili/modules/payment/kit/CashierSupport.java
+++ b/framework/src/main/java/cn/lili/modules/payment/kit/CashierSupport.java
@@ -7,7 +7,7 @@ import cn.lili.common.security.context.UserContext;
import cn.lili.common.utils.SpringContextUtil;
import cn.lili.common.vo.ResultMessage;
import cn.lili.common.enums.ClientTypeEnum;
-import cn.lili.modules.member.service.MemberWalletService;
+import cn.lili.modules.wallet.service.MemberWalletService;
import cn.lili.modules.payment.kit.dto.PayParam;
import cn.lili.modules.payment.entity.enums.PaymentClientEnum;
import cn.lili.modules.payment.entity.enums.PaymentMethodEnum;
diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/RefundSupport.java b/framework/src/main/java/cn/lili/modules/payment/kit/RefundSupport.java
index df3a3602..4f4e20a4 100644
--- a/framework/src/main/java/cn/lili/modules/payment/kit/RefundSupport.java
+++ b/framework/src/main/java/cn/lili/modules/payment/kit/RefundSupport.java
@@ -2,11 +2,11 @@ package cn.lili.modules.payment.kit;
import cn.lili.common.utils.SnowFlake;
import cn.lili.common.utils.SpringContextUtil;
-import cn.lili.modules.order.order.entity.dos.AfterSale;
+import cn.lili.modules.order.aftersale.entity.dos.AfterSale;
import cn.lili.modules.order.order.entity.dos.Order;
import cn.lili.modules.order.order.entity.dos.OrderItem;
-import cn.lili.modules.order.order.service.AfterSaleService;
import cn.lili.modules.order.order.service.OrderItemService;
+import cn.lili.modules.order.aftersale.service.AfterSaleService;
import cn.lili.modules.order.order.service.OrderService;
import cn.lili.modules.order.order.service.StoreFlowService;
import cn.lili.modules.payment.entity.RefundLog;
diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/params/impl/RechargeCashier.java b/framework/src/main/java/cn/lili/modules/payment/kit/params/impl/RechargeCashier.java
index 2db0ea27..e1ba21f7 100644
--- a/framework/src/main/java/cn/lili/modules/payment/kit/params/impl/RechargeCashier.java
+++ b/framework/src/main/java/cn/lili/modules/payment/kit/params/impl/RechargeCashier.java
@@ -4,8 +4,8 @@ import cn.hutool.json.JSONUtil;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.exception.ServiceException;
import cn.lili.modules.order.order.entity.enums.PayStatusEnum;
-import cn.lili.modules.order.trade.entity.dos.Recharge;
-import cn.lili.modules.order.trade.service.RechargeService;
+import cn.lili.modules.wallet.entity.dos.Recharge;
+import cn.lili.modules.wallet.service.RechargeService;
import cn.lili.modules.payment.kit.dto.PayParam;
import cn.lili.modules.payment.kit.dto.PaymentSuccessParams;
import cn.lili.modules.payment.entity.enums.CashierEnum;
diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wallet/WalletPlugin.java b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wallet/WalletPlugin.java
index 832e5cd6..7e10a3ba 100644
--- a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wallet/WalletPlugin.java
+++ b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wallet/WalletPlugin.java
@@ -5,8 +5,8 @@ import cn.lili.common.enums.ResultUtil;
import cn.lili.common.exception.ServiceException;
import cn.lili.common.security.context.UserContext;
import cn.lili.common.vo.ResultMessage;
-import cn.lili.modules.member.service.MemberWalletService;
-import cn.lili.modules.order.trade.entity.enums.DepositServiceTypeEnum;
+import cn.lili.modules.wallet.service.MemberWalletService;
+import cn.lili.modules.wallet.entity.enums.DepositServiceTypeEnum;
import cn.lili.modules.payment.entity.RefundLog;
import cn.lili.modules.payment.kit.CashierSupport;
import cn.lili.modules.payment.kit.Payment;
diff --git a/framework/src/main/java/cn/lili/modules/payment/serviceimpl/PaymentServiceImpl.java b/framework/src/main/java/cn/lili/modules/payment/serviceimpl/PaymentServiceImpl.java
index 97d8a242..489ba5a2 100644
--- a/framework/src/main/java/cn/lili/modules/payment/serviceimpl/PaymentServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/payment/serviceimpl/PaymentServiceImpl.java
@@ -2,6 +2,7 @@ package cn.lili.modules.payment.serviceimpl;
import cn.lili.modules.order.order.entity.vo.PaymentLog;
import cn.lili.modules.order.order.mapper.OrderMapper;
+import cn.lili.modules.order.order.service.OrderService;
import cn.lili.modules.payment.kit.CashierSupport;
import cn.lili.modules.payment.kit.dto.PaymentSuccessParams;
import cn.lili.modules.payment.kit.params.CashierExecute;
@@ -33,7 +34,7 @@ public class PaymentServiceImpl implements PaymentService {
@Autowired
private CashierSupport cashierSupport;
@Resource
- private OrderMapper orderMapper;
+ private OrderService orderService;
@Override
public void success(PaymentSuccessParams paymentSuccessParams) {
@@ -63,6 +64,6 @@ public class PaymentServiceImpl implements PaymentService {
@Override
public IPage page(Page initPage, QueryWrapper initWrapper) {
- return orderMapper.queryPaymentLogs(initPage, initWrapper);
+ return orderService.queryPaymentLogs(initPage, initWrapper);
}
}
\ No newline at end of file
diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PointsGoodsServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PointsGoodsServiceImpl.java
index acee95ac..f0b3fb97 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PointsGoodsServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PointsGoodsServiceImpl.java
@@ -228,7 +228,7 @@ public class PointsGoodsServiceImpl extends ServiceImpl getPointsGoodsByPage(PointsGoodsSearchParams searchParams, PageVO page) {
IPage pointsGoodsPage = new Page<>();
- if (UserContext.getCurrentUser().getRole().equals(UserEnums.MEMBER)) {
+ if (UserContext.getCurrentUser() == null || UserContext.getCurrentUser().getRole().equals(UserEnums.MEMBER)) {
searchParams.setPromotionStatus(PromotionStatusEnum.START.name());
}
Query query = searchParams.mongoQuery();
diff --git a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/IndexStatisticsServiceImpl.java b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/IndexStatisticsServiceImpl.java
index eab152e7..501dbb92 100644
--- a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/IndexStatisticsServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/IndexStatisticsServiceImpl.java
@@ -12,7 +12,7 @@ import cn.lili.modules.goods.service.GoodsService;
import cn.lili.modules.member.service.MemberEvaluationService;
import cn.lili.modules.order.order.entity.enums.FlowTypeEnum;
import cn.lili.modules.order.order.entity.enums.OrderStatusEnum;
-import cn.lili.modules.order.order.service.AfterSaleService;
+import cn.lili.modules.order.aftersale.service.AfterSaleService;
import cn.lili.modules.order.order.service.OrderComplaintService;
import cn.lili.modules.order.trade.entity.enums.AfterSaleTypeEnum;
import cn.lili.modules.promotion.service.SeckillService;
diff --git a/framework/src/main/java/cn/lili/modules/store/serviceimpl/BillServiceImpl.java b/framework/src/main/java/cn/lili/modules/store/serviceimpl/BillServiceImpl.java
index d25ae1e8..10d05ae2 100644
--- a/framework/src/main/java/cn/lili/modules/store/serviceimpl/BillServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/store/serviceimpl/BillServiceImpl.java
@@ -66,8 +66,6 @@ public class BillServiceImpl extends ServiceImpl implements Bi
*/
@Autowired
private StoreFlowService storeFlowService;
- @Resource
- private StoreFlowMapper storeFlowMapper;
@Override
public void createBill(String storeId, Date startTime, DateTime endTime) {
@@ -256,7 +254,7 @@ public class BillServiceImpl extends ServiceImpl implements Bi
lambdaQueryWrapper.eq(StoreFlow::getStoreId, bill.getStoreId());
lambdaQueryWrapper.between(StoreFlow::getCreateTime, bill.getStartTime(), bill.getCreateTime());
lambdaQueryWrapper.eq(StoreFlow::getFlowType, FlowTypeEnum.PAY.name());
- List storeFlowList = storeFlowMapper.getStoreFlowPayDownloadVO(lambdaQueryWrapper);
+ List storeFlowList = storeFlowService.getStoreFlowPayDownloadVO(lambdaQueryWrapper);
writer.write(storeFlowList, true);
writer.setSheet("退款订单");
@@ -288,7 +286,7 @@ public class BillServiceImpl extends ServiceImpl implements Bi
storeFlowlambdaQueryWrapper.eq(StoreFlow::getStoreId, bill.getStoreId());
storeFlowlambdaQueryWrapper.between(StoreFlow::getCreateTime, bill.getStartTime(), bill.getCreateTime());
storeFlowlambdaQueryWrapper.eq(StoreFlow::getFlowType, FlowTypeEnum.PAY.name());
- List storeFlowRefundDownloadVOList = storeFlowMapper.getStoreFlowRefundDownloadVO(storeFlowlambdaQueryWrapper);
+ List storeFlowRefundDownloadVOList = storeFlowService.getStoreFlowRefundDownloadVO(storeFlowlambdaQueryWrapper);
writer.write(storeFlowRefundDownloadVOList, true);
ServletOutputStream out = null;
diff --git a/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreServiceImpl.java b/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreServiceImpl.java
index df337b0f..be7424c2 100644
--- a/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreServiceImpl.java
@@ -72,11 +72,6 @@ public class StoreServiceImpl extends ServiceImpl implements
*/
@Autowired
private StoreDetailService storeDetailService;
- /**
- * 页面
- */
- @Autowired
- private PageDataService pageDataService;
/**
* 店铺收藏
*/
@@ -188,8 +183,6 @@ public class StoreServiceImpl extends ServiceImpl implements
}
if (passed == 0) {
store.setStoreDisable(StoreStatusEnum.OPEN.value());
- //添加店铺页面
- pageDataService.addStorePageData(store.getId());
//修改会员 表示已有店铺
Member member = memberService.getById(store.getMemberId());
member.setHaveStore(true);
diff --git a/framework/src/main/java/cn/lili/modules/system/service/SensitiveWordsService.java b/framework/src/main/java/cn/lili/modules/system/service/SensitiveWordsService.java
index 239fa94d..ac772590 100644
--- a/framework/src/main/java/cn/lili/modules/system/service/SensitiveWordsService.java
+++ b/framework/src/main/java/cn/lili/modules/system/service/SensitiveWordsService.java
@@ -11,5 +11,9 @@ import com.baomidou.mybatisplus.extension.service.IService;
*/
public interface SensitiveWordsService extends IService {
+ /**
+ * 重新写入缓存
+ */
+ void resetCache();
}
\ No newline at end of file
diff --git a/framework/src/main/java/cn/lili/modules/system/serviceimpl/SensitiveWordsServiceImpl.java b/framework/src/main/java/cn/lili/modules/system/serviceimpl/SensitiveWordsServiceImpl.java
index 9a16a185..e4e51155 100644
--- a/framework/src/main/java/cn/lili/modules/system/serviceimpl/SensitiveWordsServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/system/serviceimpl/SensitiveWordsServiceImpl.java
@@ -1,5 +1,7 @@
package cn.lili.modules.system.serviceimpl;
+import cn.lili.cache.Cache;
+import cn.lili.cache.CachePrefix;
import cn.lili.modules.system.entity.dos.SensitiveWords;
import cn.lili.modules.system.mapper.SensitiveWordsMapper;
import cn.lili.modules.system.service.SensitiveWordsService;
@@ -9,6 +11,9 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.util.List;
+import java.util.stream.Collectors;
+
/**
* 敏感词业务层实现
*
@@ -17,5 +22,17 @@ import org.springframework.transaction.annotation.Transactional;
*/
@Service
public class SensitiveWordsServiceImpl extends ServiceImpl implements SensitiveWordsService {
+ @Autowired
+ private Cache> cache;
+ @Override
+ public void resetCache() {
+ List sensitiveWordsList = this.list();
+
+ if (sensitiveWordsList == null || sensitiveWordsList.isEmpty()) {
+ return;
+ }
+ List sensitiveWords = sensitiveWordsList.stream().map(SensitiveWords::getSensitiveWord).collect(Collectors.toList());
+ cache.put(CachePrefix.SENSITIVE.getPrefix(), sensitiveWords);
+ }
}
\ No newline at end of file
diff --git a/framework/src/main/java/cn/lili/modules/system/sms/SmsUtil.java b/framework/src/main/java/cn/lili/modules/system/sms/SmsUtil.java
index de177e12..55b992df 100644
--- a/framework/src/main/java/cn/lili/modules/system/sms/SmsUtil.java
+++ b/framework/src/main/java/cn/lili/modules/system/sms/SmsUtil.java
@@ -1,6 +1,6 @@
package cn.lili.modules.system.sms;
-import cn.lili.modules.verification.enums.VerificationEnums;
+import cn.lili.modules.verification.entity.enums.VerificationEnums;
import java.util.List;
import java.util.Map;
diff --git a/framework/src/main/java/cn/lili/modules/system/sms/impl/SmsUtilAliImplService.java b/framework/src/main/java/cn/lili/modules/system/sms/impl/SmsUtilAliImplService.java
index ad7776b4..4fb1a507 100644
--- a/framework/src/main/java/cn/lili/modules/system/sms/impl/SmsUtilAliImplService.java
+++ b/framework/src/main/java/cn/lili/modules/system/sms/impl/SmsUtilAliImplService.java
@@ -10,7 +10,7 @@ import cn.lili.common.security.context.UserContext;
import cn.lili.modules.system.sms.AliSmsUtil;
import cn.lili.modules.system.sms.SmsUtil;
import cn.lili.common.utils.CommonUtil;
-import cn.lili.modules.verification.enums.VerificationEnums;
+import cn.lili.modules.verification.entity.enums.VerificationEnums;
import cn.lili.common.properties.SmsTemplateProperties;
import cn.lili.common.properties.SystemSettingProperties;
import cn.lili.common.utils.Base64Utils;
diff --git a/framework/src/main/java/cn/lili/modules/system/utils/CharacterConstant.java b/framework/src/main/java/cn/lili/modules/system/utils/CharacterConstant.java
deleted file mode 100644
index 44749097..00000000
--- a/framework/src/main/java/cn/lili/modules/system/utils/CharacterConstant.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package cn.lili.modules.system.utils;
-
-/**
- *
- * 字符常量
- * @author Bulbasaur
- * @version v1.0
- * @since v1.0
- * 2020-02-25 14:10:16
- */
-public class CharacterConstant {
-
-
- /**
- * 字符*
- */
- public final static char WILDCARD_STAR = '*';
-
-
-}
diff --git a/framework/src/main/java/cn/lili/modules/system/utils/HttpUtils.java b/framework/src/main/java/cn/lili/modules/system/utils/HttpUtils.java
deleted file mode 100644
index 8f01aaf8..00000000
--- a/framework/src/main/java/cn/lili/modules/system/utils/HttpUtils.java
+++ /dev/null
@@ -1,243 +0,0 @@
-package cn.lili.modules.system.utils;
-
-import com.alibaba.fastjson.JSONObject;
-import lombok.extern.slf4j.Slf4j;
-
-import java.io.*;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
-import java.util.Iterator;
-import java.util.Map;
-
-/**
- * Http工具
- *
- * @author pikachu
- * @since 2018/3/13
- */
-@Slf4j
-public final class HttpUtils {
-
- public static final int HTTP_CONN_TIMEOUT = 100000;
- public static final int HTTP_SOCKET_TIMEOUT = 100000;
-
- public static String doPost(String reqUrl, Map parameters, String encoding, int connectTimeout,
- int readTimeout) {
- HttpURLConnection urlConn = null;
- try {
- urlConn = sendPost(reqUrl, parameters, encoding, connectTimeout, readTimeout);
- String responseContent = getContent(urlConn, encoding);
- return responseContent.trim();
- } finally {
- if (urlConn != null) {
- urlConn.disconnect();
-
- }
- }
- }
-
- /**
- * post携带json请求
- *
- * @param reqUrl 请求地址
- * @param jsonParameters 参数
- * @return
- */
- public static String doPostWithJson(String reqUrl, Map jsonParameters) {
-
- BufferedReader reader = null;
- try {
- //创建连接
- URL url = new URL(reqUrl);
- HttpURLConnection connection = (HttpURLConnection) url.openConnection();
- connection.setDoOutput(true);
- connection.setDoInput(true);
- connection.setUseCaches(false);
- connection.setInstanceFollowRedirects(true);
- //设置请求方式
- connection.setRequestMethod("POST");
- //设置发送数据的格式
- connection.setRequestProperty("Content-Type", "application/json");
- connection.connect();
- //一定要用BufferedReader 来接收响应， 使用字节来接收响应的方法是接收不到内容的
- //utf-8编码
- OutputStreamWriter out = new OutputStreamWriter(connection.getOutputStream(), StandardCharsets.UTF_8);
- out.append(JSONObject.toJSONString(jsonParameters));
- out.flush();
- out.close();
- //读取响应
- reader = new BufferedReader(new InputStreamReader(connection.getInputStream(), StandardCharsets.UTF_8));
- String line;
- String res = "";
- while ((line = reader.readLine()) != null) {
- res += line;
- }
- reader.close();
-
- return res;
- } catch (IOException e) {
- log.error("post请求错误", e);
- }
- //自定义错误信息
- return "error";
-
- }
-
- /**
- * post携带json请求
- *
- * @param reqUrl 请求地址
- * @param object 对象
- * @return
- */
- public static String doPostWithJson(String reqUrl, Object object) {
-
- BufferedReader reader = null;
- try {
- //创建连接
- URL url = new URL(reqUrl);
- HttpURLConnection connection = (HttpURLConnection) url.openConnection();
- connection.setDoOutput(true);
- connection.setDoInput(true);
- connection.setUseCaches(false);
- connection.setInstanceFollowRedirects(true);
- //设置请求方式
- connection.setRequestMethod("POST");
- //设置发送数据的格式
- connection.setRequestProperty("Content-Type", "application/json");
- connection.connect();
- //一定要用BufferedReader 来接收响应， 使用字节来接收响应的方法是接收不到内容的
- //utf-8编码
- OutputStreamWriter out = new OutputStreamWriter(connection.getOutputStream(), StandardCharsets.UTF_8);
- out.append(JSONObject.toJSONString(object));
- out.flush();
- out.close();
- //读取响应
- reader = new BufferedReader(new InputStreamReader(connection.getInputStream(), StandardCharsets.UTF_8));
- String line;
- String res = "";
- while ((line = reader.readLine()) != null) {
- res += line;
- }
- reader.close();
-
- return res;
- } catch (IOException e) {
- log.error("post错误", e);
- }
- //自定义错误信息
- return "error";
-
- }
-
- private static HttpURLConnection sendPost(String reqUrl,
- Map parameters, String encoding, int connectTimeout, int readTimeout) {
- HttpURLConnection urlConn = null;
- try {
- String params = generatorParamString(parameters, encoding);
- URL url = new URL(reqUrl);
- urlConn = (HttpURLConnection) url.openConnection();
- urlConn.setRequestMethod("POST");
- //（单位：毫秒）jdk
- urlConn.setConnectTimeout(connectTimeout);
- //（单位：毫秒）jdk 1.5换成这个,读操作超时
- urlConn.setReadTimeout(readTimeout);
- urlConn.setDoOutput(true);
- //String按照字节处理是一个好方法
- byte[] b = params.getBytes(encoding);
- urlConn.getOutputStream().write(b, 0, b.length);
- urlConn.getOutputStream().flush();
- urlConn.getOutputStream().close();
- } catch (Exception e) {
- throw new RuntimeException(e.getMessage(), e);
- }
- return urlConn;
- }
-
- private static String getContent(HttpURLConnection urlConn, String encoding) {
- try {
- String responseContent = null;
- InputStream in = urlConn.getInputStream();
- BufferedReader rd = new BufferedReader(new InputStreamReader(in, encoding));
- String tempLine = rd.readLine();
- StringBuffer tempStr = new StringBuffer();
- String crlf = System.getProperty("line.separator");
- while (tempLine != null) {
- tempStr.append(tempLine);
- tempStr.append(crlf);
- tempLine = rd.readLine();
- }
- responseContent = tempStr.toString();
- rd.close();
- in.close();
- return responseContent;
- } catch (Exception e) {
- throw new RuntimeException(e.getMessage(), e);
- }
- }
-
- /**
- * @param link
- * @param encoding
- * @return
- */
- public static String doGet(String link, String encoding, int connectTimeout, int readTimeout) {
- HttpURLConnection conn = null;
- try {
- URL url = new URL(link);
- conn = (HttpURLConnection) url.openConnection();
- conn.setRequestMethod("GET");
- conn.setConnectTimeout(connectTimeout);
- conn.setReadTimeout(readTimeout);
- BufferedInputStream in = new BufferedInputStream(
- conn.getInputStream());
- ByteArrayOutputStream out = new ByteArrayOutputStream();
- byte[] buf = new byte[1024];
- for (int i = 0; (i = in.read(buf)) > 0; ) {
- out.write(buf, 0, i);
- }
- out.flush();
- String s = out.toString(encoding);
- return s;
- } catch (Exception e) {
- throw new RuntimeException(e.getMessage(), e);
- } finally {
- if (conn != null) {
- conn.disconnect();
- conn = null;
- }
- }
- }
-
- /**
- * 将parameters中数据转换成用"&"链接的http请求参数形式
- *
- * @param parameters
- * @return
- */
- private static String generatorParamString(Map parameters, String encoding) {
- StringBuffer params = new StringBuffer();
- if (parameters != null) {
- for (Iterator iter = parameters.keySet().iterator(); iter
- .hasNext(); ) {
- String name = iter.next();
- String value = parameters.get(name);
- params.append(name + "=");
- try {
- params.append(URLEncoder.encode(value, encoding));
- } catch (UnsupportedEncodingException e) {
- throw new RuntimeException(e.getMessage(), e);
- } catch (Exception e) {
- String message = String.format("'%s'='%s'", name, value);
- throw new RuntimeException(message, e);
- }
- if (iter.hasNext()) {
- params.append("&");
- }
- }
- }
- return params.toString();
- }
-}
\ No newline at end of file
diff --git a/framework/src/main/java/cn/lili/modules/verification/aop/VerificationInterceptor.java b/framework/src/main/java/cn/lili/modules/verification/aop/VerificationInterceptor.java
index 0948babd..913fcb25 100644
--- a/framework/src/main/java/cn/lili/modules/verification/aop/VerificationInterceptor.java
+++ b/framework/src/main/java/cn/lili/modules/verification/aop/VerificationInterceptor.java
@@ -3,7 +3,7 @@ package cn.lili.modules.verification.aop;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.exception.ServiceException;
import cn.lili.modules.verification.aop.annotation.Verification;
-import cn.lili.modules.verification.enums.VerificationEnums;
+import cn.lili.modules.verification.entity.enums.VerificationEnums;
import cn.lili.modules.verification.service.VerificationService;
import lombok.extern.slf4j.Slf4j;
import org.aspectj.lang.JoinPoint;
diff --git a/framework/src/main/java/cn/lili/modules/verification/aop/annotation/Verification.java b/framework/src/main/java/cn/lili/modules/verification/aop/annotation/Verification.java
index a6bd95e0..26b79aa2 100644
--- a/framework/src/main/java/cn/lili/modules/verification/aop/annotation/Verification.java
+++ b/framework/src/main/java/cn/lili/modules/verification/aop/annotation/Verification.java
@@ -1,7 +1,7 @@
package cn.lili.modules.verification.aop.annotation;
-import cn.lili.modules.verification.enums.VerificationEnums;
+import cn.lili.modules.verification.entity.enums.VerificationEnums;
import java.lang.annotation.*;
diff --git a/framework/src/main/java/cn/lili/modules/verification/enums/VerificationEnums.java b/framework/src/main/java/cn/lili/modules/verification/entity/enums/VerificationEnums.java
similarity index 86%
rename from framework/src/main/java/cn/lili/modules/verification/enums/VerificationEnums.java
rename to framework/src/main/java/cn/lili/modules/verification/entity/enums/VerificationEnums.java
index 4825c9a6..48b6b92b 100644
--- a/framework/src/main/java/cn/lili/modules/verification/enums/VerificationEnums.java
+++ b/framework/src/main/java/cn/lili/modules/verification/entity/enums/VerificationEnums.java
@@ -1,4 +1,4 @@
-package cn.lili.modules.verification.enums;
+package cn.lili.modules.verification.entity.enums;
/**
* VerificationEnums
diff --git a/framework/src/main/java/cn/lili/modules/verification/service/VerificationService.java b/framework/src/main/java/cn/lili/modules/verification/service/VerificationService.java
index 44c3f836..40d709c5 100644
--- a/framework/src/main/java/cn/lili/modules/verification/service/VerificationService.java
+++ b/framework/src/main/java/cn/lili/modules/verification/service/VerificationService.java
@@ -1,6 +1,6 @@
package cn.lili.modules.verification.service;
-import cn.lili.modules.verification.enums.VerificationEnums;
+import cn.lili.modules.verification.entity.enums.VerificationEnums;
import java.io.IOException;
import java.util.Map;
diff --git a/framework/src/main/java/cn/lili/modules/verification/service/impl/VerificationServiceImpl.java b/framework/src/main/java/cn/lili/modules/verification/service/impl/VerificationServiceImpl.java
index c5449bc6..2ba98d07 100644
--- a/framework/src/main/java/cn/lili/modules/verification/service/impl/VerificationServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/verification/service/impl/VerificationServiceImpl.java
@@ -11,7 +11,7 @@ import cn.lili.modules.verification.entity.dos.VerificationSource;
import cn.lili.modules.verification.entity.dto.VerificationDTO;
import cn.lili.modules.verification.service.VerificationSourceService;
import cn.lili.modules.verification.SliderImageUtil;
-import cn.lili.modules.verification.enums.VerificationEnums;
+import cn.lili.modules.verification.entity.enums.VerificationEnums;
import cn.lili.modules.verification.service.VerificationService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberWallet.java b/framework/src/main/java/cn/lili/modules/wallet/entity/dos/MemberWallet.java
similarity index 95%
rename from framework/src/main/java/cn/lili/modules/member/entity/dos/MemberWallet.java
rename to framework/src/main/java/cn/lili/modules/wallet/entity/dos/MemberWallet.java
index 9b7dab44..cf9fdfe8 100644
--- a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberWallet.java
+++ b/framework/src/main/java/cn/lili/modules/wallet/entity/dos/MemberWallet.java
@@ -1,4 +1,4 @@
-package cn.lili.modules.member.entity.dos;
+package cn.lili.modules.wallet.entity.dos;
import cn.lili.mybatis.BaseEntity;
import com.baomidou.mybatisplus.annotation.TableName;
diff --git a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberWithdrawApply.java b/framework/src/main/java/cn/lili/modules/wallet/entity/dos/MemberWithdrawApply.java
similarity index 97%
rename from framework/src/main/java/cn/lili/modules/member/entity/dos/MemberWithdrawApply.java
rename to framework/src/main/java/cn/lili/modules/wallet/entity/dos/MemberWithdrawApply.java
index 02ca4597..02aaf1eb 100644
--- a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberWithdrawApply.java
+++ b/framework/src/main/java/cn/lili/modules/wallet/entity/dos/MemberWithdrawApply.java
@@ -1,4 +1,4 @@
-package cn.lili.modules.member.entity.dos;
+package cn.lili.modules.wallet.entity.dos;
import cn.lili.mybatis.BaseEntity;
import com.baomidou.mybatisplus.annotation.FieldFill;
diff --git a/framework/src/main/java/cn/lili/modules/order/trade/entity/dos/Recharge.java b/framework/src/main/java/cn/lili/modules/wallet/entity/dos/Recharge.java
similarity index 98%
rename from framework/src/main/java/cn/lili/modules/order/trade/entity/dos/Recharge.java
rename to framework/src/main/java/cn/lili/modules/wallet/entity/dos/Recharge.java
index dc1ca9fd..fb1bf454 100644
--- a/framework/src/main/java/cn/lili/modules/order/trade/entity/dos/Recharge.java
+++ b/framework/src/main/java/cn/lili/modules/wallet/entity/dos/Recharge.java
@@ -1,4 +1,4 @@
-package cn.lili.modules.order.trade.entity.dos;
+package cn.lili.modules.wallet.entity.dos;
import cn.lili.modules.order.order.entity.enums.PayStatusEnum;
import cn.lili.mybatis.BaseIdEntity;
diff --git a/framework/src/main/java/cn/lili/modules/order/trade/entity/dos/WalletLog.java b/framework/src/main/java/cn/lili/modules/wallet/entity/dos/WalletLog.java
similarity index 88%
rename from framework/src/main/java/cn/lili/modules/order/trade/entity/dos/WalletLog.java
rename to framework/src/main/java/cn/lili/modules/wallet/entity/dos/WalletLog.java
index 8dc7112f..9f856ed0 100644
--- a/framework/src/main/java/cn/lili/modules/order/trade/entity/dos/WalletLog.java
+++ b/framework/src/main/java/cn/lili/modules/wallet/entity/dos/WalletLog.java
@@ -1,5 +1,6 @@
-package cn.lili.modules.order.trade.entity.dos;
+package cn.lili.modules.wallet.entity.dos;
+import cn.lili.modules.wallet.entity.enums.DepositServiceTypeEnum;
import cn.lili.mybatis.BaseIdEntity;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
@@ -29,34 +30,21 @@ public class WalletLog extends BaseIdEntity {
private static final long serialVersionUID = -1599270544927161096L;
- /**
- * 会员id
- */
@ApiModelProperty(value = "会员id")
private String memberId;
- /**
- * 会员名称
- */
@ApiModelProperty(value = "会员名称")
private String memberName;
- /**
- * 金额
- */
+
@ApiModelProperty(value = "金额")
private Double money;
/**
- * 变动业务类型
- *
- * @see cn.lili.modules.order.trade.entity.enums.DepositServiceTypeEnum
+ * @see DepositServiceTypeEnum
*/
@ApiModelProperty(value = "业务类型")
private String serviceType;
- /**
- * 日志明细
- */
@ApiModelProperty(value = "日志明细")
private String detail;
diff --git a/framework/src/main/java/cn/lili/modules/member/entity/dto/MemberWithdrawalMessage.java b/framework/src/main/java/cn/lili/modules/wallet/entity/dto/MemberWithdrawalMessage.java
similarity index 75%
rename from framework/src/main/java/cn/lili/modules/member/entity/dto/MemberWithdrawalMessage.java
rename to framework/src/main/java/cn/lili/modules/wallet/entity/dto/MemberWithdrawalMessage.java
index 2e468323..6eeb7f62 100644
--- a/framework/src/main/java/cn/lili/modules/member/entity/dto/MemberWithdrawalMessage.java
+++ b/framework/src/main/java/cn/lili/modules/wallet/entity/dto/MemberWithdrawalMessage.java
@@ -1,5 +1,6 @@
-package cn.lili.modules.member.entity.dto;
+package cn.lili.modules.wallet.entity.dto;
+import cn.lili.modules.wallet.entity.enums.MemberWithdrawalDestinationEnum;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -22,7 +23,7 @@ public class MemberWithdrawalMessage {
private String status;
/**
- * @see cn.lili.modules.member.entity.enums.MemberWithdrawalDestinationEnum
+ * @see MemberWithdrawalDestinationEnum
*/
@ApiModelProperty(value = "提现到哪里")
private String destination;
diff --git a/framework/src/main/java/cn/lili/modules/order/trade/entity/enums/DepositServiceTypeEnum.java b/framework/src/main/java/cn/lili/modules/wallet/entity/enums/DepositServiceTypeEnum.java
similarity index 92%
rename from framework/src/main/java/cn/lili/modules/order/trade/entity/enums/DepositServiceTypeEnum.java
rename to framework/src/main/java/cn/lili/modules/wallet/entity/enums/DepositServiceTypeEnum.java
index cbfae540..ff6109df 100644
--- a/framework/src/main/java/cn/lili/modules/order/trade/entity/enums/DepositServiceTypeEnum.java
+++ b/framework/src/main/java/cn/lili/modules/wallet/entity/enums/DepositServiceTypeEnum.java
@@ -1,4 +1,4 @@
-package cn.lili.modules.order.trade.entity.enums;
+package cn.lili.modules.wallet.entity.enums;
/**
* 预存款变动日志业务类型
diff --git a/framework/src/main/java/cn/lili/modules/member/entity/enums/MemberWithdrawalDestinationEnum.java b/framework/src/main/java/cn/lili/modules/wallet/entity/enums/MemberWithdrawalDestinationEnum.java
similarity index 90%
rename from framework/src/main/java/cn/lili/modules/member/entity/enums/MemberWithdrawalDestinationEnum.java
rename to framework/src/main/java/cn/lili/modules/wallet/entity/enums/MemberWithdrawalDestinationEnum.java
index bfcbaa0a..1ebabf31 100644
--- a/framework/src/main/java/cn/lili/modules/member/entity/enums/MemberWithdrawalDestinationEnum.java
+++ b/framework/src/main/java/cn/lili/modules/wallet/entity/enums/MemberWithdrawalDestinationEnum.java
@@ -1,4 +1,4 @@
-package cn.lili.modules.member.entity.enums;
+package cn.lili.modules.wallet.entity.enums;
/**
* 会员提现到哪里 枚举
diff --git a/framework/src/main/java/cn/lili/modules/member/entity/enums/WithdrawStatusEnum.java b/framework/src/main/java/cn/lili/modules/wallet/entity/enums/WithdrawStatusEnum.java
similarity index 92%
rename from framework/src/main/java/cn/lili/modules/member/entity/enums/WithdrawStatusEnum.java
rename to framework/src/main/java/cn/lili/modules/wallet/entity/enums/WithdrawStatusEnum.java
index 53b96e94..3910eace 100755
--- a/framework/src/main/java/cn/lili/modules/member/entity/enums/WithdrawStatusEnum.java
+++ b/framework/src/main/java/cn/lili/modules/wallet/entity/enums/WithdrawStatusEnum.java
@@ -1,4 +1,4 @@
-package cn.lili.modules.member.entity.enums;
+package cn.lili.modules.wallet.entity.enums;
/**
* 提现申请状态枚举类
diff --git a/framework/src/main/java/cn/lili/modules/member/entity/vo/MemberWalletVO.java b/framework/src/main/java/cn/lili/modules/wallet/entity/vo/MemberWalletVO.java
similarity index 93%
rename from framework/src/main/java/cn/lili/modules/member/entity/vo/MemberWalletVO.java
rename to framework/src/main/java/cn/lili/modules/wallet/entity/vo/MemberWalletVO.java
index 774084ea..cc98aa60 100644
--- a/framework/src/main/java/cn/lili/modules/member/entity/vo/MemberWalletVO.java
+++ b/framework/src/main/java/cn/lili/modules/wallet/entity/vo/MemberWalletVO.java
@@ -1,4 +1,4 @@
-package cn.lili.modules.member.entity.vo;
+package cn.lili.modules.wallet.entity.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/framework/src/main/java/cn/lili/modules/member/entity/vo/MemberWithdrawApplyQueryVO.java b/framework/src/main/java/cn/lili/modules/wallet/entity/vo/MemberWithdrawApplyQueryVO.java
similarity index 96%
rename from framework/src/main/java/cn/lili/modules/member/entity/vo/MemberWithdrawApplyQueryVO.java
rename to framework/src/main/java/cn/lili/modules/wallet/entity/vo/MemberWithdrawApplyQueryVO.java
index e5c72401..99ffd599 100644
--- a/framework/src/main/java/cn/lili/modules/member/entity/vo/MemberWithdrawApplyQueryVO.java
+++ b/framework/src/main/java/cn/lili/modules/wallet/entity/vo/MemberWithdrawApplyQueryVO.java
@@ -1,4 +1,4 @@
-package cn.lili.modules.member.entity.vo;
+package cn.lili.modules.wallet.entity.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/framework/src/main/java/cn/lili/modules/member/mapper/MemberWalletMapper.java b/framework/src/main/java/cn/lili/modules/wallet/mapper/MemberWalletMapper.java
similarity index 70%
rename from framework/src/main/java/cn/lili/modules/member/mapper/MemberWalletMapper.java
rename to framework/src/main/java/cn/lili/modules/wallet/mapper/MemberWalletMapper.java
index eec4d70f..2c8a1450 100644
--- a/framework/src/main/java/cn/lili/modules/member/mapper/MemberWalletMapper.java
+++ b/framework/src/main/java/cn/lili/modules/wallet/mapper/MemberWalletMapper.java
@@ -1,7 +1,7 @@
-package cn.lili.modules.member.mapper;
+package cn.lili.modules.wallet.mapper;
-import cn.lili.modules.member.entity.dos.MemberWallet;
+import cn.lili.modules.wallet.entity.dos.MemberWallet;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
diff --git a/framework/src/main/java/cn/lili/modules/member/mapper/MemberWithdrawApplyMapper.java b/framework/src/main/java/cn/lili/modules/wallet/mapper/MemberWithdrawApplyMapper.java
similarity index 70%
rename from framework/src/main/java/cn/lili/modules/member/mapper/MemberWithdrawApplyMapper.java
rename to framework/src/main/java/cn/lili/modules/wallet/mapper/MemberWithdrawApplyMapper.java
index 8ed446b2..bf2addfc 100644
--- a/framework/src/main/java/cn/lili/modules/member/mapper/MemberWithdrawApplyMapper.java
+++ b/framework/src/main/java/cn/lili/modules/wallet/mapper/MemberWithdrawApplyMapper.java
@@ -1,7 +1,7 @@
-package cn.lili.modules.member.mapper;
+package cn.lili.modules.wallet.mapper;
-import cn.lili.modules.member.entity.dos.MemberWithdrawApply;
+import cn.lili.modules.wallet.entity.dos.MemberWithdrawApply;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
diff --git a/framework/src/main/java/cn/lili/modules/order/trade/mapper/RechargeMapper.java b/framework/src/main/java/cn/lili/modules/wallet/mapper/RechargeMapper.java
similarity index 68%
rename from framework/src/main/java/cn/lili/modules/order/trade/mapper/RechargeMapper.java
rename to framework/src/main/java/cn/lili/modules/wallet/mapper/RechargeMapper.java
index fafc2195..fba8eeed 100644
--- a/framework/src/main/java/cn/lili/modules/order/trade/mapper/RechargeMapper.java
+++ b/framework/src/main/java/cn/lili/modules/wallet/mapper/RechargeMapper.java
@@ -1,6 +1,6 @@
-package cn.lili.modules.order.trade.mapper;
+package cn.lili.modules.wallet.mapper;
-import cn.lili.modules.order.trade.entity.dos.Recharge;
+import cn.lili.modules.wallet.entity.dos.Recharge;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
diff --git a/framework/src/main/java/cn/lili/modules/order/trade/mapper/WalletLogMapper.java b/framework/src/main/java/cn/lili/modules/wallet/mapper/WalletLogMapper.java
similarity index 68%
rename from framework/src/main/java/cn/lili/modules/order/trade/mapper/WalletLogMapper.java
rename to framework/src/main/java/cn/lili/modules/wallet/mapper/WalletLogMapper.java
index 2ea8ae05..61f2db7f 100644
--- a/framework/src/main/java/cn/lili/modules/order/trade/mapper/WalletLogMapper.java
+++ b/framework/src/main/java/cn/lili/modules/wallet/mapper/WalletLogMapper.java
@@ -1,6 +1,6 @@
-package cn.lili.modules.order.trade.mapper;
+package cn.lili.modules.wallet.mapper;
-import cn.lili.modules.order.trade.entity.dos.WalletLog;
+import cn.lili.modules.wallet.entity.dos.WalletLog;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
diff --git a/framework/src/main/java/cn/lili/modules/member/service/MemberWalletService.java b/framework/src/main/java/cn/lili/modules/wallet/service/MemberWalletService.java
similarity index 93%
rename from framework/src/main/java/cn/lili/modules/member/service/MemberWalletService.java
rename to framework/src/main/java/cn/lili/modules/wallet/service/MemberWalletService.java
index effcc319..a11cde3e 100644
--- a/framework/src/main/java/cn/lili/modules/member/service/MemberWalletService.java
+++ b/framework/src/main/java/cn/lili/modules/wallet/service/MemberWalletService.java
@@ -1,10 +1,10 @@
-package cn.lili.modules.member.service;
+package cn.lili.modules.wallet.service;
import cn.lili.modules.member.entity.dos.Member;
-import cn.lili.modules.member.entity.dos.MemberWallet;
-import cn.lili.modules.member.entity.dos.MemberWithdrawApply;
-import cn.lili.modules.member.entity.vo.MemberWalletVO;
+import cn.lili.modules.wallet.entity.dos.MemberWallet;
+import cn.lili.modules.wallet.entity.dos.MemberWithdrawApply;
+import cn.lili.modules.wallet.entity.vo.MemberWalletVO;
import com.baomidou.mybatisplus.extension.service.IService;
/**
diff --git a/framework/src/main/java/cn/lili/modules/member/service/MemberWithdrawApplyService.java b/framework/src/main/java/cn/lili/modules/wallet/service/MemberWithdrawApplyService.java
similarity index 84%
rename from framework/src/main/java/cn/lili/modules/member/service/MemberWithdrawApplyService.java
rename to framework/src/main/java/cn/lili/modules/wallet/service/MemberWithdrawApplyService.java
index ae9ac2b5..95f2339c 100644
--- a/framework/src/main/java/cn/lili/modules/member/service/MemberWithdrawApplyService.java
+++ b/framework/src/main/java/cn/lili/modules/wallet/service/MemberWithdrawApplyService.java
@@ -1,9 +1,9 @@
-package cn.lili.modules.member.service;
+package cn.lili.modules.wallet.service;
import cn.lili.common.vo.PageVO;
-import cn.lili.modules.member.entity.dos.MemberWithdrawApply;
-import cn.lili.modules.member.entity.vo.MemberWithdrawApplyQueryVO;
+import cn.lili.modules.wallet.entity.dos.MemberWithdrawApply;
+import cn.lili.modules.wallet.entity.vo.MemberWithdrawApplyQueryVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
diff --git a/framework/src/main/java/cn/lili/modules/order/trade/service/RechargeService.java b/framework/src/main/java/cn/lili/modules/wallet/service/RechargeService.java
similarity index 90%
rename from framework/src/main/java/cn/lili/modules/order/trade/service/RechargeService.java
rename to framework/src/main/java/cn/lili/modules/wallet/service/RechargeService.java
index e7034250..2943eeb2 100644
--- a/framework/src/main/java/cn/lili/modules/order/trade/service/RechargeService.java
+++ b/framework/src/main/java/cn/lili/modules/wallet/service/RechargeService.java
@@ -1,13 +1,13 @@
-package cn.lili.modules.order.trade.service;
+package cn.lili.modules.wallet.service;
import cn.lili.common.vo.PageVO;
-import cn.lili.modules.order.trade.entity.dos.Recharge;
+import cn.lili.modules.wallet.entity.dos.Recharge;
import cn.lili.modules.order.trade.entity.vo.RechargeQueryVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
/**
- * 预存款充值记录业务层
+ * 预存款充值业务层
*
* @author pikachu
* @since 2020-02-25 14:10:16
diff --git a/framework/src/main/java/cn/lili/modules/order/trade/service/WalletLogService.java b/framework/src/main/java/cn/lili/modules/wallet/service/WalletLogService.java
similarity index 82%
rename from framework/src/main/java/cn/lili/modules/order/trade/service/WalletLogService.java
rename to framework/src/main/java/cn/lili/modules/wallet/service/WalletLogService.java
index 8ca0722f..598665c8 100644
--- a/framework/src/main/java/cn/lili/modules/order/trade/service/WalletLogService.java
+++ b/framework/src/main/java/cn/lili/modules/wallet/service/WalletLogService.java
@@ -1,13 +1,13 @@
-package cn.lili.modules.order.trade.service;
+package cn.lili.modules.wallet.service;
import cn.lili.common.vo.PageVO;
-import cn.lili.modules.order.trade.entity.dos.WalletLog;
+import cn.lili.modules.wallet.entity.dos.WalletLog;
import cn.lili.modules.order.trade.entity.vo.DepositQueryVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
/**
- * 预存款日志业务层
+ * 钱包变动日志业务层
*
* @author pikachu
* @since 2020-02-25 14:10:16
diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberWalletServiceImpl.java b/framework/src/main/java/cn/lili/modules/wallet/serviceimpl/MemberWalletServiceImpl.java
similarity index 94%
rename from framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberWalletServiceImpl.java
rename to framework/src/main/java/cn/lili/modules/wallet/serviceimpl/MemberWalletServiceImpl.java
index b58407f3..8c9ef0dc 100644
--- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberWalletServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/wallet/serviceimpl/MemberWalletServiceImpl.java
@@ -1,4 +1,4 @@
-package cn.lili.modules.member.serviceimpl;
+package cn.lili.modules.wallet.serviceimpl;
import cn.lili.common.enums.ResultCode;
@@ -10,19 +10,19 @@ import cn.lili.common.utils.CurrencyUtil;
import cn.lili.common.utils.SnowFlake;
import cn.lili.common.utils.StringUtils;
import cn.lili.modules.member.entity.dos.Member;
-import cn.lili.modules.member.entity.dos.MemberWallet;
-import cn.lili.modules.member.entity.dos.MemberWithdrawApply;
-import cn.lili.modules.member.entity.dto.MemberWithdrawalMessage;
-import cn.lili.modules.member.entity.enums.MemberWithdrawalDestinationEnum;
-import cn.lili.modules.member.entity.enums.WithdrawStatusEnum;
-import cn.lili.modules.member.entity.vo.MemberWalletVO;
-import cn.lili.modules.member.mapper.MemberWalletMapper;
+import cn.lili.modules.wallet.entity.dos.MemberWallet;
+import cn.lili.modules.wallet.entity.dos.MemberWithdrawApply;
+import cn.lili.modules.wallet.entity.dto.MemberWithdrawalMessage;
+import cn.lili.modules.wallet.entity.enums.MemberWithdrawalDestinationEnum;
+import cn.lili.modules.wallet.entity.enums.WithdrawStatusEnum;
+import cn.lili.modules.wallet.entity.vo.MemberWalletVO;
+import cn.lili.modules.wallet.mapper.MemberWalletMapper;
import cn.lili.modules.member.service.MemberService;
-import cn.lili.modules.member.service.MemberWalletService;
-import cn.lili.modules.member.service.MemberWithdrawApplyService;
-import cn.lili.modules.order.trade.entity.dos.WalletLog;
-import cn.lili.modules.order.trade.entity.enums.DepositServiceTypeEnum;
-import cn.lili.modules.order.trade.service.WalletLogService;
+import cn.lili.modules.wallet.service.MemberWalletService;
+import cn.lili.modules.wallet.service.MemberWithdrawApplyService;
+import cn.lili.modules.wallet.entity.dos.WalletLog;
+import cn.lili.modules.wallet.entity.enums.DepositServiceTypeEnum;
+import cn.lili.modules.wallet.service.WalletLogService;
import cn.lili.modules.system.entity.dos.Setting;
import cn.lili.modules.system.entity.dto.WithdrawalSetting;
import cn.lili.modules.system.entity.enums.SettingEnum;
@@ -42,7 +42,7 @@ import java.util.Date;
/**
- * 会员预存款业务层实现
+ * 会员余额业务层实现
*
* @author pikachu
* @since 2020-02-25 14:10:16
diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberWithdrawApplyServiceImpl.java b/framework/src/main/java/cn/lili/modules/wallet/serviceimpl/MemberWithdrawApplyServiceImpl.java
similarity index 90%
rename from framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberWithdrawApplyServiceImpl.java
rename to framework/src/main/java/cn/lili/modules/wallet/serviceimpl/MemberWithdrawApplyServiceImpl.java
index 425c1401..c13b8183 100644
--- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberWithdrawApplyServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/wallet/serviceimpl/MemberWithdrawApplyServiceImpl.java
@@ -1,22 +1,22 @@
-package cn.lili.modules.member.serviceimpl;
+package cn.lili.modules.wallet.serviceimpl;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.exception.ServiceException;
import cn.lili.common.properties.RocketmqCustomProperties;
-import cn.lili.modules.member.entity.dto.MemberWithdrawalMessage;
-import cn.lili.modules.member.entity.enums.MemberWithdrawalDestinationEnum;
+import cn.lili.modules.wallet.entity.dto.MemberWithdrawalMessage;
+import cn.lili.modules.wallet.entity.enums.MemberWithdrawalDestinationEnum;
import cn.lili.mybatis.util.PageUtil;
import cn.lili.common.utils.StringUtils;
import cn.lili.common.vo.PageVO;
-import cn.lili.modules.member.entity.dos.MemberWithdrawApply;
-import cn.lili.modules.member.entity.enums.WithdrawStatusEnum;
-import cn.lili.modules.member.entity.vo.MemberWalletVO;
-import cn.lili.modules.member.entity.vo.MemberWithdrawApplyQueryVO;
-import cn.lili.modules.member.mapper.MemberWithdrawApplyMapper;
-import cn.lili.modules.member.service.MemberWalletService;
-import cn.lili.modules.member.service.MemberWithdrawApplyService;
-import cn.lili.modules.order.trade.entity.enums.DepositServiceTypeEnum;
+import cn.lili.modules.wallet.entity.dos.MemberWithdrawApply;
+import cn.lili.modules.wallet.entity.enums.WithdrawStatusEnum;
+import cn.lili.modules.wallet.entity.vo.MemberWalletVO;
+import cn.lili.modules.wallet.entity.vo.MemberWithdrawApplyQueryVO;
+import cn.lili.modules.wallet.mapper.MemberWithdrawApplyMapper;
+import cn.lili.modules.wallet.service.MemberWalletService;
+import cn.lili.modules.wallet.service.MemberWithdrawApplyService;
+import cn.lili.modules.wallet.entity.enums.DepositServiceTypeEnum;
import cn.lili.rocketmq.RocketmqSendCallbackBuilder;
import cn.lili.rocketmq.tags.MemberTagsEnum;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
diff --git a/framework/src/main/java/cn/lili/modules/order/trade/serviceimpl/RechargeServiceImpl.java b/framework/src/main/java/cn/lili/modules/wallet/serviceimpl/RechargeServiceImpl.java
similarity index 92%
rename from framework/src/main/java/cn/lili/modules/order/trade/serviceimpl/RechargeServiceImpl.java
rename to framework/src/main/java/cn/lili/modules/wallet/serviceimpl/RechargeServiceImpl.java
index 0c905c44..c50d97e2 100644
--- a/framework/src/main/java/cn/lili/modules/order/trade/serviceimpl/RechargeServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/wallet/serviceimpl/RechargeServiceImpl.java
@@ -1,4 +1,4 @@
-package cn.lili.modules.order.trade.serviceimpl;
+package cn.lili.modules.wallet.serviceimpl;
import cn.hutool.core.date.DateTime;
import cn.lili.common.enums.ResultCode;
@@ -9,13 +9,13 @@ import cn.lili.mybatis.util.PageUtil;
import cn.lili.common.utils.SnowFlake;
import cn.lili.common.utils.StringUtils;
import cn.lili.common.vo.PageVO;
-import cn.lili.modules.member.service.MemberWalletService;
+import cn.lili.modules.wallet.service.MemberWalletService;
import cn.lili.modules.order.order.entity.enums.PayStatusEnum;
-import cn.lili.modules.order.trade.entity.dos.Recharge;
-import cn.lili.modules.order.trade.entity.enums.DepositServiceTypeEnum;
+import cn.lili.modules.wallet.entity.dos.Recharge;
+import cn.lili.modules.wallet.entity.enums.DepositServiceTypeEnum;
import cn.lili.modules.order.trade.entity.vo.RechargeQueryVO;
-import cn.lili.modules.order.trade.mapper.RechargeMapper;
-import cn.lili.modules.order.trade.service.RechargeService;
+import cn.lili.modules.wallet.mapper.RechargeMapper;
+import cn.lili.modules.wallet.service.RechargeService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -26,7 +26,7 @@ import org.springframework.transaction.annotation.Transactional;
import java.util.Date;
/**
- * 预存款日志业务层实现
+ * 预存款业务层实现
*
* @author pikachu
* @since 2020-02-25 14:10:16
diff --git a/framework/src/main/java/cn/lili/modules/order/trade/serviceimpl/WalletLogServiceImpl.java b/framework/src/main/java/cn/lili/modules/wallet/serviceimpl/WalletLogServiceImpl.java
similarity index 88%
rename from framework/src/main/java/cn/lili/modules/order/trade/serviceimpl/WalletLogServiceImpl.java
rename to framework/src/main/java/cn/lili/modules/wallet/serviceimpl/WalletLogServiceImpl.java
index 30f2ea31..1951d1b5 100644
--- a/framework/src/main/java/cn/lili/modules/order/trade/serviceimpl/WalletLogServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/wallet/serviceimpl/WalletLogServiceImpl.java
@@ -1,12 +1,12 @@
-package cn.lili.modules.order.trade.serviceimpl;
+package cn.lili.modules.wallet.serviceimpl;
import cn.lili.mybatis.util.PageUtil;
import cn.lili.common.utils.StringUtils;
import cn.lili.common.vo.PageVO;
-import cn.lili.modules.order.trade.entity.dos.WalletLog;
+import cn.lili.modules.wallet.entity.dos.WalletLog;
import cn.lili.modules.order.trade.entity.vo.DepositQueryVO;
-import cn.lili.modules.order.trade.mapper.WalletLogMapper;
-import cn.lili.modules.order.trade.service.WalletLogService;
+import cn.lili.modules.wallet.mapper.WalletLogMapper;
+import cn.lili.modules.wallet.service.WalletLogService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
diff --git a/framework/src/main/resources/sensitive/sensitive_words.txt b/framework/src/main/resources/sensitive/sensitive_words.txt
deleted file mode 100644
index 04912c08..00000000
--- a/framework/src/main/resources/sensitive/sensitive_words.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-共产党
-习近平
-毛泽东
-胡锦涛
-邓小平
-强奸
\ No newline at end of file
diff --git a/framework/src/main/resources/sensitive_words.txt b/framework/src/main/resources/sensitive_words.txt
deleted file mode 100644
index 04912c08..00000000
--- a/framework/src/main/resources/sensitive_words.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-共产党
-习近平
-毛泽东
-胡锦涛
-邓小平
-强奸
\ No newline at end of file
diff --git a/manager-api/src/main/java/cn/lili/controller/setting/HotWordsManagerController.java b/manager-api/src/main/java/cn/lili/controller/goods/HotWordsManagerController.java
similarity index 97%
rename from manager-api/src/main/java/cn/lili/controller/setting/HotWordsManagerController.java
rename to manager-api/src/main/java/cn/lili/controller/goods/HotWordsManagerController.java
index 80c97396..b38e5e85 100755
--- a/manager-api/src/main/java/cn/lili/controller/setting/HotWordsManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/goods/HotWordsManagerController.java
@@ -1,4 +1,4 @@
-package cn.lili.controller.setting;
+package cn.lili.controller.goods;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.ResultMessage;
diff --git a/manager-api/src/main/java/cn/lili/controller/setting/MemberNoticeManagerController.java b/manager-api/src/main/java/cn/lili/controller/member/MemberNoticeManagerController.java
similarity index 98%
rename from manager-api/src/main/java/cn/lili/controller/setting/MemberNoticeManagerController.java
rename to manager-api/src/main/java/cn/lili/controller/member/MemberNoticeManagerController.java
index 54c7d520..2c3b44a3 100644
--- a/manager-api/src/main/java/cn/lili/controller/setting/MemberNoticeManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/member/MemberNoticeManagerController.java
@@ -1,4 +1,4 @@
-package cn.lili.controller.setting;
+package cn.lili.controller.member;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.security.context.UserContext;
diff --git a/manager-api/src/main/java/cn/lili/controller/member/MemberWalletManagerController.java b/manager-api/src/main/java/cn/lili/controller/member/MemberWalletManagerController.java
index 78a282ed..8fc89b45 100644
--- a/manager-api/src/main/java/cn/lili/controller/member/MemberWalletManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/member/MemberWalletManagerController.java
@@ -2,8 +2,8 @@ package cn.lili.controller.member;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.ResultMessage;
-import cn.lili.modules.member.entity.vo.MemberWalletVO;
-import cn.lili.modules.member.service.MemberWalletService;
+import cn.lili.modules.wallet.entity.vo.MemberWalletVO;
+import cn.lili.modules.wallet.service.MemberWalletService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
diff --git a/manager-api/src/main/java/cn/lili/controller/member/MemberWithdrawApplyManagerController.java b/manager-api/src/main/java/cn/lili/controller/member/MemberWithdrawApplyManagerController.java
index 3c21d1be..7b372446 100644
--- a/manager-api/src/main/java/cn/lili/controller/member/MemberWithdrawApplyManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/member/MemberWithdrawApplyManagerController.java
@@ -4,9 +4,9 @@ package cn.lili.controller.member;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
-import cn.lili.modules.member.entity.dos.MemberWithdrawApply;
-import cn.lili.modules.member.entity.vo.MemberWithdrawApplyQueryVO;
-import cn.lili.modules.member.service.MemberWithdrawApplyService;
+import cn.lili.modules.wallet.entity.dos.MemberWithdrawApply;
+import cn.lili.modules.wallet.entity.vo.MemberWithdrawApplyQueryVO;
+import cn.lili.modules.wallet.service.MemberWithdrawApplyService;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
diff --git a/manager-api/src/main/java/cn/lili/controller/other/SensitiveWordsManagerController.java b/manager-api/src/main/java/cn/lili/controller/other/SensitiveWordsManagerController.java
index 5ca04bc2..4f635c2b 100644
--- a/manager-api/src/main/java/cn/lili/controller/other/SensitiveWordsManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/other/SensitiveWordsManagerController.java
@@ -6,7 +6,7 @@ import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.system.entity.dos.SensitiveWords;
import cn.lili.modules.system.service.SensitiveWordsService;
-import cn.lili.modules.system.utils.SensitiveWordsFilter;
+import cn.lili.common.sensitive.SensitiveWordsFilter;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -48,7 +48,7 @@ public class SensitiveWordsManagerController {
@PostMapping
public ResultMessage add(@Valid SensitiveWords sensitiveWords) {
sensitiveWordsService.save(sensitiveWords);
- SensitiveWordsFilter.put(sensitiveWords.getSensitiveWord());
+ sensitiveWordsService.resetCache();
return ResultUtil.data(sensitiveWords);
}
@@ -58,7 +58,7 @@ public class SensitiveWordsManagerController {
public ResultMessage edit(@PathVariable String id, SensitiveWords sensitiveWords) {
sensitiveWords.setId(id);
sensitiveWordsService.updateById(sensitiveWords);
- SensitiveWordsFilter.put(sensitiveWords.getSensitiveWord());
+ sensitiveWordsService.resetCache();
return ResultUtil.data(sensitiveWords);
}
@@ -66,12 +66,8 @@ public class SensitiveWordsManagerController {
@ApiImplicitParam(name = "ids", value = "敏感词ID", required = true, dataType = "String", allowMultiple = true, paramType = "path")
@DeleteMapping(value = "/delByIds/{ids}")
public ResultMessage
-#### ⚽️ 平台管理端
+#### 平台管理端
### 技术选型
-#### 🥅 架构图
+#### 架构图
-##### 🕹 后台技术选型
+##### 后台技术选型
| 说明 | 框架 | 说明 | |
| -------------- | --------------- | -------------- | ------------- |
@@ -167,7 +115,7 @@ https://gitee.com/beijing_hongye_huicheng/docker/tree/master/init/mysql
| 短信 | 阿里云短信 | 认证 | JWT |
| 日志处理 | Log4j | 接口规范 | RESTful |
-##### 🖥 前端-运营后台、店铺后台
+##### 前端-运营后台、店铺后台
| 说明 | 框架 | 说明 | 框架 |
| ---------- | ---------- | ---------- | ------- |
@@ -177,14 +125,14 @@ https://gitee.com/beijing_hongye_huicheng/docker/tree/master/init/mysql
| 基础UI库 | iView | UI界面基于 | iView |
| 网络请求 | axios | | |
-##### 📱前端-移动端
+##### 前端-移动端
| 说明 | 架构 | 说明 | 架构 |
| --------- | ------- | -------- | ------- |
| 基础UI库 | uViewui | 基础框架 | uni-app |
| CSS预处理 | scss | 地图引擎 | amap |
-### 🌟 版本升级
+### 版本升级
```
商城后续会持续版本升级，修复bug，完善功能，覆盖更多业务场景 o2o/b2b/s2b2b2c/跨境电商
@@ -193,7 +141,7 @@ https://gitee.com/beijing_hongye_huicheng/docker/tree/master/init/mysql
```
-### ⚠️ 开源须知
+### 开源须知
1.仅允许用于个人学习研究使用.
2.禁止将本开源的代码和资源进行任何形式任何名义的出售.
@@ -203,7 +151,7 @@ https://gitee.com/beijing_hongye_huicheng/docker/tree/master/init/mysql
4.限制商用，如果需要商业使用请联系我们。QQ3409056806.
-### 🐧 交流群
+### 交流群
##### 官方qq 1群 961316482（已满）
##### 官方qq 2群 875294241
diff --git a/buyer-api/src/main/java/cn/lili/controller/member/ServiceNoticeBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/member/ServiceNoticeBuyerController.java
deleted file mode 100644
index 4cb786e7..00000000
--- a/buyer-api/src/main/java/cn/lili/controller/member/ServiceNoticeBuyerController.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package cn.lili.controller.member;
-
-import cn.lili.common.enums.ResultUtil;
-import cn.lili.common.vo.PageVO;
-import cn.lili.common.vo.ResultMessage;
-import cn.lili.modules.system.entity.dos.ServiceNotice;
-import cn.lili.modules.system.service.ServiceNoticeService;
-import cn.lili.mybatis.util.PageUtil;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-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;
-
-
-/**
- * 买家端,会员站服务消息接口
- *
- * @author Chopper
- * @since 2020/11/17 2:31 下午
- */
-@RestController
-@RequestMapping("/service/notice")
-@Api(tags = "买家端,会员站服务消息接口")
-public class ServiceNoticeBuyerController {
-
- /**
- * 服务消息
- */
- @Autowired
- private ServiceNoticeService serviceNoticeService;
-
- @ApiOperation(value = "获取消息详情")
- @ApiImplicitParam(name = "id", value = "商品ID", required = true, dataType = "Long", paramType = "path")
- @GetMapping(value = "/{id}")
- public ResultMessage