diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/controller/ConsInfoController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/controller/ConsInfoController.java similarity index 92% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/controller/ConsInfoController.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/controller/ConsInfoController.java index 44fa0489..1579f12e 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/controller/ConsInfoController.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/controller/ConsInfoController.java @@ -1,13 +1,12 @@ -package com.bonus.core.basic.controller; +package com.bonus.core.customer.controller; import com.bonus.core.basic.vo.Canteen; import com.bonus.core.basic.vo.Shopstall; import com.bonus.common.core.web.domain.AjaxResult; import io.swagger.v3.oas.annotations.Operation; -import com.bonus.core.basic.dto.MyiInfoReq; +import com.bonus.core.customer.domain.MyiInfoReq; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; import javax.validation.Valid; import java.util.ArrayList; import java.util.List; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/controller/CustAddrController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/controller/CustAddrController.java similarity index 93% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/controller/CustAddrController.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/controller/CustAddrController.java index c8543479..0d36d9ad 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/controller/CustAddrController.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/controller/CustAddrController.java @@ -1,7 +1,7 @@ -package com.bonus.core.basic.controller; +package com.bonus.core.customer.controller; -import com.bonus.core.basic.model.CustAddr; -import com.bonus.core.basic.service.CustAddrService; +import com.bonus.core.customer.domain.CustAddr; +import com.bonus.core.customer.service.CustAddrService; import com.bonus.common.core.web.controller.BaseController; import com.bonus.common.core.web.page.TableDataInfo; import org.springframework.http.ResponseEntity; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/controller/CustPlaceController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/controller/CustPlaceController.java similarity index 93% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/controller/CustPlaceController.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/controller/CustPlaceController.java index d62d69f6..e68c154c 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/controller/CustPlaceController.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/controller/CustPlaceController.java @@ -1,7 +1,7 @@ -package com.bonus.core.basic.controller; +package com.bonus.core.customer.controller; -import com.bonus.core.basic.model.CustPlace; -import com.bonus.core.basic.service.CustPlaceService; +import com.bonus.core.customer.domain.CustPlace; +import com.bonus.core.customer.service.CustPlaceService; import com.bonus.common.core.web.controller.BaseController; import com.bonus.common.core.web.page.TableDataInfo; import org.springframework.http.ResponseEntity; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/model/CustAddr.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/domain/CustAddr.java similarity index 99% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/model/CustAddr.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/domain/CustAddr.java index ffbcc742..cf9aa1f3 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/model/CustAddr.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/domain/CustAddr.java @@ -1,4 +1,4 @@ -package com.bonus.core.basic.model; +package com.bonus.core.customer.domain; import com.bonus.common.core.web.domain.BaseEntity; import lombok.Data; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/model/CustPlace.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/domain/CustPlace.java similarity index 99% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/model/CustPlace.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/domain/CustPlace.java index 33726406..3ceaa2eb 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/model/CustPlace.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/domain/CustPlace.java @@ -1,4 +1,4 @@ -package com.bonus.core.basic.model; +package com.bonus.core.customer.domain; import java.util.Date; import java.io.Serializable; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/dto/MyiInfoReq.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/domain/MyiInfoReq.java similarity index 84% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/dto/MyiInfoReq.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/domain/MyiInfoReq.java index 5b7af78d..23ad4c12 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/dto/MyiInfoReq.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/domain/MyiInfoReq.java @@ -1,4 +1,4 @@ -package com.bonus.core.basic.dto; +package com.bonus.core.customer.domain; import lombok.Data; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/mapper/CustAddrMapper.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/mapper/CustAddrMapper.java similarity index 95% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/mapper/CustAddrMapper.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/mapper/CustAddrMapper.java index 264104d6..96236830 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/mapper/CustAddrMapper.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/mapper/CustAddrMapper.java @@ -1,6 +1,6 @@ -package com.bonus.core.basic.mapper; +package com.bonus.core.customer.mapper; -import com.bonus.core.basic.model.CustAddr; +import com.bonus.core.customer.domain.CustAddr; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/mapper/CustPlaceMapper.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/mapper/CustPlaceMapper.java similarity index 95% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/mapper/CustPlaceMapper.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/mapper/CustPlaceMapper.java index 85487911..0a0aa1f8 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/mapper/CustPlaceMapper.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/mapper/CustPlaceMapper.java @@ -1,6 +1,6 @@ -package com.bonus.core.basic.mapper; +package com.bonus.core.customer.mapper; -import com.bonus.core.basic.model.CustPlace; +import com.bonus.core.customer.domain.CustPlace; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/service/CustAddrService.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/service/CustAddrService.java similarity index 90% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/service/CustAddrService.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/service/CustAddrService.java index 45f0b29d..c44eb641 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/service/CustAddrService.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/service/CustAddrService.java @@ -1,6 +1,6 @@ -package com.bonus.core.basic.service; +package com.bonus.core.customer.service; -import com.bonus.core.basic.model.CustAddr; +import com.bonus.core.customer.domain.CustAddr; import java.util.List; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/service/CustPlaceService.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/service/CustPlaceService.java similarity index 91% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/service/CustPlaceService.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/service/CustPlaceService.java index c7f72007..fa3d100e 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/service/CustPlaceService.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/service/CustPlaceService.java @@ -1,6 +1,6 @@ -package com.bonus.core.basic.service; +package com.bonus.core.customer.service; -import com.bonus.core.basic.model.CustPlace; +import com.bonus.core.customer.domain.CustPlace; import java.util.List; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/service/impl/CustAddrServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/service/impl/CustAddrServiceImpl.java similarity index 91% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/service/impl/CustAddrServiceImpl.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/service/impl/CustAddrServiceImpl.java index 6588e153..f77bc547 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/service/impl/CustAddrServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/service/impl/CustAddrServiceImpl.java @@ -1,9 +1,9 @@ -package com.bonus.core.basic.service.impl; +package com.bonus.core.customer.service.impl; import com.bonus.core.common.utils.StringUtils; -import com.bonus.core.basic.model.CustAddr; -import com.bonus.core.basic.mapper.CustAddrMapper; -import com.bonus.core.basic.service.CustAddrService; +import com.bonus.core.customer.domain.CustAddr; +import com.bonus.core.customer.mapper.CustAddrMapper; +import com.bonus.core.customer.service.CustAddrService; import com.bonus.common.security.utils.SecurityUtils; import org.springframework.stereotype.Service; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/service/impl/CustPlaceServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/service/impl/CustPlaceServiceImpl.java similarity index 88% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/service/impl/CustPlaceServiceImpl.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/service/impl/CustPlaceServiceImpl.java index 69f7ecf0..a5818f6d 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/service/impl/CustPlaceServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/service/impl/CustPlaceServiceImpl.java @@ -1,8 +1,8 @@ -package com.bonus.core.basic.service.impl; +package com.bonus.core.customer.service.impl; -import com.bonus.core.basic.model.CustPlace; -import com.bonus.core.basic.mapper.CustPlaceMapper; -import com.bonus.core.basic.service.CustPlaceService; +import com.bonus.core.customer.domain.CustPlace; +import com.bonus.core.customer.mapper.CustPlaceMapper; +import com.bonus.core.customer.service.CustPlaceService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/CustAddrDao.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/CustAddrDao.xml index a7670cb9..f91e90e0 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/CustAddrDao.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/CustAddrDao.xml @@ -2,7 +2,7 @@ - + diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/CustPlaceMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/CustPlaceMapper.xml index 3a446b34..41e99566 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/CustPlaceMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/CustPlaceMapper.xml @@ -2,7 +2,7 @@ - +