Merge branch 'dev' into test

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/vo/admin/MemberOrderDetailAdminVo.java

+package com.liquidnet.service.adam.dto.vo.admin;
+
+import com.liquidnet.service.adam.dto.vo.AdamMemberOrderVo;
+import com.liquidnet.service.adam.dto.vo.AdamUserInfoVo;
+import com.liquidnet.service.adam.dto.vo.AdamUserMemberVo;
+import com.liquidnet.service.adam.entity.AdamUser;
+import lombok.Data;
+
+/**
+ * @author AnJiabin <anjiabin@zhengzai.tv>
+ * @version V1.0
+ * @Description: TODO
+ * @class: MemberOrderDetailAdminVo
+ * @Package com.liquidnet.service.adam.dto.vo.admin
+ * @Copyright: LightNet @ Copyright (c) 2021
+ * @date 2021/6/20 14:37
+ */
+@Data
+public class MemberOrderDetailAdminVo {
+    private AdamMemberOrderVo adamMemberOrderVo;
+    private AdamUser adamUser;
+    private AdamUserInfoVo adamUserInfoVo;
+    private AdamUserMemberVo adamUserMemberVo;
+}

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/service/admin/IAdamMemberOrderAdminService.java

 package com.liquidnet.service.adam.service.admin;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.liquidnet.service.adam.dto.vo.admin.MemberOrderDetailAdminVo;
 import com.liquidnet.service.adam.entity.AdamMemberOrder;
 
 /**
@@ -13,5 +14,5 @@ import com.liquidnet.service.adam.entity.AdamMemberOrder;
  * @date 2021/6/6 16:23
  */
 public interface IAdamMemberOrderAdminService extends IService<AdamMemberOrder> {
-
+    MemberOrderDetailAdminVo getMemberOrderDetail(String orderNo);
 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/adam/AdamMemberOrderController.java

 package com.liquidnet.client.admin.web.controller.zhengzai.adam;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.liquidnet.client.admin.common.core.controller.BaseController;
 import com.liquidnet.client.admin.common.core.page.TableDataInfo;
+import com.liquidnet.service.adam.dto.vo.admin.MemberOrderDetailAdminVo;
 import com.liquidnet.service.adam.entity.AdamMemberOrder;
 import com.liquidnet.service.adam.service.admin.IAdamMemberOrderAdminService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -57,9 +57,7 @@ public class AdamMemberOrderController extends BaseController
     @RequiresPermissions("adam:order:orderlist:detail")
     @GetMapping("/orderList/detail/{orderId}")
     public String orderDetail(@PathVariable("orderId") String orderId, ModelMap mmap) {
-        LambdaQueryWrapper<AdamMemberOrder> queryWrapper = new LambdaQueryWrapper();
-        queryWrapper.eq(AdamMemberOrder::getOrderNo,orderId);
-        AdamMemberOrder orderDetailsVo = adamMemberOrderAdminService.getOne(queryWrapper);
+        MemberOrderDetailAdminVo orderDetailsVo = adamMemberOrderAdminService.getMemberOrderDetail(orderId);
         mmap.put("orderDetailsVo", orderDetailsVo);
         return prefix + "/orderList/detail";
     }

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

@@ -91,6 +91,7 @@
                 updateUrl: prefix + "/edit/{id}",
                 removeUrl: prefix + "/remove",
                 exportUrl: prefix + "/export",
+                detailUrl: prefix + "/detail/{id}",
                 modalName: "【请填写功能名称】",
                 columns: [{
                     checkbox: true

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/adam/service/impl/AdamMemberOrderAdminServiceImpl.java

 package com.liquidnet.client.admin.zhengzai.adam.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.liquidnet.commons.lang.util.BeanUtil;
+import com.liquidnet.service.adam.dto.vo.AdamMemberOrderVo;
+import com.liquidnet.service.adam.dto.vo.AdamUserInfoVo;
+import com.liquidnet.service.adam.dto.vo.AdamUserMemberVo;
+import com.liquidnet.service.adam.dto.vo.admin.MemberOrderDetailAdminVo;
 import com.liquidnet.service.adam.entity.AdamMemberOrder;
+import com.liquidnet.service.adam.entity.AdamUser;
+import com.liquidnet.service.adam.entity.AdamUserInfo;
+import com.liquidnet.service.adam.entity.AdamUserMember;
 import com.liquidnet.service.adam.mapper.AdamMemberOrderMapper;
+import com.liquidnet.service.adam.mapper.AdamUserInfoMapper;
+import com.liquidnet.service.adam.mapper.AdamUserMapper;
+import com.liquidnet.service.adam.mapper.AdamUserMemberMapper;
 import com.liquidnet.service.adam.service.admin.IAdamMemberOrderAdminService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
@@ -17,4 +30,47 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class AdamMemberOrderAdminServiceImpl extends ServiceImpl<AdamMemberOrderMapper, AdamMemberOrder> implements IAdamMemberOrderAdminService {
+    @Autowired
+    private AdamMemberOrderMapper adamMemberOrderMapper;
+    @Autowired
+    private AdamUserMemberMapper adamUserMemberMapper;
+    @Autowired
+    private AdamUserInfoMapper adamUserInfoMapper;
+    @Autowired
+    private AdamUserMapper adamUserMapper;
+
+    @Override
+    public MemberOrderDetailAdminVo getMemberOrderDetail(String orderNo) {
+        MemberOrderDetailAdminVo detailAdminVo = new MemberOrderDetailAdminVo();
+        AdamMemberOrderVo adamMemberOrderVo = new AdamMemberOrderVo();
+        AdamUser adamUser = new AdamUser();
+        AdamUserInfoVo adamUserInfoVo = new AdamUserInfoVo();
+        AdamUserMemberVo adamUserMemberVo = new AdamUserMemberVo();
+
+        LambdaQueryWrapper<AdamMemberOrder> queryWrapper = new LambdaQueryWrapper();
+        queryWrapper.eq(AdamMemberOrder::getOrderNo,orderNo);
+        AdamMemberOrder adamMemberOrder = adamMemberOrderMapper.selectOne(queryWrapper);
+        BeanUtil.copy(adamMemberOrder,adamMemberOrderVo);
+
+        //获取用户会员信息
+        LambdaQueryWrapper<AdamUserMember> adamUserMemberWrapper = new LambdaQueryWrapper();
+        adamUserMemberWrapper.eq(AdamUserMember::getUid,adamMemberOrderVo.getUid());
+        AdamUserMember adamUserMember = adamUserMemberMapper.selectOne(adamUserMemberWrapper);
+        BeanUtil.copy(adamUserMember,adamUserMemberVo);
+        //获取用户信息表
+        LambdaQueryWrapper<AdamUserInfo> adamUserInfoWrapper = new LambdaQueryWrapper();
+        adamUserInfoWrapper.eq(AdamUserInfo::getUid,adamMemberOrderVo.getUid());
+        AdamUserInfo adamUserInfo = adamUserInfoMapper.selectOne(adamUserInfoWrapper);
+        BeanUtil.copy(adamUserInfo,adamUserInfoVo);
+        //获取用户表信息
+        LambdaQueryWrapper<AdamUser> adamUserWrapper = new LambdaQueryWrapper();
+        adamUserWrapper.eq(AdamUser::getUid,adamMemberOrderVo.getUid());
+        adamUser = adamUserMapper.selectOne(adamUserWrapper);
+
+        detailAdminVo.setAdamMemberOrderVo(adamMemberOrderVo);
+        detailAdminVo.setAdamUserMemberVo(adamUserMemberVo);
+        detailAdminVo.setAdamUserInfoVo(adamUserInfoVo);
+        detailAdminVo.setAdamUser(adamUser);
+        return detailAdminVo;
+    }
 }

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinOrderTicketStatus.java

@@ -98,9 +98,9 @@ public class KylinOrderTicketStatus implements Serializable {
      *
      * @return
      */
-    public Object[] getCloseOrderObject(LocalDateTime updateTime,LocalDateTime createTime) {
+    public Object[] getCloseOrderObject() {
         return new Object[]{
-                status, updatedAt, orderId,updateTime,createTime
+                status, updatedAt, orderId
         };
     }
 }

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinOrderTickets.java

@@ -234,9 +234,9 @@ public class KylinOrderTickets implements Serializable {
      *
      * @return
      */
-    public Object[] getCloseOrderObject(LocalDateTime updateTime,LocalDateTime createTime) {
+    public Object[] getCloseOrderObject() {
         return new Object[]{
-                updatedAt, orderTicketsId,updateTime,createTime
+                updatedAt, orderTicketsId
         };
     }
 }

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/partner/KylinPerformancesPartnerServiceImpl.java

@@ -417,6 +417,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
                 return ResponseDto.success("保存成功");
             }
         } catch (Exception e) {
+            e.printStackTrace();
             return ResponseDto.failure(ErrorMapping.get(20115));
         }
     }

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/resources/sqlmap.properties

@@ -24,8 +24,8 @@ kylin_order_ticket_entities.synPay=UPDATE kylin_order_ticket_entities SET is_pay
 
 
 # ------------------------订单关闭----------------------------
-kylin_order_ticket.close=UPDATE kylin_order_tickets SET updated_at = ? WHERE order_tickets_id = ? and (updated_at <= ? or created_at = ?)
-kylin_order_ticket_status.close=UPDATE kylin_order_ticket_status SET `status` = ?,updated_at = ? WHERE order_id = ? and (updated_at <= ? or created_at = ?)
-kylin_order_ticket_relation.close=UPDATE kylin_order_ticket_relations SET updated_at = ? WHERE order_id = ? and (updated_at <= ? or created_at = ?)
+kylin_order_ticket.close=UPDATE kylin_order_tickets SET updated_at = ? WHERE order_tickets_id = ?
+kylin_order_ticket_status.close=UPDATE kylin_order_ticket_status SET `status` = ?,updated_at = ? WHERE order_id = ?
+kylin_order_ticket_relation.close=UPDATE kylin_order_ticket_relations SET updated_at = ? WHERE order_id = ?