diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/BonusSmartCanteenApplication.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/BonusSmartCanteenApplication.java similarity index 98% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/BonusSmartCanteenApplication.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/BonusSmartCanteenApplication.java index 698c60c9..89c5e7f5 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/BonusSmartCanteenApplication.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/BonusSmartCanteenApplication.java @@ -1,4 +1,4 @@ -package com.bonus.canteen; +package com.bonus.core; import com.bonus.common.security.annotation.EnableCustomConfig; import com.bonus.common.security.annotation.EnableRyFeignClients; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/controller/BasicsCanteenEvaluateController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/controller/BasicsCanteenEvaluateController.java similarity index 94% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/controller/BasicsCanteenEvaluateController.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/controller/BasicsCanteenEvaluateController.java index 5dc96011..3dc683ed 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/controller/BasicsCanteenEvaluateController.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/controller/BasicsCanteenEvaluateController.java @@ -1,7 +1,7 @@ -package com.bonus.canteen.basic.controller; +package com.bonus.core.basic.controller; -import com.bonus.canteen.basic.model.BasicsCanteenEvaluate; -import com.bonus.canteen.basic.service.BasicsCanteenEvaluateService; +import com.bonus.core.basic.model.BasicsCanteenEvaluate; +import com.bonus.core.basic.service.BasicsCanteenEvaluateService; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Sort; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/controller/BasicsComplaintController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/controller/BasicsComplaintController.java similarity index 93% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/controller/BasicsComplaintController.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/controller/BasicsComplaintController.java index 80c21cbd..0501b502 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/controller/BasicsComplaintController.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/controller/BasicsComplaintController.java @@ -1,7 +1,7 @@ -package com.bonus.canteen.basic.controller; +package com.bonus.core.basic.controller; -import com.bonus.canteen.basic.model.BasicsComplaint; -import com.bonus.canteen.basic.service.BasicsComplaintService; +import com.bonus.core.basic.model.BasicsComplaint; +import com.bonus.core.basic.service.BasicsComplaintService; import com.bonus.common.core.web.controller.BaseController; import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.common.core.web.page.TableDataInfo; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/controller/ConsInfoController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/controller/ConsInfoController.java similarity index 88% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/controller/ConsInfoController.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/controller/ConsInfoController.java index 9a89560f..44fa0489 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/controller/ConsInfoController.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/controller/ConsInfoController.java @@ -1,10 +1,10 @@ -package com.bonus.canteen.basic.controller; +package com.bonus.core.basic.controller; -import com.bonus.canteen.basic.vo.Canteen; -import com.bonus.canteen.basic.vo.Shopstall; +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.canteen.basic.dto.MyiInfoReq; +import com.bonus.core.basic.dto.MyiInfoReq; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/controller/CustAddrController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/controller/CustAddrController.java similarity index 93% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/controller/CustAddrController.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/controller/CustAddrController.java index c6f59a0a..c8543479 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/controller/CustAddrController.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/controller/CustAddrController.java @@ -1,7 +1,7 @@ -package com.bonus.canteen.basic.controller; +package com.bonus.core.basic.controller; -import com.bonus.canteen.basic.model.CustAddr; -import com.bonus.canteen.basic.service.CustAddrService; +import com.bonus.core.basic.model.CustAddr; +import com.bonus.core.basic.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/canteen/basic/controller/CustPlaceController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/controller/CustPlaceController.java similarity index 93% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/controller/CustPlaceController.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/controller/CustPlaceController.java index cdbf0a66..d62d69f6 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/controller/CustPlaceController.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/controller/CustPlaceController.java @@ -1,7 +1,7 @@ -package com.bonus.canteen.basic.controller; +package com.bonus.core.basic.controller; -import com.bonus.canteen.basic.model.CustPlace; -import com.bonus.canteen.basic.service.CustPlaceService; +import com.bonus.core.basic.model.CustPlace; +import com.bonus.core.basic.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/canteen/basic/controller/SysNoticeController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/controller/SysNoticeController.java similarity index 96% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/controller/SysNoticeController.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/controller/SysNoticeController.java index 4bf07afe..5c58d5e0 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/controller/SysNoticeController.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/controller/SysNoticeController.java @@ -1,7 +1,7 @@ -package com.bonus.canteen.basic.controller; +package com.bonus.core.basic.controller; -import com.bonus.canteen.basic.model.SysNotice; -import com.bonus.canteen.basic.service.ISysNoticeService; +import com.bonus.core.basic.model.SysNotice; +import com.bonus.core.basic.service.ISysNoticeService; import com.bonus.common.core.web.controller.BaseController; import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.common.core.web.page.TableDataInfo; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/dto/BasicsComplaintDTO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/dto/BasicsComplaintDTO.java similarity index 98% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/dto/BasicsComplaintDTO.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/dto/BasicsComplaintDTO.java index b5530feb..ebf20c4d 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/dto/BasicsComplaintDTO.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/dto/BasicsComplaintDTO.java @@ -1,4 +1,4 @@ -package com.bonus.canteen.basic.dto; +package com.bonus.core.basic.dto; import cn.hutool.db.Page; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/dto/MgrUserLoginDTO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/dto/MgrUserLoginDTO.java similarity index 98% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/dto/MgrUserLoginDTO.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/dto/MgrUserLoginDTO.java index 70e4bd41..3d9dfa4d 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/dto/MgrUserLoginDTO.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/dto/MgrUserLoginDTO.java @@ -1,6 +1,6 @@ -package com.bonus.canteen.basic.dto; +package com.bonus.core.basic.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/dto/MyiInfoReq.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/dto/MyiInfoReq.java similarity index 85% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/dto/MyiInfoReq.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/dto/MyiInfoReq.java index e4bcf88f..5b7af78d 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/dto/MyiInfoReq.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/dto/MyiInfoReq.java @@ -1,4 +1,4 @@ -package com.bonus.canteen.basic.dto; +package com.bonus.core.basic.dto; import lombok.Data; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/dto/PigxUser.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/dto/PigxUser.java similarity index 99% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/dto/PigxUser.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/dto/PigxUser.java index 3c10bfdc..8a8cb70a 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/dto/PigxUser.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/dto/PigxUser.java @@ -1,5 +1,5 @@ -package com.bonus.canteen.basic.dto; +package com.bonus.core.basic.dto; import java.io.Serializable; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/mapper/BasicsCanteenEvaluateMapper.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/mapper/BasicsCanteenEvaluateMapper.java similarity index 95% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/mapper/BasicsCanteenEvaluateMapper.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/mapper/BasicsCanteenEvaluateMapper.java index 55316d54..bde042a8 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/mapper/BasicsCanteenEvaluateMapper.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/mapper/BasicsCanteenEvaluateMapper.java @@ -1,6 +1,6 @@ -package com.bonus.canteen.basic.mapper; +package com.bonus.core.basic.mapper; -import com.bonus.canteen.basic.model.BasicsCanteenEvaluate; +import com.bonus.core.basic.model.BasicsCanteenEvaluate; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.springframework.data.domain.Pageable; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/mapper/BasicsComplaintMapper.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/mapper/BasicsComplaintMapper.java similarity index 95% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/mapper/BasicsComplaintMapper.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/mapper/BasicsComplaintMapper.java index 041a2d83..b0ca7eef 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/mapper/BasicsComplaintMapper.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/mapper/BasicsComplaintMapper.java @@ -1,6 +1,6 @@ -package com.bonus.canteen.basic.mapper; +package com.bonus.core.basic.mapper; -import com.bonus.canteen.basic.model.BasicsComplaint; +import com.bonus.core.basic.model.BasicsComplaint; 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/canteen/basic/mapper/CustAddrMapper.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/mapper/CustAddrMapper.java similarity index 95% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/mapper/CustAddrMapper.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/mapper/CustAddrMapper.java index 6c93fc58..264104d6 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/mapper/CustAddrMapper.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/mapper/CustAddrMapper.java @@ -1,6 +1,6 @@ -package com.bonus.canteen.basic.mapper; +package com.bonus.core.basic.mapper; -import com.bonus.canteen.basic.model.CustAddr; +import com.bonus.core.basic.model.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/canteen/basic/mapper/CustPlaceMapper.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/mapper/CustPlaceMapper.java similarity index 95% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/mapper/CustPlaceMapper.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/mapper/CustPlaceMapper.java index d9928867..85487911 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/mapper/CustPlaceMapper.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/mapper/CustPlaceMapper.java @@ -1,6 +1,6 @@ -package com.bonus.canteen.basic.mapper; +package com.bonus.core.basic.mapper; -import com.bonus.canteen.basic.model.CustPlace; +import com.bonus.core.basic.model.CustPlace; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/mapper/SysNoticeMapper.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/mapper/SysNoticeMapper.java similarity index 92% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/mapper/SysNoticeMapper.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/mapper/SysNoticeMapper.java index 7cfc0533..6afb9761 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/mapper/SysNoticeMapper.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/mapper/SysNoticeMapper.java @@ -1,7 +1,7 @@ -package com.bonus.canteen.basic.mapper; +package com.bonus.core.basic.mapper; -import com.bonus.canteen.basic.model.SysNotice; +import com.bonus.core.basic.model.SysNotice; import java.util.List; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/model/BasicsCanteenEvaluate.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/model/BasicsCanteenEvaluate.java similarity index 99% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/model/BasicsCanteenEvaluate.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/model/BasicsCanteenEvaluate.java index a694fa83..43fc898b 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/model/BasicsCanteenEvaluate.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/model/BasicsCanteenEvaluate.java @@ -1,4 +1,4 @@ -package com.bonus.canteen.basic.model; +package com.bonus.core.basic.model; import com.bonus.common.core.web.domain.BaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/model/BasicsComplaint.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/model/BasicsComplaint.java similarity index 98% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/model/BasicsComplaint.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/model/BasicsComplaint.java index 7f218638..4fde7c31 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/model/BasicsComplaint.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/model/BasicsComplaint.java @@ -1,4 +1,4 @@ -package com.bonus.canteen.basic.model; +package com.bonus.core.basic.model; import com.bonus.common.core.web.domain.BaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/model/CustAddr.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/model/CustAddr.java similarity index 99% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/model/CustAddr.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/model/CustAddr.java index 4d632f5c..ffbcc742 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/model/CustAddr.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/model/CustAddr.java @@ -1,4 +1,4 @@ -package com.bonus.canteen.basic.model; +package com.bonus.core.basic.model; import com.bonus.common.core.web.domain.BaseEntity; import lombok.Data; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/model/CustPlace.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/model/CustPlace.java similarity index 99% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/model/CustPlace.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/model/CustPlace.java index bfb86160..33726406 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/model/CustPlace.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/model/CustPlace.java @@ -1,4 +1,4 @@ -package com.bonus.canteen.basic.model; +package com.bonus.core.basic.model; import java.util.Date; import java.io.Serializable; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/model/SysNotice.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/model/SysNotice.java similarity index 98% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/model/SysNotice.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/model/SysNotice.java index 42d5e957..238fa992 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/model/SysNotice.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/model/SysNotice.java @@ -1,4 +1,4 @@ -package com.bonus.canteen.basic.model; +package com.bonus.core.basic.model; import com.bonus.common.core.web.domain.BaseEntity; import com.bonus.common.core.xss.Xss; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/service/BasicsCanteenEvaluateService.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/service/BasicsCanteenEvaluateService.java similarity index 92% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/service/BasicsCanteenEvaluateService.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/service/BasicsCanteenEvaluateService.java index 2d3ac2b8..8bb67bce 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/service/BasicsCanteenEvaluateService.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/service/BasicsCanteenEvaluateService.java @@ -1,6 +1,6 @@ -package com.bonus.canteen.basic.service; +package com.bonus.core.basic.service; -import com.bonus.canteen.basic.model.BasicsCanteenEvaluate; +import com.bonus.core.basic.model.BasicsCanteenEvaluate; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/service/BasicsComplaintService.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/service/BasicsComplaintService.java similarity index 91% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/service/BasicsComplaintService.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/service/BasicsComplaintService.java index 8ea6d8c2..1bf7607b 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/service/BasicsComplaintService.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/service/BasicsComplaintService.java @@ -1,6 +1,6 @@ -package com.bonus.canteen.basic.service; +package com.bonus.core.basic.service; -import com.bonus.canteen.basic.model.BasicsComplaint; +import com.bonus.core.basic.model.BasicsComplaint; import java.util.List; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/service/CustAddrService.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/service/CustAddrService.java similarity index 90% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/service/CustAddrService.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/service/CustAddrService.java index 33190211..45f0b29d 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/service/CustAddrService.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/service/CustAddrService.java @@ -1,6 +1,6 @@ -package com.bonus.canteen.basic.service; +package com.bonus.core.basic.service; -import com.bonus.canteen.basic.model.CustAddr; +import com.bonus.core.basic.model.CustAddr; import java.util.List; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/service/CustPlaceService.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/service/CustPlaceService.java similarity index 91% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/service/CustPlaceService.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/service/CustPlaceService.java index da1e8148..c7f72007 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/service/CustPlaceService.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/service/CustPlaceService.java @@ -1,6 +1,6 @@ -package com.bonus.canteen.basic.service; +package com.bonus.core.basic.service; -import com.bonus.canteen.basic.model.CustPlace; +import com.bonus.core.basic.model.CustPlace; import java.util.List; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/service/ISysNoticeService.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/service/ISysNoticeService.java similarity index 92% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/service/ISysNoticeService.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/service/ISysNoticeService.java index 45952775..21ff36dd 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/service/ISysNoticeService.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/service/ISysNoticeService.java @@ -1,7 +1,7 @@ -package com.bonus.canteen.basic.service; +package com.bonus.core.basic.service; -import com.bonus.canteen.basic.model.SysNotice; +import com.bonus.core.basic.model.SysNotice; import java.util.List; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/service/MgrUserBurialPointBusiness.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/service/MgrUserBurialPointBusiness.java similarity index 79% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/service/MgrUserBurialPointBusiness.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/service/MgrUserBurialPointBusiness.java index 3d0ab382..46825c8d 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/service/MgrUserBurialPointBusiness.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/service/MgrUserBurialPointBusiness.java @@ -3,13 +3,13 @@ // (powered by FernFlower decompiler) // -package com.bonus.canteen.basic.service; +package com.bonus.core.basic.service; import cn.hutool.core.collection.CollUtil; -import com.bonus.canteen.basic.dto.MgrUserLoginDTO; -import com.bonus.canteen.basic.dto.PigxUser; -import com.bonus.canteen.common.utils.CustomBusiness; +import com.bonus.core.basic.dto.MgrUserLoginDTO; +import com.bonus.core.basic.dto.PigxUser; +import com.bonus.core.common.utils.CustomBusiness; import org.springframework.stereotype.Service; import java.util.List; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/service/MgrUserService.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/service/MgrUserService.java similarity index 99% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/service/MgrUserService.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/service/MgrUserService.java index 0bfb8f8a..25be6baf 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/service/MgrUserService.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/service/MgrUserService.java @@ -3,7 +3,7 @@ // (powered by FernFlower decompiler) // -package com.bonus.canteen.basic.service; +package com.bonus.core.basic.service; import org.springframework.stereotype.Service; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/service/impl/BasicsCanteenEvaluateServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/service/impl/BasicsCanteenEvaluateServiceImpl.java similarity index 90% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/service/impl/BasicsCanteenEvaluateServiceImpl.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/service/impl/BasicsCanteenEvaluateServiceImpl.java index ae91e796..2d15f42e 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/service/impl/BasicsCanteenEvaluateServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/service/impl/BasicsCanteenEvaluateServiceImpl.java @@ -1,10 +1,10 @@ -package com.bonus.canteen.basic.service.impl; +package com.bonus.core.basic.service.impl; -import com.bonus.canteen.common.utils.StringUtils; -import com.bonus.canteen.basic.mapper.BasicsCanteenEvaluateMapper; -import com.bonus.canteen.basic.model.BasicsCanteenEvaluate; -import com.bonus.canteen.basic.service.BasicsCanteenEvaluateService; +import com.bonus.core.common.utils.StringUtils; +import com.bonus.core.basic.mapper.BasicsCanteenEvaluateMapper; +import com.bonus.core.basic.model.BasicsCanteenEvaluate; +import com.bonus.core.basic.service.BasicsCanteenEvaluateService; import com.bonus.common.security.utils.SecurityUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/service/impl/BasicsComplaintServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/service/impl/BasicsComplaintServiceImpl.java similarity index 89% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/service/impl/BasicsComplaintServiceImpl.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/service/impl/BasicsComplaintServiceImpl.java index dc9cafa7..331b2da5 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/service/impl/BasicsComplaintServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/service/impl/BasicsComplaintServiceImpl.java @@ -1,9 +1,9 @@ -package com.bonus.canteen.basic.service.impl; +package com.bonus.core.basic.service.impl; -import com.bonus.canteen.common.utils.StringUtils; -import com.bonus.canteen.basic.model.BasicsComplaint; -import com.bonus.canteen.basic.mapper.BasicsComplaintMapper; -import com.bonus.canteen.basic.service.BasicsComplaintService; +import com.bonus.core.common.utils.StringUtils; +import com.bonus.core.basic.model.BasicsComplaint; +import com.bonus.core.basic.mapper.BasicsComplaintMapper; +import com.bonus.core.basic.service.BasicsComplaintService; 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/canteen/basic/service/impl/CustAddrServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/service/impl/CustAddrServiceImpl.java similarity index 89% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/service/impl/CustAddrServiceImpl.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/service/impl/CustAddrServiceImpl.java index 415740ad..6588e153 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/service/impl/CustAddrServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/service/impl/CustAddrServiceImpl.java @@ -1,9 +1,9 @@ -package com.bonus.canteen.basic.service.impl; +package com.bonus.core.basic.service.impl; -import com.bonus.canteen.common.utils.StringUtils; -import com.bonus.canteen.basic.model.CustAddr; -import com.bonus.canteen.basic.mapper.CustAddrMapper; -import com.bonus.canteen.basic.service.CustAddrService; +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.common.security.utils.SecurityUtils; import org.springframework.stereotype.Service; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/service/impl/CustPlaceServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/service/impl/CustPlaceServiceImpl.java similarity index 88% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/service/impl/CustPlaceServiceImpl.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/service/impl/CustPlaceServiceImpl.java index ef6dbae6..69f7ecf0 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/service/impl/CustPlaceServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/service/impl/CustPlaceServiceImpl.java @@ -1,8 +1,8 @@ -package com.bonus.canteen.basic.service.impl; +package com.bonus.core.basic.service.impl; -import com.bonus.canteen.basic.model.CustPlace; -import com.bonus.canteen.basic.mapper.CustPlaceMapper; -import com.bonus.canteen.basic.service.CustPlaceService; +import com.bonus.core.basic.model.CustPlace; +import com.bonus.core.basic.mapper.CustPlaceMapper; +import com.bonus.core.basic.service.CustPlaceService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/service/impl/SysNoticeServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/service/impl/SysNoticeServiceImpl.java similarity index 89% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/service/impl/SysNoticeServiceImpl.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/service/impl/SysNoticeServiceImpl.java index 9fa0ed33..5fac0274 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/service/impl/SysNoticeServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/service/impl/SysNoticeServiceImpl.java @@ -1,7 +1,7 @@ -package com.bonus.canteen.basic.service.impl; -import com.bonus.canteen.basic.mapper.SysNoticeMapper; -import com.bonus.canteen.basic.model.SysNotice; -import com.bonus.canteen.basic.service.ISysNoticeService; +package com.bonus.core.basic.service.impl; +import com.bonus.core.basic.mapper.SysNoticeMapper; +import com.bonus.core.basic.model.SysNotice; +import com.bonus.core.basic.service.ISysNoticeService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/vo/Canteen.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/vo/Canteen.java similarity index 96% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/vo/Canteen.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/vo/Canteen.java index de87208c..c27b9f86 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/vo/Canteen.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/vo/Canteen.java @@ -1,4 +1,4 @@ -package com.bonus.canteen.basic.vo; +package com.bonus.core.basic.vo; import lombok.Data; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/vo/Shopstall.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/vo/Shopstall.java similarity index 95% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/vo/Shopstall.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/vo/Shopstall.java index 99968e03..01e0b02e 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/vo/Shopstall.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/vo/Shopstall.java @@ -1,4 +1,4 @@ -package com.bonus.canteen.basic.vo; +package com.bonus.core.basic.vo; import lombok.Data; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/common/Enum/LeCodeUseSceneEnum.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/common/Enum/LeCodeUseSceneEnum.java similarity index 91% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/common/Enum/LeCodeUseSceneEnum.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/common/Enum/LeCodeUseSceneEnum.java index f4443a00..13dcc031 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/common/Enum/LeCodeUseSceneEnum.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/common/Enum/LeCodeUseSceneEnum.java @@ -1,4 +1,4 @@ -package com.bonus.canteen.common.Enum; +package com.bonus.core.common.Enum; public enum LeCodeUseSceneEnum { PAIRING(1, "配餐"), diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/common/annotation/PreventRepeatSubmit.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/common/annotation/PreventRepeatSubmit.java similarity index 91% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/common/annotation/PreventRepeatSubmit.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/common/annotation/PreventRepeatSubmit.java index e9b18c23..9d3df615 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/common/annotation/PreventRepeatSubmit.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/common/annotation/PreventRepeatSubmit.java @@ -1,4 +1,4 @@ -package com.bonus.canteen.common.annotation; +package com.bonus.core.common.annotation; import java.lang.annotation.*; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/common/aspect/PreventRepeatSubmitAspect.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/common/aspect/PreventRepeatSubmitAspect.java similarity index 93% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/common/aspect/PreventRepeatSubmitAspect.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/common/aspect/PreventRepeatSubmitAspect.java index 6baaa742..c885b285 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/common/aspect/PreventRepeatSubmitAspect.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/common/aspect/PreventRepeatSubmitAspect.java @@ -1,10 +1,10 @@ -package com.bonus.canteen.common.aspect; +package com.bonus.core.common.aspect; import com.alibaba.fastjson2.JSON; import com.bonus.common.biz.enums.HttpCodeEnum; import com.bonus.common.biz.exception.BusinessException; -import com.bonus.canteen.common.annotation.PreventRepeatSubmit; -import com.bonus.canteen.common.utils.RedisCache; +import com.bonus.core.common.annotation.PreventRepeatSubmit; +import com.bonus.core.common.utils.RedisCache; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Aspect; @@ -32,7 +32,7 @@ public class PreventRepeatSubmitAspect { private RedisCache redisCache; // 定义一个切入点 - @Pointcut("@annotation(com.bonus.canteen.common.annotation.PreventRepeatSubmit)") + @Pointcut("@annotation(com.bonus.core.common.annotation.PreventRepeatSubmit)") public void preventRepeatSubmit() { } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/common/config/RemoteConfig.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/common/config/RemoteConfig.java similarity index 98% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/common/config/RemoteConfig.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/common/config/RemoteConfig.java index 716033f5..76ee4ace 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/common/config/RemoteConfig.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/common/config/RemoteConfig.java @@ -1,4 +1,4 @@ -package com.bonus.canteen.common.config; +package com.bonus.core.common.config; import com.bonus.common.core.constant.SecurityConstants; import com.bonus.common.core.utils.StringUtils; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/common/response/ApiResponse.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/common/response/ApiResponse.java similarity index 94% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/common/response/ApiResponse.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/common/response/ApiResponse.java index 2c1e5feb..57391d64 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/common/response/ApiResponse.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/common/response/ApiResponse.java @@ -1,4 +1,4 @@ -package com.bonus.canteen.common.response; +package com.bonus.core.common.response; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/common/response/CanteenResponse.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/common/response/CanteenResponse.java similarity index 87% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/common/response/CanteenResponse.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/common/response/CanteenResponse.java index 37fcfdf7..2a79e1c8 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/common/response/CanteenResponse.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/common/response/CanteenResponse.java @@ -1,6 +1,6 @@ -package com.bonus.canteen.common.response; +package com.bonus.core.common.response; -import com.bonus.canteen.basic.vo.Canteen; +import com.bonus.core.basic.vo.Canteen; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/common/response/Customer.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/common/response/Customer.java similarity index 97% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/common/response/Customer.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/common/response/Customer.java index cf29b6e5..1a4bfe6c 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/common/response/Customer.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/common/response/Customer.java @@ -1,4 +1,4 @@ -package com.bonus.canteen.common.response; +package com.bonus.core.common.response; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/common/response/ResponseDatad.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/common/response/ResponseDatad.java similarity index 94% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/common/response/ResponseDatad.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/common/response/ResponseDatad.java index 43f57145..9784c436 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/common/response/ResponseDatad.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/common/response/ResponseDatad.java @@ -1,4 +1,4 @@ -package com.bonus.canteen.common.response; +package com.bonus.core.common.response; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/common/response/ShopstallResponse.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/common/response/ShopstallResponse.java similarity index 90% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/common/response/ShopstallResponse.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/common/response/ShopstallResponse.java index 1e964c2a..b5f52bd2 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/common/response/ShopstallResponse.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/common/response/ShopstallResponse.java @@ -1,6 +1,6 @@ -package com.bonus.canteen.common.response; +package com.bonus.core.common.response; -import com.bonus.canteen.basic.vo.Shopstall; +import com.bonus.core.basic.vo.Shopstall; import lombok.Data; import java.util.List; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/common/utils/AccessToken.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/common/utils/AccessToken.java similarity index 99% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/common/utils/AccessToken.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/common/utils/AccessToken.java index cd80a372..dcc5f6e9 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/common/utils/AccessToken.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/common/utils/AccessToken.java @@ -3,7 +3,7 @@ // (powered by FernFlower decompiler) // -package com.bonus.canteen.common.utils; +package com.bonus.core.common.utils; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import org.slf4j.Logger; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/common/utils/AlipayUtils.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/common/utils/AlipayUtils.java similarity index 99% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/common/utils/AlipayUtils.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/common/utils/AlipayUtils.java index 97927022..979879a8 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/common/utils/AlipayUtils.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/common/utils/AlipayUtils.java @@ -1,4 +1,4 @@ -package com.bonus.canteen.common.utils; +package com.bonus.core.common.utils; import com.alipay.api.AlipayApiException; import com.alipay.api.AlipayClient; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/common/utils/CustomBusiness.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/common/utils/CustomBusiness.java similarity index 96% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/common/utils/CustomBusiness.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/common/utils/CustomBusiness.java index 83560f27..a904ccc4 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/common/utils/CustomBusiness.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/common/utils/CustomBusiness.java @@ -1,5 +1,5 @@ -package com.bonus.canteen.common.utils; +package com.bonus.core.common.utils; import cn.hutool.core.collection.CollUtil; import java.util.List; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/common/utils/RedisCache.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/common/utils/RedisCache.java similarity index 99% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/common/utils/RedisCache.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/common/utils/RedisCache.java index a7b32d2f..b4824b25 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/common/utils/RedisCache.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/common/utils/RedisCache.java @@ -1,4 +1,4 @@ -package com.bonus.canteen.common.utils; +package com.bonus.core.common.utils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.BoundSetOperations; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/common/utils/StringUtils.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/common/utils/StringUtils.java similarity index 97% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/common/utils/StringUtils.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/common/utils/StringUtils.java index 81b4d84a..97d23e9c 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/common/utils/StringUtils.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/common/utils/StringUtils.java @@ -1,4 +1,4 @@ -package com.bonus.canteen.common.utils; +package com.bonus.core.common.utils; import java.util.Random; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/menu/controller/AppletRecipeV2Controller.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/controller/AppletRecipeV2Controller.java similarity index 87% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/menu/controller/AppletRecipeV2Controller.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/controller/AppletRecipeV2Controller.java index 880e242e..769344d4 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/menu/controller/AppletRecipeV2Controller.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/controller/AppletRecipeV2Controller.java @@ -1,6 +1,6 @@ -package com.bonus.canteen.menu.controller; +package com.bonus.core.menu.controller; -import com.bonus.canteen.menu.domain.dto.AppletWeekRecipeDTO; +import com.bonus.core.menu.domain.dto.AppletWeekRecipeDTO; import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/menu/domain/dto/AppletWeekRecipeDTO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/domain/dto/AppletWeekRecipeDTO.java similarity index 93% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/menu/domain/dto/AppletWeekRecipeDTO.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/domain/dto/AppletWeekRecipeDTO.java index 7d0164b0..925322cc 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/menu/domain/dto/AppletWeekRecipeDTO.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/domain/dto/AppletWeekRecipeDTO.java @@ -1,4 +1,4 @@ -package com.bonus.canteen.menu.domain.dto; +package com.bonus.core.menu.domain.dto; import io.swagger.annotations.ApiModelProperty; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/menu/domain/vo/AppletCurrentDishesDetailVO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/domain/vo/AppletCurrentDishesDetailVO.java similarity index 95% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/menu/domain/vo/AppletCurrentDishesDetailVO.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/domain/vo/AppletCurrentDishesDetailVO.java index e29629c7..8ae0a5e8 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/menu/domain/vo/AppletCurrentDishesDetailVO.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/domain/vo/AppletCurrentDishesDetailVO.java @@ -1,4 +1,4 @@ -package com.bonus.canteen.menu.domain.vo; +package com.bonus.core.menu.domain.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/menu/domain/vo/AppletWeekRecipeDishesVO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/domain/vo/AppletWeekRecipeDishesVO.java similarity index 95% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/menu/domain/vo/AppletWeekRecipeDishesVO.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/domain/vo/AppletWeekRecipeDishesVO.java index cf7dd884..b8895f62 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/menu/domain/vo/AppletWeekRecipeDishesVO.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/domain/vo/AppletWeekRecipeDishesVO.java @@ -1,4 +1,4 @@ -package com.bonus.canteen.menu.domain.vo; +package com.bonus.core.menu.domain.vo; import cn.hutool.core.util.ObjectUtil; import io.swagger.annotations.ApiModel; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/menu/domain/vo/AppletWeekRecipeTypeVO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/domain/vo/AppletWeekRecipeTypeVO.java similarity index 91% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/menu/domain/vo/AppletWeekRecipeTypeVO.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/domain/vo/AppletWeekRecipeTypeVO.java index a487d69a..54a7496f 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/menu/domain/vo/AppletWeekRecipeTypeVO.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/domain/vo/AppletWeekRecipeTypeVO.java @@ -1,4 +1,4 @@ -package com.bonus.canteen.menu.domain.vo; +package com.bonus.core.menu.domain.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/menu/domain/vo/AppletWeekRecipeVO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/domain/vo/AppletWeekRecipeVO.java similarity index 91% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/menu/domain/vo/AppletWeekRecipeVO.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/domain/vo/AppletWeekRecipeVO.java index de9be321..0aa3631a 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/menu/domain/vo/AppletWeekRecipeVO.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/domain/vo/AppletWeekRecipeVO.java @@ -1,4 +1,4 @@ -package com.bonus.canteen.menu.domain.vo; +package com.bonus.core.menu.domain.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/menu/mapper/MenuAppRecipeMapper.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/mapper/MenuAppRecipeMapper.java similarity index 73% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/menu/mapper/MenuAppRecipeMapper.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/mapper/MenuAppRecipeMapper.java index 90242b1d..0ee305e5 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/menu/mapper/MenuAppRecipeMapper.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/mapper/MenuAppRecipeMapper.java @@ -1,6 +1,6 @@ -package com.bonus.canteen.menu.mapper; +package com.bonus.core.menu.mapper; -import com.bonus.canteen.menu.domain.vo.AppletWeekRecipeVO; +import com.bonus.core.menu.domain.vo.AppletWeekRecipeVO; import org.apache.ibatis.annotations.Param; import java.time.LocalDate; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/menu/mapper/MenuRecipeMapper.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/mapper/MenuRecipeMapper.java similarity index 81% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/menu/mapper/MenuRecipeMapper.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/mapper/MenuRecipeMapper.java index e79e019c..253b26ea 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/menu/mapper/MenuRecipeMapper.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/mapper/MenuRecipeMapper.java @@ -1,7 +1,7 @@ -package com.bonus.canteen.menu.mapper; +package com.bonus.core.menu.mapper; -import com.bonus.canteen.menu.domain.vo.AppletWeekRecipeVO; +import com.bonus.core.menu.domain.vo.AppletWeekRecipeVO; 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/canteen/menu/service/MenuRecipeService.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/service/MenuRecipeService.java similarity index 65% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/menu/service/MenuRecipeService.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/service/MenuRecipeService.java index 21b841cb..7247988c 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/menu/service/MenuRecipeService.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/service/MenuRecipeService.java @@ -1,9 +1,9 @@ -package com.bonus.canteen.menu.service; +package com.bonus.core.menu.service; import cn.hutool.core.util.ObjectUtil; -import com.bonus.canteen.menu.domain.dto.AppletWeekRecipeDTO; -import com.bonus.canteen.menu.domain.vo.AppletWeekRecipeVO; +import com.bonus.core.menu.domain.dto.AppletWeekRecipeDTO; +import com.bonus.core.menu.domain.vo.AppletWeekRecipeVO; import com.google.common.collect.Lists; import com.google.common.collect.Sets; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/menu/service/impl/MenuRecipeServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/service/impl/MenuRecipeServiceImpl.java similarity index 83% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/menu/service/impl/MenuRecipeServiceImpl.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/service/impl/MenuRecipeServiceImpl.java index a5d11287..908c1997 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/menu/service/impl/MenuRecipeServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/service/impl/MenuRecipeServiceImpl.java @@ -1,7 +1,7 @@ -package com.bonus.canteen.menu.service.impl; +package com.bonus.core.menu.service.impl; -import com.bonus.canteen.menu.domain.dto.AppletWeekRecipeDTO; -import com.bonus.canteen.menu.service.MenuRecipeService; +import com.bonus.core.menu.domain.dto.AppletWeekRecipeDTO; +import com.bonus.core.menu.service.MenuRecipeService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/order/controller/OrderInfoController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/order/controller/OrderInfoController.java similarity index 95% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/order/controller/OrderInfoController.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/order/controller/OrderInfoController.java index 8014cc90..9d0e9331 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/order/controller/OrderInfoController.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/order/controller/OrderInfoController.java @@ -1,9 +1,9 @@ -package com.bonus.canteen.order.controller; +package com.bonus.core.order.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; -import com.bonus.canteen.order.domain.dto.CustQueryDTO; +import com.bonus.core.order.domain.dto.CustQueryDTO; import com.bonus.common.log.enums.OperaType; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -16,8 +16,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import com.bonus.common.log.annotation.SysLog; import com.bonus.common.security.annotation.RequiresPermissions; -import com.bonus.canteen.order.domain.OrderInfo; -import com.bonus.canteen.order.service.IOrderInfoService; +import com.bonus.core.order.domain.OrderInfo; +import com.bonus.core.order.service.IOrderInfoService; import com.bonus.common.core.web.controller.BaseController; import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.common.core.utils.poi.ExcelUtil; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/order/domain/OrderInfo.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/order/domain/OrderInfo.java similarity index 99% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/order/domain/OrderInfo.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/order/domain/OrderInfo.java index 1d41e1dc..fd4e90c8 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/order/domain/OrderInfo.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/order/domain/OrderInfo.java @@ -1,4 +1,4 @@ -package com.bonus.canteen.order.domain; +package com.bonus.core.order.domain; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/order/domain/dto/CustQueryDTO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/order/domain/dto/CustQueryDTO.java similarity index 97% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/order/domain/dto/CustQueryDTO.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/order/domain/dto/CustQueryDTO.java index 6ef88b54..456b1983 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/order/domain/dto/CustQueryDTO.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/order/domain/dto/CustQueryDTO.java @@ -1,4 +1,4 @@ -package com.bonus.canteen.order.domain.dto; +package com.bonus.core.order.domain.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/order/domain/vo/OrderIdDateVO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/order/domain/vo/OrderIdDateVO.java similarity index 76% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/order/domain/vo/OrderIdDateVO.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/order/domain/vo/OrderIdDateVO.java index 03405e05..144f533c 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/order/domain/vo/OrderIdDateVO.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/order/domain/vo/OrderIdDateVO.java @@ -1,4 +1,4 @@ -package com.bonus.canteen.order.domain.vo; +package com.bonus.core.order.domain.vo; import lombok.Data; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/order/mapper/OrderInfoMapper.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/order/mapper/OrderInfoMapper.java similarity index 89% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/order/mapper/OrderInfoMapper.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/order/mapper/OrderInfoMapper.java index c0a33b45..4f313405 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/order/mapper/OrderInfoMapper.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/order/mapper/OrderInfoMapper.java @@ -1,9 +1,9 @@ -package com.bonus.canteen.order.mapper; +package com.bonus.core.order.mapper; import java.util.List; -import com.bonus.canteen.order.domain.vo.OrderIdDateVO; -import com.bonus.canteen.order.domain.OrderInfo; +import com.bonus.core.order.domain.vo.OrderIdDateVO; +import com.bonus.core.order.domain.OrderInfo; /** * 订单Mapper接口 diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/order/service/IOrderInfoService.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/order/service/IOrderInfoService.java similarity index 93% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/order/service/IOrderInfoService.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/order/service/IOrderInfoService.java index a00a84e9..4ff9e3de 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/order/service/IOrderInfoService.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/order/service/IOrderInfoService.java @@ -1,7 +1,7 @@ -package com.bonus.canteen.order.service; +package com.bonus.core.order.service; import java.util.List; -import com.bonus.canteen.order.domain.OrderInfo; +import com.bonus.core.order.domain.OrderInfo; /** * 订单Service接口 diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/order/service/impl/OrderInfoServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/order/service/impl/OrderInfoServiceImpl.java similarity index 89% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/order/service/impl/OrderInfoServiceImpl.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/order/service/impl/OrderInfoServiceImpl.java index 350352bb..6c283fe2 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/order/service/impl/OrderInfoServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/order/service/impl/OrderInfoServiceImpl.java @@ -1,15 +1,15 @@ -package com.bonus.canteen.order.service.impl; +package com.bonus.core.order.service.impl; import java.util.List; -import com.bonus.canteen.common.Enum.LeCodeUseSceneEnum; +import com.bonus.core.common.Enum.LeCodeUseSceneEnum; import com.bonus.common.core.exception.ServiceException; -import com.bonus.canteen.order.domain.vo.OrderIdDateVO; +import com.bonus.core.order.domain.vo.OrderIdDateVO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.bonus.canteen.order.mapper.OrderInfoMapper; -import com.bonus.canteen.order.domain.OrderInfo; -import com.bonus.canteen.order.service.IOrderInfoService; +import com.bonus.core.order.mapper.OrderInfoMapper; +import com.bonus.core.order.domain.OrderInfo; +import com.bonus.core.order.service.IOrderInfoService; /** * 订单Service业务层处理 diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/pay/controller/PayController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/pay/controller/PayController.java similarity index 99% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/pay/controller/PayController.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/pay/controller/PayController.java index e2b4cf61..5f38e94e 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/pay/controller/PayController.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/pay/controller/PayController.java @@ -1,4 +1,4 @@ -package com.bonus.canteen.pay.controller; +package com.bonus.core.pay.controller; import com.alipay.api.AlipayApiException; import com.alipay.api.AlipayClient; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/pay/domain/OrdDetailDTO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/pay/domain/OrdDetailDTO.java similarity index 91% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/pay/domain/OrdDetailDTO.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/pay/domain/OrdDetailDTO.java index 51b7d603..08d91dd3 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/pay/domain/OrdDetailDTO.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/pay/domain/OrdDetailDTO.java @@ -1,4 +1,4 @@ -package com.bonus.canteen.pay.domain; +package com.bonus.core.pay.domain; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/pay/domain/PayDeviceDTO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/pay/domain/PayDeviceDTO.java similarity index 98% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/pay/domain/PayDeviceDTO.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/pay/domain/PayDeviceDTO.java index 7248c44f..f482f097 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/pay/domain/PayDeviceDTO.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/pay/domain/PayDeviceDTO.java @@ -1,4 +1,4 @@ -package com.bonus.canteen.pay.domain; +package com.bonus.core.pay.domain; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/pay/domain/PayResDTO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/pay/domain/PayResDTO.java similarity index 88% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/pay/domain/PayResDTO.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/pay/domain/PayResDTO.java index 1d17bbf6..3bc65b59 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/pay/domain/PayResDTO.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/pay/domain/PayResDTO.java @@ -1,4 +1,4 @@ -package com.bonus.canteen.pay.domain; +package com.bonus.core.pay.domain; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/pay/domain/RechargeResDTO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/pay/domain/RechargeResDTO.java similarity index 97% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/pay/domain/RechargeResDTO.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/pay/domain/RechargeResDTO.java index cfe66a98..ad55a2b4 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/pay/domain/RechargeResDTO.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/pay/domain/RechargeResDTO.java @@ -1,4 +1,4 @@ -package com.bonus.canteen.pay.domain; +package com.bonus.core.pay.domain; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/BasicsCanteenEvaluateMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/BasicsCanteenEvaluateMapper.xml index bc4e01b1..3759635f 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/BasicsCanteenEvaluateMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/BasicsCanteenEvaluateMapper.xml @@ -1,8 +1,8 @@ - + - + diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/BasicsComplaintMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/BasicsComplaintMapper.xml index 8180b774..0d98c23a 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/BasicsComplaintMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/BasicsComplaintMapper.xml @@ -1,8 +1,8 @@ - + - + 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 2eb81269..a7670cb9 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 @@ -1,8 +1,8 @@ - + - + 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 fd672e6b..3a446b34 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 @@ -1,8 +1,8 @@ - + - + diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/OrderInfoMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/OrderInfoMapper.xml index 4ed56862..cc2afbc4 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/OrderInfoMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/OrderInfoMapper.xml @@ -2,8 +2,8 @@ - - + + @@ -75,7 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select order_id, mac_order_id, machine_sn, machine_num, plate_serial_num, cust_id, org_id, org_num, org_full_name, psn_type, psn_type_name, operator_id, operator_name, cashier_id, cashier_name, nu_clear_mode, consum_mode, source_type, if_online, canteen_id, canteen_name, stall_id, stall_name, room_id, room_name, permission_code, mealtime_type, mealtime_name, meal_code, order_date, coupon_id, payable_amount, discounts_amount, coupon_amount, delivery_amount, packing_amount, real_amount, acc_pay_amount, out_pay_amount, refund_amount, order_time, order_type, order_state, order_refund_state, deduction_type, pay_time, pay_type, pay_channel, pay_state, part_pay_reason, pay_param, delivery_type, dishes_state, comment_state, img_url, remark, inventory_out_id, if_quick_fail, ext_param, reserve, crby, crtime, upby, uptime, expire_time from order_info - and mac_order_id = #{macOrderId} @@ -149,7 +149,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where order_id = #{orderId} - + insert into order_info order_id, @@ -287,7 +287,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + update order_info mac_order_id = #{macOrderId}, @@ -370,7 +370,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - SELECT oi.order_id AS id, oi.order_date as orderDate FROM order_info oi where 1=1 diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/SysNoticeMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/SysNoticeMapper.xml index e785ed92..4caa8fff 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/SysNoticeMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/SysNoticeMapper.xml @@ -2,9 +2,9 @@ - + - + @@ -27,7 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where notice_id = #{noticeId} - @@ -42,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + insert into sys_notice ( notice_title, notice_type, @@ -62,7 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ) - + update sys_notice notice_title = #{noticeTitle},