From 0f9d03ee930d1c2dc62b34dd2c3522cda91f93cf Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期二, 06 六月 2023 14:29:33 +0800
Subject: [PATCH] 基础配置
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtShopController.java | 7
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/management/MgtOrderController.java | 7
ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/EmojiUtil.java | 2
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppOrderController.java | 15 --
ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/CodeFactoryUtil.java | 48 +++++-
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerTaskController.java | 3
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppHomeController.java | 5
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/business/MerConfigController.java | 2
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/miniapp/AppHomeController.java | 9
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/goods/GoodsServiceImpl.java | 6
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerShopController.java | 21 ++
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/concole/ActivityController.java | 3
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtMemberController.java | 4
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtTaskController.java | 7
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java | 22 +-
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppGoodsController.java | 8
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java | 7
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java | 5
/dev/null | 95 -------------
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/business/MerMemberController.java | 4
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/business/MerGoodsController.java | 2
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerConsumerController.java | 13 +
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/management/MgtMemberController.java | 5
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/concole/GoodsController.java | 5
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerOrderController.java | 5
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/miniapp/AppHomeController.java | 2
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/concole/ShoppingCartController.java | 6
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/util/FileConvertUtils.java | 17 +-
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/concole/OrderController.java | 9 -
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/console/MemberController.java | 14 +
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppMemberController.java | 2
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppConsumerController.java | 2
32 files changed, 130 insertions(+), 232 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/util/CodeFactoryUtil.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/CodeFactoryUtil.java
similarity index 81%
rename from ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/util/CodeFactoryUtil.java
rename to ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/CodeFactoryUtil.java
index 193269f..f26f5f2 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/util/CodeFactoryUtil.java
+++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/CodeFactoryUtil.java
@@ -1,14 +1,11 @@
-package com.ruoyi.order.util;
-
+package com.ruoyi.common.security.utils;
import com.ruoyi.common.redis.service.RedisService;
import org.apache.commons.lang3.time.DateFormatUtils;
-import org.apache.commons.lang3.time.DateUtils;
-import org.apache.poi.ss.usermodel.DateUtil;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+import javax.annotation.Resource;
import java.security.SecureRandom;
import java.util.Date;
import java.util.Random;
@@ -50,6 +47,17 @@
private static final String ORDER_PREFIX = "SC";
/**
+ * 活动订单前缀
+ */
+ private static final String ACTIVITY_ORDER_PREFIX = "MS";
+
+ /**
+ * 店铺创建订单前缀
+ */
+ private static final String SHOP_ORDER_PREFIX = "CJ";
+
+
+ /**
* 退款订单前缀
*/
private static final String ORDER_REFUND_PREFIX = "RO";
@@ -58,17 +66,23 @@
* 用户id和随机数总长度
*/
- private static final int MAX_LENGTH = 4;
+ /**
+ * 用户id和随机数总长度
+ */
+
+ private static final int SHOP_LENGTH = 4;
+
+ private static final int MEMBER_LENGTH = 6;
+
+ private static final int ORDER_LENGTH = 4;
/**
* 更具id进行加密+加随机数组成固定长度编码
*/
- public static void main(String[] args) {
- Long orderId = 1L;
- String userNo = getShopNo(orderId);
- System.out.println(userNo);
- }
+ /*public static void main(String[] args) {
+
+ }*/
/**
* 获取商户编号
@@ -78,7 +92,17 @@
*/
public static String getShopNo(Long shopId) {
String prefix = SHOP_PREFIX;
- return toFillZeroCode(prefix, MAX_LENGTH, shopId);
+ return toFillZeroCode(prefix, SHOP_LENGTH, shopId);
+ }
+
+ /**
+ * 获取会员编号
+ * @param userId
+ * @return
+ */
+ public static String getMemberNo(Long userId) {
+ String prefix = APP_USER_PREFIX;
+ return toFillZeroCode(prefix, MEMBER_LENGTH, userId);
}
public static String getShopOrderNo() {
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/util/EmojiUtil.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/EmojiUtil.java
similarity index 98%
rename from ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/util/EmojiUtil.java
rename to ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/EmojiUtil.java
index dba9982..1657778 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/util/EmojiUtil.java
+++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/EmojiUtil.java
@@ -1,4 +1,4 @@
-package com.ruoyi.member.util;
+package com.ruoyi.common.security.utils;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/business/MerGoodsController.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/business/MerGoodsController.java
index 145975e..f2c3df9 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/business/MerGoodsController.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/business/MerGoodsController.java
@@ -9,12 +9,12 @@
import com.ruoyi.goods.service.goods.GoodsService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
import java.util.List;
/**
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/concole/ActivityController.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/concole/ActivityController.java
index 481277a..d72338b 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/concole/ActivityController.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/concole/ActivityController.java
@@ -3,12 +3,13 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.goods.service.activity.ActivityGoodsService;
import com.ruoyi.system.api.domain.poji.activity.ActivityGoods;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
+
/**
* @author jqs34
* @version 1.0
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/concole/GoodsController.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/concole/GoodsController.java
index b5ea18f..b328fb9 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/concole/GoodsController.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/concole/GoodsController.java
@@ -1,21 +1,20 @@
package com.ruoyi.goods.controller.concole;
import com.ruoyi.common.core.domain.R;
-import com.ruoyi.goods.service.activity.ActivityGoodsService;
import com.ruoyi.goods.service.goods.GoodsFileService;
import com.ruoyi.goods.service.goods.GoodsService;
import com.ruoyi.goods.service.goods.ShopGoodsService;
import com.ruoyi.system.api.domain.dto.AppShopGoodsGetDto;
-import com.ruoyi.system.api.domain.poji.activity.ActivityGoods;
import com.ruoyi.system.api.domain.poji.goods.Goods;
import com.ruoyi.system.api.domain.poji.goods.GoodsFile;
import com.ruoyi.system.api.domain.poji.goods.ShopGoods;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
+
/**
* @author jqs34
* @ClassName GoodsController
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/concole/ShoppingCartController.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/concole/ShoppingCartController.java
index c0f443b..b70abc3 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/concole/ShoppingCartController.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/concole/ShoppingCartController.java
@@ -1,13 +1,15 @@
package com.ruoyi.goods.controller.concole;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.goods.service.goods.ShoppingCartService;
import com.ruoyi.system.api.domain.dto.AppShoppingCartDelDto;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.goods.service.goods.ShoppingCartService;
+
+import javax.annotation.Resource;
+
/**
* @author jqs34
* @ClassName ShoppingCartController
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppGoodsController.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppGoodsController.java
index 394522b..baff41c 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppGoodsController.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppGoodsController.java
@@ -4,25 +4,25 @@
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.goods.domain.vo.AppShoppingCartVo;
-import com.ruoyi.system.api.constant.AppErrorConstant;
-import com.ruoyi.system.api.domain.dto.AppBaseBathDto;
import com.ruoyi.goods.domain.dto.AppGoodsInfoGetDto;
import com.ruoyi.goods.domain.dto.AppShoppingCartAddDto;
import com.ruoyi.goods.domain.dto.AppShoppingCartChangeDto;
import com.ruoyi.goods.domain.vo.AppGoodsInfoVo;
+import com.ruoyi.goods.domain.vo.AppShoppingCartVo;
import com.ruoyi.goods.service.goods.GoodsService;
import com.ruoyi.goods.service.goods.ShoppingCartService;
+import com.ruoyi.system.api.constant.AppErrorConstant;
+import com.ruoyi.system.api.domain.dto.AppBaseBathDto;
import com.ruoyi.system.api.domain.poji.member.Member;
import com.ruoyi.system.api.service.RemoteMemberService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
import java.util.List;
/**
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppHomeController.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppHomeController.java
index 97186f6..0dbf3bf 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppHomeController.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppHomeController.java
@@ -6,23 +6,22 @@
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.goods.domain.dto.AppRecommendGoodsPageDto;
-import com.ruoyi.system.api.constant.AppErrorConstant;
-import com.ruoyi.system.api.domain.dto.AppPageDto;
import com.ruoyi.goods.domain.dto.AppSearchGoodsPageDto;
import com.ruoyi.goods.domain.dto.AppShopGoodsPageDto;
import com.ruoyi.goods.domain.vo.AppSimpleActivityGoodsVo;
import com.ruoyi.goods.domain.vo.AppSimpleGoodsVo;
import com.ruoyi.goods.service.goods.GoodsService;
+import com.ruoyi.system.api.constant.AppErrorConstant;
import com.ruoyi.system.api.domain.poji.member.Member;
import com.ruoyi.system.api.service.RemoteMemberService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
import java.util.List;
/**
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/goods/GoodsServiceImpl.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/goods/GoodsServiceImpl.java
index 68de6f5..8f829f2 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/goods/GoodsServiceImpl.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/goods/GoodsServiceImpl.java
@@ -3,7 +3,6 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.exception.ServiceException;
-import com.ruoyi.common.core.utils.DateUtils;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.utils.uuid.IdUtils;
import com.ruoyi.goods.domain.dto.*;
@@ -27,10 +26,7 @@
import javax.annotation.Resource;
import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.stream.Collectors;
/**
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/util/CodeFactoryUtil.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/util/CodeFactoryUtil.java
deleted file mode 100644
index f35b423..0000000
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/util/CodeFactoryUtil.java
+++ /dev/null
@@ -1,154 +0,0 @@
-package com.ruoyi.goods.util;
-
-
-
-import com.ruoyi.common.redis.service.RedisService;
-import org.apache.commons.lang3.time.DateFormatUtils;
-import org.apache.commons.lang3.time.DateUtils;
-import org.apache.poi.ss.usermodel.DateUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.security.SecureRandom;
-import java.util.Date;
-import java.util.Random;
-import java.util.concurrent.TimeUnit;
-
-/**
- * @author jqs34
- * @ClassName CodeFactoryUtil
- * @description: TODO
- * @date 2023年02月13日
- * @version: 1.0
- */
-@Component
-public class CodeFactoryUtil {
-
-
- //静态住入到自己的类中
- private static RedisService redisService;
-
- //将静态属性以入参（形参）的方式传入一个方法中，然后将此方法通过 @Resource 注入到Spring容器中
- @Resource
- public void setService(RedisService redisService) {
- CodeFactoryUtil.redisService = redisService;
- }
-
- /**
- * APP用户编码
- */
- private static final String APP_USER_PREFIX = "HRT_M";
-
- /**
- * 商户编号
- */
- private static final String SHOP_PREFIX = "HRT_S";
-
- /**
- * 商户订单前缀
- */
- private static final String ORDER_PREFIX = "SC";
-
- /**
- * 退款订单前缀
- */
- private static final String ORDER_REFUND_PREFIX = "RO";
-
- /**
- * 用户id和随机数总长度
- */
-
- private static final int MAX_LENGTH = 4;
-
- /**
- * 更具id进行加密+加随机数组成固定长度编码
- */
-
- public static void main(String[] args) {
- Long orderId = 1L;
- String userNo = getShopNo(orderId);
- System.out.println(userNo);
- }
-
- /**
- * 获取商户编号
- *
- * @param shopId
- * @return
- */
- public static String getShopNo(Long shopId) {
- String prefix = SHOP_PREFIX;
- return toFillZeroCode(prefix, MAX_LENGTH, shopId);
- }
-
- public static String getShopOrderNo() {
- String orderNo;
- String timeTemp = DateFormatUtils.format(new Date(), "yyyyMMdd");
- String prefix = ORDER_PREFIX + timeTemp;
- String suffixNumber = getSuffixNumber(prefix);
- orderNo = prefix + suffixNumber;
- return orderNo;
- }
-
- private static String getSuffixNumber(String prefix){
- Integer suffixNumberInt;
- String suffixNumber = "0001";
- if(redisService.hasKey(prefix)){
- suffixNumberInt = redisService.getCacheObject(prefix);
- suffixNumber = toFillZeroSuffixNumber(suffixNumberInt);
- suffixNumberInt = suffixNumberInt + 1;
- redisService.setCacheObject(prefix, suffixNumberInt, 24L, TimeUnit.HOURS);
- }else{
- redisService.setCacheObject(prefix, 1, 24L, TimeUnit.HOURS);
- }
- return suffixNumber;
- }
-
- private static String toFillZeroSuffixNumber(Integer suffixNumberInt){
- String suffixNumberStr = suffixNumberInt.toString();
- int length = suffixNumberStr.length();
- int fillLength = 4 - length;
- StringBuilder idsbs = new StringBuilder();
- for (int i = 0; i < fillLength; i++) {
- idsbs.append("0");
- }
- return idsbs.append(suffixNumberStr).toString();
- }
-
-
- /**
- * 0补位
- *
- * @param prefix
- * @param totalLength
- * @param id
- * @return
- */
- private static String toFillZeroCode(String prefix, int totalLength, Long id) {
- String idStr = id.toString();
- int length = idStr.length();
-
- int fillLength = totalLength - length;
- StringBuilder idsbs = new StringBuilder(prefix);
- for (int i = 0; i < fillLength; i++) {
- idsbs.append("0");
- }
- return idsbs.append(idStr).toString();
- }
-
- /**
- * 随机6位数生成
- */
- public static String getRandStr(int num) {
- // 默认6位
- num = num != 0 ? num : 6;
- Random r = new SecureRandom();
- StringBuffer str = new StringBuffer();
- int i = 0;
- while (i < num) {
- str.append(r.nextInt(10));
- i++;
- }
- return str.toString();
- }
-}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/util/EmojiUtil.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/util/EmojiUtil.java
deleted file mode 100644
index 32dddd0..0000000
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/util/EmojiUtil.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package com.ruoyi.goods.util;
-
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.net.URLEncoder;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-public class EmojiUtil {
- /**
- * 编码
- *
- * @param str 待转换字符串
- * @return 转换后字符串
- * @throws UnsupportedEncodingException exception
- * @Description 将字符串中的emoji表情转换成可以在utf-8字符集数据库中保存的格式（表情占4个字节，需要utf8mb4字符集）
- */
- public static String emojiEncode(String str)
- throws UnsupportedEncodingException {
- String patternString = "([\\x{10000}-\\x{10ffff}\ud800-\udfff])";
-
- Pattern pattern = Pattern.compile(patternString);
- Matcher matcher = pattern.matcher(str);
- StringBuffer sb = new StringBuffer();
- while (matcher.find()) {
- try {
- matcher.appendReplacement(
- sb,
- "[["
- + URLEncoder.encode(matcher.group(1),
- "UTF-8") + "]]");
- } catch (UnsupportedEncodingException e) {
-// LOG.error("emojiConvert error", e);
- throw e;
- }
- }
- matcher.appendTail(sb);
-// LOG.debug("emojiConvert " + str + " to " + sb.toString()
-// + ", len：" + sb.length());
- return sb.toString();
- }
-
- /**
- * 解码
- *
- * @param str 转换后的字符串
- * @return 转换前的字符串
- * @throws UnsupportedEncodingException exception
- * @Description 还原utf8数据库中保存的含转换后emoji表情的字符串
- */
- public static String emojiDecode(String str)
- throws UnsupportedEncodingException {
- String patternString = "\\[\\[(.*?)\\]\\]";
-
- Pattern pattern = Pattern.compile(patternString);
- if (str == null) {
- return str;
- }
- Matcher matcher = pattern.matcher(str);
-
- StringBuffer sb = new StringBuffer();
- while (matcher.find()) {
- try {
- matcher.appendReplacement(sb,
- URLDecoder.decode(matcher.group(1), "UTF-8"));
- } catch (UnsupportedEncodingException e) {
-// LOG.error("emojiRecovery error", e);
- throw e;
- }
- }
- matcher.appendTail(sb);
-// LOG.debug("emojiRecovery " + str + " to " + sb.toString());
-// System.out.println("emojiRecovery " + str + " to " + sb.toString());
- return sb.toString();
- }
-
- /**
- * @param str 待过滤字符串
- * @return 过滤后字符串
- * exception
- * @Description 将字符串中的emoji表情过滤掉
- */
- public static String emojiSub(String str) {
- String patternString = "([\\x{10000}-\\x{10ffff}\ud800-\udfff])";
- Pattern pattern = Pattern.compile(patternString);
- Matcher matcher = pattern.matcher(str);
- StringBuffer sb = new StringBuffer();
- while (matcher.find()) {
- matcher.appendReplacement(sb, "");
- }
- matcher.appendTail(sb);
- return sb.toString();
- }
-
-}
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/business/MerMemberController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/business/MerMemberController.java
index f59f35f..748c236 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/business/MerMemberController.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/business/MerMemberController.java
@@ -6,17 +6,15 @@
import com.ruoyi.member.domain.dto.*;
import com.ruoyi.member.domain.vo.*;
import com.ruoyi.member.service.member.MemberService;
-import com.ruoyi.system.api.domain.dto.MerBaseDto;
import com.ruoyi.system.api.domain.dto.MerBaseGetDto;
-import com.ruoyi.system.api.domain.dto.MerPageDto;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
import java.util.List;
/**
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/console/MemberController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/console/MemberController.java
index 96eedeb..45c46da 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/console/MemberController.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/console/MemberController.java
@@ -2,21 +2,23 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.controller.BaseController;
-import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.system.api.domain.dto.AppMiniRegisterDto;
-import com.ruoyi.system.api.domain.vo.AppMiniRegisterVo;
-import com.ruoyi.member.service.member.MemberService;
import com.ruoyi.member.service.member.MemberCouponService;
+import com.ruoyi.member.service.member.MemberService;
import com.ruoyi.system.api.domain.dto.AppMemberBindingDto;
import com.ruoyi.system.api.domain.dto.AppMemberGoodsTypeDto;
+import com.ruoyi.system.api.domain.dto.AppMiniRegisterDto;
import com.ruoyi.system.api.domain.poji.member.Member;
import com.ruoyi.system.api.domain.vo.AppMemberCouponVo;
+import com.ruoyi.system.api.domain.vo.AppMiniRegisterVo;
import com.ruoyi.system.api.model.AppMiniLoginDto;
import com.ruoyi.system.api.model.AppMiniLoginVo;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
import java.util.List;
@RestController
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppMemberController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppMemberController.java
index 0211d5c..b1ec2a8 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppMemberController.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppMemberController.java
@@ -12,12 +12,12 @@
import com.ruoyi.system.api.domain.dto.AppUserSuggestDto;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
import java.util.List;
/**
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java
index f794ba1..3220e6c 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java
@@ -1,13 +1,10 @@
package com.ruoyi.member.service.impl.member;
-import com.google.common.collect.Lists;
import java.util.Date;
import cn.binarywang.wx.miniapp.api.WxMaService;
import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.segments.MergeSegments;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -24,7 +21,6 @@
import com.ruoyi.member.domain.vo.*;
import com.ruoyi.member.mapper.member.MemberMapper;
import com.ruoyi.member.service.member.*;
-import com.ruoyi.member.util.CodeFactoryUtil;
import com.ruoyi.member.util.HttpUtils;
import com.ruoyi.system.api.domain.dto.AppMiniRegisterDto;
import com.ruoyi.system.api.domain.poji.config.Activeness;
@@ -45,14 +41,13 @@
import com.ruoyi.system.api.domain.vo.AppOrderTotalVo;
import com.ruoyi.system.api.model.AppMiniLoginDto;
import com.ruoyi.system.api.model.AppMiniLoginVo;
-import io.swagger.models.auth.In;
import lombok.extern.log4j.Log4j2;
import com.ruoyi.common.core.utils.StringUtils;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.http.HttpResponse;
import org.apache.http.util.EntityUtils;
-import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Service;
+import com.ruoyi.common.security.utils.CodeFactoryUtil;
import javax.annotation.Resource;
import java.math.BigDecimal;
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/util/CodeFactoryUtil.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/util/CodeFactoryUtil.java
deleted file mode 100644
index 1b1b5ce..0000000
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/util/CodeFactoryUtil.java
+++ /dev/null
@@ -1,145 +0,0 @@
-package com.ruoyi.member.util;
-
-
-
-import com.ruoyi.common.core.utils.DateUtils;
-
-import java.security.SecureRandom;
-import java.util.Date;
-import java.util.Random;
-
-/**
- * @author jqs34
- * @ClassName CodeFactoryUtil
- * @description: TODO
- * @date 2023年02月13日
- * @version: 1.0
- */
-public class CodeFactoryUtil {
-
- /**
- * APP用户编码
- */
- private static final String APP_USER_PREFIX = "HRT_M";
-
- /**
- * 商户编号
- */
- private static final String SHOP_PREFIX = "HRT_S";
-
- /**
- * 订单前缀
- */
- private static final String ORDER_PREFIX = "BO";
-
- /**
- * 退款订单前缀
- */
- private static final String ORDER_REFUND_PREFIX = "RO";
-
- /**
- * 用户id和随机数总长度
- */
-
- private static final int SHOP_LENGTH = 4;
-
- private static final int MEMBER_LENGTH = 6;
-
- private static final int ORDER_LENGTH = 4;
-
- /**
- * 更具id进行加密+加随机数组成固定长度编码
- */
-
- public static void main(String[] args) throws Exception{
- Date date1 = DateUtils.parseDate("2023-05-29","YY-MM-dd");
- Date date2 = DateUtils.parseDate("2023-05-30","YY-MM-dd");
- Date date3 = DateUtils.parseDate("2023-05-31","YY-MM-dd");
- Date date4 = DateUtils.parseDate("2023-05-30 12:00:00","YY-MM-dd");
- System.out.println(date4.compareTo(date1));
- System.out.println(date4.compareTo(date2));
- System.out.println(date4.compareTo(date3));
- }
-
- /**
- * 获取商户编号
- *
- * @param shopId
- * @return
- */
- public static String getShopNo(Long shopId) {
- String prefix = SHOP_PREFIX;
- return toFillZeroCode(prefix, SHOP_LENGTH, shopId);
- }
-
- /**
- * 获取会员编号
- * @param userId
- * @return
- */
- public static String getMemberNo(Long userId) {
- String prefix = APP_USER_PREFIX;
- return toFillZeroCode(prefix, MEMBER_LENGTH, userId);
- }
-
- /**
- * 获取订单编号
- *
- * @param userId
- * @return
- */
- public static String getOrderNo(Long userId) {
-
- String prefix = DateUtils.parseDateToStr( "yyyyMMddHHmmss",new Date());
- prefix = ORDER_PREFIX + prefix;
- return toFillZeroCode(prefix, ORDER_LENGTH, userId);
- }
-
-
-
- /**
- * 获取用户编号
- *
- * @param userId
- * @return
- */
- public static String getAppUserNo(Long userId) {
- return toFillZeroCode(APP_USER_PREFIX, 9, userId);
- }
-
- /**
- * 0补位
- *
- * @param prefix
- * @param totalLength
- * @param id
- * @return
- */
- private static String toFillZeroCode(String prefix, int totalLength, Long id) {
- String idStr = id.toString();
- int length = idStr.length();
-
- int fillLength = totalLength - length;
- StringBuilder idsbs = new StringBuilder(prefix);
- for (int i = 0; i < fillLength; i++) {
- idsbs.append("0");
- }
- return idsbs.append(idStr).toString();
- }
-
- /**
- * 随机6位数生成
- */
- public static String getRandStr(int num) {
- // 默认6位
- num = num != 0 ? num : 6;
- Random r = new SecureRandom();
- StringBuffer str = new StringBuffer();
- int i = 0;
- while (i < num) {
- str.append(r.nextInt(10));
- i++;
- }
- return str.toString();
- }
-}
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerConsumerController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerConsumerController.java
index d18020a..1f0459f 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerConsumerController.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerConsumerController.java
@@ -3,20 +3,23 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.order.domain.dto.*;
-import com.ruoyi.order.domain.vo.*;
+import com.ruoyi.order.domain.dto.MerConsumerGoodsDto;
+import com.ruoyi.order.domain.dto.MerConsumerGoodsPageDto;
+import com.ruoyi.order.domain.dto.MerServiceRecordPageDto;
+import com.ruoyi.order.domain.dto.MerSureConsumerGoodsDto;
+import com.ruoyi.order.domain.vo.MerConsumerGoodsListVo;
+import com.ruoyi.order.domain.vo.MerConsumerGoodsVo;
+import com.ruoyi.order.domain.vo.MerServiceRecordPageVo;
import com.ruoyi.order.service.order.ConsumerGoodsService;
import com.ruoyi.order.service.order.UserServiceRecordService;
-import com.ruoyi.system.api.domain.poji.member.Member;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import lombok.Data;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
import java.util.List;
/**
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerOrderController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerOrderController.java
index a7d4201..ec29164 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerOrderController.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerOrderController.java
@@ -3,22 +3,19 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.exception.ServiceException;
-import com.ruoyi.common.security.annotation.InnerAuth;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.order.domain.dto.*;
import com.ruoyi.order.domain.vo.*;
import com.ruoyi.order.service.order.OrderService;
import com.ruoyi.system.api.constant.AppErrorConstant;
-import com.ruoyi.system.api.domain.dto.MerPageDto;
-import com.ruoyi.system.api.domain.poji.member.Member;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
import java.util.List;
import static org.reflections.Reflections.log;
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/concole/OrderController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/concole/OrderController.java
index 516b1fd..ed5c34e 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/concole/OrderController.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/concole/OrderController.java
@@ -1,16 +1,11 @@
package com.ruoyi.order.controller.concole;
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.security.annotation.InnerAuth;
import com.ruoyi.order.service.order.OrderService;
-import com.ruoyi.system.api.domain.vo.AppOrderTotalVo;
-import com.ruoyi.system.api.domain.vo.MerHomeShopTotalVo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
+
/**
* @author jqs34
* @ClassName OrderController
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/management/MgtMemberController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/management/MgtMemberController.java
index 61649a9..497ebd4 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/management/MgtMemberController.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/management/MgtMemberController.java
@@ -3,22 +3,19 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.order.domain.dto.MgtMemberOrderPageDto;
import com.ruoyi.order.domain.dto.MgtMemberServiceRecordPageDto;
-import com.ruoyi.order.domain.vo.MgtMemberOrderPageVo;
import com.ruoyi.order.domain.vo.MgtMemberServiceRecordPageVo;
import com.ruoyi.order.domain.vo.MgtMemberServiceTotalVo;
import com.ruoyi.order.service.order.UserServiceRecordService;
import com.ruoyi.system.api.domain.dto.MgtBaseGetDto;
-import com.ruoyi.system.api.domain.dto.MgtPageDto;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
import java.util.List;
/**
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/management/MgtOrderController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/management/MgtOrderController.java
index 0b17f09..26c03ce 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/management/MgtOrderController.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/management/MgtOrderController.java
@@ -3,25 +3,20 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.order.domain.dto.MerOrderPageDto;
import com.ruoyi.order.domain.dto.MgtMemberOrderPageDto;
import com.ruoyi.order.domain.dto.MgtMemberOrderTotalDto;
-import com.ruoyi.order.domain.vo.MerOrderPageVo;
import com.ruoyi.order.domain.vo.MgtMemberOrderPageVo;
import com.ruoyi.order.domain.vo.MgtMemberOrderTotalVo;
import com.ruoyi.order.service.order.OrderService;
-import com.ruoyi.system.api.domain.dto.MgtBaseGetDto;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
import java.util.List;
-
-import static org.reflections.Reflections.log;
/**
* @author jqs34
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppConsumerController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppConsumerController.java
index 26f63f8..ba6162f 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppConsumerController.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppConsumerController.java
@@ -12,12 +12,12 @@
import com.ruoyi.system.api.service.RemoteMemberService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
import java.util.List;
/**
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppOrderController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppOrderController.java
index 69d2a5c..f569556 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppOrderController.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppOrderController.java
@@ -1,25 +1,12 @@
package com.ruoyi.order.controller.miniapp;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.controller.BaseController;
-import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.order.domain.dto.*;
-import com.ruoyi.order.domain.pojo.order.Order;
-import com.ruoyi.order.domain.vo.*;
import com.ruoyi.order.service.order.OrderService;
-import com.ruoyi.system.api.domain.dto.AppBaseGetDto;
-import com.ruoyi.system.api.domain.dto.AppMemberBindingDto;
-import com.ruoyi.system.api.domain.poji.member.Member;
import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
-import java.util.List;
+import javax.annotation.Resource;
/**
* @author jqs34
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
index 15b3934..4b80802 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
@@ -6,10 +6,8 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.exception.ServiceException;
-import com.ruoyi.common.core.utils.DateUtils;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.utils.uuid.IdUtils;
-import com.ruoyi.common.core.utils.uuid.UUID;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.order.domain.dto.*;
import com.ruoyi.order.domain.pojo.order.ConsumerGoods;
@@ -18,7 +16,7 @@
import com.ruoyi.order.domain.vo.*;
import com.ruoyi.order.service.order.ConsumerGoodsService;
import com.ruoyi.order.service.order.OrderGoodsService;
-import com.ruoyi.order.util.CodeFactoryUtil;
+import com.ruoyi.common.security.utils.CodeFactoryUtil;
import com.ruoyi.system.api.domain.dto.*;
import com.ruoyi.system.api.service.*;
import com.ruoyi.system.api.constant.AppErrorConstant;
@@ -33,7 +31,6 @@
import com.ruoyi.order.mapper.order.OrderMapper;
import com.ruoyi.order.service.order.OrderService;
import com.ruoyi.system.api.domain.vo.MerHomeShopTotalVo;
-import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/util/EmojiUtil.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/util/EmojiUtil.java
deleted file mode 100644
index 0bc979c..0000000
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/util/EmojiUtil.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package com.ruoyi.order.util;
-
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.net.URLEncoder;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-public class EmojiUtil {
- /**
- * 编码
- *
- * @param str 待转换字符串
- * @return 转换后字符串
- * @throws UnsupportedEncodingException exception
- * @Description 将字符串中的emoji表情转换成可以在utf-8字符集数据库中保存的格式（表情占4个字节，需要utf8mb4字符集）
- */
- public static String emojiEncode(String str)
- throws UnsupportedEncodingException {
- String patternString = "([\\x{10000}-\\x{10ffff}\ud800-\udfff])";
-
- Pattern pattern = Pattern.compile(patternString);
- Matcher matcher = pattern.matcher(str);
- StringBuffer sb = new StringBuffer();
- while (matcher.find()) {
- try {
- matcher.appendReplacement(
- sb,
- "[["
- + URLEncoder.encode(matcher.group(1),
- "UTF-8") + "]]");
- } catch (UnsupportedEncodingException e) {
-// LOG.error("emojiConvert error", e);
- throw e;
- }
- }
- matcher.appendTail(sb);
-// LOG.debug("emojiConvert " + str + " to " + sb.toString()
-// + ", len：" + sb.length());
- return sb.toString();
- }
-
- /**
- * 解码
- *
- * @param str 转换后的字符串
- * @return 转换前的字符串
- * @throws UnsupportedEncodingException exception
- * @Description 还原utf8数据库中保存的含转换后emoji表情的字符串
- */
- public static String emojiDecode(String str)
- throws UnsupportedEncodingException {
- String patternString = "\\[\\[(.*?)\\]\\]";
-
- Pattern pattern = Pattern.compile(patternString);
- if (str == null) {
- return str;
- }
- Matcher matcher = pattern.matcher(str);
-
- StringBuffer sb = new StringBuffer();
- while (matcher.find()) {
- try {
- matcher.appendReplacement(sb,
- URLDecoder.decode(matcher.group(1), "UTF-8"));
- } catch (UnsupportedEncodingException e) {
-// LOG.error("emojiRecovery error", e);
- throw e;
- }
- }
- matcher.appendTail(sb);
-// LOG.debug("emojiRecovery " + str + " to " + sb.toString());
-// System.out.println("emojiRecovery " + str + " to " + sb.toString());
- return sb.toString();
- }
-
- /**
- * @param str 待过滤字符串
- * @return 过滤后字符串
- * exception
- * @Description 将字符串中的emoji表情过滤掉
- */
- public static String emojiSub(String str) {
- String patternString = "([\\x{10000}-\\x{10ffff}\ud800-\udfff])";
- Pattern pattern = Pattern.compile(patternString);
- Matcher matcher = pattern.matcher(str);
- StringBuffer sb = new StringBuffer();
- while (matcher.find()) {
- matcher.appendReplacement(sb, "");
- }
- matcher.appendTail(sb);
- return sb.toString();
- }
-
-}
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerShopController.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerShopController.java
index d86eb0d..806b660 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerShopController.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerShopController.java
@@ -3,20 +3,31 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.shop.domain.dto.*;
-import com.ruoyi.shop.domain.vo.*;
-import com.ruoyi.shop.service.shop.*;
-import com.ruoyi.system.api.domain.dto.*;
+import com.ruoyi.shop.domain.dto.MerAgencyPageDto;
+import com.ruoyi.shop.domain.dto.MerShopCertificateEditDto;
+import com.ruoyi.shop.domain.dto.MerShopCertificateListDto;
+import com.ruoyi.shop.domain.dto.MerShopSuggestDto;
+import com.ruoyi.shop.domain.vo.MerAgencyPageVo;
+import com.ruoyi.shop.domain.vo.MerShopCertificateListVo;
+import com.ruoyi.shop.domain.vo.MerShopSuggestVo;
+import com.ruoyi.shop.service.shop.ShopCertificateService;
+import com.ruoyi.shop.service.shop.ShopService;
+import com.ruoyi.shop.service.shop.ShopStaffService;
+import com.ruoyi.shop.service.shop.ShopSuggestService;
+import com.ruoyi.system.api.domain.dto.MerBaseDto;
+import com.ruoyi.system.api.domain.dto.MerBaseGetDto;
+import com.ruoyi.system.api.domain.dto.MerEditUserDto;
+import com.ruoyi.system.api.domain.dto.MerPageDto;
import com.ruoyi.system.api.domain.vo.MerHomeShopTotalVo;
import com.ruoyi.system.api.domain.vo.MerStaffInfoVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
import java.util.List;
/**
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerTaskController.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerTaskController.java
index 11be045..f12102d 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerTaskController.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerTaskController.java
@@ -12,15 +12,14 @@
import com.ruoyi.shop.service.task.AgencyTaskService;
import com.ruoyi.shop.service.task.MemberTaskRecordService;
import com.ruoyi.shop.service.task.MemberTaskService;
-import com.ruoyi.system.api.domain.poji.member.Member;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
import java.util.List;
/**
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtMemberController.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtMemberController.java
index aaab4f6..4cc9131 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtMemberController.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtMemberController.java
@@ -6,16 +6,14 @@
import com.ruoyi.shop.domain.dto.MgtMemberTaskPageDto;
import com.ruoyi.shop.domain.vo.MgtMemberFollowPageVo;
import com.ruoyi.shop.service.task.MemberTaskRecordService;
-import com.ruoyi.system.api.domain.dto.MgtBaseDto;
-import com.ruoyi.system.api.domain.dto.MgtPageDto;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
import java.util.List;
/**
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtShopController.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtShopController.java
index 74a320c..fd2ae2b 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtShopController.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtShopController.java
@@ -3,7 +3,10 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.shop.domain.dto.*;
+import com.ruoyi.shop.domain.dto.MgtChangeCoopDto;
+import com.ruoyi.shop.domain.dto.MgtEditShopDto;
+import com.ruoyi.shop.domain.dto.MgtEditShopTagDto;
+import com.ruoyi.shop.domain.dto.MgtShopPageDto;
import com.ruoyi.shop.domain.vo.MgtShopInfoVo;
import com.ruoyi.shop.domain.vo.MgtShopPageVo;
import com.ruoyi.shop.domain.vo.MgtShopTagVo;
@@ -12,12 +15,12 @@
import com.ruoyi.system.api.domain.dto.MgtBaseGetDto;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
import java.util.List;
/**
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtTaskController.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtTaskController.java
index b16bb5d..536d4d5 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtTaskController.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtTaskController.java
@@ -3,26 +3,21 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.shop.domain.dto.MerFollowMemberTaskDto;
import com.ruoyi.shop.domain.dto.MgtFollowShopTaskDto;
import com.ruoyi.shop.domain.dto.MgtShopTaskPageDto;
import com.ruoyi.shop.domain.vo.MgtAgencyTaskRecordPageVo;
-import com.ruoyi.shop.domain.vo.MgtMemberFollowPageVo;
-import com.ruoyi.shop.domain.vo.MgtShopTagVo;
import com.ruoyi.shop.domain.vo.MgtShopTaskRecordPageVo;
import com.ruoyi.shop.service.task.AgencyTaskRecordService;
import com.ruoyi.shop.service.task.ShopTaskRecordService;
import com.ruoyi.shop.service.task.ShopTaskService;
-import com.ruoyi.system.api.domain.dto.MgtBaseGetDto;
-import com.ruoyi.system.api.domain.dto.MgtPageDto;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
import java.util.List;
/**
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/miniapp/AppHomeController.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/miniapp/AppHomeController.java
index 7afedfb..ce5c413 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/miniapp/AppHomeController.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/miniapp/AppHomeController.java
@@ -2,23 +2,24 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.system.api.service.RemoteConfigService;
-import com.ruoyi.system.api.service.RemoteMemberService;
-import com.ruoyi.system.api.domain.dto.AppBaseGetDto;
import com.ruoyi.shop.domain.dto.AppNearbyShopDto;
import com.ruoyi.shop.domain.vo.AppNearbyShopVo;
import com.ruoyi.shop.domain.vo.AppShopInfoVo;
import com.ruoyi.shop.service.shop.ShopService;
+import com.ruoyi.system.api.domain.dto.AppBaseGetDto;
import com.ruoyi.system.api.domain.poji.member.Member;
+import com.ruoyi.system.api.service.RemoteConfigService;
+import com.ruoyi.system.api.service.RemoteMemberService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.log4j.Log4j2;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
+
/**
* @author jqs34
* @ClassName AppHomeController
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java
index 25187af..d656658 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java
@@ -1,11 +1,12 @@
package com.ruoyi.shop.service.impl.shop;
-import java.math.BigDecimal;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.common.core.utils.DateUtils;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.utils.uuid.IdUtils;
+import com.ruoyi.common.security.utils.CodeFactoryUtil;
import com.ruoyi.shop.domain.dto.*;
import com.ruoyi.shop.domain.pojo.shop.*;
import com.ruoyi.shop.domain.pojo.task.ShopFile;
@@ -13,23 +14,22 @@
import com.ruoyi.shop.mapper.shop.ShopMapper;
import com.ruoyi.shop.service.shop.*;
import com.ruoyi.shop.service.task.ShopFileService;
-import com.ruoyi.shop.util.CodeFactoryUtil;
+import com.ruoyi.system.api.domain.dto.AppMemberBindingDto;
+import com.ruoyi.system.api.domain.poji.config.SysTag;
+import com.ruoyi.system.api.domain.poji.member.Member;
+import com.ruoyi.system.api.domain.poji.shop.Shop;
+import com.ruoyi.system.api.domain.poji.sys.SysUser;
+import com.ruoyi.system.api.domain.vo.MerHomeShopTotalVo;
import com.ruoyi.system.api.service.RemoteConfigService;
import com.ruoyi.system.api.service.RemoteMemberService;
import com.ruoyi.system.api.service.RemoteOrderService;
import com.ruoyi.system.api.service.RemoteUserService;
-import com.ruoyi.system.api.domain.dto.AppMemberBindingDto;
-import com.ruoyi.system.api.domain.poji.shop.Shop;
-import com.ruoyi.system.api.domain.poji.config.SysTag;
-import com.ruoyi.system.api.domain.poji.member.Member;
-import com.ruoyi.system.api.domain.poji.sys.SysUser;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.system.api.domain.vo.MerHomeShopTotalVo;
-import com.ruoyi.common.core.utils.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
+
import javax.annotation.Resource;
+import java.math.BigDecimal;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/util/CodeFactoryUtil.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/util/CodeFactoryUtil.java
deleted file mode 100644
index 5250452..0000000
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/util/CodeFactoryUtil.java
+++ /dev/null
@@ -1,137 +0,0 @@
-package com.ruoyi.shop.util;
-
-
-
-import com.ruoyi.common.core.utils.DateUtils;
-
-import java.security.SecureRandom;
-import java.util.Date;
-import java.util.Random;
-
-/**
- * @author jqs34
- * @ClassName CodeFactoryUtil
- * @description: TODO
- * @date 2023年02月13日
- * @version: 1.0
- */
-public class CodeFactoryUtil {
-
- /**
- * APP用户编码
- */
- private static final String APP_USER_PREFIX = "HRT_M";
-
- /**
- * 商户编号
- */
- private static final String SHOP_PREFIX = "HRT_S";
-
- /**
- * 订单前缀
- */
- private static final String ORDER_PREFIX = "BO";
-
- /**
- * 退款订单前缀
- */
- private static final String ORDER_REFUND_PREFIX = "RO";
-
- /**
- * 用户id和随机数总长度
- */
-
- private static final int MAX_LENGTH = 4;
-
- /**
- * 更具id进行加密+加随机数组成固定长度编码
- */
-
- public static void main(String[] args) {
- Long orderId = 1L;
- String userNo = getShopNo(orderId);
- System.out.println(userNo);
- }
-
- /**
- * 获取商户编号
- *
- * @param shopId
- * @return
- */
- public static String getShopNo(Long shopId) {
- String prefix = SHOP_PREFIX;
- return toFillZeroCode(prefix, MAX_LENGTH, shopId);
- }
-
- /**
- * 获取会员编号
- * @param userId
- * @return
- */
- public static String getMemberNo(Long userId) {
- String prefix = APP_USER_PREFIX;
- return toFillZeroCode(prefix, MAX_LENGTH, userId);
- }
-
- /**
- * 获取订单编号
- *
- * @param userId
- * @return
- */
- public static String getOrderNo(Long userId) {
-
- String prefix = DateUtils.parseDateToStr( "yyyyMMddHHmmss",new Date());
- prefix = ORDER_PREFIX + prefix;
- return toFillZeroCode(prefix, MAX_LENGTH, userId);
- }
-
-
-
- /**
- * 获取用户编号
- *
- * @param userId
- * @return
- */
- public static String getAppUserNo(Long userId) {
- return toFillZeroCode(APP_USER_PREFIX, 9, userId);
- }
-
- /**
- * 0补位
- *
- * @param prefix
- * @param totalLength
- * @param id
- * @return
- */
- private static String toFillZeroCode(String prefix, int totalLength, Long id) {
- String idStr = id.toString();
- int length = idStr.length();
-
- int fillLength = totalLength - length;
- StringBuilder idsbs = new StringBuilder(prefix);
- for (int i = 0; i < fillLength; i++) {
- idsbs.append("0");
- }
- return idsbs.append(idStr).toString();
- }
-
- /**
- * 随机6位数生成
- */
- public static String getRandStr(int num) {
- // 默认6位
- num = num != 0 ? num : 6;
- Random r = new SecureRandom();
- StringBuffer str = new StringBuffer();
- int i = 0;
- while (i < num) {
- str.append(r.nextInt(10));
- i++;
- }
- return str.toString();
- }
-}
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/util/EmojiUtil.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/util/EmojiUtil.java
deleted file mode 100644
index 7c538eb..0000000
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/util/EmojiUtil.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package com.ruoyi.shop.util;
-
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.net.URLEncoder;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-public class EmojiUtil {
- /**
- * 编码
- *
- * @param str 待转换字符串
- * @return 转换后字符串
- * @throws UnsupportedEncodingException exception
- * @Description 将字符串中的emoji表情转换成可以在utf-8字符集数据库中保存的格式（表情占4个字节，需要utf8mb4字符集）
- */
- public static String emojiEncode(String str)
- throws UnsupportedEncodingException {
- String patternString = "([\\x{10000}-\\x{10ffff}\ud800-\udfff])";
-
- Pattern pattern = Pattern.compile(patternString);
- Matcher matcher = pattern.matcher(str);
- StringBuffer sb = new StringBuffer();
- while (matcher.find()) {
- try {
- matcher.appendReplacement(
- sb,
- "[["
- + URLEncoder.encode(matcher.group(1),
- "UTF-8") + "]]");
- } catch (UnsupportedEncodingException e) {
-// LOG.error("emojiConvert error", e);
- throw e;
- }
- }
- matcher.appendTail(sb);
-// LOG.debug("emojiConvert " + str + " to " + sb.toString()
-// + ", len：" + sb.length());
- return sb.toString();
- }
-
- /**
- * 解码
- *
- * @param str 转换后的字符串
- * @return 转换前的字符串
- * @throws UnsupportedEncodingException exception
- * @Description 还原utf8数据库中保存的含转换后emoji表情的字符串
- */
- public static String emojiDecode(String str)
- throws UnsupportedEncodingException {
- String patternString = "\\[\\[(.*?)\\]\\]";
-
- Pattern pattern = Pattern.compile(patternString);
- if (str == null) {
- return str;
- }
- Matcher matcher = pattern.matcher(str);
-
- StringBuffer sb = new StringBuffer();
- while (matcher.find()) {
- try {
- matcher.appendReplacement(sb,
- URLDecoder.decode(matcher.group(1), "UTF-8"));
- } catch (UnsupportedEncodingException e) {
-// LOG.error("emojiRecovery error", e);
- throw e;
- }
- }
- matcher.appendTail(sb);
-// LOG.debug("emojiRecovery " + str + " to " + sb.toString());
-// System.out.println("emojiRecovery " + str + " to " + sb.toString());
- return sb.toString();
- }
-
- /**
- * @param str 待过滤字符串
- * @return 过滤后字符串
- * exception
- * @Description 将字符串中的emoji表情过滤掉
- */
- public static String emojiSub(String str) {
- String patternString = "([\\x{10000}-\\x{10ffff}\ud800-\udfff])";
- Pattern pattern = Pattern.compile(patternString);
- Matcher matcher = pattern.matcher(str);
- StringBuffer sb = new StringBuffer();
- while (matcher.find()) {
- matcher.appendReplacement(sb, "");
- }
- matcher.appendTail(sb);
- return sb.toString();
- }
-
-}
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/util/FileConvertUtils.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/util/FileConvertUtils.java
index e73e7b8..22c7471 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/util/FileConvertUtils.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/util/FileConvertUtils.java
@@ -3,7 +3,6 @@
import com.ruoyi.shop.domain.pojo.task.TaskFile;
import java.util.List;
-import java.util.StringJoiner;
/**
* @author jqs34
@@ -14,15 +13,15 @@
*/
public class FileConvertUtils {
- public static String convertFileListToString(List<TaskFile> taskFileList){
- StringJoiner sj = new StringJoiner(",");
- if(taskFileList!=null&&!taskFileList.isEmpty()){
- for(TaskFile taskFile : taskFileList){
- sj.add(taskFile.getFileUrl());
- }
- return sj.toString();
- }else{
+ public static String convertFileListToString(List<TaskFile> taskFileList) {
+ if (taskFileList == null || taskFileList.isEmpty()) {
return null;
}
+ StringBuilder sb = new StringBuilder();
+ for (TaskFile taskFile : taskFileList) {
+ sb.append(taskFile.getFileUrl()).append(",");
+ }
+ sb.deleteCharAt(sb.length() - 1);
+ return sb.toString();
}
}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/business/MerConfigController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/business/MerConfigController.java
index 534efe9..564e7d0 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/business/MerConfigController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/business/MerConfigController.java
@@ -9,12 +9,12 @@
import com.ruoyi.system.service.config.RecommendCooperationService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
import java.util.List;
/**
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/miniapp/AppHomeController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/miniapp/AppHomeController.java
index 5c26fa3..ac14734 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/miniapp/AppHomeController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/miniapp/AppHomeController.java
@@ -9,11 +9,11 @@
import com.ruoyi.system.service.config.QuickEntryService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
import java.util.List;
/**
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/util/CodeFactoryUtil.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/util/CodeFactoryUtil.java
deleted file mode 100644
index 196a2ef..0000000
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/util/CodeFactoryUtil.java
+++ /dev/null
@@ -1,137 +0,0 @@
-package com.ruoyi.system.util;
-
-
-
-import com.ruoyi.common.core.utils.DateUtils;
-
-import java.security.SecureRandom;
-import java.util.Date;
-import java.util.Random;
-
-/**
- * @author jqs34
- * @ClassName CodeFactoryUtil
- * @description: TODO
- * @date 2023年02月13日
- * @version: 1.0
- */
-public class CodeFactoryUtil {
-
- /**
- * APP用户编码
- */
- private static final String APP_USER_PREFIX = "HRT_M";
-
- /**
- * 商户编号
- */
- private static final String SHOP_PREFIX = "HRT_S";
-
- /**
- * 订单前缀
- */
- private static final String ORDER_PREFIX = "BO";
-
- /**
- * 退款订单前缀
- */
- private static final String ORDER_REFUND_PREFIX = "RO";
-
- /**
- * 用户id和随机数总长度
- */
-
- private static final int MAX_LENGTH = 4;
-
- /**
- * 更具id进行加密+加随机数组成固定长度编码
- */
-
- public static void main(String[] args) {
- Long orderId = 1L;
- String userNo = getShopNo(orderId);
- System.out.println(userNo);
- }
-
- /**
- * 获取商户编号
- *
- * @param shopId
- * @return
- */
- public static String getShopNo(Long shopId) {
- String prefix = SHOP_PREFIX;
- return toFillZeroCode(prefix, MAX_LENGTH, shopId);
- }
-
- /**
- * 获取会员编号
- * @param userId
- * @return
- */
- public static String getMemberNo(Long userId) {
- String prefix = APP_USER_PREFIX;
- return toFillZeroCode(prefix, MAX_LENGTH, userId);
- }
-
- /**
- * 获取订单编号
- *
- * @param userId
- * @return
- */
- public static String getOrderNo(Long userId) {
-
- String prefix = DateUtils.parseDateToStr( "yyyyMMddHHmmss",new Date());
- prefix = ORDER_PREFIX + prefix;
- return toFillZeroCode(prefix, MAX_LENGTH, userId);
- }
-
-
-
- /**
- * 获取用户编号
- *
- * @param userId
- * @return
- */
- public static String getAppUserNo(Long userId) {
- return toFillZeroCode(APP_USER_PREFIX, 9, userId);
- }
-
- /**
- * 0补位
- *
- * @param prefix
- * @param totalLength
- * @param id
- * @return
- */
- private static String toFillZeroCode(String prefix, int totalLength, Long id) {
- String idStr = id.toString();
- int length = idStr.length();
-
- int fillLength = totalLength - length;
- StringBuilder idsbs = new StringBuilder(prefix);
- for (int i = 0; i < fillLength; i++) {
- idsbs.append("0");
- }
- return idsbs.append(idStr).toString();
- }
-
- /**
- * 随机6位数生成
- */
- public static String getRandStr(int num) {
- // 默认6位
- num = num != 0 ? num : 6;
- Random r = new SecureRandom();
- StringBuffer str = new StringBuffer();
- int i = 0;
- while (i < num) {
- str.append(r.nextInt(10));
- i++;
- }
- return str.toString();
- }
-}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/util/EmojiUtil.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/util/EmojiUtil.java
deleted file mode 100644
index 6ab1320..0000000
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/util/EmojiUtil.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package com.ruoyi.system.util;
-
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.net.URLEncoder;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-public class EmojiUtil {
- /**
- * 编码
- *
- * @param str 待转换字符串
- * @return 转换后字符串
- * @throws UnsupportedEncodingException exception
- * @Description 将字符串中的emoji表情转换成可以在utf-8字符集数据库中保存的格式（表情占4个字节，需要utf8mb4字符集）
- */
- public static String emojiEncode(String str)
- throws UnsupportedEncodingException {
- String patternString = "([\\x{10000}-\\x{10ffff}\ud800-\udfff])";
-
- Pattern pattern = Pattern.compile(patternString);
- Matcher matcher = pattern.matcher(str);
- StringBuffer sb = new StringBuffer();
- while (matcher.find()) {
- try {
- matcher.appendReplacement(
- sb,
- "[["
- + URLEncoder.encode(matcher.group(1),
- "UTF-8") + "]]");
- } catch (UnsupportedEncodingException e) {
-// LOG.error("emojiConvert error", e);
- throw e;
- }
- }
- matcher.appendTail(sb);
-// LOG.debug("emojiConvert " + str + " to " + sb.toString()
-// + ", len：" + sb.length());
- return sb.toString();
- }
-
- /**
- * 解码
- *
- * @param str 转换后的字符串
- * @return 转换前的字符串
- * @throws UnsupportedEncodingException exception
- * @Description 还原utf8数据库中保存的含转换后emoji表情的字符串
- */
- public static String emojiDecode(String str)
- throws UnsupportedEncodingException {
- String patternString = "\\[\\[(.*?)\\]\\]";
-
- Pattern pattern = Pattern.compile(patternString);
- if (str == null) {
- return str;
- }
- Matcher matcher = pattern.matcher(str);
-
- StringBuffer sb = new StringBuffer();
- while (matcher.find()) {
- try {
- matcher.appendReplacement(sb,
- URLDecoder.decode(matcher.group(1), "UTF-8"));
- } catch (UnsupportedEncodingException e) {
-// LOG.error("emojiRecovery error", e);
- throw e;
- }
- }
- matcher.appendTail(sb);
-// LOG.debug("emojiRecovery " + str + " to " + sb.toString());
-// System.out.println("emojiRecovery " + str + " to " + sb.toString());
- return sb.toString();
- }
-
- /**
- * @param str 待过滤字符串
- * @return 过滤后字符串
- * exception
- * @Description 将字符串中的emoji表情过滤掉
- */
- public static String emojiSub(String str) {
- String patternString = "([\\x{10000}-\\x{10ffff}\ud800-\udfff])";
- Pattern pattern = Pattern.compile(patternString);
- Matcher matcher = pattern.matcher(str);
- StringBuffer sb = new StringBuffer();
- while (matcher.find()) {
- matcher.appendReplacement(sb, "");
- }
- matcher.appendTail(sb);
- return sb.toString();
- }
-
-}
--
Gitblit v1.7.1