lostecho/mall
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

添加生成确认单接口

Browse Source
This commit is contained in:
zhh
2018-08-30 16:22:22 +08:00
parent 61a67c9aa9
commit b33f396d53
15 changed files with 1026 additions and 525 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
mall-mbg/src/main/resources/com/macro/mall/mapper/OmsOrderMapper.xml
View File

@@ -9,6 +9,7 @@
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="member_username" jdbcType="VARCHAR" property="memberUsername" />
<result column="total_amount" jdbcType="DECIMAL" property="totalAmount" />
<result column="pay_amount" jdbcType="DECIMAL" property="payAmount" />
<result column="freight_amount" jdbcType="DECIMAL" property="freightAmount" />
<result column="promotion_amount" jdbcType="DECIMAL" property="promotionAmount" />
<result column="integration_amount" jdbcType="DECIMAL" property="integrationAmount" />
@@ -38,6 +39,7 @@
<result column="receiver_detail_address" jdbcType="VARCHAR" property="receiverDetailAddress" />
<result column="note" jdbcType="VARCHAR" property="note" />
<result column="confirm_status" jdbcType="INTEGER" property="confirmStatus" />
<result column="delete_status" jdbcType="INTEGER" property="deleteStatus" />
</resultMap>
<sql id="Example_Where_Clause">
<where>
@@ -98,12 +100,12 @@
</where>
</sql>
<sql id="Base_Column_List">
id, member_id, coupon_id, order_sn, create_time, member_username, total_amount, freight_amount,
promotion_amount, integration_amount, coupon_amount, discount_amount, pay_type, source_type,
status, order_type, delivery_company, delivery_sn, auto_confirm_day, integration,
growth, promotion_info, bill_type, bill_header, bill_content, bill_receiver_phone,
id, member_id, coupon_id, order_sn, create_time, member_username, total_amount, pay_amount,
freight_amount, promotion_amount, integration_amount, coupon_amount, discount_amount,
pay_type, source_type, status, order_type, delivery_company, delivery_sn, auto_confirm_day,
integration, growth, promotion_info, bill_type, bill_header, bill_content, bill_receiver_phone,
bill_receiver_email, receiver_name, receiver_phone, receiver_post_code, receiver_province,
receiver_city, receiver_region, receiver_detail_address, note, confirm_status
receiver_city, receiver_region, receiver_detail_address, note, confirm_status, delete_status
</sql>
<select id="selectByExample" parameterType="com.macro.mall.model.OmsOrderExample" resultMap="BaseResultMap">
select
@@ -141,28 +143,30 @@
</selectKey>
insert into oms_order (member_id, coupon_id, order_sn,
create_time, member_username, total_amount,
freight_amount, promotion_amount, integration_amount,
coupon_amount, discount_amount, pay_type,
source_type, status, order_type,
delivery_company, delivery_sn, auto_confirm_day,
integration, growth, promotion_info,
bill_type, bill_header, bill_content,
bill_receiver_phone, bill_receiver_email, receiver_name,
receiver_phone, receiver_post_code, receiver_province,
receiver_city, receiver_region, receiver_detail_address,
note, confirm_status)
pay_amount, freight_amount, promotion_amount,
integration_amount, coupon_amount, discount_amount,
pay_type, source_type, status,
order_type, delivery_company, delivery_sn,
auto_confirm_day, integration, growth,
promotion_info, bill_type, bill_header,
bill_content, bill_receiver_phone, bill_receiver_email,
receiver_name, receiver_phone, receiver_post_code,
receiver_province, receiver_city, receiver_region,
receiver_detail_address, note, confirm_status,
delete_status)
values (#{memberId,jdbcType=BIGINT}, #{couponId,jdbcType=BIGINT}, #{orderSn,jdbcType=VARCHAR},
#{createTime,jdbcType=TIMESTAMP}, #{memberUsername,jdbcType=VARCHAR}, #{totalAmount,jdbcType=DECIMAL},
#{freightAmount,jdbcType=DECIMAL}, #{promotionAmount,jdbcType=DECIMAL}, #{integrationAmount,jdbcType=DECIMAL},
#{couponAmount,jdbcType=DECIMAL}, #{discountAmount,jdbcType=DECIMAL}, #{payType,jdbcType=INTEGER},
#{sourceType,jdbcType=INTEGER}, #{status,jdbcType=INTEGER}, #{orderType,jdbcType=INTEGER},
#{deliveryCompany,jdbcType=VARCHAR}, #{deliverySn,jdbcType=VARCHAR}, #{autoConfirmDay,jdbcType=INTEGER},
#{integration,jdbcType=INTEGER}, #{growth,jdbcType=INTEGER}, #{promotionInfo,jdbcType=VARCHAR},
#{billType,jdbcType=INTEGER}, #{billHeader,jdbcType=VARCHAR}, #{billContent,jdbcType=VARCHAR},
#{billReceiverPhone,jdbcType=VARCHAR}, #{billReceiverEmail,jdbcType=VARCHAR}, #{receiverName,jdbcType=VARCHAR},
#{receiverPhone,jdbcType=VARCHAR}, #{receiverPostCode,jdbcType=VARCHAR}, #{receiverProvince,jdbcType=VARCHAR},
#{receiverCity,jdbcType=VARCHAR}, #{receiverRegion,jdbcType=VARCHAR}, #{receiverDetailAddress,jdbcType=VARCHAR},
#{note,jdbcType=VARCHAR}, #{confirmStatus,jdbcType=INTEGER})
#{payAmount,jdbcType=DECIMAL}, #{freightAmount,jdbcType=DECIMAL}, #{promotionAmount,jdbcType=DECIMAL},
#{integrationAmount,jdbcType=DECIMAL}, #{couponAmount,jdbcType=DECIMAL}, #{discountAmount,jdbcType=DECIMAL},
#{payType,jdbcType=INTEGER}, #{sourceType,jdbcType=INTEGER}, #{status,jdbcType=INTEGER},
#{orderType,jdbcType=INTEGER}, #{deliveryCompany,jdbcType=VARCHAR}, #{deliverySn,jdbcType=VARCHAR},
#{autoConfirmDay,jdbcType=INTEGER}, #{integration,jdbcType=INTEGER}, #{growth,jdbcType=INTEGER},
#{promotionInfo,jdbcType=VARCHAR}, #{billType,jdbcType=INTEGER}, #{billHeader,jdbcType=VARCHAR},
#{billContent,jdbcType=VARCHAR}, #{billReceiverPhone,jdbcType=VARCHAR}, #{billReceiverEmail,jdbcType=VARCHAR},
#{receiverName,jdbcType=VARCHAR}, #{receiverPhone,jdbcType=VARCHAR}, #{receiverPostCode,jdbcType=VARCHAR},
#{receiverProvince,jdbcType=VARCHAR}, #{receiverCity,jdbcType=VARCHAR}, #{receiverRegion,jdbcType=VARCHAR},
#{receiverDetailAddress,jdbcType=VARCHAR}, #{note,jdbcType=VARCHAR}, #{confirmStatus,jdbcType=INTEGER},
#{deleteStatus,jdbcType=INTEGER})
</insert>
<insert id="insertSelective" parameterType="com.macro.mall.model.OmsOrder">
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
@@ -188,6 +192,9 @@
<if test="totalAmount != null">
total_amount,
</if>
<if test="payAmount != null">
pay_amount,
</if>
<if test="freightAmount != null">
freight_amount,
</if>
@@ -275,6 +282,9 @@
<if test="confirmStatus != null">
confirm_status,
</if>
<if test="deleteStatus != null">
delete_status,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="memberId != null">
@@ -295,6 +305,9 @@
<if test="totalAmount != null">
#{totalAmount,jdbcType=DECIMAL},
</if>
<if test="payAmount != null">
#{payAmount,jdbcType=DECIMAL},
</if>
<if test="freightAmount != null">
#{freightAmount,jdbcType=DECIMAL},
</if>
@@ -382,6 +395,9 @@
<if test="confirmStatus != null">
#{confirmStatus,jdbcType=INTEGER},
</if>
<if test="deleteStatus != null">
#{deleteStatus,jdbcType=INTEGER},
</if>
</trim>
</insert>
<select id="countByExample" parameterType="com.macro.mall.model.OmsOrderExample" resultType="java.lang.Integer">
@@ -414,6 +430,9 @@
<if test="record.totalAmount != null">
total_amount = #{record.totalAmount,jdbcType=DECIMAL},
</if>
<if test="record.payAmount != null">
pay_amount = #{record.payAmount,jdbcType=DECIMAL},
</if>
<if test="record.freightAmount != null">
freight_amount = #{record.freightAmount,jdbcType=DECIMAL},
</if>
@@ -501,6 +520,9 @@
<if test="record.confirmStatus != null">
confirm_status = #{record.confirmStatus,jdbcType=INTEGER},
</if>
<if test="record.deleteStatus != null">
delete_status = #{record.deleteStatus,jdbcType=INTEGER},
</if>
</set>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
@@ -515,6 +537,7 @@
create_time = #{record.createTime,jdbcType=TIMESTAMP},
member_username = #{record.memberUsername,jdbcType=VARCHAR},
total_amount = #{record.totalAmount,jdbcType=DECIMAL},
pay_amount = #{record.payAmount,jdbcType=DECIMAL},
freight_amount = #{record.freightAmount,jdbcType=DECIMAL},
promotion_amount = #{record.promotionAmount,jdbcType=DECIMAL},
integration_amount = #{record.integrationAmount,jdbcType=DECIMAL},
@@ -543,7 +566,8 @@
receiver_region = #{record.receiverRegion,jdbcType=VARCHAR},
receiver_detail_address = #{record.receiverDetailAddress,jdbcType=VARCHAR},
note = #{record.note,jdbcType=VARCHAR},
confirm_status = #{record.confirmStatus,jdbcType=INTEGER}
confirm_status = #{record.confirmStatus,jdbcType=INTEGER},
delete_status = #{record.deleteStatus,jdbcType=INTEGER}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
@@ -569,6 +593,9 @@
<if test="totalAmount != null">
total_amount = #{totalAmount,jdbcType=DECIMAL},
</if>
<if test="payAmount != null">
pay_amount = #{payAmount,jdbcType=DECIMAL},
</if>
<if test="freightAmount != null">
freight_amount = #{freightAmount,jdbcType=DECIMAL},
</if>
@@ -656,6 +683,9 @@
<if test="confirmStatus != null">
confirm_status = #{confirmStatus,jdbcType=INTEGER},
</if>
<if test="deleteStatus != null">
delete_status = #{deleteStatus,jdbcType=INTEGER},
</if>
</set>
where id = #{id,jdbcType=BIGINT}
</update>
@@ -667,6 +697,7 @@
create_time = #{createTime,jdbcType=TIMESTAMP},
member_username = #{memberUsername,jdbcType=VARCHAR},
total_amount = #{totalAmount,jdbcType=DECIMAL},
pay_amount = #{payAmount,jdbcType=DECIMAL},
freight_amount = #{freightAmount,jdbcType=DECIMAL},
promotion_amount = #{promotionAmount,jdbcType=DECIMAL},
integration_amount = #{integrationAmount,jdbcType=DECIMAL},
@@ -695,7 +726,8 @@
receiver_region = #{receiverRegion,jdbcType=VARCHAR},
receiver_detail_address = #{receiverDetailAddress,jdbcType=VARCHAR},
note = #{note,jdbcType=VARCHAR},
confirm_status = #{confirmStatus,jdbcType=INTEGER}
confirm_status = #{confirmStatus,jdbcType=INTEGER},
delete_status = #{deleteStatus,jdbcType=INTEGER}
where id = #{id,jdbcType=BIGINT}
</update>
</mapper>

40
mall-mbg/src/main/resources/com/macro/mall/mapper/UmsIntergrationConsumeSettingMapper.xml → mall-mbg/src/main/resources/com/macro/mall/mapper/UmsIntegrationConsumeSettingMapper.xml
View File

@@ -1,7 +1,7 @@
<?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.macro.mall.mapper.UmsIntergrationConsumeSettingMapper">
<resultMap id="BaseResultMap" type="com.macro.mall.model.UmsIntergrationConsumeSetting">
<mapper namespace="com.macro.mall.mapper.UmsIntegrationConsumeSettingMapper">
<resultMap id="BaseResultMap" type="com.macro.mall.model.UmsIntegrationConsumeSetting">
<id column="id" jdbcType="BIGINT" property="id" />
<result column="deduction_per_amount" jdbcType="INTEGER" property="deductionPerAmount" />
<result column="max_percent_per_order" jdbcType="INTEGER" property="maxPercentPerOrder" />
@@ -69,13 +69,13 @@
<sql id="Base_Column_List">
id, deduction_per_amount, max_percent_per_order, use_unit, coupon_status
</sql>
<select id="selectByExample" parameterType="com.macro.mall.model.UmsIntergrationConsumeSettingExample" resultMap="BaseResultMap">
<select id="selectByExample" parameterType="com.macro.mall.model.UmsIntegrationConsumeSettingExample" resultMap="BaseResultMap">
select
<if test="distinct">
distinct
</if>
<include refid="Base_Column_List" />
from ums_intergration_consume_setting
from ums_integration_consume_setting
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
@@ -86,33 +86,33 @@
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from ums_intergration_consume_setting
from ums_integration_consume_setting
where id = #{id,jdbcType=BIGINT}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
delete from ums_intergration_consume_setting
delete from ums_integration_consume_setting
where id = #{id,jdbcType=BIGINT}
</delete>
<delete id="deleteByExample" parameterType="com.macro.mall.model.UmsIntergrationConsumeSettingExample">
delete from ums_intergration_consume_setting
<delete id="deleteByExample" parameterType="com.macro.mall.model.UmsIntegrationConsumeSettingExample">
delete from ums_integration_consume_setting
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</delete>
<insert id="insert" parameterType="com.macro.mall.model.UmsIntergrationConsumeSetting">
<insert id="insert" parameterType="com.macro.mall.model.UmsIntegrationConsumeSetting">
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
SELECT LAST_INSERT_ID()
</selectKey>
insert into ums_intergration_consume_setting (deduction_per_amount, max_percent_per_order,
insert into ums_integration_consume_setting (deduction_per_amount, max_percent_per_order,
use_unit, coupon_status)
values (#{deductionPerAmount,jdbcType=INTEGER}, #{maxPercentPerOrder,jdbcType=INTEGER},
#{useUnit,jdbcType=INTEGER}, #{couponStatus,jdbcType=INTEGER})
</insert>
<insert id="insertSelective" parameterType="com.macro.mall.model.UmsIntergrationConsumeSetting">
<insert id="insertSelective" parameterType="com.macro.mall.model.UmsIntegrationConsumeSetting">
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
SELECT LAST_INSERT_ID()
</selectKey>
insert into ums_intergration_consume_setting
insert into ums_integration_consume_setting
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="deductionPerAmount != null">
deduction_per_amount,
@@ -142,14 +142,14 @@
</if>
</trim>
</insert>
<select id="countByExample" parameterType="com.macro.mall.model.UmsIntergrationConsumeSettingExample" resultType="java.lang.Integer">
select count(*) from ums_intergration_consume_setting
<select id="countByExample" parameterType="com.macro.mall.model.UmsIntegrationConsumeSettingExample" resultType="java.lang.Integer">
select count(*) from ums_integration_consume_setting
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</select>
<update id="updateByExampleSelective" parameterType="map">
update ums_intergration_consume_setting
update ums_integration_consume_setting
<set>
<if test="record.id != null">
id = #{record.id,jdbcType=BIGINT},
@@ -172,7 +172,7 @@
</if>
</update>
<update id="updateByExample" parameterType="map">
update ums_intergration_consume_setting
update ums_integration_consume_setting
set id = #{record.id,jdbcType=BIGINT},
deduction_per_amount = #{record.deductionPerAmount,jdbcType=INTEGER},
max_percent_per_order = #{record.maxPercentPerOrder,jdbcType=INTEGER},
@@ -182,8 +182,8 @@
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<update id="updateByPrimaryKeySelective" parameterType="com.macro.mall.model.UmsIntergrationConsumeSetting">
update ums_intergration_consume_setting
<update id="updateByPrimaryKeySelective" parameterType="com.macro.mall.model.UmsIntegrationConsumeSetting">
update ums_integration_consume_setting
<set>
<if test="deductionPerAmount != null">
deduction_per_amount = #{deductionPerAmount,jdbcType=INTEGER},
@@ -200,8 +200,8 @@
</set>
where id = #{id,jdbcType=BIGINT}
</update>
<update id="updateByPrimaryKey" parameterType="com.macro.mall.model.UmsIntergrationConsumeSetting">
update ums_intergration_consume_setting
<update id="updateByPrimaryKey" parameterType="com.macro.mall.model.UmsIntegrationConsumeSetting">
update ums_integration_consume_setting
set deduction_per_amount = #{deductionPerAmount,jdbcType=INTEGER},
max_percent_per_order = #{maxPercentPerOrder,jdbcType=INTEGER},
use_unit = #{useUnit,jdbcType=INTEGER},