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:19:22 +08:00
parent 4ebcc21e48
commit 4b7ab6ee90
14 changed files with 29 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,13 +1,12 @@
package com.bonus.core.basic.controller; package com.bonus.core.customer.controller;
import com.bonus.core.basic.vo.Canteen; import com.bonus.core.basic.vo.Canteen;
import com.bonus.core.basic.vo.Shopstall; import com.bonus.core.basic.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.basic.dto.MyiInfoReq; import com.bonus.core.customer.domain.MyiInfoReq;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.validation.Valid; import javax.validation.Valid;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;

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

@ -1,7 +1,7 @@
package com.bonus.core.basic.controller; package com.bonus.core.customer.controller;
import com.bonus.core.basic.model.CustAddr; import com.bonus.core.customer.domain.CustAddr;
import com.bonus.core.basic.service.CustAddrService; import com.bonus.core.customer.service.CustAddrService;
import com.bonus.common.core.web.controller.BaseController; import com.bonus.common.core.web.controller.BaseController;
import com.bonus.common.core.web.page.TableDataInfo; import com.bonus.common.core.web.page.TableDataInfo;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;

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

@ -1,7 +1,7 @@
package com.bonus.core.basic.controller; package com.bonus.core.customer.controller;
import com.bonus.core.basic.model.CustPlace; import com.bonus.core.customer.domain.CustPlace;
import com.bonus.core.basic.service.CustPlaceService; import com.bonus.core.customer.service.CustPlaceService;
import com.bonus.common.core.web.controller.BaseController; import com.bonus.common.core.web.controller.BaseController;
import com.bonus.common.core.web.page.TableDataInfo; import com.bonus.common.core.web.page.TableDataInfo;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;

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

@ -1,4 +1,4 @@
package com.bonus.core.basic.model; package com.bonus.core.customer.domain;
import com.bonus.common.core.web.domain.BaseEntity; import com.bonus.common.core.web.domain.BaseEntity;
import lombok.Data; import lombok.Data;

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

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

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

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

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

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

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

@ -1,6 +1,6 @@
package com.bonus.core.basic.mapper; package com.bonus.core.customer.mapper;
import com.bonus.core.basic.model.CustPlace; import com.bonus.core.customer.domain.CustPlace;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;

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

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

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

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

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

@ -1,9 +1,9 @@
package com.bonus.core.basic.service.impl; package com.bonus.core.customer.service.impl;
import com.bonus.core.common.utils.StringUtils; import com.bonus.core.common.utils.StringUtils;
import com.bonus.core.basic.model.CustAddr; import com.bonus.core.customer.domain.CustAddr;
import com.bonus.core.basic.mapper.CustAddrMapper; import com.bonus.core.customer.mapper.CustAddrMapper;
import com.bonus.core.basic.service.CustAddrService; import com.bonus.core.customer.service.CustAddrService;
import com.bonus.common.security.utils.SecurityUtils; import com.bonus.common.security.utils.SecurityUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;

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

@ -1,8 +1,8 @@
package com.bonus.core.basic.service.impl; package com.bonus.core.customer.service.impl;
import com.bonus.core.basic.model.CustPlace; import com.bonus.core.customer.domain.CustPlace;
import com.bonus.core.basic.mapper.CustPlaceMapper; import com.bonus.core.customer.mapper.CustPlaceMapper;
import com.bonus.core.basic.service.CustPlaceService; import com.bonus.core.customer.service.CustPlaceService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.Resource; import javax.annotation.Resource;

2
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/CustAddrDao.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.CustAddrMapper"> <mapper namespace="com.bonus.core.consumer.mapper.CustAddrMapper">
<resultMap type="com.bonus.core.basic.model.CustAddr" id="CustAddrMap"> <resultMap type="com.bonus.core.customer.domain.CustAddr" id="CustAddrMap">
<result property="id" column="id" jdbcType="INTEGER"/> <result property="id" column="id" jdbcType="INTEGER"/>
<result property="custId" column="cust_id" jdbcType="INTEGER"/> <result property="custId" column="cust_id" jdbcType="INTEGER"/>
<result property="addrId" column="addr_id" jdbcType="INTEGER"/> <result property="addrId" column="addr_id" jdbcType="INTEGER"/>

2
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/CustPlaceMapper.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.CustPlaceMapper"> <mapper namespace="com.bonus.core.consumer.mapper.CustPlaceMapper">
<resultMap type="com.bonus.core.basic.model.CustPlace" id="CustPlaceMap"> <resultMap type="com.bonus.core.customer.domain.CustPlace" id="CustPlaceMap">
<result property="id" column="id" jdbcType="INTEGER"/> <result property="id" column="id" jdbcType="INTEGER"/>
<result property="placeId" column="place_id" jdbcType="INTEGER"/> <result property="placeId" column="place_id" jdbcType="INTEGER"/>
<result property="placeNum" column="place_num" jdbcType="VARCHAR"/> <result property="placeNum" column="place_num" jdbcType="VARCHAR"/>