Merge branch 'pre' into 'master'

Pre

See merge request !55

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

@@ -121,7 +121,7 @@
                     <a class="btn btn-danger" href="#" onclick="closeItem()">
                         <i class="fa fa-reply-all"></i> 关&nbsp;&nbsp;&nbsp;闭
                     </a>
-                    <a class="btn btn-primary" style="margin-left: 15px;" href="#member-refund-form" data-toggle="modal" shiro:hasPermission="adam:order:orderlist:refund" th:if="${orderDetailsVo.adamMemberOrderVo.state == 1 && orderDetailsVo.adamUserMemberVo.state == 1}">
+                    <a class="btn btn-primary" style="margin-left: 15px;" href="#member-refund-form" data-toggle="modal" shiro:hasPermission="adam:order:orderlist:refund" th:if="${orderDetailsVo.adamMemberOrderVo.state == 1 && orderDetailsVo.adamUserMemberVo.state == 1 && orderDetailsVo.adamMemberOrderVo.mode == 0}">
                         申请退款
                     </a>
                 </div>

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinDamaiServiceImpl.java

@@ -91,6 +91,7 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
                         return false;
                     }
                 }
+                log.info("[ 同步大麦-完成 ]");
                 return true;
             } else {
                 return false;
@@ -149,13 +150,13 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
             long ticketIdKey = IDGenerator.getDamaiCode(ticketsData.getTicketsId());
             obj1.setItemId(ticketIdKey);
             obj1.setItemName(ticketsData.getTitle());
-            obj1.setItemPrice(ticketsData.getPrice().longValue());
+            obj1.setItemPrice(ticketsData.getPrice().longValue()*100);
             obj1.setPerformId(timemId);
             obj1.setSupplierSecret(taobaoTicketUtils.getSupplierSecret());
             obj1.setSystemId(taobaoTicketUtils.getSystemId());
 //            obj1.setRemark("0");
             req.setPushItemParam(obj1);
-            log.info("[同步票种] 票种名称 = " + ticketsData.getTitle() + " 大麦票种id =" + ticketIdKey);
+            log.info("[同步票种] 票种名称 = " + ticketsData.getTitle() + " 大麦票种id =" + ticketIdKey +" 票种价格 = "+ticketsData.getPrice());
             AlibabaDamaiMevOpenPushitemResponse rsp = client.execute(req);
             if (rsp.getResult().getSuccess()) {
                 return sycOrder(timemId, ticketsData.getTicketsId(), ticketIdKey);
@@ -199,6 +200,9 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
                     } else if (item.getTransferStatus() == 2 || item.getTransferStatus() == 6) {
                         taobaoTicketUtils.withdrawDamaiOrder(timemId, orderTicketEntitiesKey);
                     } else {
+                        if (item.getEnterType() == 0 && !item.getEnterName().equals("")) {
+                            log.info("[入场人错误数据] 入场人id = " + item.getOrderTicketEntitiesId() + " 入场人 name = " + item.getEnterName());
+                        }
                         list2.add(obj3);
                         obj3.setUserName(item.getEnterName());//用户名 入场人姓名
                         obj3.setCertificateNo(item.getEnterIdCode());//证件号 入场人身份证
@@ -221,7 +225,7 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
                     return true;
                 } else {
                     AlibabaDamaiMevOpenBatchpushticketResponse rsp = client.execute(req);
-                    log.info("order = " + rsp.getBody());
+//                    log.info("order = " + rsp.getBody());
                     if (!rsp.getResult().getSuccess()) {
                         return false;
                     }

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinOrderTicketsMapper.xml

@@ -256,7 +256,7 @@
                  LEFT JOIN kylin_order_ticket_entities AS ote ON ote.order_id = ot.order_tickets_id
                  LEFT JOIN kylin_ticket_status AS kys ON kys.ticket_id = otr.ticket_id
         WHERE (ots.status = 1 or ots.status = 3 or ots.status = 4 or ots.status = 6)
-          AND ote.ticket_id = ${ticketsId}
+          AND ote.ticket_id = ${ticketsId} group by order_ticket_entities_id
     </select>
 
     <select id="orderScriptDto" parameterType="java.lang.String" resultMap="orderScriptDtoResult">