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:22:04 +08:00
parent 4b7ab6ee90
commit dda2589474
27 changed files with 32 additions and 32 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/core/basic/controller/BasicsCanteenEvaluateController.java
View File

@ -1,6 +1,6 @@
package com.bonus.core.basic.controller; package com.bonus.core.basic.controller;
import com.bonus.core.basic.model.BasicsCanteenEvaluate; import com.bonus.core.basic.domain.BasicsCanteenEvaluate;
import com.bonus.core.basic.service.BasicsCanteenEvaluateService; import com.bonus.core.basic.service.BasicsCanteenEvaluateService;
import org.springframework.data.domain.Page; import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.PageRequest;

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

@ -1,6 +1,6 @@
package com.bonus.core.basic.controller; package com.bonus.core.basic.controller;
import com.bonus.core.basic.model.BasicsComplaint; import com.bonus.core.basic.domain.BasicsComplaint;
import com.bonus.core.basic.service.BasicsComplaintService; import com.bonus.core.basic.service.BasicsComplaintService;
import com.bonus.common.core.web.controller.BaseController; import com.bonus.common.core.web.controller.BaseController;
import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.common.core.web.domain.AjaxResult;

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

@ -1,6 +1,6 @@
package com.bonus.core.basic.controller; package com.bonus.core.basic.controller;
import com.bonus.core.basic.model.SysNotice; import com.bonus.core.basic.domain.SysNotice;
import com.bonus.core.basic.service.ISysNoticeService; import com.bonus.core.basic.service.ISysNoticeService;
import com.bonus.common.core.web.controller.BaseController; import com.bonus.common.core.web.controller.BaseController;
import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.common.core.web.domain.AjaxResult;

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

@ -1,4 +1,4 @@
package com.bonus.core.basic.model; package com.bonus.core.basic.domain;
import com.bonus.common.core.web.domain.BaseEntity; import com.bonus.common.core.web.domain.BaseEntity;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;

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

@ -1,4 +1,4 @@
package com.bonus.core.basic.model; package com.bonus.core.basic.domain;
import com.bonus.common.core.web.domain.BaseEntity; import com.bonus.common.core.web.domain.BaseEntity;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;

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

@ -1,4 +1,4 @@
package com.bonus.core.basic.model; package com.bonus.core.basic.domain;
import com.bonus.common.core.web.domain.BaseEntity; import com.bonus.common.core.web.domain.BaseEntity;
import com.bonus.common.core.xss.Xss; import com.bonus.common.core.xss.Xss;

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

@ -1,4 +1,4 @@
package com.bonus.core.basic.dto; package com.bonus.core.basic.domain.dto;
import cn.hutool.db.Page; import cn.hutool.db.Page;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;

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

@ -1,6 +1,6 @@
package com.bonus.core.basic.dto; package com.bonus.core.basic.domain.dto;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;

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

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

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

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

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

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

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

@ -1,6 +1,6 @@
package com.bonus.core.basic.mapper; package com.bonus.core.basic.mapper;
import com.bonus.core.basic.model.BasicsCanteenEvaluate; import com.bonus.core.basic.domain.BasicsCanteenEvaluate;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Pageable;

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

@ -1,6 +1,6 @@
package com.bonus.core.basic.mapper; package com.bonus.core.basic.mapper;
import com.bonus.core.basic.model.BasicsComplaint; import com.bonus.core.basic.domain.BasicsComplaint;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;

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

@ -1,7 +1,7 @@
package com.bonus.core.basic.mapper; package com.bonus.core.basic.mapper;
import com.bonus.core.basic.model.SysNotice; import com.bonus.core.basic.domain.SysNotice;
import java.util.List; import java.util.List;

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

@ -1,6 +1,6 @@
package com.bonus.core.basic.service; package com.bonus.core.basic.service;
import com.bonus.core.basic.model.BasicsCanteenEvaluate; import com.bonus.core.basic.domain.BasicsCanteenEvaluate;
import org.springframework.data.domain.Page; import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.PageRequest;

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

@ -1,6 +1,6 @@
package com.bonus.core.basic.service; package com.bonus.core.basic.service;
import com.bonus.core.basic.model.BasicsComplaint; import com.bonus.core.basic.domain.BasicsComplaint;
import java.util.List; import java.util.List;

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

@ -1,7 +1,7 @@
package com.bonus.core.basic.service; package com.bonus.core.basic.service;
import com.bonus.core.basic.model.SysNotice; import com.bonus.core.basic.domain.SysNotice;
import java.util.List; import java.util.List;

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

@ -7,8 +7,8 @@ package com.bonus.core.basic.service;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import com.bonus.core.basic.dto.MgrUserLoginDTO; import com.bonus.core.basic.domain.dto.MgrUserLoginDTO;
import com.bonus.core.basic.dto.PigxUser; import com.bonus.core.basic.domain.dto.PigxUser;
import com.bonus.core.common.utils.CustomBusiness; import com.bonus.core.common.utils.CustomBusiness;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;

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

@ -3,7 +3,7 @@ package com.bonus.core.basic.service.impl;
import com.bonus.core.common.utils.StringUtils; import com.bonus.core.common.utils.StringUtils;
import com.bonus.core.basic.mapper.BasicsCanteenEvaluateMapper; import com.bonus.core.basic.mapper.BasicsCanteenEvaluateMapper;
import com.bonus.core.basic.model.BasicsCanteenEvaluate; import com.bonus.core.basic.domain.BasicsCanteenEvaluate;
import com.bonus.core.basic.service.BasicsCanteenEvaluateService; import com.bonus.core.basic.service.BasicsCanteenEvaluateService;
import com.bonus.common.security.utils.SecurityUtils; import com.bonus.common.security.utils.SecurityUtils;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;

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

@ -1,7 +1,7 @@
package com.bonus.core.basic.service.impl; package com.bonus.core.basic.service.impl;
import com.bonus.core.common.utils.StringUtils; import com.bonus.core.common.utils.StringUtils;
import com.bonus.core.basic.model.BasicsComplaint; import com.bonus.core.basic.domain.BasicsComplaint;
import com.bonus.core.basic.mapper.BasicsComplaintMapper; import com.bonus.core.basic.mapper.BasicsComplaintMapper;
import com.bonus.core.basic.service.BasicsComplaintService; import com.bonus.core.basic.service.BasicsComplaintService;
import com.bonus.common.security.utils.SecurityUtils; import com.bonus.common.security.utils.SecurityUtils;

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

@ -1,6 +1,6 @@
package com.bonus.core.basic.service.impl; package com.bonus.core.basic.service.impl;
import com.bonus.core.basic.mapper.SysNoticeMapper; import com.bonus.core.basic.mapper.SysNoticeMapper;
import com.bonus.core.basic.model.SysNotice; import com.bonus.core.basic.domain.SysNotice;
import com.bonus.core.basic.service.ISysNoticeService; import com.bonus.core.basic.service.ISysNoticeService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;

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

@ -1,6 +1,6 @@
package com.bonus.core.common.response; package com.bonus.core.common.response;
import com.bonus.core.basic.vo.Canteen; import com.bonus.core.basic.domain.vo.Canteen;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data; import lombok.Data;

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

@ -1,6 +1,6 @@
package com.bonus.core.common.response; package com.bonus.core.common.response;
import com.bonus.core.basic.vo.Shopstall; import com.bonus.core.basic.domain.vo.Shopstall;
import lombok.Data; import lombok.Data;
import java.util.List; import java.util.List;

4
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/controller/ConsInfoController.java
View File

@ -1,7 +1,7 @@
package com.bonus.core.customer.controller; package com.bonus.core.customer.controller;
import com.bonus.core.basic.vo.Canteen; import com.bonus.core.basic.domain.vo.Canteen;
import com.bonus.core.basic.vo.Shopstall; import com.bonus.core.basic.domain.vo.Shopstall;
import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.common.core.web.domain.AjaxResult;
import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Operation;
import com.bonus.core.customer.domain.MyiInfoReq; import com.bonus.core.customer.domain.MyiInfoReq;

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

@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.bonus.core.consumer.mapper.BasicsCanteenEvaluateMapper"> <mapper namespace="com.bonus.core.consumer.mapper.BasicsCanteenEvaluateMapper">
<resultMap type="com.bonus.core.basic.model.BasicsCanteenEvaluate" id="BasicsCanteenEvaluateMap"> <resultMap type="com.bonus.core.basic.domain.BasicsCanteenEvaluate" id="BasicsCanteenEvaluateMap">
<result property="id" column="id" jdbcType="INTEGER"/> <result property="id" column="id" jdbcType="INTEGER"/>
<result property="evaluateId" column="evaluate_id" jdbcType="INTEGER"/> <result property="evaluateId" column="evaluate_id" jdbcType="INTEGER"/>
<result property="custId" column="cust_id" jdbcType="INTEGER"/> <result property="custId" column="cust_id" jdbcType="INTEGER"/>

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

@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.bonus.core.consumer.mapper.BasicsComplaintMapper"> <mapper namespace="com.bonus.core.consumer.mapper.BasicsComplaintMapper">
<resultMap type="com.bonus.core.basic.model.BasicsComplaint" id="BasicsComplaintMap"> <resultMap type="com.bonus.core.basic.domain.BasicsComplaint" id="BasicsComplaintMap">
<result property="id" column="id" jdbcType="INTEGER"/> <result property="id" column="id" jdbcType="INTEGER"/>
<result property="complaintId" column="complaint_id" jdbcType="INTEGER"/> <result property="complaintId" column="complaint_id" jdbcType="INTEGER"/>
<result property="custId" column="cust_id" jdbcType="INTEGER"/> <result property="custId" column="cust_id" jdbcType="INTEGER"/>

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

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