diff --git a/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/domain/OrderDetails.java b/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/order/OrderDetails.java similarity index 97% rename from zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/domain/OrderDetails.java rename to zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/order/OrderDetails.java index bd45133..0340b7a 100644 --- a/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/domain/OrderDetails.java +++ b/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/order/OrderDetails.java @@ -1,4 +1,4 @@ -package com.bonus.zlpt.order.domain; +package com.bonus.zlpt.common.core.domain.order; import com.bonus.zlpt.common.core.annotation.Excel; import com.bonus.zlpt.common.core.web.domain.BaseEntity; diff --git a/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/domain/OrderInfo.java b/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/order/OrderInfo.java similarity index 97% rename from zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/domain/OrderInfo.java rename to zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/order/OrderInfo.java index 84214a7..8332af2 100644 --- a/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/domain/OrderInfo.java +++ b/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/order/OrderInfo.java @@ -1,4 +1,4 @@ -package com.bonus.zlpt.order.domain; +package com.bonus.zlpt.common.core.domain.order; import java.math.BigDecimal; diff --git a/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/controller/OrderDetailsController.java b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/controller/OrderDetailsController.java index 702d768..a9f943b 100644 --- a/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/controller/OrderDetailsController.java +++ b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/controller/OrderDetailsController.java @@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.bonus.zlpt.order.domain.OrderDetails; +import com.bonus.zlpt.common.core.domain.order.OrderDetails; import com.bonus.zlpt.order.service.IOrderDetailsService; /** diff --git a/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/controller/OrderInfoController.java b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/controller/OrderInfoController.java index ee2bb64..944385f 100644 --- a/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/controller/OrderInfoController.java +++ b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/controller/OrderInfoController.java @@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.bonus.zlpt.order.domain.OrderInfo; +import com.bonus.zlpt.common.core.domain.order.OrderInfo; import com.bonus.zlpt.order.service.IOrderInfoService; /** * 订单信息Controller diff --git a/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/mapper/OrderDetailsMapper.java b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/mapper/OrderDetailsMapper.java index 481c274..22e1712 100644 --- a/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/mapper/OrderDetailsMapper.java +++ b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/mapper/OrderDetailsMapper.java @@ -1,7 +1,7 @@ package com.bonus.zlpt.order.mapper; import java.util.List; -import com.bonus.zlpt.order.domain.OrderDetails; +import com.bonus.zlpt.common.core.domain.order.OrderDetails; /** * 订单详细Mapper接口 diff --git a/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/mapper/OrderInfoMapper.java b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/mapper/OrderInfoMapper.java index 3d9c5cb..b438230 100644 --- a/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/mapper/OrderInfoMapper.java +++ b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/mapper/OrderInfoMapper.java @@ -1,7 +1,7 @@ package com.bonus.zlpt.order.mapper; import java.util.List; -import com.bonus.zlpt.order.domain.OrderInfo; +import com.bonus.zlpt.common.core.domain.order.OrderInfo; /** * 订单信息Mapper接口 diff --git a/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/service/IOrderDetailsService.java b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/service/IOrderDetailsService.java index 28ffd5e..45b8f66 100644 --- a/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/service/IOrderDetailsService.java +++ b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/service/IOrderDetailsService.java @@ -1,7 +1,7 @@ package com.bonus.zlpt.order.service; import java.util.List; -import com.bonus.zlpt.order.domain.OrderDetails; +import com.bonus.zlpt.common.core.domain.order.OrderDetails; /** * 订单详细Service接口 diff --git a/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/service/IOrderInfoService.java b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/service/IOrderInfoService.java index 13db8a9..5c69dcd 100644 --- a/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/service/IOrderInfoService.java +++ b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/service/IOrderInfoService.java @@ -1,7 +1,7 @@ package com.bonus.zlpt.order.service; import java.util.List; -import com.bonus.zlpt.order.domain.OrderInfo; +import com.bonus.zlpt.common.core.domain.order.OrderInfo; /** * 订单信息Service接口 diff --git a/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/service/impl/OrderDetailsServiceImpl.java b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/service/impl/OrderDetailsServiceImpl.java index e3753d2..92c4d83 100644 --- a/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/service/impl/OrderDetailsServiceImpl.java +++ b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/service/impl/OrderDetailsServiceImpl.java @@ -4,7 +4,7 @@ import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.bonus.zlpt.order.mapper.OrderDetailsMapper; -import com.bonus.zlpt.order.domain.OrderDetails; +import com.bonus.zlpt.common.core.domain.order.OrderDetails; import com.bonus.zlpt.order.service.IOrderDetailsService; /** diff --git a/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/service/impl/OrderInfoServiceImpl.java b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/service/impl/OrderInfoServiceImpl.java index dbc71dc..7a31d29 100644 --- a/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/service/impl/OrderInfoServiceImpl.java +++ b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/service/impl/OrderInfoServiceImpl.java @@ -4,7 +4,7 @@ import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.bonus.zlpt.order.mapper.OrderInfoMapper; -import com.bonus.zlpt.order.domain.OrderInfo; +import com.bonus.zlpt.common.core.domain.order.OrderInfo; import com.bonus.zlpt.order.service.IOrderInfoService; /** diff --git a/zlpt-modules/zlpt-order/src/main/resources/mapper.order/OrderDetailsMapper.xml b/zlpt-modules/zlpt-order/src/main/resources/mapper.order/OrderDetailsMapper.xml index 7c4775a..e075666 100644 --- a/zlpt-modules/zlpt-order/src/main/resources/mapper.order/OrderDetailsMapper.xml +++ b/zlpt-modules/zlpt-order/src/main/resources/mapper.order/OrderDetailsMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -32,7 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select id, order_id, need_company, plan_start_time, is_machinist, address, duration, invoice_type, description, ma_id, lease_type, lease_price, machinist_price, order_contract, machinist_name, phone, logistics_phone, real_start_time, rental_name, tenant_name, entry_attachment from ma_order_details - and order_id = #{orderId} @@ -63,7 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} - + insert into ma_order_details id, @@ -113,7 +113,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + update ma_order_details order_id = #{orderId}, diff --git a/zlpt-modules/zlpt-order/src/main/resources/mapper.order/OrderInfoMapper.xml b/zlpt-modules/zlpt-order/src/main/resources/mapper.order/OrderInfoMapper.xml index f3ac984..f219e29 100644 --- a/zlpt-modules/zlpt-order/src/main/resources/mapper.order/OrderInfoMapper.xml +++ b/zlpt-modules/zlpt-order/src/main/resources/mapper.order/OrderInfoMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -22,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select order_id, p_id, code, time, deposit, cost, pay_type, supplier, order_status, order_user, order_company from ma_order_info - and order_id = #{orderId} @@ -44,7 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where order_id = #{orderId} - + insert into ma_order_info order_id, @@ -74,7 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + update ma_order_info p_id = #{pId},