Merge remote-tracking branch 'origin/master'

buyer-api/src/main/java/cn/lili/controller/distribution/DistributionBuyerController.java

@@ -1,4 +1,4 @@
-package cn.lili.controller.other.distribution;
+package cn.lili.controller.distribution;
 
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.ResultMessage;

buyer-api/src/main/java/cn/lili/controller/distribution/DistributionCashBuyerController.java

@@ -1,4 +1,4 @@
-package cn.lili.controller.other.distribution;
+package cn.lili.controller.distribution;
 
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.enums.ResultUtil;

buyer-api/src/main/java/cn/lili/controller/distribution/DistributionGoodsBuyerController.java

@@ -1,4 +1,4 @@
-package cn.lili.controller.other.distribution;
+package cn.lili.controller.distribution;
 
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.enums.ResultUtil;

buyer-api/src/main/java/cn/lili/controller/distribution/DistributionOrderBuyerController.java

@@ -1,4 +1,4 @@
-package cn.lili.controller.other.distribution;
+package cn.lili.controller.distribution;
 
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.ResultMessage;

buyer-api/src/main/java/cn/lili/controller/order/AfterSaleBuyerController.java

@@ -1,4 +1,4 @@
-package cn.lili.controller.trade;
+package cn.lili.controller.order;
 
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.ResultMessage;

buyer-api/src/main/java/cn/lili/controller/order/CartController.java

@@ -1,4 +1,4 @@
-package cn.lili.controller.trade;
+package cn.lili.controller.order;
 
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;

buyer-api/src/main/java/cn/lili/controller/order/OrderBuyerController.java

@@ -1,4 +1,4 @@
-package cn.lili.controller.trade;
+package cn.lili.controller.order;
 
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.enums.ResultUtil;

buyer-api/src/main/java/cn/lili/controller/order/OrderComplaintBuyerController.java

@@ -1,4 +1,4 @@
-package cn.lili.controller.trade;
+package cn.lili.controller.order;
 
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.security.AuthUser;

buyer-api/src/main/java/cn/lili/controller/order/ReceiptBuyerController.java

@@ -1,4 +1,4 @@
-package cn.lili.controller.trade;
+package cn.lili.controller.order;
 
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.PageVO;

buyer-api/src/main/java/cn/lili/controller/order/RechargeTradeBuyerController.java

@@ -1,4 +1,4 @@
-package cn.lili.controller.trade;
+package cn.lili.controller.order;
 
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.ResultMessage;

buyer-api/src/main/java/cn/lili/controller/passport/MemberBuyerController.java

@@ -6,7 +6,7 @@ import cn.lili.common.vo.ResultMessage;
 import cn.lili.modules.member.entity.dos.Member;
 import cn.lili.modules.member.entity.dto.MemberEditDTO;
 import cn.lili.modules.member.service.MemberService;
-import cn.lili.modules.system.sms.SmsUtil;
+import cn.lili.modules.sms.SmsUtil;
 import cn.lili.modules.verification.entity.enums.VerificationEnums;
 import cn.lili.modules.verification.service.VerificationService;
 import io.swagger.annotations.Api;

buyer-api/src/main/java/cn/lili/controller/passport/connect/MiniProgramBuyerController.java

@@ -5,10 +5,10 @@ import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.modules.connect.entity.dto.WechatMPLoginParams;
 import cn.lili.modules.connect.service.ConnectService;
-import cn.lili.modules.message.entity.dos.WechatMPMessage;
+import cn.lili.modules.wechat.entity.dos.WechatMPMessage;
 import cn.lili.modules.message.service.ShortLinkService;
-import cn.lili.modules.message.service.WechatMPMessageService;
+import cn.lili.modules.wechat.service.WechatMPMessageService;
-import cn.lili.modules.message.util.WechatMpCodeUtil;
+import cn.lili.modules.wechat.util.WechatMpCodeUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

buyer-api/src/main/java/cn/lili/controller/wallet/MemberReceiptController.java

@@ -1,4 +1,4 @@
-package cn.lili.controller.member;
+package cn.lili.controller.wallet;
 
 
 import cn.lili.common.enums.ResultUtil;

buyer-api/src/main/java/cn/lili/controller/wallet/WalletLogBuyerController.java

@@ -1,4 +1,4 @@
-package cn.lili.controller.trade;
+package cn.lili.controller.wallet;
 
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.security.AuthUser;

common-api/src/main/java/cn/lili/controller/common/FileController.java

@@ -78,9 +78,7 @@ public class FileController {
                 }
                 throw new ServiceException(ResultCode.USER_AUTHORITY_ERROR);
             case MANAGER:
-                if (file.getUserEnums().equals(authUser.getRole().name())) {
+                break;
-                    break;
-                }
             default:
                 throw new ServiceException(ResultCode.USER_AUTHORITY_ERROR);
         }

common-api/src/main/java/cn/lili/controller/common/IpInfoManagerController.java

@@ -1,4 +1,4 @@
-package cn.lili.controller.member;
+package cn.lili.controller.common;
 
 import cn.lili.common.utils.IpHelper;
 import cn.lili.common.enums.ResultUtil;
@@ -19,8 +19,8 @@ import javax.servlet.http.HttpServletRequest;
  * @since 2020-02-25 14:10:16
  */
 @RestController
-@Api(tags = "管理端,IP接口")
+@Api(tags = "获取IP信息以及天气")
-@RequestMapping("/manager/common/ip")
+@RequestMapping("/common/ip")
 public class IpInfoManagerController {
     @Autowired
     private IpHelper ipHelper;
@@ -28,7 +28,6 @@ public class IpInfoManagerController {
     @RequestMapping(value = "/info", method = RequestMethod.GET)
     @ApiOperation(value = "IP及天气相关信息")
     public ResultMessage<Object> upload(HttpServletRequest request) {
-
         String result = ipHelper.getIpCity(request);
         return ResultUtil.data(result);
     }

common-api/src/main/java/cn/lili/controller/common/SmsController.java

@@ -4,7 +4,7 @@ import cn.lili.cache.limit.annotation.LimitPoint;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.ResultMessage;
-import cn.lili.modules.system.sms.SmsUtil;
+import cn.lili.modules.sms.SmsUtil;
 import cn.lili.modules.verification.entity.enums.VerificationEnums;
 import cn.lili.modules.verification.service.VerificationService;
 import io.swagger.annotations.Api;

consumer/src/main/java/cn/lili/event/impl/WechatMessageExecute.java

@@ -2,7 +2,7 @@ package cn.lili.event.impl;
 
 import cn.lili.event.OrderStatusChangeEvent;
 import cn.lili.event.TradeEvent;
-import cn.lili.modules.message.util.WechatMessageUtil;
+import cn.lili.modules.wechat.util.WechatMessageUtil;
 import cn.lili.modules.order.cart.entity.dto.TradeDTO;
 import cn.lili.modules.order.order.entity.dto.OrderMessage;
 import cn.lili.modules.order.order.entity.vo.OrderVO;

consumer/src/main/java/cn/lili/listener/NoticeSendMessageListener.java

@@ -10,7 +10,7 @@ import cn.lili.modules.member.service.MemberService;
 import cn.lili.modules.message.entity.dos.MemberMessage;
 import cn.lili.modules.message.entity.dos.Message;
 import cn.lili.modules.message.entity.dos.StoreMessage;
-import cn.lili.modules.message.entity.dto.SmsReachDTO;
+import cn.lili.modules.sms.entity.dto.SmsReachDTO;
 import cn.lili.modules.message.entity.enums.MessageSendClient;
 import cn.lili.modules.message.entity.enums.MessageStatusEnum;
 import cn.lili.modules.message.entity.enums.RangeEnum;
@@ -18,7 +18,7 @@ import cn.lili.modules.message.service.MemberMessageService;
 import cn.lili.modules.message.service.StoreMessageService;
 import cn.lili.modules.store.entity.dos.Store;
 import cn.lili.modules.store.service.StoreService;
-import cn.lili.modules.system.sms.SmsUtil;
+import cn.lili.modules.sms.SmsUtil;
 import cn.lili.rocketmq.tags.OtherTagsEnum;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;

consumer/src/main/java/cn/lili/timetask/handler/impl/statistics/MemberStatisticsExecute.java

@@ -52,21 +52,4 @@ public class MemberStatisticsExecute implements EveryDayExecute {
             log.error("每日会员统计功能异常：", e);
         }
     }
-
-    public static void main(String[] args) {
-
-        //统计的时间（开始。结束时间）
-        Date startTime, endTime;
-        //初始值
-        Calendar calendar = Calendar.getInstance();
-        calendar.set(Calendar.SECOND, 0);
-        calendar.set(Calendar.MILLISECOND, 1);
-        calendar.set(Calendar.MINUTE, 0);
-        calendar.set(Calendar.HOUR_OF_DAY, 0);
-        endTime = calendar.getTime();
-        //-1天，即为开始时间
-        calendar.set(Calendar.DAY_OF_MONTH, calendar.get(Calendar.DAY_OF_MONTH) - 1);
-        startTime = calendar.getTime();
-        System.out.println(startTime);
-    }
 }

framework/src/main/java/cn/lili/common/security/filter/XssHttpServletRequestWrapper.java

@@ -4,6 +4,7 @@ package cn.lili.common.security.filter;
 import cn.hutool.core.text.CharSequenceUtil;
 import cn.hutool.http.HtmlUtil;
 import cn.hutool.json.JSONUtil;
+import lombok.extern.slf4j.Slf4j;
 import org.owasp.html.Sanitizers;
 
 import javax.servlet.ReadListener;
@@ -27,6 +28,7 @@ import java.util.Map;
  * @version v1.0
  * 2021-06-04 10:39
  */
+@Slf4j
 public class XssHttpServletRequestWrapper extends HttpServletRequestWrapper {
 
 
@@ -141,45 +143,72 @@ public class XssHttpServletRequestWrapper extends HttpServletRequestWrapper {
      */
     @Override
     public ServletInputStream getInputStream() throws IOException {
-        //获取输入流
-        ServletInputStream in = super.getInputStream();
-        //用于存储输入流
-        StringBuilder body = new StringBuilder();
-        InputStreamReader reader = new InputStreamReader(in, StandardCharsets.UTF_8);
-        BufferedReader bufferedReader = new BufferedReader(reader);
-        //按行读取输入流
-        String line = bufferedReader.readLine();
-        while (line != null) {
-            //将获取到的第一行数据append到StringBuffer中
-            body.append(line);
-            //继续读取下一行流，直到line为空
-            line = bufferedReader.readLine();
-        }
-        //关闭流
-        bufferedReader.close();
-        reader.close();
-        in.close();
 
-        if (CharSequenceUtil.isNotEmpty(body) && Boolean.TRUE.equals(JSONUtil.isJsonObj(body.toString()))) {
+        BufferedReader bufferedReader = null;
-            //将body转换为map
+
-            Map<String, Object> map = JSONUtil.parseObj(body.toString());
+        InputStreamReader reader = null;
-            //创建空的map用于存储结果
+
-            Map<String, Object> resultMap = new HashMap<>(map.size());
+        //获取输入流
-            //遍历数组
+        ServletInputStream in = null;
-            for (Map.Entry<String, Object> entry : map.entrySet()) {
+        try {
-                //如果map.get(key)获取到的是字符串就需要进行处理，如果不是直接存储resultMap
+            in = super.getInputStream();
-                if (map.get(entry.getKey()) instanceof String) {
+            //用于存储输入流
-                    resultMap.put(entry.getKey(), filterXss(entry.getKey(), entry.getValue().toString()));
+            StringBuilder body = new StringBuilder();
-                } else {
+            reader = new InputStreamReader(in, StandardCharsets.UTF_8);
-                    resultMap.put(entry.getKey(), entry.getValue());
+            bufferedReader = new BufferedReader(reader);
+            //按行读取输入流
+            String line = bufferedReader.readLine();
+            while (line != null) {
+                //将获取到的第一行数据append到StringBuffer中
+                body.append(line);
+                //继续读取下一行流，直到line为空
+                line = bufferedReader.readLine();
+            }
+            if (CharSequenceUtil.isNotEmpty(body) && Boolean.TRUE.equals(JSONUtil.isJsonObj(body.toString()))) {
+                //将body转换为map
+                Map<String, Object> map = JSONUtil.parseObj(body.toString());
+                //创建空的map用于存储结果
+                Map<String, Object> resultMap = new HashMap<>(map.size());
+                //遍历数组
+                for (Map.Entry<String, Object> entry : map.entrySet()) {
+                    //如果map.get(key)获取到的是字符串就需要进行处理，如果不是直接存储resultMap
+                    if (map.get(entry.getKey()) instanceof String) {
+                        resultMap.put(entry.getKey(), filterXss(entry.getKey(), entry.getValue().toString()));
+                    } else {
+                        resultMap.put(entry.getKey(), entry.getValue());
+                    }
                 }
+
+                //将resultMap转换为json字符串
+                String resultStr = JSONUtil.toJsonStr(resultMap);
+                //将json字符串转换为字节
+                final ByteArrayInputStream resultBIS = new ByteArrayInputStream(resultStr.getBytes());
+
+                //实现接口
+                return new ServletInputStream() {
+                    @Override
+                    public boolean isFinished() {
+                        return false;
+                    }
+
+                    @Override
+                    public boolean isReady() {
+                        return false;
+                    }
+
+                    @Override
+                    public void setReadListener(ReadListener readListener) {
+                    }
+
+                    @Override
+                    public int read() {
+                        return resultBIS.read();
+                    }
+                };
             }
 
-            //将resultMap转换为json字符串
-            String resultStr = JSONUtil.toJsonStr(resultMap);
             //将json字符串转换为字节
-            final ByteArrayInputStream resultBIS = new ByteArrayInputStream(resultStr.getBytes());
+            final ByteArrayInputStream bis = new ByteArrayInputStream(body.toString().getBytes());
-
             //实现接口
             return new ServletInputStream() {
                 @Override
@@ -194,41 +223,31 @@ public class XssHttpServletRequestWrapper extends HttpServletRequestWrapper {
 
                 @Override
                 public void setReadListener(ReadListener readListener) {
+
                 }
 
                 @Override
                 public int read() {
-                    return resultBIS.read();
+                    return bis.read();
                 }
             };
+        } catch (Exception e) {
+
+            log.error("get request inputStream error", e);
+            return null;
+        } finally {
+            //关闭流
+            if (bufferedReader != null) {
+                bufferedReader.close();
+            }
+            if (reader != null) {
+                reader.close();
+            }
+            if (in != null) {
+                in.close();
+            }
         }
 
-        //将json字符串转换为字节
-        final ByteArrayInputStream bis = new ByteArrayInputStream(body.toString().getBytes());
-
-        //实现接口
-        return new ServletInputStream() {
-            @Override
-            public boolean isFinished() {
-                return false;
-            }
-
-            @Override
-            public boolean isReady() {
-                return false;
-            }
-
-            @Override
-            public void setReadListener(ReadListener readListener) {
-
-            }
-
-            @Override
-            public int read() {
-                return bis.read();
-            }
-        };
-
     }
 
     private String cleanXSS(String value) {

framework/src/main/java/cn/lili/common/utils/Base64DecodeMultipartFile.java

@@ -55,7 +55,7 @@ public class Base64DecodeMultipartFile implements MultipartFile {
     }
 
     @Override
-    public InputStream getInputStream() throws IOException {
+    public InputStream getInputStream() {
         return new ByteArrayInputStream(imgContent);
     }
 
@@ -66,8 +66,9 @@ public class Base64DecodeMultipartFile implements MultipartFile {
             stream = new FileOutputStream(dest);
             stream.write(imgContent);
         } catch (IOException e) {
-            log.error("transferTo错误",e);
+            log.error("transferTo错误", e);
-        }finally {
+        } finally {
+            assert stream != null;
             stream.close();
         }
     }
@@ -94,7 +95,7 @@ public class Base64DecodeMultipartFile implements MultipartFile {
             byte[] bytes = Base64.getDecoder().decode(base64);
             stream = new ByteArrayInputStream(bytes);
         } catch (Exception e) {
-            log.error("base64ToInputStream错误",e);
+            log.error("base64ToInputStream错误", e);
         }
         return stream;
     }
@@ -111,13 +112,13 @@ public class Base64DecodeMultipartFile implements MultipartFile {
             }
             data = swapStream.toByteArray();
         } catch (IOException e) {
-           log.error("转码错误",e);
+            log.error("转码错误", e);
         } finally {
             if (in != null) {
                 try {
                     in.close();
                 } catch (IOException e) {
-                    log.error("inputStreamToStream错误",e);
+                    log.error("inputStreamToStream错误", e);
                 }
             }
         }

framework/src/main/java/cn/lili/common/utils/BeanUtil.java

@@ -16,7 +16,7 @@ public class BeanUtil {
      * 复制属性
      *
      * @param objectFrom 源自对象
-     * @param objectTo 复制给对象
+     * @param objectTo   复制给对象
      */
     public static void copyProperties(Object objectFrom, Object objectTo) {
         BeanUtils.copyProperties(objectFrom, objectTo);
@@ -25,6 +25,7 @@ public class BeanUtil {
 
     /**
      * 获取属性名数组
+     *
      * @param o 获取字段的对象
      * @return 返回各个字段
      */
@@ -49,8 +50,9 @@ public class BeanUtil {
 
     /**
      * 根据属性名获取属性值
+     *
      * @param fieldName 属性名
-     * @param o 对象
+     * @param o         对象
      * @return 属性值
      */
     public static Object getFieldValueByName(String fieldName, Object o) {
@@ -69,6 +71,7 @@ public class BeanUtil {
     /**
      * 将对象转换为key value
      * A=a&B=b&C=c 格式
+     *
      * @param object 对象
      * @return 格式化结果
      */
@@ -87,6 +90,7 @@ public class BeanUtil {
             String key = fieldNames[j];
             //获取值
             Object value = BeanUtil.getFieldValueByName(key, object);
+            assert value != null;
             stringBuffer.append(key).append("=").append(value.toString());
         }
         return stringBuffer.toString();
@@ -95,8 +99,9 @@ public class BeanUtil {
     /**
      * key value键值对 转换为 对象
      * A=a&B=b&C=c 格式 转换为对象
+     *
      * @param str 对象字符串
-     * @param t 范型
+     * @param t   范型
      * @param <T> 范型
      * @return 格式化结果
      */

framework/src/main/java/cn/lili/common/utils/CurrencyUtil.java

@@ -29,8 +29,8 @@ public final class CurrencyUtil {
      * @return 两个参数的和
      */
     public static Double add(double v1, double v2) {
-        BigDecimal b1 = new BigDecimal(v1);
+        BigDecimal b1 = BigDecimal.valueOf(v1);
-        BigDecimal b2 = new BigDecimal(v2);
+        BigDecimal b2 = BigDecimal.valueOf(v2);
         return b1.add(b2).setScale(2, RoundingMode.HALF_UP).doubleValue();
     }
 
@@ -42,8 +42,8 @@ public final class CurrencyUtil {
      * @return 两个参数的差
      */
     public static double sub(double v1, double v2) {
-        BigDecimal b1 = new BigDecimal(v1);
+        BigDecimal b1 = BigDecimal.valueOf(v1);
-        BigDecimal b2 = new BigDecimal(v2);
+        BigDecimal b2 = BigDecimal.valueOf(v2);
         return b1.subtract(b2).setScale(2, RoundingMode.HALF_UP).doubleValue();
     }
 
@@ -55,8 +55,8 @@ public final class CurrencyUtil {
      * @return 两个参数的积
      */
     public static Double mul(double v1, double v2) {
-        BigDecimal b1 = new BigDecimal(v1);
+        BigDecimal b1 = BigDecimal.valueOf(v1);
-        BigDecimal b2 = new BigDecimal(v2);
+        BigDecimal b2 = BigDecimal.valueOf(v2);
         return b1.multiply(b2).setScale(2, RoundingMode.HALF_UP).doubleValue();
     }
 
@@ -73,8 +73,8 @@ public final class CurrencyUtil {
             throw new IllegalArgumentException(
                     "The scale must be a positive integer or zero");
         }
-        BigDecimal b1 = new BigDecimal(v1);
+        BigDecimal b1 = BigDecimal.valueOf(v1);
-        BigDecimal b2 = new BigDecimal(v2);
+        BigDecimal b2 = BigDecimal.valueOf(v2);
         return b1.multiply(b2).setScale(scale, RoundingMode.HALF_UP).doubleValue();
     }
 
@@ -106,28 +106,11 @@ public final class CurrencyUtil {
         if (v2 == 0) {
             return 0;
         }
-        BigDecimal b1 = new BigDecimal(v1);
+        BigDecimal b1 = BigDecimal.valueOf(v1);
-        BigDecimal b2 = new BigDecimal(v2);
+        BigDecimal b2 = BigDecimal.valueOf(v2);
         return b1.divide(b2, scale, RoundingMode.HALF_UP).doubleValue();
     }
 
-    /**
-     * 提供精确的小数位四舍五入处理。
-     *
-     * @param v     需要四舍五入的数字
-     * @param scale 小数点后保留几位
-     * @return 四舍五入后的结果
-     */
-    public static double round(double v, int scale) {
-        if (scale < 0) {
-            throw new IllegalArgumentException(
-                    "The scale must be a positive integer or zero");
-        }
-        BigDecimal b = new BigDecimal(v);
-        BigDecimal one = new BigDecimal("1");
-        return b.divide(one, scale, RoundingMode.HALF_UP).doubleValue();
-    }
-
     /**
      * 金额转分
      *

framework/src/main/java/cn/lili/common/utils/DateUtil.java

@@ -273,7 +273,7 @@ public class DateUtil {
      * @return 时间戳
      */
     public static long getDateline(String date) {
-        return toDate(date, STANDARD_DATE_FORMAT).getTime() / 1000;
+        return Objects.requireNonNull(toDate(date, STANDARD_DATE_FORMAT)).getTime() / 1000;
     }
 
     /**
@@ -311,7 +311,7 @@ public class DateUtil {
      * @return 时间戳
      */
     public static long getDateline(String date, String pattern) {
-        return toDate(date, pattern).getTime() / 1000;
+        return Objects.requireNonNull(toDate(date, pattern)).getTime() / 1000;
     }
 
     /**

framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsServiceImpl.java

@@ -1,7 +1,5 @@
 package cn.lili.modules.goods.serviceimpl;
 
-import cn.hutool.core.date.DateTime;
-import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.text.CharSequenceUtil;
 import cn.hutool.core.util.NumberUtil;
 import cn.hutool.json.JSONUtil;
@@ -16,7 +14,6 @@ import cn.lili.common.security.enums.UserEnums;
 import cn.lili.modules.goods.entity.dos.Category;
 import cn.lili.modules.goods.entity.dos.Goods;
 import cn.lili.modules.goods.entity.dos.GoodsGallery;
-import cn.lili.modules.goods.entity.dos.GoodsSku;
 import cn.lili.modules.goods.entity.dto.GoodsOperationDTO;
 import cn.lili.modules.goods.entity.dto.GoodsParamsDTO;
 import cn.lili.modules.goods.entity.dto.GoodsSearchParams;
@@ -27,7 +24,6 @@ import cn.lili.modules.goods.entity.vos.GoodsVO;
 import cn.lili.modules.goods.mapper.GoodsMapper;
 import cn.lili.modules.goods.service.*;
 import cn.lili.modules.member.entity.dos.MemberEvaluation;
-import cn.lili.modules.member.entity.dto.CollectionDTO;
 import cn.lili.modules.member.entity.enums.EvaluationGradeEnum;
 import cn.lili.modules.member.service.MemberEvaluationService;
 import cn.lili.modules.store.entity.dos.FreightTemplate;
@@ -477,12 +473,12 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
      */
     private AuthUser checkStoreAuthority() {
         AuthUser currentUser = UserContext.getCurrentUser();
-        if (currentUser == null || (currentUser.getRole().equals(UserEnums.STORE) && currentUser.getStoreId() == null)) {
+        //如果当前会员不为空，且为店铺角色
-            throw new ServiceException(ResultCode.USER_AUTHORITY_ERROR);
+        if (currentUser != null && (currentUser.getRole().equals(UserEnums.STORE) && currentUser.getStoreId() != null)) {
-        } else if (currentUser.getRole().equals(UserEnums.STORE) && currentUser.getStoreId() != null) {
             return currentUser;
+        } else {
+            throw new ServiceException(ResultCode.USER_AUTHORITY_ERROR);
         }
-        return null;
     }
 
     /**

framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsSkuServiceImpl.java

@@ -491,6 +491,7 @@ public class GoodsSkuServiceImpl extends ServiceImpl<GoodsSkuMapper, GoodsSku> i
      *
      * @param goods 商品信息
      */
+    @Override
     public void generateEs(Goods goods) {
         String destination = rocketmqCustomProperties.getGoodsTopic() + ":" + GoodsTagsEnum.GENERATOR_GOODS_INDEX.name();
         //发送mq消息

framework/src/main/java/cn/lili/modules/goods/util/WechatLivePlayerUtil.java

@@ -7,7 +7,7 @@ import cn.lili.common.utils.HttpUtils;
 import cn.lili.modules.goods.entity.dos.Commodity;
 import cn.lili.modules.goods.entity.dos.Studio;
 import cn.lili.modules.goods.entity.dto.GoodsInfo;
-import cn.lili.modules.message.util.WechatAccessTokenUtil;
+import cn.lili.modules.wechat.util.WechatAccessTokenUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;

framework/src/main/java/cn/lili/modules/goods/util/WechatMediaUtil.java

@@ -4,7 +4,7 @@ import cn.hutool.json.JSONObject;
 import cn.lili.common.enums.ClientTypeEnum;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
-import cn.lili.modules.message.util.WechatAccessTokenUtil;
+import cn.lili.modules.wechat.util.WechatAccessTokenUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -105,8 +105,9 @@ public class WechatMediaUtil {
         } catch (Exception e) {
             log.error("微信媒体上传失败", e);
         }
+        assert resultStr != null;
         JSONObject jsonObject = new JSONObject(resultStr.toString());
-        log.info("微信媒体上传:" + jsonObject.toString());
+        log.info("微信媒体上传:" + jsonObject);
         //判断是否传递成功，如果token过期则重新获取
         if (jsonObject.get("errcode") != null && ("40001").equals(jsonObject.get("errcode"))) {
             wechatAccessTokenUtil.removeAccessToken(ClientTypeEnum.WECHAT_MP);

framework/src/main/java/cn/lili/modules/member/mapper/StoreLogisticsMapper.java

@@ -1,4 +1,4 @@
-package cn.lili.modules.system.mapper;
+package cn.lili.modules.member.mapper;
 
 import cn.lili.modules.store.entity.dos.StoreLogistics;
 import cn.lili.modules.system.entity.vo.StoreLogisticsVO;

framework/src/main/java/cn/lili/modules/member/service/StoreLogisticsService.java

@@ -1,4 +1,4 @@
-package cn.lili.modules.system.service;
+package cn.lili.modules.member.service;
 
 import cn.lili.modules.store.entity.dos.StoreLogistics;
 import cn.lili.modules.system.entity.vo.StoreLogisticsVO;

framework/src/main/java/cn/lili/modules/member/serviceimpl/StoreLogisticsServiceImpl.java

@@ -1,9 +1,9 @@
-package cn.lili.modules.system.serviceimpl;
+package cn.lili.modules.member.serviceimpl;
 
 import cn.lili.modules.store.entity.dos.StoreLogistics;
 import cn.lili.modules.system.entity.vo.StoreLogisticsVO;
-import cn.lili.modules.system.mapper.StoreLogisticsMapper;
+import cn.lili.modules.member.mapper.StoreLogisticsMapper;
-import cn.lili.modules.system.service.StoreLogisticsService;
+import cn.lili.modules.member.service.StoreLogisticsService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

framework/src/main/java/cn/lili/modules/order/cart/service/CartServiceImpl.java

@@ -396,11 +396,8 @@ public class CartServiceImpl implements CartService {
     private void checkSetGoodsQuantity(CartSkuVO cartSkuVO, String skuId, Integer num) {
         Integer enableStock = goodsSkuService.getStock(skuId);
 
-        //读取sku的可用库存
-        Integer enableQuantity = goodsSkuService.getStock(skuId);
-
         //如果sku的可用库存小于等于0或者小于用户购买的数量，则不允许购买
-        if (enableQuantity <= 0 || enableQuantity < num) {
+        if (enableStock <= 0 || enableStock < num) {
             throw new ServiceException(ResultCode.GOODS_SKU_QUANTITY_NOT_ENOUGH);
         }
 

framework/src/main/java/cn/lili/modules/sms/AliSmsUtil.java

@@ -1,7 +1,7 @@
-package cn.lili.modules.system.sms;
+package cn.lili.modules.sms;
 
-import cn.lili.modules.message.entity.dos.SmsSign;
+import cn.lili.modules.sms.entity.dos.SmsSign;
-import cn.lili.modules.message.entity.dos.SmsTemplate;
+import cn.lili.modules.sms.entity.dos.SmsTemplate;
 
 import java.util.Map;
 

framework/src/main/java/cn/lili/modules/sms/SmsUtil.java

@@ -1,4 +1,4 @@
-package cn.lili.modules.system.sms;
+package cn.lili.modules.sms;
 
 import cn.lili.modules.verification.entity.enums.VerificationEnums;
 

framework/src/main/java/cn/lili/modules/sms/entity/dos/SmsReach.java

@@ -1,4 +1,4 @@
-package cn.lili.modules.message.entity.dos;
+package cn.lili.modules.sms.entity.dos;
 
 import cn.lili.mybatis.BaseIdEntity;
 import com.baomidou.mybatisplus.annotation.FieldFill;

framework/src/main/java/cn/lili/modules/sms/entity/dos/SmsSign.java

@@ -1,4 +1,4 @@
-package cn.lili.modules.message.entity.dos;
+package cn.lili.modules.sms.entity.dos;
 
 import cn.lili.mybatis.BaseIdEntity;
 import com.baomidou.mybatisplus.annotation.TableName;

framework/src/main/java/cn/lili/modules/sms/entity/dos/SmsTemplate.java

@@ -1,4 +1,4 @@
-package cn.lili.modules.message.entity.dos;
+package cn.lili.modules.sms.entity.dos;
 
 import cn.lili.mybatis.BaseIdEntity;
 import com.baomidou.mybatisplus.annotation.TableName;

framework/src/main/java/cn/lili/modules/sms/entity/dto/SmsReachDTO.java

@@ -1,6 +1,6 @@
-package cn.lili.modules.message.entity.dto;
+package cn.lili.modules.sms.entity.dto;
 
-import cn.lili.modules.message.entity.dos.SmsReach;
+import cn.lili.modules.sms.entity.dos.SmsReach;
 import lombok.Data;
 
 import java.util.List;

framework/src/main/java/cn/lili/modules/sms/impl/SmsUtilAliImplService.java

@@ -1,4 +1,4 @@
-package cn.lili.modules.system.sms.impl;
+package cn.lili.modules.sms.impl;
 
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
@@ -7,8 +7,8 @@ import cn.lili.cache.CachePrefix;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
 import cn.lili.common.security.context.UserContext;
-import cn.lili.modules.system.sms.AliSmsUtil;
+import cn.lili.modules.sms.AliSmsUtil;
-import cn.lili.modules.system.sms.SmsUtil;
+import cn.lili.modules.sms.SmsUtil;
 import cn.lili.common.utils.CommonUtil;
 import cn.lili.modules.verification.entity.enums.VerificationEnums;
 import cn.lili.common.properties.SmsTemplateProperties;
@@ -16,8 +16,8 @@ import cn.lili.common.properties.SystemSettingProperties;
 import cn.lili.common.utils.Base64Utils;
 import cn.lili.modules.member.entity.dos.Member;
 import cn.lili.modules.member.service.MemberService;
-import cn.lili.modules.message.entity.dos.SmsSign;
+import cn.lili.modules.sms.entity.dos.SmsSign;
-import cn.lili.modules.message.entity.dos.SmsTemplate;
+import cn.lili.modules.sms.entity.dos.SmsTemplate;
 import cn.lili.modules.system.entity.dos.Setting;
 import cn.lili.modules.system.entity.dto.SmsSetting;
 import cn.lili.modules.system.entity.enums.SettingEnum;

framework/src/main/java/cn/lili/modules/sms/mapper/SmsReachMapper.java

@@ -1,6 +1,6 @@
-package cn.lili.modules.message.mapper;
+package cn.lili.modules.sms.mapper;
 
-import cn.lili.modules.message.entity.dos.SmsReach;
+import cn.lili.modules.sms.entity.dos.SmsReach;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

framework/src/main/java/cn/lili/modules/sms/mapper/SmsSignMapper.java

@@ -1,6 +1,6 @@
-package cn.lili.modules.message.mapper;
+package cn.lili.modules.sms.mapper;
 
-import cn.lili.modules.message.entity.dos.SmsSign;
+import cn.lili.modules.sms.entity.dos.SmsSign;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

framework/src/main/java/cn/lili/modules/sms/mapper/SmsTemplateMapper.java

@@ -1,6 +1,6 @@
-package cn.lili.modules.message.mapper;
+package cn.lili.modules.sms.mapper;
 
-import cn.lili.modules.message.entity.dos.SmsTemplate;
+import cn.lili.modules.sms.entity.dos.SmsTemplate;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

framework/src/main/java/cn/lili/modules/sms/service/SmsReachService.java

@@ -1,6 +1,6 @@
-package cn.lili.modules.message.service;
+package cn.lili.modules.sms.service;
 
-import cn.lili.modules.message.entity.dos.SmsReach;
+import cn.lili.modules.sms.entity.dos.SmsReach;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;

framework/src/main/java/cn/lili/modules/sms/service/SmsSignService.java

@@ -1,7 +1,7 @@
-package cn.lili.modules.message.service;
+package cn.lili.modules.sms.service;
 
 import cn.lili.common.vo.PageVO;
-import cn.lili.modules.message.entity.dos.SmsSign;
+import cn.lili.modules.sms.entity.dos.SmsSign;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 

framework/src/main/java/cn/lili/modules/sms/service/SmsTemplateService.java

@@ -1,7 +1,7 @@
-package cn.lili.modules.message.service;
+package cn.lili.modules.sms.service;
 
 import cn.lili.common.vo.PageVO;
-import cn.lili.modules.message.entity.dos.SmsTemplate;
+import cn.lili.modules.sms.entity.dos.SmsTemplate;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 

framework/src/main/java/cn/lili/modules/sms/serviceimpl/SmsReachServiceImpl.java

@@ -1,14 +1,14 @@
-package cn.lili.modules.message.serviceimpl;
+package cn.lili.modules.sms.serviceimpl;
 
 import cn.hutool.json.JSONUtil;
 import cn.lili.rocketmq.RocketmqSendCallbackBuilder;
 import cn.lili.rocketmq.tags.OtherTagsEnum;
 import cn.lili.common.utils.BeanUtil;
 import cn.lili.common.properties.RocketmqCustomProperties;
-import cn.lili.modules.message.entity.dos.SmsReach;
+import cn.lili.modules.sms.entity.dos.SmsReach;
-import cn.lili.modules.message.entity.dto.SmsReachDTO;
+import cn.lili.modules.sms.entity.dto.SmsReachDTO;
-import cn.lili.modules.message.mapper.SmsReachMapper;
+import cn.lili.modules.sms.mapper.SmsReachMapper;
-import cn.lili.modules.message.service.SmsReachService;
+import cn.lili.modules.sms.service.SmsReachService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.apache.rocketmq.spring.core.RocketMQTemplate;
 import org.springframework.beans.factory.annotation.Autowired;

framework/src/main/java/cn/lili/modules/sms/serviceimpl/SmsSignServiceImpl.java

@@ -1,13 +1,13 @@
-package cn.lili.modules.message.serviceimpl;
+package cn.lili.modules.sms.serviceimpl;
 
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
-import cn.lili.modules.system.sms.AliSmsUtil;
+import cn.lili.modules.sms.AliSmsUtil;
 import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.vo.PageVO;
-import cn.lili.modules.message.entity.dos.SmsSign;
+import cn.lili.modules.sms.entity.dos.SmsSign;
-import cn.lili.modules.message.mapper.SmsSignMapper;
+import cn.lili.modules.sms.mapper.SmsSignMapper;
-import cn.lili.modules.message.service.SmsSignService;
+import cn.lili.modules.sms.service.SmsSignService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;

framework/src/main/java/cn/lili/modules/sms/serviceimpl/SmsTemplateServiceImpl.java

@@ -1,11 +1,11 @@
-package cn.lili.modules.message.serviceimpl;
+package cn.lili.modules.sms.serviceimpl;
 
-import cn.lili.modules.system.sms.AliSmsUtil;
+import cn.lili.modules.sms.AliSmsUtil;
 import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.vo.PageVO;
-import cn.lili.modules.message.entity.dos.SmsTemplate;
+import cn.lili.modules.sms.entity.dos.SmsTemplate;
-import cn.lili.modules.message.mapper.SmsTemplateMapper;
+import cn.lili.modules.sms.mapper.SmsTemplateMapper;
-import cn.lili.modules.message.service.SmsTemplateService;
+import cn.lili.modules.sms.service.SmsTemplateService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;

framework/src/main/java/cn/lili/modules/wechat/entity/dos/WechatMPMessage.java

@@ -1,4 +1,4 @@
-package cn.lili.modules.message.entity.dos;
+package cn.lili.modules.wechat.entity.dos;
 
 import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;

framework/src/main/java/cn/lili/modules/wechat/entity/dos/WechatMessage.java

@@ -1,4 +1,4 @@
-package cn.lili.modules.message.entity.dos;
+package cn.lili.modules.wechat.entity.dos;
 
 import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;

framework/src/main/java/cn/lili/modules/wechat/entity/enums/WechatMessageItemEnums.java

@@ -1,4 +1,4 @@
-package cn.lili.modules.message.entity.enums;
+package cn.lili.modules.wechat.entity.enums;
 
 /**
  * 微信模版设置变量

framework/src/main/java/cn/lili/modules/wechat/mapper/WechatMPMessageMapper.java

@@ -1,7 +1,7 @@
-package cn.lili.modules.message.mapper;
+package cn.lili.modules.wechat.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import cn.lili.modules.message.entity.dos.WechatMPMessage;
+import cn.lili.modules.wechat.entity.dos.WechatMPMessage;
 import org.apache.ibatis.annotations.Delete;
 
 /**

framework/src/main/java/cn/lili/modules/wechat/mapper/WechatMessageMapper.java

@@ -1,6 +1,6 @@
-package cn.lili.modules.message.mapper;
+package cn.lili.modules.wechat.mapper;
 
-import cn.lili.modules.message.entity.dos.WechatMessage;
+import cn.lili.modules.wechat.entity.dos.WechatMessage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Delete;
 

framework/src/main/java/cn/lili/modules/wechat/service/WechatMPMessageService.java

@@ -1,7 +1,7 @@
-package cn.lili.modules.message.service;
+package cn.lili.modules.wechat.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import cn.lili.modules.message.entity.dos.WechatMPMessage;
+import cn.lili.modules.wechat.entity.dos.WechatMPMessage;
 
 /**
  * 微信小程序消息订阅 业务层

framework/src/main/java/cn/lili/modules/wechat/service/WechatMessageService.java

@@ -1,6 +1,6 @@
-package cn.lili.modules.message.service;
+package cn.lili.modules.wechat.service;
 
-import cn.lili.modules.message.entity.dos.WechatMessage;
+import cn.lili.modules.wechat.entity.dos.WechatMessage;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

framework/src/main/java/cn/lili/modules/wechat/serviceimpl/WechatMPMessageServiceImpl.java

@@ -1,4 +1,4 @@
-package cn.lili.modules.message.serviceimpl;
+package cn.lili.modules.wechat.serviceimpl;
 
 import cn.hutool.http.HttpUtil;
 import cn.hutool.json.JSONArray;
@@ -8,12 +8,12 @@ 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.wechat.entity.dos.WechatMPMessage;
-import cn.lili.modules.message.entity.enums.WechatMessageItemEnums;
+import cn.lili.modules.wechat.entity.enums.WechatMessageItemEnums;
-import cn.lili.modules.message.mapper.WechatMPMessageMapper;
+import cn.lili.modules.wechat.mapper.WechatMPMessageMapper;
-import cn.lili.modules.message.service.WechatMPMessageService;
+import cn.lili.modules.wechat.service.WechatMPMessageService;
-import cn.lili.modules.message.util.WechatAccessTokenUtil;
+import cn.lili.modules.wechat.util.WechatAccessTokenUtil;
-import cn.lili.modules.message.util.WechatMessageUtil;
+import cn.lili.modules.wechat.util.WechatMessageUtil;
 import cn.lili.modules.order.order.entity.enums.OrderStatusEnum;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.AllArgsConstructor;

framework/src/main/java/cn/lili/modules/wechat/serviceimpl/WechatMessageServiceImpl.java

@@ -1,4 +1,4 @@
-package cn.lili.modules.message.serviceimpl;
+package cn.lili.modules.wechat.serviceimpl;
 
 import cn.hutool.http.HttpUtil;
 import cn.hutool.json.JSONObject;
@@ -7,12 +7,12 @@ 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.wechat.entity.dos.WechatMessage;
-import cn.lili.modules.message.entity.enums.WechatMessageItemEnums;
+import cn.lili.modules.wechat.entity.enums.WechatMessageItemEnums;
-import cn.lili.modules.message.mapper.WechatMessageMapper;
+import cn.lili.modules.wechat.mapper.WechatMessageMapper;
-import cn.lili.modules.message.service.WechatMessageService;
+import cn.lili.modules.wechat.service.WechatMessageService;
-import cn.lili.modules.message.util.WechatAccessTokenUtil;
+import cn.lili.modules.wechat.util.WechatAccessTokenUtil;
-import cn.lili.modules.message.util.WechatMessageUtil;
+import cn.lili.modules.wechat.util.WechatMessageUtil;
 import cn.lili.modules.order.order.entity.enums.OrderStatusEnum;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.AllArgsConstructor;

framework/src/main/java/cn/lili/modules/wechat/util/WechatAccessTokenUtil.java

@@ -1,4 +1,4 @@
-package cn.lili.modules.message.util;
+package cn.lili.modules.wechat.util;
 
 import cn.hutool.http.HttpUtil;
 import cn.hutool.json.JSONObject;

framework/src/main/java/cn/lili/modules/wechat/util/WechatMessageData.java

@@ -1,4 +1,4 @@
-package cn.lili.modules.message.util;
+package cn.lili.modules.wechat.util;
 
 import cn.hutool.json.JSONUtil;
 import lombok.Data;

framework/src/main/java/cn/lili/modules/wechat/util/WechatMessageUtil.java

@@ -1,4 +1,4 @@
-package cn.lili.modules.message.util;
+package cn.lili.modules.wechat.util;
 
 import cn.hutool.http.HttpUtil;
 import cn.hutool.json.JSONObject;
@@ -12,18 +12,17 @@ import cn.lili.modules.connect.entity.Connect;
 import cn.lili.modules.connect.entity.enums.ConnectEnum;
 import cn.lili.modules.connect.service.ConnectService;
 import cn.lili.modules.member.entity.dto.ConnectQueryDTO;
-import cn.lili.modules.message.entity.dos.WechatMPMessage;
+import cn.lili.modules.wechat.entity.dos.WechatMPMessage;
-import cn.lili.modules.message.entity.dos.WechatMessage;
+import cn.lili.modules.wechat.entity.dos.WechatMessage;
-import cn.lili.modules.message.entity.enums.WechatMessageItemEnums;
+import cn.lili.modules.wechat.entity.enums.WechatMessageItemEnums;
-import cn.lili.modules.message.service.WechatMPMessageService;
+import cn.lili.modules.wechat.service.WechatMPMessageService;
-import cn.lili.modules.message.service.WechatMessageService;
+import cn.lili.modules.wechat.service.WechatMessageService;
 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.common.utils.HttpUtils;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;

framework/src/main/java/cn/lili/modules/wechat/util/WechatMpCodeUtil.java

@@ -1,4 +1,4 @@
-package cn.lili.modules.message.util;
+package cn.lili.modules.wechat.util;
 
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;

manager-api/src/main/java/cn/lili/controller/distribution/DistributionCashManagerController.java

@@ -1,4 +1,4 @@
-package cn.lili.controller.other.distribution;
+package cn.lili.controller.distribution;
 
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.ResultMessage;

manager-api/src/main/java/cn/lili/controller/distribution/DistributionGoodsManagerController.java

@@ -1,6 +1,5 @@
-package cn.lili.controller.other.distribution;
+package cn.lili.controller.distribution;
 
-import cn.lili.common.enums.ResultCode;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.modules.distribution.entity.dto.DistributionGoodsSearchParams;

manager-api/src/main/java/cn/lili/controller/distribution/DistributionManagerController.java

@@ -1,4 +1,4 @@
-package cn.lili.controller.other.distribution;
+package cn.lili.controller.distribution;
 
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;

manager-api/src/main/java/cn/lili/controller/distribution/DistributionOrderManagerController.java

@@ -1,4 +1,4 @@
-package cn.lili.controller.other.distribution;
+package cn.lili.controller.distribution;
 
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.ResultMessage;

manager-api/src/main/java/cn/lili/controller/message/ServiceNoticeManagerController.java

@@ -1,4 +1,4 @@
-package cn.lili.controller.setting;
+package cn.lili.controller.message;
 
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.PageVO;

manager-api/src/main/java/cn/lili/controller/order/AfterSaleManagerController.java

@@ -1,4 +1,4 @@
-package cn.lili.controller.trade;
+package cn.lili.controller.order;
 
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.ResultMessage;

manager-api/src/main/java/cn/lili/controller/order/AfterSaleReasonManagerController.java

@@ -1,4 +1,4 @@
-package cn.lili.controller.trade;
+package cn.lili.controller.order;
 
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.PageVO;

manager-api/src/main/java/cn/lili/controller/order/OrderComplaintManagerController.java

@@ -1,4 +1,4 @@
-package cn.lili.controller.trade;
+package cn.lili.controller.order;
 
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.security.AuthUser;

manager-api/src/main/java/cn/lili/controller/order/OrderLogManagerController.java

@@ -1,4 +1,4 @@
-package cn.lili.controller.trade;
+package cn.lili.controller.order;
 
 import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.enums.ResultUtil;

manager-api/src/main/java/cn/lili/controller/order/OrderManagerController.java

@@ -1,4 +1,4 @@
-package cn.lili.controller.trade;
+package cn.lili.controller.order;
 
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.ResultMessage;

manager-api/src/main/java/cn/lili/controller/order/PaymentLogManagerController.java

@@ -1,4 +1,4 @@
-package cn.lili.controller.trade;
+package cn.lili.controller.order;
 
 import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.enums.ResultUtil;

manager-api/src/main/java/cn/lili/controller/order/ReceiptManagerController.java

@@ -1,4 +1,4 @@
-package cn.lili.controller.trade;
+package cn.lili.controller.order;
 
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.PageVO;

manager-api/src/main/java/cn/lili/controller/order/RefundLogManagerController.java

@@ -1,4 +1,4 @@
-package cn.lili.controller.trade;
+package cn.lili.controller.order;
 
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.PageVO;

manager-api/src/main/java/cn/lili/controller/sms/SmsManagerController.java

@@ -1,10 +1,10 @@
-package cn.lili.controller.setting;
+package cn.lili.controller.sms;
 
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
-import cn.lili.modules.message.entity.dos.SmsReach;
+import cn.lili.modules.sms.entity.dos.SmsReach;
-import cn.lili.modules.message.service.SmsReachService;
+import cn.lili.modules.sms.service.SmsReachService;
 import cn.lili.mybatis.util.PageUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;

manager-api/src/main/java/cn/lili/controller/sms/SmsSignManagerController.java

@@ -1,10 +1,10 @@
-package cn.lili.controller.setting;
+package cn.lili.controller.sms;
 
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
-import cn.lili.modules.message.entity.dos.SmsSign;
+import cn.lili.modules.sms.entity.dos.SmsSign;
-import cn.lili.modules.message.service.SmsSignService;
+import cn.lili.modules.sms.service.SmsSignService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;

manager-api/src/main/java/cn/lili/controller/sms/SmsTemplateManagerController.java

@@ -1,10 +1,10 @@
-package cn.lili.controller.setting;
+package cn.lili.controller.sms;
 
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
-import cn.lili.modules.message.entity.dos.SmsTemplate;
+import cn.lili.modules.sms.entity.dos.SmsTemplate;
-import cn.lili.modules.message.service.SmsTemplateService;
+import cn.lili.modules.sms.service.SmsTemplateService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;

manager-api/src/main/java/cn/lili/controller/wallet/MemberWalletManagerController.java

@@ -1,4 +1,4 @@
-package cn.lili.controller.member;
+package cn.lili.controller.wallet;
 
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.ResultMessage;

manager-api/src/main/java/cn/lili/controller/wallet/MemberWithdrawApplyManagerController.java

@@ -1,4 +1,4 @@
-package cn.lili.controller.member;
+package cn.lili.controller.wallet;
 
 
 import cn.lili.common.enums.ResultUtil;

manager-api/src/main/java/cn/lili/controller/wallet/RechargeManagerController.java

@@ -1,4 +1,4 @@
-package cn.lili.controller.trade;
+package cn.lili.controller.wallet;
 
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.PageVO;

manager-api/src/main/java/cn/lili/controller/wallet/WalletLogManagerController.java

@@ -1,4 +1,4 @@
-package cn.lili.controller.trade;
+package cn.lili.controller.wallet;
 
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.PageVO;

manager-api/src/main/java/cn/lili/controller/wechat/WechatMPMessageManagerController.java

@@ -1,12 +1,12 @@
-package cn.lili.controller.setting;
+package cn.lili.controller.wechat;
 
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.common.vo.SearchVO;
-import cn.lili.modules.message.entity.dos.WechatMPMessage;
+import cn.lili.modules.wechat.entity.dos.WechatMPMessage;
-import cn.lili.modules.message.service.WechatMPMessageService;
+import cn.lili.modules.wechat.service.WechatMPMessageService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

manager-api/src/main/java/cn/lili/controller/wechat/WechatMessageManageController.java

@@ -1,11 +1,11 @@
-package cn.lili.controller.setting;
+package cn.lili.controller.wechat;
 
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
-import cn.lili.modules.message.entity.dos.WechatMessage;
+import cn.lili.modules.wechat.entity.dos.WechatMessage;
-import cn.lili.modules.message.service.WechatMessageService;
+import cn.lili.modules.wechat.service.WechatMessageService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

seller-api/src/main/java/cn/lili/controller/distribution/DistributionGoodsStoreController.java

@@ -1,4 +1,4 @@
-package cn.lili.controller.other.distribution;
+package cn.lili.controller.distribution;
 
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.security.context.UserContext;

seller-api/src/main/java/cn/lili/controller/distribution/DistributionOrderStoreController.java

@@ -1,4 +1,4 @@
-package cn.lili.controller.other.distribution;
+package cn.lili.controller.distribution;
 
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.security.context.UserContext;

seller-api/src/main/java/cn/lili/controller/member/BillStoreController.java

@@ -1,4 +1,4 @@
-package cn.lili.controller.trade;
+package cn.lili.controller.member;
 
 import cn.lili.common.context.ThreadContextHolder;
 import cn.lili.common.enums.ResultUtil;

seller-api/src/main/java/cn/lili/controller/member/MemberEvaluationStoreController.java

@@ -1,4 +1,4 @@
-package cn.lili.controller.trade;
+package cn.lili.controller.member;
 
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.security.context.UserContext;

seller-api/src/main/java/cn/lili/controller/order/AfterSaleStoreController.java

@@ -1,4 +1,4 @@
-package cn.lili.controller.trade;
+package cn.lili.controller.order;
 
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.security.context.UserContext;

seller-api/src/main/java/cn/lili/controller/order/OrderComplaintStoreController.java

@@ -1,4 +1,4 @@
-package cn.lili.controller.trade;
+package cn.lili.controller.order;
 
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.security.AuthUser;

seller-api/src/main/java/cn/lili/controller/order/OrderLogStoreController.java

@@ -1,4 +1,4 @@
-package cn.lili.controller.trade;
+package cn.lili.controller.order;
 
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.ResultMessage;

seller-api/src/main/java/cn/lili/controller/order/OrderStoreController.java

@@ -1,4 +1,4 @@
-package cn.lili.controller.trade;
+package cn.lili.controller.order;
 
 import cn.lili.common.context.ThreadContextHolder;
 import cn.lili.common.enums.ResultCode;
@@ -12,7 +12,7 @@ import cn.lili.modules.order.order.entity.vo.OrderDetailVO;
 import cn.lili.modules.order.order.entity.vo.OrderSimpleVO;
 import cn.lili.modules.order.order.service.OrderPriceService;
 import cn.lili.modules.order.order.service.OrderService;
-import cn.lili.modules.system.service.StoreLogisticsService;
+import cn.lili.modules.member.service.StoreLogisticsService;
 import cn.lili.common.security.OperationalJudgment;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;

seller-api/src/main/java/cn/lili/controller/order/ReceiptStoreController.java

@@ -1,4 +1,4 @@
-package cn.lili.controller.trade;
+package cn.lili.controller.order;
 
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.security.context.UserContext;

seller-api/src/main/java/cn/lili/controller/settings/LogisticsStoreController.java

@@ -6,7 +6,7 @@ import cn.lili.common.security.context.UserContext;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.modules.store.entity.dos.StoreLogistics;
 import cn.lili.modules.system.entity.vo.StoreLogisticsVO;
-import cn.lili.modules.system.service.StoreLogisticsService;
+import cn.lili.modules.member.service.StoreLogisticsService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;