bonus
/
Zlpt-Cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

move order po

This commit is contained in:
sxu 2023-12-03 17:12:53 +08:00
parent 61e7ea2954
commit 749c343286
12 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/domain/OrderDetails.java → zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/order/OrderDetails.java
View File

@ -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.annotation.Excel;
import com.bonus.zlpt.common.core.web.domain.BaseEntity; import com.bonus.zlpt.common.core.web.domain.BaseEntity;

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

@ -1,4 +1,4 @@
package com.bonus.zlpt.order.domain; package com.bonus.zlpt.common.core.domain.order;
import java.math.BigDecimal; import java.math.BigDecimal;

2
zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/controller/OrderDetailsController.java
View File

@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; 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; import com.bonus.zlpt.order.service.IOrderDetailsService;
/** /**

2
zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/controller/OrderInfoController.java
View File

@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; 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; import com.bonus.zlpt.order.service.IOrderInfoService;
/** /**
* 订单信息Controller * 订单信息Controller

2
zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/mapper/OrderDetailsMapper.java
View File

@ -1,7 +1,7 @@
package com.bonus.zlpt.order.mapper; package com.bonus.zlpt.order.mapper;
import java.util.List; import java.util.List;
import com.bonus.zlpt.order.domain.OrderDetails; import com.bonus.zlpt.common.core.domain.order.OrderDetails;
/** /**
* 订单详细Mapper接口 * 订单详细Mapper接口

2
zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/mapper/OrderInfoMapper.java
View File

@ -1,7 +1,7 @@
package com.bonus.zlpt.order.mapper; package com.bonus.zlpt.order.mapper;
import java.util.List; import java.util.List;
import com.bonus.zlpt.order.domain.OrderInfo; import com.bonus.zlpt.common.core.domain.order.OrderInfo;
/** /**
* 订单信息Mapper接口 * 订单信息Mapper接口

2
zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/service/IOrderDetailsService.java
View File

@ -1,7 +1,7 @@
package com.bonus.zlpt.order.service; package com.bonus.zlpt.order.service;
import java.util.List; import java.util.List;
import com.bonus.zlpt.order.domain.OrderDetails; import com.bonus.zlpt.common.core.domain.order.OrderDetails;
/** /**
* 订单详细Service接口 * 订单详细Service接口

2
zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/service/IOrderInfoService.java
View File

@ -1,7 +1,7 @@
package com.bonus.zlpt.order.service; package com.bonus.zlpt.order.service;
import java.util.List; import java.util.List;
import com.bonus.zlpt.order.domain.OrderInfo; import com.bonus.zlpt.common.core.domain.order.OrderInfo;
/** /**
* 订单信息Service接口 * 订单信息Service接口

2
zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/service/impl/OrderDetailsServiceImpl.java
View File

@ -4,7 +4,7 @@ import java.util.List;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.bonus.zlpt.order.mapper.OrderDetailsMapper; 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; import com.bonus.zlpt.order.service.IOrderDetailsService;
/** /**

2
zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/service/impl/OrderInfoServiceImpl.java
View File

@ -4,7 +4,7 @@ import java.util.List;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.bonus.zlpt.order.mapper.OrderInfoMapper; 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; import com.bonus.zlpt.order.service.IOrderInfoService;
/** /**

8
zlpt-modules/zlpt-order/src/main/resources/mapper.order/OrderDetailsMapper.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.zlpt.order.mapper.OrderDetailsMapper"> <mapper namespace="com.bonus.zlpt.order.mapper.OrderDetailsMapper">
<resultMap type="com.bonus.zlpt.order.domain.OrderDetails" id="OrderDetailsResult"> <resultMap type="com.bonus.zlpt.common.core.domain.order.OrderDetails" id="OrderDetailsResult">
<result property="id" column="id" /> <result property="id" column="id" />
<result property="orderId" column="order_id" /> <result property="orderId" column="order_id" />
<result property="needCompany" column="need_company" /> <result property="needCompany" column="need_company" />
@ -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 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
</sql> </sql>
<select id="selectOrderDetailsList" parameterType="com.bonus.zlpt.order.domain.OrderDetails" resultMap="OrderDetailsResult"> <select id="selectOrderDetailsList" parameterType="com.bonus.zlpt.common.core.domain.order.OrderDetails" resultMap="OrderDetailsResult">
<include refid="selectOrderDetailsVo"/> <include refid="selectOrderDetailsVo"/>
<where> <where>
<if test="orderId != null "> and order_id = #{orderId}</if> <if test="orderId != null "> and order_id = #{orderId}</if>
@ -63,7 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where id = #{id} where id = #{id}
</select> </select>
<insert id="insertOrderDetails" parameterType="com.bonus.zlpt.order.domain.OrderDetails"> <insert id="insertOrderDetails" parameterType="com.bonus.zlpt.common.core.domain.order.OrderDetails">
insert into ma_order_details insert into ma_order_details
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if> <if test="id != null">id,</if>
@ -113,7 +113,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</trim> </trim>
</insert> </insert>
<update id="updateOrderDetails" parameterType="com.bonus.zlpt.order.domain.OrderDetails"> <update id="updateOrderDetails" parameterType="com.bonus.zlpt.common.core.domain.order.OrderDetails">
update ma_order_details update ma_order_details
<trim prefix="SET" suffixOverrides=","> <trim prefix="SET" suffixOverrides=",">
<if test="orderId != null">order_id = #{orderId},</if> <if test="orderId != null">order_id = #{orderId},</if>

8
zlpt-modules/zlpt-order/src/main/resources/mapper.order/OrderInfoMapper.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.zlpt.order.mapper.OrderInfoMapper"> <mapper namespace="com.bonus.zlpt.order.mapper.OrderInfoMapper">
<resultMap type="com.bonus.zlpt.order.domain.OrderInfo" id="OrderInfoResult"> <resultMap type="com.bonus.zlpt.common.core.domain.order.OrderInfo" id="OrderInfoResult">
<result property="orderId" column="order_id" /> <result property="orderId" column="order_id" />
<result property="pId" column="p_id" /> <result property="pId" column="p_id" />
<result property="code" column="code" /> <result property="code" column="code" />
@ -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 select order_id, p_id, code, time, deposit, cost, pay_type, supplier, order_status, order_user, order_company from ma_order_info
</sql> </sql>
<select id="selectOrderInfoList" parameterType="com.bonus.zlpt.order.domain.OrderInfo" resultMap="OrderInfoResult"> <select id="selectOrderInfoList" parameterType="com.bonus.zlpt.common.core.domain.order.OrderInfo" resultMap="OrderInfoResult">
<include refid="selectOrderInfoVo"/> <include refid="selectOrderInfoVo"/>
<where> <where>
<if test="orderId != null "> and order_id = #{orderId}</if> <if test="orderId != null "> and order_id = #{orderId}</if>
@ -44,7 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where order_id = #{orderId} where order_id = #{orderId}
</select> </select>
<insert id="insertOrderInfo" parameterType="com.bonus.zlpt.order.domain.OrderInfo"> <insert id="insertOrderInfo" parameterType="com.bonus.zlpt.common.core.domain.order.OrderInfo">
insert into ma_order_info insert into ma_order_info
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
<if test="orderId != null">order_id,</if> <if test="orderId != null">order_id,</if>
@ -74,7 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</trim> </trim>
</insert> </insert>
<update id="updateOrderInfo" parameterType="com.bonus.zlpt.order.domain.OrderInfo"> <update id="updateOrderInfo" parameterType="com.bonus.zlpt.common.core.domain.order.OrderInfo">
update ma_order_info update ma_order_info
<trim prefix="SET" suffixOverrides=","> <trim prefix="SET" suffixOverrides=",">
<if test="pId != null">p_id = #{pId},</if> <if test="pId != null">p_id = #{pId},</if>