修改订单模块至mall

hiver-core/src/main/java/cc/hiver/core/dao/CourierDao.java

@@ -2,7 +2,6 @@ package cc.hiver.core.dao;
 
 import cc.hiver.core.base.HiverBaseDao;
 import cc.hiver.core.entity.Courier;
-import cc.hiver.core.entity.Worker;
 
 public interface CourierDao extends HiverBaseDao<Courier, String> {
 

hiver-core/src/main/java/cc/hiver/core/service/CourierService.java

@@ -3,7 +3,6 @@ package cc.hiver.core.service;
 import cc.hiver.core.base.HiverBaseService;
 import cc.hiver.core.common.vo.SearchVo;
 import cc.hiver.core.entity.Courier;
-import cc.hiver.core.entity.Worker;
 import org.springframework.cache.annotation.CacheConfig;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;

hiver-modules/hiver-app/src/main/java/cc/hiver/app/controller/admin/ExpressCompanyController.java

@@ -16,9 +16,7 @@ limitations under the License.
 package cc.hiver.app.controller.admin;
 
 import cc.hiver.app.entity.ExpressCompany;
-import cc.hiver.app.entity.LogiticsCompany;
 import cc.hiver.app.service.ExpressCompanyService;
-import cc.hiver.app.service.LogiticsCompanyService;
 import cc.hiver.core.common.utils.PageUtil;
 import cc.hiver.core.common.utils.ResultUtil;
 import cc.hiver.core.common.vo.PageVo;

hiver-modules/hiver-base/src/main/java/cc/hiver/base/handler/OrderXdHandler.java

@@ -1,11 +1,5 @@
 package cc.hiver.base.handler;
 
-import cc.hiver.core.entity.OrderXd;
-import lombok.AllArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.stereotype.Component;
-
 /**
  * @author benjamin_5
  * @Description

hiver-core/src/main/java/cc/hiver/core/common/constant/WorkerConstant.java → hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/common/constant/WorkerConstant.java

@@ -1,4 +1,4 @@
-package cc.hiver.core.common.constant;
+package cc.hiver.mall.common.constant;
 
 /**
  * 用户常量

hiver-modules/hiver-app/src/main/java/cc/hiver/app/controller/admin/LogiticsCompanyController.java → hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/LogiticsCompanyController.java

@@ -13,16 +13,14 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
  */
-package cc.hiver.app.controller.admin;
+package cc.hiver.mall.controller;
 
-import cc.hiver.app.entity.Company;
-import cc.hiver.app.entity.LogiticsCompany;
-import cc.hiver.app.service.CompanyService;
-import cc.hiver.app.service.LogiticsCompanyService;
 import cc.hiver.core.common.utils.PageUtil;
 import cc.hiver.core.common.utils.ResultUtil;
 import cc.hiver.core.common.vo.PageVo;
 import cc.hiver.core.common.vo.Result;
+import cc.hiver.mall.entity.LogiticsCompany;
+import cc.hiver.mall.service.LogiticsCompanyService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;

hiver-modules/hiver-base/src/main/java/cc/hiver/base/controller/manage/OrderController.java → hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/OrderController.java

@@ -1,14 +1,17 @@
-package cc.hiver.base.controller.manage;
+package cc.hiver.mall.controller;
 
 import cc.hiver.core.common.exception.HiverException;
 import cc.hiver.core.common.redis.RedisTemplateHelper;
-import cc.hiver.core.common.utils.*;
+import cc.hiver.core.common.utils.PageUtil;
+import cc.hiver.core.common.utils.ResultUtil;
+import cc.hiver.core.common.utils.SecurityUtil;
 import cc.hiver.core.common.vo.PageVo;
 import cc.hiver.core.common.vo.Result;
 import cc.hiver.core.common.vo.SearchVo;
 import cc.hiver.core.dao.mapper.DeleteMapper;
-import cc.hiver.core.entity.*;
+import cc.hiver.mall.entity.OrderXd;
-import cc.hiver.core.service.*;
+import cc.hiver.mall.service.OrderService;
+import cc.hiver.mall.service.WorkerService;
 import cn.hutool.core.date.DateTime;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -68,8 +71,8 @@ public class OrderController {
     @ApiOperation(value = "多条件分页获取订单列表")
     //@Cacheable(cacheNames = ORDER)
     public Result<Page<OrderXd>> getByCondition(OrderXd order,
-                                             SearchVo searchVo,
+                                                SearchVo searchVo,
-                                             PageVo pageVo) {
+                                                PageVo pageVo) {
         Page<OrderXd> page = orderService.findByCondition(order, searchVo, PageUtil.initPage(pageVo));
         return new ResultUtil<Page<OrderXd>>().setData(page);
     }

hiver-modules/hiver-base/src/main/java/cc/hiver/base/controller/manage/RechargeController.java → hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/RechargeController.java

@@ -1,20 +1,21 @@
-package cc.hiver.base.controller.manage;
+package cc.hiver.mall.controller;
 
 import cc.hiver.core.common.utils.PageUtil;
 import cc.hiver.core.common.utils.ResultUtil;
 import cc.hiver.core.common.vo.PageVo;
 import cc.hiver.core.common.vo.Result;
 import cc.hiver.core.common.vo.SearchVo;
-import cc.hiver.core.entity.Recharge;
+import cc.hiver.mall.entity.Recharge;
-import cc.hiver.core.service.RechargeService;
+import cc.hiver.mall.service.RechargeService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cache.annotation.CacheConfig;
 import org.springframework.data.domain.Page;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * 充值记录管理接口

hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/SalesOrderController.java

@@ -7,20 +7,15 @@ import cc.hiver.core.common.utils.ResultUtil;
 import cc.hiver.core.common.utils.SecurityUtil;
 import cc.hiver.core.common.vo.PageVo;
 import cc.hiver.core.common.vo.Result;
-import cc.hiver.core.entity.OrderXd;
-import cc.hiver.core.service.OrderService;
 import cc.hiver.mall.entity.CustomAddress;
-import cc.hiver.mall.entity.GoodsBrand;
+import cc.hiver.mall.entity.OrderXd;
 import cc.hiver.mall.entity.SalesOrder;
 import cc.hiver.mall.entity.SalesOrderItem;
 import cc.hiver.mall.pojo.dto.CartItemDTO;
 import cc.hiver.mall.pojo.form.SalesOrderForm;
 import cc.hiver.mall.pojo.query.SalesOrderQueryCriteria;
 import cc.hiver.mall.pojo.vo.SalesOrderVo;
-import cc.hiver.mall.service.CartService;
+import cc.hiver.mall.service.*;
-import cc.hiver.mall.service.CustomAddressService;
-import cc.hiver.mall.service.SalesOrderItemService;
-import cc.hiver.mall.service.SalesOrderService;
 import cn.hutool.core.util.StrUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

hiver-modules/hiver-base/src/main/java/cc/hiver/base/controller/manage/WorkerController.java → hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/WorkerController.java

@@ -1,7 +1,6 @@
-package cc.hiver.base.controller.manage;
+package cc.hiver.mall.controller;
 
-import cc.hiver.core.common.constant.UserConstant;
+import cc.hiver.mall.common.constant.WorkerConstant;
-import cc.hiver.core.common.constant.WorkerConstant;
 import cc.hiver.core.common.redis.RedisTemplateHelper;
 import cc.hiver.core.common.utils.PageUtil;
 import cc.hiver.core.common.utils.ResultUtil;
@@ -10,11 +9,10 @@ import cc.hiver.core.common.vo.PageVo;
 import cc.hiver.core.common.vo.Result;
 import cc.hiver.core.common.vo.SearchVo;
 import cc.hiver.core.dao.mapper.DeleteMapper;
-import cc.hiver.core.entity.Courier;
+import cc.hiver.mall.entity.Recharge;
-import cc.hiver.core.entity.Recharge;
+import cc.hiver.mall.entity.Worker;
-import cc.hiver.core.entity.Worker;
+import cc.hiver.mall.service.RechargeService;
-import cc.hiver.core.service.RechargeService;
+import cc.hiver.mall.service.WorkerService;
-import cc.hiver.core.service.WorkerService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;

hiver-modules/hiver-app/src/main/java/cc/hiver/app/dao/LogiticsCompanyDao.java → hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/LogiticsCompanyDao.java

@@ -13,11 +13,10 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
  */
-package cc.hiver.app.dao;
+package cc.hiver.mall.dao;
 
-import cc.hiver.app.entity.Company;
-import cc.hiver.app.entity.LogiticsCompany;
 import cc.hiver.core.base.HiverBaseDao;
+import cc.hiver.mall.entity.LogiticsCompany;
 
 /**
  * @author houpn

hiver-core/src/main/java/cc/hiver/core/dao/OrderDao.java → hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/OrderDao.java

@@ -1,7 +1,7 @@
-package cc.hiver.core.dao;
+package cc.hiver.mall.dao;
 
 import cc.hiver.core.base.HiverBaseDao;
-import cc.hiver.core.entity.OrderXd;
+import cc.hiver.mall.entity.OrderXd;
 
 
 /**

hiver-core/src/main/java/cc/hiver/core/dao/RechargeDao.java → hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/RechargeDao.java

@@ -1,8 +1,7 @@
-package cc.hiver.core.dao;
+package cc.hiver.mall.dao;
 
 import cc.hiver.core.base.HiverBaseDao;
-import cc.hiver.core.entity.Courier;
+import cc.hiver.mall.entity.Recharge;
-import cc.hiver.core.entity.Recharge;
 
 public interface RechargeDao extends HiverBaseDao<Recharge, String> {
 

hiver-core/src/main/java/cc/hiver/core/dao/WorkerDao.java → hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/WorkerDao.java

@@ -1,7 +1,7 @@
-package cc.hiver.core.dao;
+package cc.hiver.mall.dao;
 
 import cc.hiver.core.base.HiverBaseDao;
-import cc.hiver.core.entity.Worker;
+import cc.hiver.mall.entity.Worker;
 
 public interface WorkerDao extends HiverBaseDao<Worker, String> {
 

hiver-modules/hiver-app/src/main/java/cc/hiver/app/entity/LogiticsCompany.java → hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/LogiticsCompany.java

@@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
  */
-package cc.hiver.app.entity;
+package cc.hiver.mall.entity;
 
 import cc.hiver.core.base.HiverBaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;

hiver-core/src/main/java/cc/hiver/core/entity/OrderXd.java → hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/OrderXd.java

@@ -1,4 +1,4 @@
-package cc.hiver.core.entity;
+package cc.hiver.mall.entity;
 
 import cc.hiver.core.common.utils.NameUtil;
 import cc.hiver.core.common.utils.SnowFlakeUtil;
@@ -13,8 +13,6 @@ import lombok.Data;
 import lombok.experimental.Accessors;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
-import org.hibernate.annotations.NotFound;
-import org.hibernate.annotations.NotFoundAction;
 import org.springframework.data.annotation.CreatedBy;
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.annotation.LastModifiedBy;

hiver-core/src/main/java/cc/hiver/core/entity/Recharge.java → hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/Recharge.java

@@ -1,4 +1,4 @@
-package cc.hiver.core.entity;
+package cc.hiver.mall.entity;
 
 import cc.hiver.core.common.utils.SnowFlakeUtil;
 import com.baomidou.mybatisplus.annotation.FieldFill;

hiver-core/src/main/java/cc/hiver/core/entity/Worker.java → hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/Worker.java

@@ -1,4 +1,4 @@
-package cc.hiver.core.entity;
+package cc.hiver.mall.entity;
 
 import cc.hiver.core.common.utils.SnowFlakeUtil;
 import com.baomidou.mybatisplus.annotation.FieldFill;

hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/pojo/vo/SalesOrderVo.java

@@ -1,6 +1,6 @@
 package cc.hiver.mall.pojo.vo;
 
-import cc.hiver.core.entity.OrderXd;
+import cc.hiver.mall.entity.OrderXd;
 import cc.hiver.mall.entity.SalesOrder;
 import cc.hiver.mall.entity.SalesOrderItem;
 import io.swagger.annotations.ApiModelProperty;

hiver-modules/hiver-app/src/main/java/cc/hiver/app/service/LogiticsCompanyService.java → hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/service/LogiticsCompanyService.java

@@ -13,12 +13,10 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
  */
-package cc.hiver.app.service;
+package cc.hiver.mall.service;
 
-import cc.hiver.app.entity.Company;
-import cc.hiver.app.entity.LogiticsCompany;
 import cc.hiver.core.base.HiverBaseService;
-import cc.hiver.core.entity.OrderXd;
+import cc.hiver.mall.entity.LogiticsCompany;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 

hiver-core/src/main/java/cc/hiver/core/service/OrderService.java → hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/service/OrderService.java

@@ -1,8 +1,8 @@
-package cc.hiver.core.service;
+package cc.hiver.mall.service;
 
 import cc.hiver.core.base.HiverBaseService;
 import cc.hiver.core.common.vo.SearchVo;
-import cc.hiver.core.entity.OrderXd;
+import cc.hiver.mall.entity.OrderXd;
 import org.springframework.cache.annotation.CacheConfig;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;

hiver-core/src/main/java/cc/hiver/core/service/RechargeService.java → hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/service/RechargeService.java

@@ -1,9 +1,8 @@
-package cc.hiver.core.service;
+package cc.hiver.mall.service;
 
 import cc.hiver.core.base.HiverBaseService;
 import cc.hiver.core.common.vo.SearchVo;
-import cc.hiver.core.entity.Courier;
+import cc.hiver.mall.entity.Recharge;
-import cc.hiver.core.entity.Recharge;
 import org.springframework.cache.annotation.CacheConfig;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;

hiver-core/src/main/java/cc/hiver/core/service/WorkerService.java → hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/service/WorkerService.java

@@ -1,8 +1,8 @@
-package cc.hiver.core.service;
+package cc.hiver.mall.service;
 
 import cc.hiver.core.base.HiverBaseService;
 import cc.hiver.core.common.vo.SearchVo;
-import cc.hiver.core.entity.Worker;
+import cc.hiver.mall.entity.Worker;
 import org.springframework.cache.annotation.CacheConfig;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;

hiver-modules/hiver-app/src/main/java/cc/hiver/app/serviceimpl/LogiticsCompanyServiceImpl.java → hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/LogiticsCompanyServiceImpl.java

@@ -13,16 +13,12 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
  */
-package cc.hiver.app.serviceimpl;
+package cc.hiver.mall.serviceimpl;
-
+
-import cc.hiver.app.dao.CompanyDao;
-import cc.hiver.app.dao.LogiticsCompanyDao;
-import cc.hiver.app.entity.Company;
-import cc.hiver.app.entity.LogiticsCompany;
-import cc.hiver.app.service.CompanyService;
-import cc.hiver.app.service.LogiticsCompanyService;
 import cc.hiver.core.base.HiverBaseDao;
-import cc.hiver.core.entity.OrderXd;
+import cc.hiver.mall.dao.LogiticsCompanyDao;
+import cc.hiver.mall.entity.LogiticsCompany;
+import cc.hiver.mall.service.LogiticsCompanyService;
 import cn.hutool.core.util.StrUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

hiver-core/src/main/java/cc/hiver/core/serviceimpl/OrderServiceImpl.java → hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/OrderServiceImpl.java

@@ -1,14 +1,11 @@
-package cc.hiver.core.serviceimpl;
+package cc.hiver.mall.serviceimpl;
 
 import cc.hiver.core.common.utils.SecurityUtil;
 import cc.hiver.core.common.vo.SearchVo;
-import cc.hiver.core.dao.OrderDao;
+import cc.hiver.mall.dao.OrderDao;
-
+import cc.hiver.mall.entity.OrderXd;
-import cc.hiver.core.entity.Courier;
+import cc.hiver.mall.entity.Worker;
-import cc.hiver.core.entity.OrderXd;
+import cc.hiver.mall.service.OrderService;
-import cc.hiver.core.entity.Worker;
-import cc.hiver.core.service.OrderService;
-import cc.hiver.core.vo.OrderVO;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -112,7 +109,7 @@ public class OrderServiceImpl implements OrderService {
             @Nullable
             @Override
             public Predicate toPredicate(Root<OrderXd> root, CriteriaQuery<?> cq, CriteriaBuilder cb) {
-                Join<Order,Worker> joinWorker = root.join("worker",JoinType.LEFT);
+                Join<Order, Worker> joinWorker = root.join("worker",JoinType.LEFT);
 
                 Path<String> orderIdField = root.get("orderId");
                 Path<String> orderLogisticsField = root.get("orderLogistics");

hiver-core/src/main/java/cc/hiver/core/serviceimpl/RechargeServiceImpl.java → hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/RechargeServiceImpl.java

@@ -1,10 +1,10 @@
-package cc.hiver.core.serviceimpl;
+package cc.hiver.mall.serviceimpl;
 
 import cc.hiver.core.common.utils.SecurityUtil;
 import cc.hiver.core.common.vo.SearchVo;
-import cc.hiver.core.dao.RechargeDao;
+import cc.hiver.mall.dao.RechargeDao;
-import cc.hiver.core.entity.Recharge;
+import cc.hiver.mall.entity.Recharge;
-import cc.hiver.core.service.RechargeService;
+import cc.hiver.mall.service.RechargeService;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import lombok.extern.slf4j.Slf4j;

hiver-core/src/main/java/cc/hiver/core/serviceimpl/WorkerServiceImpl.java → hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/WorkerServiceImpl.java

@@ -1,10 +1,10 @@
-package cc.hiver.core.serviceimpl;
+package cc.hiver.mall.serviceimpl;
 
 import cc.hiver.core.common.utils.SecurityUtil;
 import cc.hiver.core.common.vo.SearchVo;
-import cc.hiver.core.dao.WorkerDao;
+import cc.hiver.mall.dao.WorkerDao;
-import cc.hiver.core.entity.Worker;
+import cc.hiver.mall.entity.Worker;
-import cc.hiver.core.service.WorkerService;
+import cc.hiver.mall.service.WorkerService;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import lombok.extern.slf4j.Slf4j;