提交 64af38ca authored 作者: 吴德鹏's avatar 吴德鹏

修改订单bug

上级 3a5d7804
...@@ -27,15 +27,14 @@ ...@@ -27,15 +27,14 @@
<!--查询订单列表--> <!--查询订单列表-->
<select id="queryOrderList" resultType="com.platform.entity.TbCfOrderListEntity"> <select id="queryOrderList" resultType="com.platform.entity.TbCfOrderListEntity">
select select
o.order_id,
o.order_no, o.order_no,
o.order_id,
o.user_name, o.user_name,
o.order_time, o.order_time,
o.reality_pay, o.reality_pay,
o.delivery_name, o.delivery_name,
o.delivery_phone, o.delivery_phone,
o.delivery_address, o.delivery_address,
a.email,
f.pay_way_code, f.pay_way_code,
o.order_status, o.order_status,
o.pay_id, o.pay_id,
...@@ -48,7 +47,6 @@ ...@@ -48,7 +47,6 @@
LEFT JOIN tb_cf_finance f on f.order_id=o.order_id LEFT JOIN tb_cf_finance f on f.order_id=o.order_id
LEFT JOIN tb_cf_user_info u on u.user_id=o.user_id LEFT JOIN tb_cf_user_info u on u.user_id=o.user_id
LEFT JOIN tb_cf_coupon c on c.coupon_id=o.coupon_id LEFT JOIN tb_cf_coupon c on c.coupon_id=o.coupon_id
LEFT JOIN tb_cf_address a on a.user_id=u.user_id
WHERE 1=1 and o.enable_flag=1 WHERE 1=1 and o.enable_flag=1
<if test="name != null and name.trim() != ''"> <if test="name != null and name.trim() != ''">
AND o.order_no LIKE concat('%',#{name},'%') AND o.order_no LIKE concat('%',#{name},'%')
......
...@@ -22,7 +22,7 @@ $(function () { ...@@ -22,7 +22,7 @@ $(function () {
{label: '收货人', name: 'deliveryName', index: 'delivery_name', hidden: true}, {label: '收货人', name: 'deliveryName', index: 'delivery_name', hidden: true},
{label: '收货人手机', name: 'deliveryPhone', index: 'delivery_phone', hidden: true}, {label: '收货人手机', name: 'deliveryPhone', index: 'delivery_phone', hidden: true},
{label: '收货地址', name: 'deliveryAddress', index: 'delivery_address', hidden: true}, {label: '收货地址', name: 'deliveryAddress', index: 'delivery_address', hidden: true},
{label: '收货人邮箱', name: 'email', index: 'email'}, // {label: '收货人邮箱', name: 'email', index: 'email'},
{label: '流水ID', name: 'payId', index: 'pay_id', hidden: true}, {label: '流水ID', name: 'payId', index: 'pay_id', hidden: true},
{label: '税费', name: 'tax', index: 'tax', hidden: true}, {label: '税费', name: 'tax', index: 'tax', hidden: true},
{label: '手续费', name: 'fee', index: 'fee', hidden: true}, {label: '手续费', name: 'fee', index: 'fee', hidden: true},
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论