bonus
/
Bonus-Cloud-Smart-Canteen
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

合并代码

This commit is contained in:
sxu 2025-01-23 17:04:37 +08:00
parent 3bacd3b8a4
commit 4ebcc21e48
77 changed files with 157 additions and 157 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/BonusSmartCanteenApplication.java → bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/BonusSmartCanteenApplication.java
View File

@ -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;

6
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/controller/BasicsCanteenEvaluateController.java → bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/controller/BasicsCanteenEvaluateController.java
View File

@ -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;

6
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/controller/BasicsComplaintController.java → bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/controller/BasicsComplaintController.java
View File

@ -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;

8
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/controller/ConsInfoController.java → bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/controller/ConsInfoController.java
View File

@ -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;

6
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/controller/CustAddrController.java → bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/controller/CustAddrController.java
View File

@ -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;

6
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/controller/CustPlaceController.java → bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/controller/CustPlaceController.java
View File

@ -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;

6
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/controller/SysNoticeController.java → bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/controller/SysNoticeController.java
View File

@ -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;

2
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/dto/BasicsComplaintDTO.java → bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/dto/BasicsComplaintDTO.java
View File

@ -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;

2
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/dto/MgrUserLoginDTO.java → bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/dto/MgrUserLoginDTO.java
View File

@ -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;

2
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/dto/MyiInfoReq.java → bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/dto/MyiInfoReq.java
View File

@ -1,4 +1,4 @@
package com.bonus.canteen.basic.dto;
package com.bonus.core.basic.dto;
import lombok.Data;

2
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/dto/PigxUser.java → bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/dto/PigxUser.java
View File

@ -1,5 +1,5 @@
package com.bonus.canteen.basic.dto;
package com.bonus.core.basic.dto;
import java.io.Serializable;

4
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/mapper/BasicsCanteenEvaluateMapper.java → bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/mapper/BasicsCanteenEvaluateMapper.java
View File

@ -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;

4
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/mapper/BasicsComplaintMapper.java → bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/mapper/BasicsComplaintMapper.java
View File

@ -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;

4
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/mapper/CustAddrMapper.java → bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/mapper/CustAddrMapper.java
View File

@ -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;

4
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/mapper/CustPlaceMapper.java → bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/mapper/CustPlaceMapper.java
View File

@ -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;

4
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/mapper/SysNoticeMapper.java → bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/mapper/SysNoticeMapper.java
View File

@ -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;

2
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/model/BasicsCanteenEvaluate.java → bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/model/BasicsCanteenEvaluate.java
View File

@ -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;

2
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/model/BasicsComplaint.java → bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/model/BasicsComplaint.java
View File

@ -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;

2
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/model/CustAddr.java → bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/model/CustAddr.java
View File

@ -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;

2
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/model/CustPlace.java → bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/model/CustPlace.java
View File

@ -1,4 +1,4 @@
package com.bonus.canteen.basic.model;
package com.bonus.core.basic.model;
import java.util.Date;
import java.io.Serializable;

2
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/model/SysNotice.java → bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/model/SysNotice.java
View File

@ -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;

4
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/service/BasicsCanteenEvaluateService.java → bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/service/BasicsCanteenEvaluateService.java
View File

@ -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;

4
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/service/BasicsComplaintService.java → bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/service/BasicsComplaintService.java
View File

@ -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;

4
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/service/CustAddrService.java → bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/service/CustAddrService.java
View File

@ -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;

4
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/service/CustPlaceService.java → bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/service/CustPlaceService.java
View File

@ -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;

4
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/service/ISysNoticeService.java → bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/service/ISysNoticeService.java
View File

@ -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;

8
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/service/MgrUserBurialPointBusiness.java → bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/service/MgrUserBurialPointBusiness.java
View File

@ -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;

2
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/service/MgrUserService.java → bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/service/MgrUserService.java
View File

@ -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;

10
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/service/impl/BasicsCanteenEvaluateServiceImpl.java → bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/service/impl/BasicsCanteenEvaluateServiceImpl.java
View File

@ -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;

10
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/service/impl/BasicsComplaintServiceImpl.java → bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/service/impl/BasicsComplaintServiceImpl.java
View File

@ -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;

10
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/service/impl/CustAddrServiceImpl.java → bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/service/impl/CustAddrServiceImpl.java
View File

@ -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;

8
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/service/impl/CustPlaceServiceImpl.java → bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/service/impl/CustPlaceServiceImpl.java
View File

@ -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;

8
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/service/impl/SysNoticeServiceImpl.java → bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/service/impl/SysNoticeServiceImpl.java
View File

@ -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;

2
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/vo/Canteen.java → bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/vo/Canteen.java
View File

@ -1,4 +1,4 @@
package com.bonus.canteen.basic.vo;
package com.bonus.core.basic.vo;
import lombok.Data;

2
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/basic/vo/Shopstall.java → bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/basic/vo/Shopstall.java
View File

@ -1,4 +1,4 @@
package com.bonus.canteen.basic.vo;
package com.bonus.core.basic.vo;
import lombok.Data;

2
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/common/Enum/LeCodeUseSceneEnum.java → bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/common/Enum/LeCodeUseSceneEnum.java
View File

@ -1,4 +1,4 @@
package com.bonus.canteen.common.Enum;
package com.bonus.core.common.Enum;
public enum LeCodeUseSceneEnum {
PAIRING(1, "配餐"),

2
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/common/annotation/PreventRepeatSubmit.java → bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/common/annotation/PreventRepeatSubmit.java
View File

@ -1,4 +1,4 @@
package com.bonus.canteen.common.annotation;
package com.bonus.core.common.annotation;
import java.lang.annotation.*;

8
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/common/aspect/PreventRepeatSubmitAspect.java → bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/common/aspect/PreventRepeatSubmitAspect.java
View File

@ -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() {
}

2
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/common/config/RemoteConfig.java → bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/common/config/RemoteConfig.java
View File

@ -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;

2
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/common/response/ApiResponse.java → bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/common/response/ApiResponse.java
View File

@ -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;

4
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/common/response/CanteenResponse.java → bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/common/response/CanteenResponse.java
View File

@ -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;

2
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/common/response/Customer.java → bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/common/response/Customer.java
View File

@ -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;

2
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/common/response/ResponseDatad.java → bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/common/response/ResponseDatad.java
View File

@ -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;

4
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/common/response/ShopstallResponse.java → bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/common/response/ShopstallResponse.java
View File

@ -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;

2
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/common/utils/AccessToken.java → bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/common/utils/AccessToken.java
View File

@ -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;

2
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/common/utils/AlipayUtils.java → bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/common/utils/AlipayUtils.java
View File

@ -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;

2
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/common/utils/CustomBusiness.java → bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/common/utils/CustomBusiness.java
View File

@ -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;

2
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/common/utils/RedisCache.java → bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/common/utils/RedisCache.java
View File

@ -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;

2
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/common/utils/StringUtils.java → bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/common/utils/StringUtils.java
View File

@ -1,4 +1,4 @@
package com.bonus.canteen.common.utils;
package com.bonus.core.common.utils;
import java.util.Random;

4
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/menu/controller/AppletRecipeV2Controller.java → bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/controller/AppletRecipeV2Controller.java
View File

@ -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;

2
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/menu/domain/dto/AppletWeekRecipeDTO.java → bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/domain/dto/AppletWeekRecipeDTO.java
View File

@ -1,4 +1,4 @@
package com.bonus.canteen.menu.domain.dto;
package com.bonus.core.menu.domain.dto;
import io.swagger.annotations.ApiModelProperty;

2
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/menu/domain/vo/AppletCurrentDishesDetailVO.java → bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/domain/vo/AppletCurrentDishesDetailVO.java
View File

@ -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;

2
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/menu/domain/vo/AppletWeekRecipeDishesVO.java → bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/domain/vo/AppletWeekRecipeDishesVO.java
View File

@ -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;

2
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/menu/domain/vo/AppletWeekRecipeTypeVO.java → bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/domain/vo/AppletWeekRecipeTypeVO.java
View File

@ -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;

2
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/menu/domain/vo/AppletWeekRecipeVO.java → bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/domain/vo/AppletWeekRecipeVO.java
View File

@ -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;

4
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/menu/mapper/MenuAppRecipeMapper.java → bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/mapper/MenuAppRecipeMapper.java
View File

@ -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;

4
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/menu/mapper/MenuRecipeMapper.java → bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/mapper/MenuRecipeMapper.java
View File

@ -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;

6
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/menu/service/MenuRecipeService.java → bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/service/MenuRecipeService.java
View File

@ -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;

6
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/menu/service/impl/MenuRecipeServiceImpl.java → bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/service/impl/MenuRecipeServiceImpl.java
View File

@ -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;

8
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/order/controller/OrderInfoController.java → bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/order/controller/OrderInfoController.java
View File

@ -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;

2
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/order/domain/OrderInfo.java → bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/order/domain/OrderInfo.java
View File

@ -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;

2
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/order/domain/dto/CustQueryDTO.java → bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/order/domain/dto/CustQueryDTO.java
View File

@ -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;

2
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/order/domain/vo/OrderIdDateVO.java → bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/order/domain/vo/OrderIdDateVO.java
View File

@ -1,4 +1,4 @@
package com.bonus.canteen.order.domain.vo;
package com.bonus.core.order.domain.vo;
import lombok.Data;

6
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/order/mapper/OrderInfoMapper.java → bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/order/mapper/OrderInfoMapper.java
View File

@ -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接口

4
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/order/service/IOrderInfoService.java → bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/order/service/IOrderInfoService.java
View File

@ -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接口

12
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/order/service/impl/OrderInfoServiceImpl.java → bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/order/service/impl/OrderInfoServiceImpl.java
View File

@ -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业务层处理

2
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/pay/controller/PayController.java → bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/pay/controller/PayController.java
View File

@ -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;

2
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/pay/domain/OrdDetailDTO.java → bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/pay/domain/OrdDetailDTO.java
View File

@ -1,4 +1,4 @@
package com.bonus.canteen.pay.domain;
package com.bonus.core.pay.domain;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

2
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/pay/domain/PayDeviceDTO.java → bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/pay/domain/PayDeviceDTO.java
View File

@ -1,4 +1,4 @@
package com.bonus.canteen.pay.domain;
package com.bonus.core.pay.domain;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

2
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/pay/domain/PayResDTO.java → bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/pay/domain/PayResDTO.java
View File

@ -1,4 +1,4 @@
package com.bonus.canteen.pay.domain;
package com.bonus.core.pay.domain;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

2
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/pay/domain/RechargeResDTO.java → bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/pay/domain/RechargeResDTO.java
View File

@ -1,4 +1,4 @@
package com.bonus.canteen.pay.domain;
package com.bonus.core.pay.domain;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

4
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/BasicsCanteenEvaluateMapper.xml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.bonus.canteen.consumer.mapper.BasicsCanteenEvaluateMapper">
<mapper namespace="com.bonus.core.consumer.mapper.BasicsCanteenEvaluateMapper">
<resultMap type="com.bonus.canteen.basic.model.BasicsCanteenEvaluate" id="BasicsCanteenEvaluateMap">
<resultMap type="com.bonus.core.basic.model.BasicsCanteenEvaluate" id="BasicsCanteenEvaluateMap">
<result property="id" column="id" jdbcType="INTEGER"/>
<result property="evaluateId" column="evaluate_id" jdbcType="INTEGER"/>
<result property="custId" column="cust_id" jdbcType="INTEGER"/>

4
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/BasicsComplaintMapper.xml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.bonus.canteen.consumer.mapper.BasicsComplaintMapper">
<mapper namespace="com.bonus.core.consumer.mapper.BasicsComplaintMapper">
<resultMap type="com.bonus.canteen.basic.model.BasicsComplaint" id="BasicsComplaintMap">
<resultMap type="com.bonus.core.basic.model.BasicsComplaint" id="BasicsComplaintMap">
<result property="id" column="id" jdbcType="INTEGER"/>
<result property="complaintId" column="complaint_id" jdbcType="INTEGER"/>
<result property="custId" column="cust_id" jdbcType="INTEGER"/>

4
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/CustAddrDao.xml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.bonus.canteen.consumer.mapper.CustAddrMapper">
<mapper namespace="com.bonus.core.consumer.mapper.CustAddrMapper">
<resultMap type="com.bonus.canteen.basic.model.CustAddr" id="CustAddrMap">
<resultMap type="com.bonus.core.basic.model.CustAddr" id="CustAddrMap">
<result property="id" column="id" jdbcType="INTEGER"/>
<result property="custId" column="cust_id" jdbcType="INTEGER"/>
<result property="addrId" column="addr_id" jdbcType="INTEGER"/>

4
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/CustPlaceMapper.xml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.bonus.canteen.consumer.mapper.CustPlaceMapper">
<mapper namespace="com.bonus.core.consumer.mapper.CustPlaceMapper">
<resultMap type="com.bonus.canteen.basic.model.CustPlace" id="CustPlaceMap">
<resultMap type="com.bonus.core.basic.model.CustPlace" id="CustPlaceMap">
<result property="id" column="id" jdbcType="INTEGER"/>
<result property="placeId" column="place_id" jdbcType="INTEGER"/>
<result property="placeNum" column="place_num" jdbcType="VARCHAR"/>

12
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/OrderInfoMapper.xml
View File

@ -2,8 +2,8 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.bonus.canteen.order.mapper.OrderInfoMapper">
<resultMap type="com.bonus.canteen.order.domain.OrderInfo" id="OrderInfoResult">
<mapper namespace="com.bonus.core.order.mapper.OrderInfoMapper">
<resultMap type="com.bonus.core.order.domain.OrderInfo" id="OrderInfoResult">
<result property="orderId" column="order_id" />
<result property="macOrderId" column="mac_order_id" />
<result property="machineSn" column="machine_sn" />
@ -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
</sql>
<select id="selectOrderInfoList" parameterType="com.bonus.canteen.order.domain.OrderInfo" resultMap="OrderInfoResult">
<select id="selectOrderInfoList" parameterType="com.bonus.core.order.domain.OrderInfo" resultMap="OrderInfoResult">
<include refid="selectOrderInfoVo"/>
<where>
<if test="macOrderId != null and macOrderId != ''"> and mac_order_id = #{macOrderId}</if>
@ -149,7 +149,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where order_id = #{orderId}
</select>
<insert id="insertOrderInfo" parameterType="com.bonus.canteen.order.domain.OrderInfo">
<insert id="insertOrderInfo" parameterType="com.bonus.core.order.domain.OrderInfo">
insert into order_info
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="orderId != null">order_id,</if>
@ -287,7 +287,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</trim>
</insert>
<update id="updateOrderInfo" parameterType="com.bonus.canteen.order.domain.OrderInfo">
<update id="updateOrderInfo" parameterType="com.bonus.core.order.domain.OrderInfo">
update order_info
<trim prefix="SET" suffixOverrides=",">
<if test="macOrderId != null and macOrderId != ''">mac_order_id = #{macOrderId},</if>
@ -370,7 +370,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</delete>
<!-- 查询订单id -->
<select id="queryOrderId" resultType="com.bonus.canteen.order.domain.vo.OrderIdDateVO">
<select id="queryOrderId" resultType="com.bonus.core.order.domain.vo.OrderIdDateVO">
SELECT oi.order_id AS id, oi.order_date as orderDate
FROM order_info oi
where 1=1

10
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/SysNoticeMapper.xml
View File

@ -2,9 +2,9 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.bonus.canteen.consumer.mapper.SysNoticeMapper">
<mapper namespace="com.bonus.core.consumer.mapper.SysNoticeMapper">
<resultMap type="com.bonus.canteen.basic.model.SysNotice" id="SysNoticeResult">
<resultMap type="com.bonus.core.basic.model.SysNotice" id="SysNoticeResult">
<result property="noticeId" column="notice_id" />
<result property="noticeTitle" column="notice_title" />
<result property="noticeType" column="notice_type" />
@ -27,7 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where notice_id = #{noticeId}
</select>
<select id="selectNoticeList" parameterType="com.bonus.canteen.basic.model.SysNotice" resultMap="SysNoticeResult">
<select id="selectNoticeList" parameterType="com.bonus.core.basic.model.SysNotice" resultMap="SysNoticeResult">
<include refid="selectNoticeVo"/>
<where>
<if test="noticeTitle != null and noticeTitle != ''">
@ -42,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</where>
</select>
<insert id="insertNotice" parameterType="com.bonus.canteen.basic.model.SysNotice">
<insert id="insertNotice" parameterType="com.bonus.core.basic.model.SysNotice">
insert into sys_notice (
<if test="noticeTitle != null and noticeTitle != '' ">notice_title, </if>
<if test="noticeType != null and noticeType != '' ">notice_type, </if>
@ -62,7 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
)
</insert>
<update id="updateNotice" parameterType="com.bonus.canteen.basic.model.SysNotice">
<update id="updateNotice" parameterType="com.bonus.core.basic.model.SysNotice">
update sys_notice
<set>
<if test="noticeTitle != null and noticeTitle != ''">notice_title = #{noticeTitle}, </if>