项目结构修改为manager和H5两大模块

ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java

@@ -1,8 +1,14 @@
 package com.ruoyi.web.controller.common;
 
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.cyl.manager.ums.domain.Address;
+import com.cyl.manager.ums.mapper.AddressMapper;
+import com.cyl.manager.ums.pojo.dto.AddressDTO;
 import com.ruoyi.common.config.RuoYiConfig;
 import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.redis.RedisService;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.file.FileUploadUtils;
 import com.ruoyi.common.utils.file.FileUtils;
@@ -19,6 +25,8 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 通用请求处理
@@ -33,6 +41,12 @@ public class CommonController
     @Autowired
     private ServerConfig serverConfig;
 
+    @Autowired
+    private RedisService redisService;
+
+    @Autowired
+    private AddressMapper addressMapper;
+
     /**
      * 通用下载请求
      * 
@@ -117,4 +131,50 @@ public class CommonController
             log.error("下载文件失败", e);
         }
     }
+
+    @GetMapping("/common/area")
+    public AjaxResult getAddressList() {
+        String addresses = redisService.getAddressList();
+        if (org.apache.commons.lang3.StringUtils.isNotEmpty(addresses)) {
+            return AjaxResult.success(JSON.parseArray(addresses, AddressDTO.class));
+        }
+        QueryWrapper<Address> addressQueryWrapper = new QueryWrapper<>();
+        addressQueryWrapper.in("level", Arrays.asList(0,1,2));
+        List<Address> addressList = addressMapper.selectList(addressQueryWrapper);
+        Map<Long, List<Address>> cityMap = addressList.stream().filter(it -> it.getLevel() == 1).collect(Collectors.groupingBy(it -> it.getParentCode()));
+        Map<Long, List<Address>> districtMap = addressList.stream().filter(it -> it.getLevel() == 2).collect(Collectors.groupingBy(it -> it.getParentCode()));
+        List<AddressDTO> result = new ArrayList<>();
+        addressList.stream().filter(it -> it.getLevel() == 0).forEach(it -> {
+            AddressDTO dto = new AddressDTO();
+            dto.setId(it.getCode());
+            dto.setLevel("province");
+            dto.setName(it.getName());
+            dto.setPid(0L);
+            //获取城市列表
+            List<AddressDTO> child = new ArrayList<>();
+            if (cityMap.containsKey(it.getCode())) {
+                cityMap.get(it.getCode()).forEach(city -> {
+                    AddressDTO cityDto = new AddressDTO();
+                    cityDto.setId(city.getCode());
+                    cityDto.setLevel("city");
+                    cityDto.setName(city.getName());
+                    cityDto.setPid(city.getParentCode());
+                    cityDto.setChildren(districtMap.containsKey(city.getCode()) ?
+                            districtMap.get(city.getCode()).stream().map(district -> {
+                                AddressDTO districtDto = new AddressDTO();
+                                districtDto.setId(district.getCode());
+                                districtDto.setLevel("district");
+                                districtDto.setName(district.getName());
+                                districtDto.setPid(district.getParentCode());
+                                return districtDto;
+                            }).collect(Collectors.toList()) : Collections.EMPTY_LIST);
+                    child.add(cityDto);
+                });
+            }
+            dto.setChildren(child);
+            result.add(dto);
+        });
+        redisService.setAddressList(JSON.toJSONString(result));
+        return AjaxResult.success(result);
+    }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/core/config/H5MemberInterceptor.java

@@ -1,7 +1,7 @@
 package com.ruoyi.web.core.config;
 
-import com.cyl.ums.domain.Member;
+import com.cyl.manager.ums.domain.Member;
-import com.cyl.ums.service.MemberService;
+import com.cyl.manager.ums.service.MemberService;
 import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.constant.HttpStatus;
 import com.ruoyi.common.core.domain.model.LoginMember;

ruoyi-admin/src/main/resources/logback.xml

@@ -67,9 +67,9 @@
 	<logger name="com.ruoyi" level="info" />
 	<!-- Spring日志级别控制  -->
 	<logger name="org.springframework" level="warn" />
-    <logger name="com.cyl.pms.mapper" level="debug" />
+    <logger name="com.cyl.manager.pms.mapper" level="debug" />
-    <logger name="com.cyl.ums.mapper" level="debug" />
+    <logger name="com.cyl.manager.ums.mapper" level="debug" />
-    <logger name="com.cyl.oms.mapper" level="debug" />
+    <logger name="com.cyl.manager.oms.mapper" level="debug" />
     <logger name="com.ruoyi.framework.aspectj.LoggingAspect" level="info" />
     <root level="info">
 		<appender-ref ref="console" />

ruoyi-admin/src/test/java/com/fjp/lc/test/service/ServiceTest.java

@@ -1,15 +1,18 @@
 package com.fjp.lc.test.service;
 
-import com.cyl.ums.service.MemberCartService;
+import cn.hutool.core.util.CharsetUtil;
+import cn.hutool.crypto.SecureUtil;
+import cn.hutool.crypto.symmetric.AES;
+import com.cyl.manager.ums.service.MemberCartService;
 import com.ruoyi.RuoYiApplication;
 import com.ruoyi.common.config.properties.SmsProperties;
 import com.ruoyi.common.core.sms.AliyunSmsTemplate;
 import com.ruoyi.common.core.sms.SmsTemplate;
-import com.ruoyi.common.utils.spring.SpringUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit4.SpringRunner;
@@ -28,11 +31,13 @@ public class ServiceTest {
     @Autowired
     private SmsProperties smsProperties;
 
+    @Value("${aes.key}")
+    private String key;
+
     @Test
     public void test1() {
         memberCartService.mineCartNum();
     }
-
     @Test
     public void test2(){
         System.out.println(smsProperties);
@@ -45,4 +50,16 @@ public class ServiceTest {
         Object send = smsTemplate.send("15706259078", "SMS_146125046", map);
         log.info("短信发送结果：" + send);
     }
+
+    @Test
+    public void test3(){
+        String content = "test中文";
+        AES aes = SecureUtil.aes(key.getBytes());
+        byte[] encrypt = aes.encrypt(content);
+        byte[] decrypt = aes.decrypt(encrypt);
+        String encryptHex = aes.encryptHex(content);
+        System.out.println("加密后16进制：" + encryptHex);
+        String decryptStr = aes.decryptStr(encryptHex, CharsetUtil.CHARSET_UTF_8);
+        System.out.println("解密：" + decryptStr);
+    }
 }

ruoyi-admin/src/test/java/com/fjp/lc/test/service/WechatTest.java

@@ -1,7 +1,7 @@
 package com.fjp.lc.test.service;
 
 import com.cyl.h5.pojo.vo.form.WechatLoginForm;
-import com.cyl.ums.service.MemberWechatService;
+import com.cyl.manager.ums.service.MemberWechatService;
 import com.ruoyi.RuoYiApplication;
 import org.junit.Test;
 import org.junit.runner.RunWith;

ruoyi-common/src/main/java/com/ruoyi/common/utils/ResponseUtils.java

@@ -0,0 +1,26 @@
+package com.ruoyi.common.utils;
+
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.util.MultiValueMap;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ResponseUtils {
+
+    private static final String MESSAGE = "msg";
+    private static final String CODE = "code";
+    private static final String DATA = "data";
+
+    private ResponseUtils(){}
+
+    private static ResponseEntity<Object> getEntity(Object body, HttpStatus statusCode){
+        MultiValueMap<String, String> headers = new HttpHeaders();
+        List<String> contentType = new ArrayList<String>();
+        contentType.add("application/json;charset=utf-8");
+        headers.put("Content-Type", contentType);
+        return new ResponseEntity<Object>(body, headers, statusCode);
+    }
+}

ruoyi-generator/src/test/resources/application.yml

@@ -27,7 +27,7 @@ gen:
   # 作者
   author: zcc
   # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool
-  packageName: com.cyl.pms
+  packageName: com.cyl.manager.pms
   # 自动去除表前缀，默认是false
   autoRemovePre: true
   # 表前缀（生成类名不会包含表前缀，多个用逗号分隔）

ruoyi-mall/src/main/java/com/cyl/h5/config/SecurityUtil.java

@@ -1,7 +1,6 @@
 package com.cyl.h5.config;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.cyl.manager.ums.domain.Member;
-import com.cyl.ums.domain.Member;
 import com.ruoyi.common.constant.Constants;
 import com.ruoyi.framework.config.LocalDataUtil;
 import org.springframework.stereotype.Service;

ruoyi-mall/src/main/java/com/cyl/h5/controller/CartController.java

@@ -1,25 +1,18 @@
 package com.cyl.h5.controller;
 
-import com.cyl.pms.pojo.dto.MemberCartDTO;
+import com.cyl.manager.ums.convert.MemberCartConvert;
-import com.cyl.ums.convert.MemberCartConvert;
+import com.cyl.manager.ums.domain.Member;
-import com.cyl.ums.domain.Member;
+import com.cyl.manager.ums.domain.MemberCart;
-import com.cyl.ums.domain.MemberCart;
+import com.cyl.manager.ums.pojo.query.MemberCartQuery;
-import com.cyl.ums.pojo.query.MemberCartQuery;
+import com.cyl.manager.ums.pojo.vo.MemberCartVO;
-import com.cyl.ums.pojo.vo.MemberCartVO;
+import com.cyl.manager.ums.service.MemberCartService;
-import com.cyl.ums.pojo.vo.form.AddMemberCartForm;
-import com.cyl.ums.pojo.vo.form.UpdateMemberCartForm;
-import com.cyl.ums.service.MemberCartService;
 import com.ruoyi.common.constant.Constants;
 import com.ruoyi.framework.config.LocalDataUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageImpl;
-import org.springframework.data.domain.Pageable;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
-import java.util.ArrayList;
 import java.util.List;
 
 @RestController

ruoyi-mall/src/main/java/com/cyl/h5/controller/CategoryController.java

@@ -1,7 +1,7 @@
 package com.cyl.h5.controller;
 
-import com.cyl.pms.domain.ProductCategory;
+import com.cyl.manager.pms.domain.ProductCategory;
-import com.cyl.pms.service.ProductCategoryService;
+import com.cyl.manager.pms.service.ProductCategoryService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;

ruoyi-mall/src/main/java/com/cyl/h5/controller/H5CommonController.java

@@ -2,9 +2,9 @@ package com.cyl.h5.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.cyl.ums.domain.Address;
+import com.cyl.manager.ums.domain.Address;
-import com.cyl.ums.mapper.AddressMapper;
+import com.cyl.manager.ums.mapper.AddressMapper;
-import com.cyl.ums.pojo.dto.AddressDTO;
+import com.cyl.manager.ums.pojo.dto.AddressDTO;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.redis.RedisService;
 import com.ruoyi.common.utils.OssUtils;

ruoyi-mall/src/main/java/com/cyl/h5/controller/H5MemberAddressController.java

@@ -1,10 +1,8 @@
 package com.cyl.h5.controller;
 
 import com.cyl.h5.service.H5MemberAddressService;
-import com.cyl.ums.domain.MemberAddress;
+import com.cyl.manager.ums.pojo.dto.MemberAddressDTO;
-import com.cyl.ums.pojo.dto.MemberAddressDTO;
+import com.cyl.manager.ums.pojo.vo.MemberAddressVO;
-import com.cyl.ums.pojo.vo.MemberAddressVO;
-import com.ruoyi.common.core.domain.AjaxResult;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;

ruoyi-mall/src/main/java/com/cyl/h5/controller/H5MemberController.java

@@ -5,7 +5,7 @@ import com.cyl.h5.pojo.response.RegisterResponse;
 import com.cyl.h5.pojo.response.ValidatePhoneResponse;
 import com.cyl.h5.pojo.response.H5LoginResponse;
 import com.cyl.h5.service.H5MemberService;
-import com.cyl.ums.pojo.vo.MemberVO;
+import com.cyl.manager.ums.pojo.vo.MemberVO;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;

ruoyi-mall/src/main/java/com/cyl/h5/controller/H5OrderController.java

@@ -4,9 +4,9 @@ import com.cyl.h5.pojo.dto.OrderCreateDTO;
 import com.cyl.h5.pojo.vo.OrderCalcVO;
 import com.cyl.h5.pojo.vo.form.OrderSubmitForm;
 import com.cyl.h5.pojo.vo.query.OrderH5Query;
-import com.cyl.oms.pojo.vo.OrderVO;
+import com.cyl.manager.oms.pojo.vo.OrderVO;
-import com.cyl.oms.service.OrderService;
+import com.cyl.manager.oms.service.OrderService;
-import com.cyl.ums.domain.Member;
+import com.cyl.manager.ums.domain.Member;
 import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.core.redis.RedisService;
 import com.ruoyi.framework.config.LocalDataUtil;
@@ -21,8 +21,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.List;
-
 @RestController
 @RequestMapping("/h5/order")
 @Slf4j

ruoyi-mall/src/main/java/com/cyl/h5/controller/H5ProductController.java

@@ -2,10 +2,10 @@ package com.cyl.h5.controller;
 
 import com.cyl.h5.pojo.dto.ProductDTO;
 import com.cyl.h5.pojo.vo.ProductDetail;
-import com.cyl.pms.convert.ProductConvert;
+import com.cyl.manager.pms.convert.ProductConvert;
-import com.cyl.pms.domain.Product;
+import com.cyl.manager.pms.domain.Product;
-import com.cyl.pms.pojo.query.ProductQuery;
+import com.cyl.manager.pms.pojo.query.ProductQuery;
-import com.cyl.pms.service.ProductService;
+import com.cyl.manager.pms.service.ProductService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;

ruoyi-mall/src/main/java/com/cyl/h5/controller/HomeController.java

@@ -1,7 +1,7 @@
 package com.cyl.h5.controller;
 
 import com.cyl.h5.pojo.vo.HomeConfigVO;
-import com.cyl.pms.service.ProductCategoryService;
+import com.cyl.manager.pms.service.ProductCategoryService;
 import com.ruoyi.system.service.ISysConfigService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;

ruoyi-mall/src/main/java/com/cyl/h5/controller/UserController.java

@@ -1,8 +1,8 @@
 package com.cyl.h5.controller;
 
-import com.cyl.ums.domain.MemberAddress;
+import com.cyl.manager.ums.domain.MemberAddress;
-import com.cyl.ums.pojo.query.MemberAddressQuery;
+import com.cyl.manager.ums.pojo.query.MemberAddressQuery;
-import com.cyl.ums.service.MemberAddressService;
+import com.cyl.manager.ums.service.MemberAddressService;
 import com.ruoyi.common.utils.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;

ruoyi-mall/src/main/java/com/cyl/h5/controller/WechatController.java

@@ -2,7 +2,7 @@ package com.cyl.h5.controller;
 
 import com.cyl.external.WechatUtil;
 import com.cyl.h5.pojo.vo.form.WechatLoginForm;
-import com.cyl.ums.service.MemberWechatService;
+import com.cyl.manager.ums.service.MemberWechatService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;

ruoyi-mall/src/main/java/com/cyl/h5/pojo/dto/OrderProductListDTO.java

@@ -1,7 +1,7 @@
  package com.cyl.h5.pojo.dto;
 
- import com.cyl.pms.domain.Product;
+ import com.cyl.manager.pms.domain.Product;
- import com.cyl.pms.domain.Sku;
+ import com.cyl.manager.pms.domain.Sku;
  import io.swagger.annotations.ApiModel;
  import io.swagger.annotations.ApiModelProperty;
  import lombok.Data;

ruoyi-mall/src/main/java/com/cyl/h5/pojo/vo/OrderCalcVO.java

@@ -1,6 +1,5 @@
 package com.cyl.h5.pojo.vo;
 
-import com.cyl.pms.pojo.vo.SkuVO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

ruoyi-mall/src/main/java/com/cyl/h5/pojo/vo/ProductDetail.java

@@ -1,8 +1,8 @@
 package com.cyl.h5.pojo.vo;
 
-import com.cyl.pms.domain.Brand;
+import com.cyl.manager.pms.domain.Brand;
-import com.cyl.pms.domain.Product;
+import com.cyl.manager.pms.domain.Product;
-import com.cyl.pms.domain.Sku;
+import com.cyl.manager.pms.domain.Sku;
 import lombok.Data;
 
 import java.util.List;

ruoyi-mall/src/main/java/com/cyl/h5/service/H5MemberAddressService.java

@@ -1,11 +1,11 @@
 package com.cyl.h5.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.cyl.ums.domain.Member;
+import com.cyl.manager.ums.domain.Member;
-import com.cyl.ums.domain.MemberAddress;
+import com.cyl.manager.ums.domain.MemberAddress;
-import com.cyl.ums.mapper.MemberAddressMapper;
+import com.cyl.manager.ums.mapper.MemberAddressMapper;
-import com.cyl.ums.pojo.dto.MemberAddressDTO;
+import com.cyl.manager.ums.pojo.dto.MemberAddressDTO;
-import com.cyl.ums.pojo.vo.MemberAddressVO;
+import com.cyl.manager.ums.pojo.vo.MemberAddressVO;
 import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.utils.AesCryptoUtils;
 import com.ruoyi.common.utils.PhoneUtils;
@@ -18,7 +18,6 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import java.time.LocalDateTime;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;

ruoyi-mall/src/main/java/com/cyl/h5/service/H5MemberService.java

@@ -9,9 +9,9 @@ import com.cyl.h5.pojo.request.RegisterRequest;
 import com.cyl.h5.pojo.response.RegisterResponse;
 import com.cyl.h5.pojo.response.ValidatePhoneResponse;
 import com.cyl.h5.pojo.response.H5LoginResponse;
-import com.cyl.ums.domain.Member;
+import com.cyl.manager.ums.domain.Member;
-import com.cyl.ums.mapper.MemberMapper;
+import com.cyl.manager.ums.mapper.MemberMapper;
-import com.cyl.ums.pojo.vo.MemberVO;
+import com.cyl.manager.ums.pojo.vo.MemberVO;
 import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.core.domain.model.LoginMember;
 import com.ruoyi.common.core.redis.RedisCache;

ruoyi-mall/src/main/java/com/cyl/manager/oms/controller/AftersaleController.java

@@ -1,4 +1,4 @@
-package com.cyl.oms.controller;
+package com.cyl.manager.oms.controller;
 
 import java.util.List;
 
@@ -21,11 +21,11 @@ import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.enums.BusinessType;
-import com.cyl.oms.convert.AftersaleConvert;
+import com.cyl.manager.oms.convert.AftersaleConvert;
-import com.cyl.oms.domain.Aftersale;
+import com.cyl.manager.oms.domain.Aftersale;
-import com.cyl.oms.pojo.query.AftersaleQuery;
+import com.cyl.manager.oms.pojo.query.AftersaleQuery;
-import com.cyl.oms.service.AftersaleService;
+import com.cyl.manager.oms.service.AftersaleService;
-import com.cyl.oms.pojo.vo.AftersaleVO;
+import com.cyl.manager.oms.pojo.vo.AftersaleVO;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 /**
  * 订单售后Controller

ruoyi-mall/src/main/java/com/cyl/manager/oms/controller/AftersaleItemController.java

@@ -1,4 +1,4 @@
-package com.cyl.oms.controller;
+package com.cyl.manager.oms.controller;
 
 import java.util.List;
 
@@ -21,11 +21,11 @@ import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.enums.BusinessType;
-import com.cyl.oms.convert.AftersaleItemConvert;
+import com.cyl.manager.oms.convert.AftersaleItemConvert;
-import com.cyl.oms.domain.AftersaleItem;
+import com.cyl.manager.oms.domain.AftersaleItem;
-import com.cyl.oms.pojo.query.AftersaleItemQuery;
+import com.cyl.manager.oms.pojo.query.AftersaleItemQuery;
-import com.cyl.oms.service.AftersaleItemService;
+import com.cyl.manager.oms.service.AftersaleItemService;
-import com.cyl.oms.pojo.vo.AftersaleItemVO;
+import com.cyl.manager.oms.pojo.vo.AftersaleItemVO;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 /**
  * 订单售后Controller

ruoyi-mall/src/main/java/com/cyl/manager/oms/controller/OrderController.java

@@ -1,4 +1,4 @@
-package com.cyl.oms.controller;
+package com.cyl.manager.oms.controller;
 
 import java.util.List;
 
@@ -21,11 +21,11 @@ import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.enums.BusinessType;
-import com.cyl.oms.convert.OrderConvert;
+import com.cyl.manager.oms.convert.OrderConvert;
-import com.cyl.oms.domain.Order;
+import com.cyl.manager.oms.domain.Order;
-import com.cyl.oms.pojo.query.OrderQuery;
+import com.cyl.manager.oms.pojo.query.OrderQuery;
-import com.cyl.oms.service.OrderService;
+import com.cyl.manager.oms.service.OrderService;
-import com.cyl.oms.pojo.vo.OrderVO;
+import com.cyl.manager.oms.pojo.vo.OrderVO;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 /**
  * 订单表Controller

ruoyi-mall/src/main/java/com/cyl/manager/oms/controller/OrderDeliveryHistoryController.java

@@ -1,4 +1,4 @@
-package com.cyl.oms.controller;
+package com.cyl.manager.oms.controller;
 
 import java.util.List;
 
@@ -21,11 +21,11 @@ import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.enums.BusinessType;
-import com.cyl.oms.convert.OrderDeliveryHistoryConvert;
+import com.cyl.manager.oms.convert.OrderDeliveryHistoryConvert;
-import com.cyl.oms.domain.OrderDeliveryHistory;
+import com.cyl.manager.oms.domain.OrderDeliveryHistory;
-import com.cyl.oms.pojo.query.OrderDeliveryHistoryQuery;
+import com.cyl.manager.oms.pojo.query.OrderDeliveryHistoryQuery;
-import com.cyl.oms.service.OrderDeliveryHistoryService;
+import com.cyl.manager.oms.service.OrderDeliveryHistoryService;
-import com.cyl.oms.pojo.vo.OrderDeliveryHistoryVO;
+import com.cyl.manager.oms.pojo.vo.OrderDeliveryHistoryVO;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 /**
  * 订单发货记录Controller

ruoyi-mall/src/main/java/com/cyl/manager/oms/controller/OrderItemController.java

@@ -1,4 +1,4 @@
-package com.cyl.oms.controller;
+package com.cyl.manager.oms.controller;
 
 import java.util.List;
 
@@ -21,11 +21,11 @@ import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.enums.BusinessType;
-import com.cyl.oms.convert.OrderItemConvert;
+import com.cyl.manager.oms.convert.OrderItemConvert;
-import com.cyl.oms.domain.OrderItem;
+import com.cyl.manager.oms.domain.OrderItem;
-import com.cyl.oms.pojo.query.OrderItemQuery;
+import com.cyl.manager.oms.pojo.query.OrderItemQuery;
-import com.cyl.oms.service.OrderItemService;
+import com.cyl.manager.oms.service.OrderItemService;
-import com.cyl.oms.pojo.vo.OrderItemVO;
+import com.cyl.manager.oms.pojo.vo.OrderItemVO;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 /**
  * 订单中所包含的商品Controller

ruoyi-mall/src/main/java/com/cyl/manager/oms/controller/OrderOperateHistoryController.java

@@ -1,4 +1,4 @@
-package com.cyl.oms.controller;
+package com.cyl.manager.oms.controller;
 
 import java.util.List;
 
@@ -21,11 +21,11 @@ import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.enums.BusinessType;
-import com.cyl.oms.convert.OrderOperateHistoryConvert;
+import com.cyl.manager.oms.convert.OrderOperateHistoryConvert;
-import com.cyl.oms.domain.OrderOperateHistory;
+import com.cyl.manager.oms.domain.OrderOperateHistory;
-import com.cyl.oms.pojo.query.OrderOperateHistoryQuery;
+import com.cyl.manager.oms.pojo.query.OrderOperateHistoryQuery;
-import com.cyl.oms.service.OrderOperateHistoryService;
+import com.cyl.manager.oms.service.OrderOperateHistoryService;
-import com.cyl.oms.pojo.vo.OrderOperateHistoryVO;
+import com.cyl.manager.oms.pojo.vo.OrderOperateHistoryVO;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 /**
  * 订单操作历史记录Controller

ruoyi-mall/src/main/java/com/cyl/manager/oms/convert/AftersaleConvert.java

@@ -1,8 +1,8 @@
-package com.cyl.oms.convert;
+package com.cyl.manager.oms.convert;
 
 import org.mapstruct.Mapper;
-import com.cyl.oms.domain.Aftersale;
+import com.cyl.manager.oms.domain.Aftersale;
-import com.cyl.oms.pojo.vo.AftersaleVO;
+import com.cyl.manager.oms.pojo.vo.AftersaleVO;
 import java.util.List;
 /**
  * 订单售后  DO <=> DTO <=> VO / BO / Query

ruoyi-mall/src/main/java/com/cyl/manager/oms/convert/AftersaleItemConvert.java

@@ -1,8 +1,8 @@
-package com.cyl.oms.convert;
+package com.cyl.manager.oms.convert;
 
 import org.mapstruct.Mapper;
-import com.cyl.oms.domain.AftersaleItem;
+import com.cyl.manager.oms.domain.AftersaleItem;
-import com.cyl.oms.pojo.vo.AftersaleItemVO;
+import com.cyl.manager.oms.pojo.vo.AftersaleItemVO;
 import java.util.List;
 /**
  * 订单售后  DO <=> DTO <=> VO / BO / Query

ruoyi-mall/src/main/java/com/cyl/manager/oms/convert/OrderConvert.java

@@ -1,8 +1,8 @@
-package com.cyl.oms.convert;
+package com.cyl.manager.oms.convert;
 
 import org.mapstruct.Mapper;
-import com.cyl.oms.domain.Order;
+import com.cyl.manager.oms.domain.Order;
-import com.cyl.oms.pojo.vo.OrderVO;
+import com.cyl.manager.oms.pojo.vo.OrderVO;
 import java.util.List;
 /**
  * 订单表  DO <=> DTO <=> VO / BO / Query

ruoyi-mall/src/main/java/com/cyl/manager/oms/convert/OrderDeliveryHistoryConvert.java

@@ -1,8 +1,8 @@
-package com.cyl.oms.convert;
+package com.cyl.manager.oms.convert;
 
 import org.mapstruct.Mapper;
-import com.cyl.oms.domain.OrderDeliveryHistory;
+import com.cyl.manager.oms.domain.OrderDeliveryHistory;
-import com.cyl.oms.pojo.vo.OrderDeliveryHistoryVO;
+import com.cyl.manager.oms.pojo.vo.OrderDeliveryHistoryVO;
 import java.util.List;
 /**
  * 订单发货记录  DO <=> DTO <=> VO / BO / Query

ruoyi-mall/src/main/java/com/cyl/manager/oms/convert/OrderItemConvert.java

@@ -1,8 +1,8 @@
-package com.cyl.oms.convert;
+package com.cyl.manager.oms.convert;
 
 import org.mapstruct.Mapper;
-import com.cyl.oms.domain.OrderItem;
+import com.cyl.manager.oms.domain.OrderItem;
-import com.cyl.oms.pojo.vo.OrderItemVO;
+import com.cyl.manager.oms.pojo.vo.OrderItemVO;
 import java.util.List;
 /**
  * 订单中所包含的商品  DO <=> DTO <=> VO / BO / Query

ruoyi-mall/src/main/java/com/cyl/manager/oms/convert/OrderOperateHistoryConvert.java

@@ -1,8 +1,8 @@
-package com.cyl.oms.convert;
+package com.cyl.manager.oms.convert;
 
 import org.mapstruct.Mapper;
-import com.cyl.oms.domain.OrderOperateHistory;
+import com.cyl.manager.oms.domain.OrderOperateHistory;
-import com.cyl.oms.pojo.vo.OrderOperateHistoryVO;
+import com.cyl.manager.oms.pojo.vo.OrderOperateHistoryVO;
 import java.util.List;
 /**
  * 订单操作历史记录  DO <=> DTO <=> VO / BO / Query

ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/Aftersale.java

@@ -1,4 +1,4 @@
-package com.cyl.oms.domain;
+package com.cyl.manager.oms.domain;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;

ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/AftersaleItem.java

@@ -1,4 +1,4 @@
-package com.cyl.oms.domain;
+package com.cyl.manager.oms.domain;
 
 import java.math.BigDecimal;
 import com.ruoyi.common.annotation.Excel;

ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/Order.java

@@ -1,4 +1,4 @@
-package com.cyl.oms.domain;
+package com.cyl.manager.oms.domain;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;

ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/OrderDeliveryHistory.java

@@ -1,4 +1,4 @@
-package com.cyl.oms.domain;
+package com.cyl.manager.oms.domain;
 
 import com.ruoyi.common.annotation.Excel;
 import io.swagger.annotations.ApiModel;

ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/OrderItem.java

@@ -1,4 +1,4 @@
-package com.cyl.oms.domain;
+package com.cyl.manager.oms.domain;
 
 import java.math.BigDecimal;
 

ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/OrderOperateHistory.java

@@ -1,4 +1,4 @@
-package com.cyl.oms.domain;
+package com.cyl.manager.oms.domain;
 
 import com.ruoyi.common.annotation.Excel;
 import io.swagger.annotations.ApiModel;

ruoyi-mall/src/main/java/com/cyl/manager/oms/mapper/AftersaleItemMapper.java

@@ -1,9 +1,8 @@
-package com.cyl.oms.mapper;
+package com.cyl.manager.oms.mapper;
 
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
+import com.cyl.manager.oms.domain.AftersaleItem;
-import com.cyl.oms.domain.AftersaleItem;
 
 /**
  * 订单售后Mapper接口

ruoyi-mall/src/main/java/com/cyl/manager/oms/mapper/AftersaleMapper.java

@@ -1,9 +1,8 @@
-package com.cyl.oms.mapper;
+package com.cyl.manager.oms.mapper;
 
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
+import com.cyl.manager.oms.domain.Aftersale;
-import com.cyl.oms.domain.Aftersale;
 
 /**
  * 订单售后Mapper接口

ruoyi-mall/src/main/java/com/cyl/manager/oms/mapper/OrderDeliveryHistoryMapper.java

@@ -1,9 +1,8 @@
-package com.cyl.oms.mapper;
+package com.cyl.manager.oms.mapper;
 
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
+import com.cyl.manager.oms.domain.OrderDeliveryHistory;
-import com.cyl.oms.domain.OrderDeliveryHistory;
 
 /**
  * 订单发货记录Mapper接口

ruoyi-mall/src/main/java/com/cyl/manager/oms/mapper/OrderItemMapper.java

@@ -1,9 +1,8 @@
-package com.cyl.oms.mapper;
+package com.cyl.manager.oms.mapper;
 
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
+import com.cyl.manager.oms.domain.OrderItem;
-import com.cyl.oms.domain.OrderItem;
 
 /**
  * 订单中所包含的商品Mapper接口

ruoyi-mall/src/main/java/com/cyl/manager/oms/mapper/OrderMapper.java

@@ -1,9 +1,8 @@
-package com.cyl.oms.mapper;
+package com.cyl.manager.oms.mapper;
 
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
+import com.cyl.manager.oms.domain.Order;
-import com.cyl.oms.domain.Order;
 
 /**
  * 订单表Mapper接口

ruoyi-mall/src/main/java/com/cyl/manager/oms/mapper/OrderOperateHistoryMapper.java

@@ -1,9 +1,8 @@
-package com.cyl.oms.mapper;
+package com.cyl.manager.oms.mapper;
 
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
+import com.cyl.manager.oms.domain.OrderOperateHistory;
-import com.cyl.oms.domain.OrderOperateHistory;
 
 /**
  * 订单操作历史记录Mapper接口

ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/dto/SaveOrderItemDTO.java

@@ -0,0 +1,4 @@
+package com.cyl.manager.oms.pojo.dto;
+
+public class SaveOrderItemDTO {
+}

ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/query/AftersaleItemQuery.java

@@ -1,4 +1,4 @@
-package com.cyl.oms.pojo.query;
+package com.cyl.manager.oms.pojo.query;
 
 import java.math.BigDecimal;
 import lombok.Data;

ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/query/AftersaleQuery.java

@@ -1,4 +1,4 @@
-package com.cyl.oms.pojo.query;
+package com.cyl.manager.oms.pojo.query;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;

ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/query/OrderDeliveryHistoryQuery.java

@@ -1,4 +1,4 @@
-package com.cyl.oms.pojo.query;
+package com.cyl.manager.oms.pojo.query;
 
 import lombok.Data;
 import io.swagger.annotations.ApiModel;

ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/query/OrderItemQuery.java

@@ -1,4 +1,4 @@
-package com.cyl.oms.pojo.query;
+package com.cyl.manager.oms.pojo.query;
 
 import java.math.BigDecimal;
 import lombok.Data;

ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/query/OrderOperateHistoryQuery.java

@@ -1,4 +1,4 @@
-package com.cyl.oms.pojo.query;
+package com.cyl.manager.oms.pojo.query;
 
 import lombok.Data;
 import io.swagger.annotations.ApiModel;

ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/query/OrderQuery.java

@@ -1,4 +1,4 @@
-package com.cyl.oms.pojo.query;
+package com.cyl.manager.oms.pojo.query;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
@@ -98,4 +98,9 @@ public class OrderQuery {
     @ApiModelProperty("确认收货时间 精确匹配")
     private LocalDateTime receiveTime;
 
+    @ApiModelProperty("创建订单开始时间")
+    private LocalDateTime startTime;
+
+    @ApiModelProperty("创建订单结束时间")
+    private LocalDateTime endTime;
 }

ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/vo/AftersaleItemVO.java

@@ -1,8 +1,7 @@
-package com.cyl.oms.pojo.vo;
+package com.cyl.manager.oms.pojo.vo;
 
 import java.math.BigDecimal;
 import com.ruoyi.common.annotation.Excel;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.domain.BaseAudit;
 import lombok.Data;
 /**

ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/vo/AftersaleVO.java

@@ -1,4 +1,4 @@
-package com.cyl.oms.pojo.vo;
+package com.cyl.manager.oms.pojo.vo;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;

ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/vo/OrderDeliveryHistoryVO.java

@@ -1,7 +1,6 @@
-package com.cyl.oms.pojo.vo;
+package com.cyl.manager.oms.pojo.vo;
 
 import com.ruoyi.common.annotation.Excel;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.domain.BaseAudit;
 import lombok.Data;
 /**

ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/vo/OrderItemVO.java

@@ -1,8 +1,7 @@
-package com.cyl.oms.pojo.vo;
+package com.cyl.manager.oms.pojo.vo;
 
 import java.math.BigDecimal;
 import com.ruoyi.common.annotation.Excel;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.domain.BaseAudit;
 import lombok.Data;
 /**

ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/vo/OrderOperateHistoryVO.java

@@ -1,7 +1,6 @@
-package com.cyl.oms.pojo.vo;
+package com.cyl.manager.oms.pojo.vo;
 
 import com.ruoyi.common.annotation.Excel;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.domain.BaseAudit;
 import lombok.Data;
 /**

ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/vo/OrderVO.java

@@ -1,11 +1,10 @@
-package com.cyl.oms.pojo.vo;
+package com.cyl.manager.oms.pojo.vo;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.List;
 
-import com.cyl.oms.domain.OrderItem;
+import com.cyl.manager.oms.domain.OrderItem;
-import com.cyl.pay.domain.PayOrder;
 import com.cyl.pay.pojo.vo.PayOrderVO;
 import com.ruoyi.common.annotation.Excel;
 import com.fasterxml.jackson.annotation.JsonFormat;

ruoyi-mall/src/main/java/com/cyl/manager/oms/service/AftersaleItemService.java

@@ -1,18 +1,16 @@
-package com.cyl.oms.service;
+package com.cyl.manager.oms.service;
 
 import java.math.BigDecimal;
-import java.util.Arrays;
 import java.util.List;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Pageable;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
-import com.cyl.oms.mapper.AftersaleItemMapper;
+import com.cyl.manager.oms.mapper.AftersaleItemMapper;
-import com.cyl.oms.domain.AftersaleItem;
+import com.cyl.manager.oms.domain.AftersaleItem;
-import com.cyl.oms.pojo.query.AftersaleItemQuery;
+import com.cyl.manager.oms.pojo.query.AftersaleItemQuery;
 
 /**
  * 订单售后Service业务层处理

ruoyi-mall/src/main/java/com/cyl/manager/oms/service/AftersaleService.java

@@ -1,19 +1,18 @@
-package com.cyl.oms.service;
+package com.cyl.manager.oms.service;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
-import java.util.Arrays;
 import java.util.List;
-import java.time.LocalDateTime;
+
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Pageable;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
-import com.cyl.oms.mapper.AftersaleMapper;
+import com.cyl.manager.oms.mapper.AftersaleMapper;
-import com.cyl.oms.domain.Aftersale;
+import com.cyl.manager.oms.domain.Aftersale;
-import com.cyl.oms.pojo.query.AftersaleQuery;
+import com.cyl.manager.oms.pojo.query.AftersaleQuery;
 
 /**
  * 订单售后Service业务层处理

ruoyi-mall/src/main/java/com/cyl/manager/oms/service/OrderDeliveryHistoryService.java

@@ -1,6 +1,5 @@
-package com.cyl.oms.service;
+package com.cyl.manager.oms.service;
 
-import java.util.Arrays;
 import java.util.List;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -9,9 +8,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Pageable;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
-import com.cyl.oms.mapper.OrderDeliveryHistoryMapper;
+import com.cyl.manager.oms.mapper.OrderDeliveryHistoryMapper;
-import com.cyl.oms.domain.OrderDeliveryHistory;
+import com.cyl.manager.oms.domain.OrderDeliveryHistory;
-import com.cyl.oms.pojo.query.OrderDeliveryHistoryQuery;
+import com.cyl.manager.oms.pojo.query.OrderDeliveryHistoryQuery;
 
 /**
  * 订单发货记录Service业务层处理

ruoyi-mall/src/main/java/com/cyl/manager/oms/service/OrderItemService.java

@@ -1,23 +1,22 @@
-package com.cyl.oms.service;
+package com.cyl.manager.oms.service;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.cyl.h5.pojo.dto.OrderProductListDTO;
-import com.cyl.ums.domain.Member;
+import com.cyl.manager.ums.domain.Member;
 import com.github.pagehelper.PageHelper;
 import com.ruoyi.common.utils.IDGenerator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Pageable;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
-import com.cyl.oms.mapper.OrderItemMapper;
+import com.cyl.manager.oms.mapper.OrderItemMapper;
-import com.cyl.oms.domain.OrderItem;
+import com.cyl.manager.oms.domain.OrderItem;
-import com.cyl.oms.pojo.query.OrderItemQuery;
+import com.cyl.manager.oms.pojo.query.OrderItemQuery;
 import org.springframework.transaction.annotation.Transactional;
 
 /**

ruoyi-mall/src/main/java/com/cyl/manager/oms/service/OrderOperateHistoryService.java

@@ -1,6 +1,5 @@
-package com.cyl.oms.service;
+package com.cyl.manager.oms.service;
 
-import java.util.Arrays;
 import java.util.List;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -9,9 +8,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Pageable;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
-import com.cyl.oms.mapper.OrderOperateHistoryMapper;
+import com.cyl.manager.oms.mapper.OrderOperateHistoryMapper;
-import com.cyl.oms.domain.OrderOperateHistory;
+import com.cyl.manager.oms.domain.OrderOperateHistory;
-import com.cyl.oms.pojo.query.OrderOperateHistoryQuery;
+import com.cyl.manager.oms.pojo.query.OrderOperateHistoryQuery;
 
 /**
  * 订单操作历史记录Service业务层处理

ruoyi-mall/src/main/java/com/cyl/manager/oms/service/OrderService.java

@@ -1,15 +1,12 @@
-package com.cyl.oms.service;
+package com.cyl.manager.oms.service;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.*;
-import java.time.LocalDateTime;
 import java.util.stream.Collectors;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.util.StrUtil;
-import cn.hutool.crypto.SecureUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -21,47 +18,38 @@ import com.cyl.h5.pojo.vo.OrderCalcVO;
 import com.cyl.h5.pojo.vo.SkuViewDTO;
 import com.cyl.h5.pojo.vo.form.OrderSubmitForm;
 import com.cyl.h5.pojo.vo.query.OrderH5Query;
-import com.cyl.oms.convert.OrderConvert;
+import com.cyl.manager.oms.convert.OrderConvert;
-import com.cyl.oms.domain.OrderItem;
+import com.cyl.manager.oms.domain.OrderItem;
-import com.cyl.oms.domain.OrderOperateHistory;
+import com.cyl.manager.oms.domain.OrderOperateHistory;
-import com.cyl.oms.mapper.OrderItemMapper;
+import com.cyl.manager.oms.mapper.OrderItemMapper;
-import com.cyl.oms.mapper.OrderOperateHistoryMapper;
+import com.cyl.manager.oms.mapper.OrderOperateHistoryMapper;
-import com.cyl.oms.pojo.vo.OrderVO;
+import com.cyl.manager.oms.pojo.vo.OrderVO;
-import com.cyl.pms.convert.SkuConvert;
+import com.cyl.manager.pms.convert.SkuConvert;
-import com.cyl.pms.domain.Product;
+import com.cyl.manager.pms.domain.Product;
-import com.cyl.pms.domain.Sku;
+import com.cyl.manager.pms.domain.Sku;
-import com.cyl.pms.mapper.ProductMapper;
+import com.cyl.manager.pms.mapper.ProductMapper;
-import com.cyl.pms.mapper.SkuMapper;
+import com.cyl.manager.pms.mapper.SkuMapper;
-import com.cyl.pms.pojo.vo.SkuVO;
+import com.cyl.manager.ums.domain.Member;
-import com.cyl.ums.domain.Member;
+import com.cyl.manager.ums.domain.MemberAddress;
-import com.cyl.ums.domain.MemberAddress;
+import com.cyl.manager.ums.domain.MemberCart;
-import com.cyl.ums.domain.MemberCart;
+import com.cyl.manager.ums.mapper.MemberAddressMapper;
-import com.cyl.ums.mapper.MemberAddressMapper;
+import com.cyl.manager.ums.mapper.MemberCartMapper;
-import com.cyl.ums.mapper.MemberCartMapper;
 import com.github.pagehelper.PageHelper;
 import com.ruoyi.common.constant.Constants;
-import com.ruoyi.common.core.domain.entity.SysUser;
-import com.ruoyi.common.core.domain.model.LoginUser;
-import com.ruoyi.common.exception.base.BaseException;
 import com.ruoyi.common.utils.IDGenerator;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.framework.config.LocalDataUtil;
-import com.ruoyi.system.mapper.SysUserMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Pageable;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
-import com.cyl.oms.mapper.OrderMapper;
+import com.cyl.manager.oms.mapper.OrderMapper;
-import com.cyl.oms.domain.Order;
+import com.cyl.manager.oms.domain.Order;
-import com.cyl.oms.pojo.query.OrderQuery;
+import com.cyl.manager.oms.pojo.query.OrderQuery;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
-
 /**
  * 订单表Service业务层处理
  *
@@ -320,7 +308,7 @@ public class OrderService {
         order.setStatus(Constants.OrderStatus.SEND);
         order.setAftersaleStatus(1);
         order.setReceiverName(memberAddress.getName());
-        order.setReceiverPhone(memberAddress.getPhone());
+//        order.setReceiverPhone(memberAddress.getPhone());
         order.setReceiverPostCode(memberAddress.getPostCode());
         order.setReceiverProvince(memberAddress.getProvince());
         order.setReceiverCity(memberAddress.getCity());

ruoyi-mall/src/main/java/com/cyl/manager/pms/controller/BrandController.java

@@ -1,4 +1,4 @@
-package com.cyl.pms.controller;
+package com.cyl.manager.pms.controller;
 
 import java.util.List;
 
@@ -21,11 +21,11 @@ import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.enums.BusinessType;
-import com.cyl.pms.convert.BrandConvert;
+import com.cyl.manager.pms.convert.BrandConvert;
-import com.cyl.pms.domain.Brand;
+import com.cyl.manager.pms.domain.Brand;
-import com.cyl.pms.pojo.query.BrandQuery;
+import com.cyl.manager.pms.pojo.query.BrandQuery;
-import com.cyl.pms.service.BrandService;
+import com.cyl.manager.pms.service.BrandService;
-import com.cyl.pms.pojo.vo.BrandVO;
+import com.cyl.manager.pms.pojo.vo.BrandVO;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 /**
  * 品牌管理Controller

ruoyi-mall/src/main/java/com/cyl/manager/pms/controller/ProductCategoryController.java

@@ -1,12 +1,9 @@
-package com.cyl.pms.controller;
+package com.cyl.manager.pms.controller;
 
 import java.util.List;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.data.domain.PageImpl;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Page;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,12 +18,12 @@ import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.enums.BusinessType;
-import com.cyl.pms.convert.ProductCategoryConvert;
+import com.cyl.manager.pms.convert.ProductCategoryConvert;
-import com.cyl.pms.domain.ProductCategory;
+import com.cyl.manager.pms.domain.ProductCategory;
-import com.cyl.pms.pojo.query.ProductCategoryQuery;
+import com.cyl.manager.pms.pojo.query.ProductCategoryQuery;
-import com.cyl.pms.service.ProductCategoryService;
+import com.cyl.manager.pms.service.ProductCategoryService;
-import com.cyl.pms.pojo.vo.ProductCategoryVO;
+import com.cyl.manager.pms.pojo.vo.ProductCategoryVO;
-import com.ruoyi.common.utils.poi.ExcelUtil;
+
 /**
  * 商品分类Controller
  * 

ruoyi-mall/src/main/java/com/cyl/manager/pms/controller/ProductController.java

@@ -1,4 +1,4 @@
-package com.cyl.pms.controller;
+package com.cyl.manager.pms.controller;
 
 import java.util.List;
 
@@ -21,11 +21,11 @@ import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.enums.BusinessType;
-import com.cyl.pms.convert.ProductConvert;
+import com.cyl.manager.pms.convert.ProductConvert;
-import com.cyl.pms.domain.Product;
+import com.cyl.manager.pms.domain.Product;
-import com.cyl.pms.pojo.query.ProductQuery;
+import com.cyl.manager.pms.pojo.query.ProductQuery;
-import com.cyl.pms.service.ProductService;
+import com.cyl.manager.pms.service.ProductService;
-import com.cyl.pms.pojo.vo.ProductVO;
+import com.cyl.manager.pms.pojo.vo.ProductVO;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 /**
  * 商品信息Controller

ruoyi-mall/src/main/java/com/cyl/manager/pms/controller/SkuController.java

@@ -1,4 +1,4 @@
-package com.cyl.pms.controller;
+package com.cyl.manager.pms.controller;
 
 import java.util.List;
 
@@ -21,11 +21,11 @@ import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.enums.BusinessType;
-import com.cyl.pms.convert.SkuConvert;
+import com.cyl.manager.pms.convert.SkuConvert;
-import com.cyl.pms.domain.Sku;
+import com.cyl.manager.pms.domain.Sku;
-import com.cyl.pms.pojo.query.SkuQuery;
+import com.cyl.manager.pms.pojo.query.SkuQuery;
-import com.cyl.pms.service.SkuService;
+import com.cyl.manager.pms.service.SkuService;
-import com.cyl.pms.pojo.vo.SkuVO;
+import com.cyl.manager.pms.pojo.vo.SkuVO;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 /**
  * sku信息Controller

ruoyi-mall/src/main/java/com/cyl/manager/pms/convert/BrandConvert.java

@@ -1,8 +1,8 @@
-package com.cyl.pms.convert;
+package com.cyl.manager.pms.convert;
 
 import org.mapstruct.Mapper;
-import com.cyl.pms.domain.Brand;
+import com.cyl.manager.pms.domain.Brand;
-import com.cyl.pms.pojo.vo.BrandVO;
+import com.cyl.manager.pms.pojo.vo.BrandVO;
 import java.util.List;
 /**
  * 品牌管理  DO <=> DTO <=> VO / BO / Query

ruoyi-mall/src/main/java/com/cyl/manager/pms/convert/ProductCategoryConvert.java

@@ -1,9 +1,9 @@
-package com.cyl.pms.convert;
+package com.cyl.manager.pms.convert;
 
 import com.cyl.h5.pojo.dto.CategoryDTO;
 import org.mapstruct.Mapper;
-import com.cyl.pms.domain.ProductCategory;
+import com.cyl.manager.pms.domain.ProductCategory;
-import com.cyl.pms.pojo.vo.ProductCategoryVO;
+import com.cyl.manager.pms.pojo.vo.ProductCategoryVO;
 import java.util.List;
 /**
  * 商品分类  DO <=> DTO <=> VO / BO / Query

ruoyi-mall/src/main/java/com/cyl/manager/pms/convert/ProductConvert.java

@@ -1,9 +1,9 @@
-package com.cyl.pms.convert;
+package com.cyl.manager.pms.convert;
 
 import com.cyl.h5.pojo.dto.ProductDTO;
 import org.mapstruct.Mapper;
-import com.cyl.pms.domain.Product;
+import com.cyl.manager.pms.domain.Product;
-import com.cyl.pms.pojo.vo.ProductVO;
+import com.cyl.manager.pms.pojo.vo.ProductVO;
 import java.util.List;
 /**
  * 商品信息  DO <=> DTO <=> VO / BO / Query

ruoyi-mall/src/main/java/com/cyl/manager/pms/convert/SkuConvert.java

@@ -1,8 +1,8 @@
-package com.cyl.pms.convert;
+package com.cyl.manager.pms.convert;
 
 import org.mapstruct.Mapper;
-import com.cyl.pms.domain.Sku;
+import com.cyl.manager.pms.domain.Sku;
-import com.cyl.pms.pojo.vo.SkuVO;
+import com.cyl.manager.pms.pojo.vo.SkuVO;
 import java.util.List;
 /**
  * sku信息  DO <=> DTO <=> VO / BO / Query

ruoyi-mall/src/main/java/com/cyl/manager/pms/domain/Brand.java

@@ -1,4 +1,4 @@
-package com.cyl.pms.domain;
+package com.cyl.manager.pms.domain;
 
 import com.ruoyi.common.annotation.Excel;
 import io.swagger.annotations.ApiModel;

ruoyi-mall/src/main/java/com/cyl/manager/pms/domain/Product.java

@@ -1,4 +1,4 @@
-package com.cyl.pms.domain;
+package com.cyl.manager.pms.domain;
 
 import java.math.BigDecimal;
 import com.ruoyi.common.annotation.Excel;

ruoyi-mall/src/main/java/com/cyl/manager/pms/domain/ProductCategory.java

@@ -1,4 +1,4 @@
-package com.cyl.pms.domain;
+package com.cyl.manager.pms.domain;
 
 import com.ruoyi.common.annotation.Excel;
 import io.swagger.annotations.ApiModel;

ruoyi-mall/src/main/java/com/cyl/manager/pms/domain/Sku.java

@@ -1,4 +1,4 @@
-package com.cyl.pms.domain;
+package com.cyl.manager.pms.domain;
 
 import java.math.BigDecimal;
 import com.ruoyi.common.annotation.Excel;

ruoyi-mall/src/main/java/com/cyl/manager/pms/mapper/BrandMapper.java

@@ -1,9 +1,8 @@
-package com.cyl.pms.mapper;
+package com.cyl.manager.pms.mapper;
 
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
+import com.cyl.manager.pms.domain.Brand;
-import com.cyl.pms.domain.Brand;
 
 /**
  * 品牌管理Mapper接口

ruoyi-mall/src/main/java/com/cyl/manager/pms/mapper/ProductCategoryMapper.java

@@ -1,9 +1,8 @@
-package com.cyl.pms.mapper;
+package com.cyl.manager.pms.mapper;
 
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
+import com.cyl.manager.pms.domain.ProductCategory;
-import com.cyl.pms.domain.ProductCategory;
 
 /**
  * 商品分类Mapper接口

ruoyi-mall/src/main/java/com/cyl/manager/pms/mapper/ProductMapper.java

@@ -1,9 +1,8 @@
-package com.cyl.pms.mapper;
+package com.cyl.manager.pms.mapper;
 
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
+import com.cyl.manager.pms.domain.Product;
-import com.cyl.pms.domain.Product;
 
 /**
  * 商品信息Mapper接口

ruoyi-mall/src/main/java/com/cyl/manager/pms/mapper/SkuMapper.java

@@ -1,9 +1,8 @@
-package com.cyl.pms.mapper;
+package com.cyl.manager.pms.mapper;
 
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
+import com.cyl.manager.pms.domain.Sku;
-import com.cyl.pms.domain.Sku;
 
 /**
  * sku信息Mapper接口

ruoyi-mall/src/main/java/com/cyl/manager/pms/pojo/dto/MemberCartDTO.java

@@ -1,6 +1,6 @@
-package com.cyl.pms.pojo.dto;
+package com.cyl.manager.pms.pojo.dto;
 
-import com.cyl.ums.domain.MemberCart;
+import com.cyl.manager.ums.domain.MemberCart;
 import lombok.Data;
 
 import java.math.BigDecimal;

ruoyi-mall/src/main/java/com/cyl/manager/pms/pojo/query/BrandQuery.java

@@ -1,4 +1,4 @@
-package com.cyl.pms.pojo.query;
+package com.cyl.manager.pms.pojo.query;
 
 import lombok.Data;
 import io.swagger.annotations.ApiModel;

ruoyi-mall/src/main/java/com/cyl/manager/pms/pojo/query/ProductCategoryQuery.java

@@ -1,4 +1,4 @@
-package com.cyl.pms.pojo.query;
+package com.cyl.manager.pms.pojo.query;
 
 import lombok.Data;
 import io.swagger.annotations.ApiModel;

ruoyi-mall/src/main/java/com/cyl/manager/pms/pojo/query/ProductQuery.java

@@ -1,8 +1,7 @@
-package com.cyl.pms.pojo.query;
+package com.cyl.manager.pms.pojo.query;
 
 import java.math.BigDecimal;
 
-import com.ruoyi.common.annotation.Excel;
 import lombok.Data;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

ruoyi-mall/src/main/java/com/cyl/manager/pms/pojo/query/SkuQuery.java

@@ -1,4 +1,4 @@
-package com.cyl.pms.pojo.query;
+package com.cyl.manager.pms.pojo.query;
 
 import java.math.BigDecimal;
 import lombok.Data;

ruoyi-mall/src/main/java/com/cyl/manager/pms/pojo/vo/BrandVO.java

@@ -1,7 +1,6 @@
-package com.cyl.pms.pojo.vo;
+package com.cyl.manager.pms.pojo.vo;
 
 import com.ruoyi.common.annotation.Excel;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.domain.BaseAudit;
 import lombok.Data;
 /**

ruoyi-mall/src/main/java/com/cyl/manager/pms/pojo/vo/ProductCategoryVO.java

@@ -1,8 +1,5 @@
-package com.cyl.pms.pojo.vo;
+package com.cyl.manager.pms.pojo.vo;
 
-import com.cyl.pms.domain.ProductCategory;
-import com.ruoyi.common.annotation.Excel;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.domain.BaseAudit;
 import lombok.Data;
 

ruoyi-mall/src/main/java/com/cyl/manager/pms/pojo/vo/ProductVO.java

@@ -1,11 +1,10 @@
-package com.cyl.pms.pojo.vo;
+package com.cyl.manager.pms.pojo.vo;
 
 import java.math.BigDecimal;
 import java.util.List;
 
-import com.cyl.pms.domain.Sku;
+import com.cyl.manager.pms.domain.Sku;
 import com.ruoyi.common.annotation.Excel;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.domain.BaseAudit;
 import lombok.Data;
 /**

ruoyi-mall/src/main/java/com/cyl/manager/pms/pojo/vo/SkuVO.java

@@ -1,8 +1,7 @@
-package com.cyl.pms.pojo.vo;
+package com.cyl.manager.pms.pojo.vo;
 
 import java.math.BigDecimal;
 import com.ruoyi.common.annotation.Excel;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.domain.BaseAudit;
 import lombok.Data;
 /**

ruoyi-mall/src/main/java/com/cyl/manager/pms/service/BrandService.java

@@ -1,6 +1,5 @@
-package com.cyl.pms.service;
+package com.cyl.manager.pms.service;
 
-import java.util.Arrays;
 import java.util.List;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -9,9 +8,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Pageable;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
-import com.cyl.pms.mapper.BrandMapper;
+import com.cyl.manager.pms.mapper.BrandMapper;
-import com.cyl.pms.domain.Brand;
+import com.cyl.manager.pms.domain.Brand;
-import com.cyl.pms.pojo.query.BrandQuery;
+import com.cyl.manager.pms.pojo.query.BrandQuery;
 
 /**
  * 品牌管理Service业务层处理

ruoyi-mall/src/main/java/com/cyl/manager/pms/service/ProductCategoryService.java

@@ -1,4 +1,4 @@
-package com.cyl.pms.service;
+package com.cyl.manager.pms.service;
 
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -6,14 +6,14 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.cyl.h5.pojo.dto.CategoryDTO;
-import com.cyl.pms.convert.ProductCategoryConvert;
+import com.cyl.manager.pms.convert.ProductCategoryConvert;
-import com.cyl.pms.convert.ProductConvert;
+import com.cyl.manager.pms.convert.ProductConvert;
-import com.cyl.pms.domain.Product;
+import com.cyl.manager.pms.domain.Product;
-import com.cyl.pms.domain.ProductCategory;
+import com.cyl.manager.pms.domain.ProductCategory;
-import com.cyl.pms.mapper.ProductCategoryMapper;
+import com.cyl.manager.pms.mapper.ProductCategoryMapper;
-import com.cyl.pms.mapper.ProductMapper;
+import com.cyl.manager.pms.mapper.ProductMapper;
-import com.cyl.pms.pojo.query.ProductCategoryQuery;
+import com.cyl.manager.pms.pojo.query.ProductCategoryQuery;
-import com.cyl.pms.pojo.vo.ProductCategoryVO;
+import com.cyl.manager.pms.pojo.vo.ProductCategoryVO;
 import com.github.pagehelper.PageHelper;
 import com.ruoyi.common.exception.base.BaseException;
 import org.apache.commons.lang3.StringUtils;

ruoyi-mall/src/main/java/com/cyl/manager/pms/service/ProductService.java

@@ -1,29 +1,24 @@
-package com.cyl.pms.service;
+package com.cyl.manager.pms.service;
 
-import java.math.BigDecimal;
 import java.util.*;
 import java.time.LocalDateTime;
 
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.segments.MergeSegments;
 import com.cyl.h5.pojo.vo.ProductDetail;
-import com.cyl.pms.convert.ProductConvert;
+import com.cyl.manager.pms.convert.ProductConvert;
-import com.cyl.pms.domain.Brand;
+import com.cyl.manager.pms.domain.Sku;
-import com.cyl.pms.domain.Sku;
+import com.cyl.manager.pms.mapper.BrandMapper;
-import com.cyl.pms.mapper.BrandMapper;
+import com.cyl.manager.pms.mapper.SkuMapper;
-import com.cyl.pms.mapper.SkuMapper;
+import com.cyl.manager.pms.pojo.vo.ProductVO;
-import com.cyl.pms.pojo.vo.ProductVO;
 import com.github.pagehelper.PageHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Pageable;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.security.core.parameters.P;
 import org.springframework.stereotype.Service;
-import com.cyl.pms.mapper.ProductMapper;
+import com.cyl.manager.pms.mapper.ProductMapper;
-import com.cyl.pms.domain.Product;
+import com.cyl.manager.pms.domain.Product;
-import com.cyl.pms.pojo.query.ProductQuery;
+import com.cyl.manager.pms.pojo.query.ProductQuery;
 import org.springframework.transaction.annotation.Transactional;
 
 /**

ruoyi-mall/src/main/java/com/cyl/manager/pms/service/SkuService.java

@@ -1,7 +1,6 @@
-package com.cyl.pms.service;
+package com.cyl.manager.pms.service;
 
 import java.math.BigDecimal;
-import java.util.Arrays;
 import java.util.List;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -10,9 +9,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Pageable;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
-import com.cyl.pms.mapper.SkuMapper;
+import com.cyl.manager.pms.mapper.SkuMapper;
-import com.cyl.pms.domain.Sku;
+import com.cyl.manager.pms.domain.Sku;
-import com.cyl.pms.pojo.query.SkuQuery;
+import com.cyl.manager.pms.pojo.query.SkuQuery;
 
 /**
  * sku信息Service业务层处理

ruoyi-mall/src/main/java/com/cyl/manager/ums/controller/MemberAddressController.java

@@ -1,4 +1,4 @@
-package com.cyl.ums.controller;
+package com.cyl.manager.ums.controller;
 
 import java.util.List;
 
@@ -21,12 +21,12 @@ import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.enums.BusinessType;
-import com.cyl.ums.convert.MemberAddressConvert;
+import com.cyl.manager.ums.convert.MemberAddressConvert;
-import com.cyl.ums.domain.MemberAddress;
+import com.cyl.manager.ums.domain.MemberAddress;
-import com.cyl.ums.pojo.query.MemberAddressQuery;
+import com.cyl.manager.ums.pojo.query.MemberAddressQuery;
-import com.cyl.ums.service.MemberAddressService;
+import com.cyl.manager.ums.service.MemberAddressService;
-import com.cyl.ums.pojo.vo.MemberAddressVO;
+import com.cyl.manager.ums.pojo.vo.MemberAddressVO;
-import com.ruoyi.common.utils.poi.ExcelUtil;
+
 /**
  * 会员收货地址Controller
  * 

ruoyi-mall/src/main/java/com/cyl/manager/ums/controller/MemberCartController.java

@@ -1,10 +1,7 @@
-package com.cyl.ums.controller;
+package com.cyl.manager.ums.controller;
-
-import java.util.List;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Page;
 import org.springframework.http.ResponseEntity;
@@ -21,12 +18,11 @@ import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.enums.BusinessType;
-import com.cyl.ums.convert.MemberCartConvert;
+import com.cyl.manager.ums.convert.MemberCartConvert;
-import com.cyl.ums.domain.MemberCart;
+import com.cyl.manager.ums.domain.MemberCart;
-import com.cyl.ums.pojo.query.MemberCartQuery;
+import com.cyl.manager.ums.pojo.query.MemberCartQuery;
-import com.cyl.ums.service.MemberCartService;
+import com.cyl.manager.ums.service.MemberCartService;
-import com.cyl.ums.pojo.vo.MemberCartVO;
+
-import com.ruoyi.common.utils.poi.ExcelUtil;
 /**
  * 购物车Controller
  * 

ruoyi-mall/src/main/java/com/cyl/manager/ums/controller/MemberController.java

@@ -1,8 +1,8 @@
-package com.cyl.ums.controller;
+package com.cyl.manager.ums.controller;
 
 import java.util.List;
 
-import com.cyl.ums.pojo.dto.ChangeMemberStatusDTO;
+import com.cyl.manager.ums.pojo.dto.ChangeMemberStatusDTO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.data.domain.PageImpl;
@@ -22,11 +22,11 @@ import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.enums.BusinessType;
-import com.cyl.ums.convert.MemberConvert;
+import com.cyl.manager.ums.convert.MemberConvert;
-import com.cyl.ums.domain.Member;
+import com.cyl.manager.ums.domain.Member;
-import com.cyl.ums.pojo.query.MemberQuery;
+import com.cyl.manager.ums.pojo.query.MemberQuery;
-import com.cyl.ums.service.MemberService;
+import com.cyl.manager.ums.service.MemberService;
-import com.cyl.ums.pojo.vo.MemberVO;
+import com.cyl.manager.ums.pojo.vo.MemberVO;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 /**
  * 会员信息Controller

ruoyi-mall/src/main/java/com/cyl/manager/ums/controller/MemberWechatController.java

@@ -1,4 +1,4 @@
-package com.cyl.ums.controller;
+package com.cyl.manager.ums.controller;
 
 import java.util.List;
 
@@ -21,11 +21,11 @@ import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.enums.BusinessType;
-import com.cyl.ums.convert.MemberWechatConvert;
+import com.cyl.manager.ums.convert.MemberWechatConvert;
-import com.cyl.ums.domain.MemberWechat;
+import com.cyl.manager.ums.domain.MemberWechat;
-import com.cyl.ums.pojo.query.MemberWechatQuery;
+import com.cyl.manager.ums.pojo.query.MemberWechatQuery;
-import com.cyl.ums.service.MemberWechatService;
+import com.cyl.manager.ums.service.MemberWechatService;
-import com.cyl.ums.pojo.vo.MemberWechatVO;
+import com.cyl.manager.ums.pojo.vo.MemberWechatVO;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 /**
  * 用户微信信息Controller

ruoyi-mall/src/main/java/com/cyl/manager/ums/convert/MemberAddressConvert.java

@@ -1,8 +1,8 @@
-package com.cyl.ums.convert;
+package com.cyl.manager.ums.convert;
 
 import org.mapstruct.Mapper;
-import com.cyl.ums.domain.MemberAddress;
+import com.cyl.manager.ums.domain.MemberAddress;
-import com.cyl.ums.pojo.vo.MemberAddressVO;
+import com.cyl.manager.ums.pojo.vo.MemberAddressVO;
 import java.util.List;
 /**
  * 会员收货地址  DO <=> DTO <=> VO / BO / Query