Merge branch 'dev' into test

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/adam/order/orderList/order.html

@@ -113,7 +113,7 @@
                     title: '支付方式'
                 },
                 {
-                    field: 'price',
+                    field: 'pricePaid',
                     title: '价格(元)'
                 },
                 {
@@ -132,13 +132,13 @@
                     title: '用户ID'
                 },
                 {
-                    field: 'memberPriceId',
+                    field: 'mobile',
                     title: '手机号'
                 },
                 {
                     field: 'source',
                     title: '客户端'
-                }
+                },
                 // {
                 //     field: 'state',
                 //     title: '快递状态'

liquidnet-bus-do/liquidnet-service-adam-do/src/main/resources/com/liquidnet/service/adam/mapper/AdamMemberOrderMapper.xml

+<?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.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" />
+    </resultMap>
+    <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-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinOrderTicketsServiceImpl.java

@@ -1091,12 +1091,12 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
                     String orderStr = "";
                     for (int i = 0; i < orderIdList.size(); i++) {
                         String orderTicketId = orderIdList.get(i).split(",")[0];
-                        orderStr = orderTicketId + ",";
+                        orderStr = orderStr+"'"+orderTicketId + "',";
                     }
                     orderStr = orderStr.substring(0, orderStr.length() - 1);
-                    sqls.add("UPDATE kylin_order_tickets SET updated_at = " + now + " WHERE order_tickets_id in (" + orderStr + ") ");
-                    sqls.add("UPDATE kylin_order_ticket_status SET `status` = 2,updated_at = " + now + " WHERE order_id in (" + orderStr + ") ");
-                    sqls.add("UPDATE kylin_order_ticket_relations SET updated_at = " + now + " WHERE order_id in (" + orderStr + ")");
+                    sqls.add("UPDATE kylin_order_tickets SET updated_at = '" + now + "'WHERE order_tickets_id in (" + orderStr + ") ");
+                    sqls.add("UPDATE kylin_order_ticket_status SET `status` = 2,updated_at = '" + now + "' WHERE order_id in (" + orderStr + ") ");
+                    sqls.add("UPDATE kylin_order_ticket_relations SET updated_at = '" + now + "' WHERE order_id in (" + orderStr + ")");
                     rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_CLOSE, MQConst.ROUTING_KEY_SQL_ORDER_CLOSE, SqlMapping.gets(sqls));
                     currentTime = System.currentTimeMillis() - currentTime;
                     log.debug("mysql -> time:" + (currentTime) + "毫秒");