记得上下班打卡 | git大法好，push需谨慎

Skip to content

L
liquidnet-bus-v1
Commit f1dc0e5d authored by anjiabin's avatar anjiabin
Browse files
Options

修改会员订单明细

parent ac56770e
Hide whitespace changes
Inline Side-by-side
Showing with 19 additions and 72 deletions
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/adam/order/orderList/order.html
View file @ f1dc0e5d
......@@ -20,36 +20,36 @@
</li>
<li>
<label>支付方式：</label>
<select name="paymentType" th:with="type=${@dict.getType('zhengzai_pay_type')}">
<select name="payType" th:with="type=${@dict.getType('zhengzai_pay_type')}">
<option value="">所有</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</li>
<li>
<label>订单状态：</label>
<select name="orderStatus" th:with="type=${@dict.getType('zhengzai_member_order_status')}">
<select name="state" th:with="type=${@dict.getType('zhengzai_member_order_status')}">
<option value="">所有</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</li>
<li>
<label>购买方式：</label>
<select name="buyMode" th:with="type=${@dict.getType('zhengzai_buy_mode')}">
<select name="mode" th:with="type=${@dict.getType('zhengzai_buy_mode')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</li>
<li>
<label>客户端：</label>
<select name="orderSource" th:with="type=${@dict.getType('zhengzai_order_source')}">
<select name="source" th:with="type=${@dict.getType('zhengzai_order_source')}">
<option value="">所有</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</li>
<li class="select-time">
<label>支付时间： </label>
<input type="text" class="time-input" id="timePayStart" placeholder="开始日期" name="params[beginTime]"/>
<input type="text" class="time-input" id="timeStart" placeholder="开始日期" name="paymentAtStart"/>
<span>-</span>
<input type="text" class="time-input" id="timePayEnd" placeholder="结束日期" name="params[endTime]"/>
<input type="text" class="time-input" id="timeEnd" placeholder="结束日期" name="paymentAtEnd"/>
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
......@@ -113,7 +113,7 @@
title: '支付方式'
},
{
field: 'pricePaid',
field: 'price',
title: '价格(元)'
},
{
......
liquidnet-bus-do/liquidnet-service-adam-do/src/main/java/com/liquidnet/service/adam/dto/MemberOrderDto.java
View file @ f1dc0e5d
......@@ -25,4 +25,5 @@ public class MemberOrderDto {
private String createdAt;
private String mobile;
private String source;
private String mode;
}
liquidnet-bus-do/liquidnet-service-adam-do/src/main/resources/com/liquidnet/service/adam/mapper/AdamMemberMapper.xml
View file @ f1dc0e5d
......@@ -22,18 +22,6 @@
<result column="created_at" property="createdAt" />
<result column="updated_at" property="updatedAt" />
</resultMap>
<resultMap id="orderListResult" type="com.liquidnet.service.adam.dto.MemberOrderDto" >
<result column="member_id" property="uid" />
<result column="name" property="orderNo" />
<result column="title" property="state" />
<result column="sub_title" property="payType" />
<result column="start_no" property="price" />
<result column="icon" property="pricePaid" />
<result column="avatar" property="paymentAt" />
<result column="type" property="createdAt" />
<result column="interests_detail" property="mobile" />
<result column="notes" property="source" />
</resultMap>
<!-- sql -->
<select id="getFirstMember" resultMap="MemberResult">
SELECT
......@@ -59,47 +47,4 @@
FROM adam_member
limit 0,1
</select>
<select id="getMemberOrderList" resultMap="orderListResult">
select amo.uid,
amo.order_no,
amo.state,
amo.pay_type,
amo.price,
amo.price_paid,
amo.payment_at,
amo.created_at,
au.mobile,
amo.source,
amo.mode
from adam_member_order amo
inner join adam_user_member aum
on amo.uid = aum.uid
inner join adam_user au on aum.uid = au.uid
<where>
<if test="orderNo != null and orderNo != ''">
and amo.order_no = #{orderNo}
</if>
<if test="mobile != null and mobile != ''">
and au.mobile = #{mobile}
</if>
<if test="payType != null and payType != ''">
and amo.pay_type = #{payType}
</if>
<if test="state != null and state != ''">
and amo.state = #{state}
</if>
<if test="mode != null and mode != ''">
and amo.mode = #{mode}
</if>
<if test="source != null and source != ''">
and amo.source = #{source}
</if>
<if test="paymentAtStart != null and paymentAtStart != ''">
and amo.payment_at &gt; #{paymentAtStart}
</if>
<if test="paymentAtEnd != null and paymentAtEnd != ''">
and amo.payment_at &lt; #{paymentAtEnd}
</if>
</where>
</select>
</mapper>
liquidnet-bus-do/liquidnet-service-adam-do/src/main/resources/com/liquidnet/service/adam/mapper/AdamMemberOrderMapper.xml
View file @ f1dc0e5d
......@@ -2,16 +2,17 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.liquidnet.service.adam.mapper.AdamMemberOrderMapper">
<resultMap id="orderListResult" type="com.liquidnet.service.adam.dto.MemberOrderDto" >
<result column="member_id" property="uid" />
<result column="name" property="orderNo" />
<result column="title" property="state" />
<result column="sub_title" property="payType" />
<result column="start_no" property="price" />
<result column="icon" property="pricePaid" />
<result column="avatar" property="paymentAt" />
<result column="type" property="createdAt" />
<result column="interests_detail" property="mobile" />
<result column="notes" property="source" />
<result column="uid" property="uid" />
<result column="order_no" property="orderNo" />
<result column="state" property="state" />
<result column="pay_type" property="payType" />
<result column="price" property="price" />
<result column="price_paid" property="pricePaid" />
<result column="payment_at" property="paymentAt" />
<result column="created_at" property="createdAt" />
<result column="mobile" property="mobile" />
<result column="source" property="source" />
<result column="mode" property="mode" />
</resultMap>
<select id="getMemberOrderList" resultMap="orderListResult">
select amo.uid,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment