提交 74af1414 authored 作者: 吕本才's avatar 吕本才

优化代码,还原删除的字段

上级 c16e15c0
...@@ -31,7 +31,7 @@ public class FinanceOrderDetail { ...@@ -31,7 +31,7 @@ public class FinanceOrderDetail {
private String srcTid; private String srcTid;
// 赠品方式 0、非赠品 // 赠品方式 0、非赠品
// 1、自动赠送 2、手工赠送 4、周期购赠送 8、平台赠送 32、阶梯满赠 64、CRM追加赠送 128 主品 // 1、自动赠送 2、手工赠送 4、周期购赠送 8、平台赠送 32、阶梯满赠 64、CRM追加赠送 128 主品
// private Integer giftType; private Integer giftType;
// 0:未付款 1:部分付款 2:已付款(原始订单的支付状态) // 0:未付款 1:部分付款 2:已付款(原始订单的支付状态)
private Integer payStatus; private Integer payStatus;
// 退款状态: // 退款状态:
...@@ -47,7 +47,7 @@ public class FinanceOrderDetail { ...@@ -47,7 +47,7 @@ public class FinanceOrderDetail {
// 1、担保 // 1、担保
// 2、非担保 // 2、非担保
// 3、在线非担保 // 3、在线非担保
// private Integer guaranteeMode; private Integer guaranteeMode;
// 如果没有对应的原始单明细,则返回0. // 如果没有对应的原始单明细,则返回0.
// 平台状态: // 平台状态:
// 10、未确认 // 10、未确认
......
...@@ -165,8 +165,10 @@ ...@@ -165,8 +165,10 @@
platform_id, platform_id,
src_oid, src_oid,
src_tid, src_tid,
gift_type,
pay_status, pay_status,
refund_status, refund_status,
guarantee_mode,
platform_status, platform_status,
delivery_term, delivery_term,
num, num,
...@@ -226,8 +228,12 @@ ...@@ -226,8 +228,12 @@
fenxiao_name, fenxiao_name,
batch_no, batch_no,
del_flag, del_flag,
create_by,
create_user_id,
create_time, create_time,
update_time, update_time,
update_by,
update_user_id,
start_time, start_time,
end_time, end_time,
shop_no, shop_no,
...@@ -265,7 +271,7 @@ ...@@ -265,7 +271,7 @@
trade_no trade_no
,shop_name,src_tid,src_oid,trade_status,trade_time,pay_time,consign_time,receiver_area, ,shop_name,src_tid,src_oid,trade_status,trade_time,pay_time,consign_time,receiver_area,
remark,receivable,goods_no,goods_name,spec_name,goods_type,num,discount,share_amount,suite_no, remark,receivable,goods_no,goods_name,spec_name,goods_type,num,discount,share_amount,suite_no,
suite_name,suite_num, fenxiao_name,fenxiao_id,api_goods_name suite_name,suite_num, gift_type,fenxiao_name,fenxiao_id,api_goods_name
</sql> </sql>
...@@ -277,8 +283,10 @@ ...@@ -277,8 +283,10 @@
<result column="platform_id" property="platformId" jdbcType="INTEGER"/> <result column="platform_id" property="platformId" jdbcType="INTEGER"/>
<result column="src_oid" property="srcOid" jdbcType="VARCHAR"/> <result column="src_oid" property="srcOid" jdbcType="VARCHAR"/>
<result column="src_tid" property="srcTid" jdbcType="VARCHAR"/> <result column="src_tid" property="srcTid" jdbcType="VARCHAR"/>
<result column="gift_type" property="giftType" jdbcType="INTEGER"/>
<result column="pay_status" property="payStatus" jdbcType="INTEGER"/> <result column="pay_status" property="payStatus" jdbcType="INTEGER"/>
<result column="refund_status" property="refundStatus" jdbcType="INTEGER"/> <result column="refund_status" property="refundStatus" jdbcType="INTEGER"/>
<result column="guarantee_mode" property="guaranteeMode" jdbcType="INTEGER"/>
<result column="platform_status" property="platformStatus" jdbcType="INTEGER"/> <result column="platform_status" property="platformStatus" jdbcType="INTEGER"/>
<result column="delivery_term" property="deliveryTerm" jdbcType="INTEGER"/> <result column="delivery_term" property="deliveryTerm" jdbcType="INTEGER"/>
<result column="num" property="num" jdbcType="DECIMAL"/> <result column="num" property="num" jdbcType="DECIMAL"/>
...@@ -337,7 +345,11 @@ ...@@ -337,7 +345,11 @@
<result column="fenxiao_name" property="fenxiaoName" jdbcType="VARCHAR"/> <result column="fenxiao_name" property="fenxiaoName" jdbcType="VARCHAR"/>
<result column="batch_no" property="batchNo" jdbcType="VARCHAR"/> <result column="batch_no" property="batchNo" jdbcType="VARCHAR"/>
<result column="del_flag" property="delFlag" jdbcType="CHAR"/> <result column="del_flag" property="delFlag" jdbcType="CHAR"/>
<result column="create_by" property="createBy" jdbcType="VARCHAR"/>
<result column="create_user_id" property="createUserId" jdbcType="BIGINT"/>
<result column="create_time" property="createTime" jdbcType="TIMESTAMP"/> <result column="create_time" property="createTime" jdbcType="TIMESTAMP"/>
<result column="update_by" property="updateBy" jdbcType="VARCHAR"/>
<result column="update_user_id" property="updateUserId" jdbcType="BIGINT"/>
<result column="update_time" property="updateTime" jdbcType="TIMESTAMP"/> <result column="update_time" property="updateTime" jdbcType="TIMESTAMP"/>
<result column="start_time" property="startTime" jdbcType="TIMESTAMP"/> <result column="start_time" property="startTime" jdbcType="TIMESTAMP"/>
<result column="end_time" property="endTime" jdbcType="TIMESTAMP"/> <result column="end_time" property="endTime" jdbcType="TIMESTAMP"/>
...@@ -359,6 +371,8 @@ ...@@ -359,6 +371,8 @@
<result column="sync_type" property="syncType" jdbcType="TINYINT"/> <result column="sync_type" property="syncType" jdbcType="TINYINT"/>
<result column="actual_cost" property="actualCost" jdbcType="DECIMAL"/> <result column="actual_cost" property="actualCost" jdbcType="DECIMAL"/>
<result column="standard_cost" property="standardCost" jdbcType="DECIMAL"/> <result column="standard_cost" property="standardCost" jdbcType="DECIMAL"/>
<result column="sum_actual_cost" property="sumActualCost" jdbcType="DECIMAL"/>
<result column="sum_standard_cost" property="sumStandardCost" jdbcType="DECIMAL"/>
</resultMap> </resultMap>
</mapper> </mapper>
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论