From 652988fbc8ec370d782f4f8d1b619969cf0f66d3 Mon Sep 17 00:00:00 2001
From: limqhz <540344226@qq.com>
Date: Sun, 31 Dec 2023 12:40:32 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E6=94=AF=E4=BB=98=E5=9B=9E=E8=B0=83?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/sv/service/api/VenueEnterService.java     |  8 --------
 .../mybatis/mapper/sv/BarcodeOrderTimeMapper.xml       |  2 +-
 .../main/resources/mybatis/mapper/sv/OrderMapper.xml   | 10 +---------
 3 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/service/src/main/java/com/sv/service/api/VenueEnterService.java b/service/src/main/java/com/sv/service/api/VenueEnterService.java
index 88a9752..fcdb559 100644
--- a/service/src/main/java/com/sv/service/api/VenueEnterService.java
+++ b/service/src/main/java/com/sv/service/api/VenueEnterService.java
@@ -1,28 +1,20 @@
 package com.sv.service.api;
 
 import com.enums.*;
-import com.github.pagehelper.PageHelper;
 import com.sv.dto.BasketEnterResult;
-import com.sv.dto.api.MemberCardDTO;
-import com.sv.dto.api.MemberCardVenuesDTO;
-import com.sv.dto.api.VenueDTO;
 import com.sv.entity.*;
 import com.sv.exception.api.ExceptionCodeTemplate;
 import com.sv.mapper.BarcodeOrderTimeMapper;
 import com.sv.mapper.OrderMapper;
 import com.sv.mapper.VenueMapper;
 import com.sv.service.api.util.DateUtilCard;
-import com.sv.service.api.util.GeoHashUtils;
-import com.ydd.framework.core.common.Pagination;
 import com.ydd.framework.core.common.utils.ValidationUtils;
 import com.ydd.framework.core.exception.ServiceException;
 import com.ydd.framework.core.service.impl.BaseServiceImpl;
 import com.ydd.oms.entity.enums.PayStatusEnum;
-import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
-import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
diff --git a/service/src/main/resources/mybatis/mapper/sv/BarcodeOrderTimeMapper.xml b/service/src/main/resources/mybatis/mapper/sv/BarcodeOrderTimeMapper.xml
index 56b8c55..d203392 100644
--- a/service/src/main/resources/mybatis/mapper/sv/BarcodeOrderTimeMapper.xml
+++ b/service/src/main/resources/mybatis/mapper/sv/BarcodeOrderTimeMapper.xml
@@ -32,7 +32,7 @@
   <insert id="insert" parameterType="com.sv.entity.BarcodeOrderTime" >
     insert into sv_barcode_order_time (id, member_id, venue_id,
       created_time, modified_time, order_start,
-      order_end, status,paying ,pay_money)
+      order_end, status,paying ,pay_money,order_sn)
     values (#{id,jdbcType=INTEGER}, #{memberId,jdbcType=INTEGER}, #{venueId,jdbcType=INTEGER},
       #{createdTime,jdbcType=TIMESTAMP}, #{modifiedTime,jdbcType=TIMESTAMP}, #{orderStart,jdbcType=TIMESTAMP},
       #{orderEnd,jdbcType=TIMESTAMP}, #{status,jdbcType=INTEGER}, #{paying,jdbcType=INTEGER}, #{payMoney,jdbcType=INTEGER}, #{orderSn,jdbcType=VARCHAR})
diff --git a/service/src/main/resources/mybatis/mapper/sv/OrderMapper.xml b/service/src/main/resources/mybatis/mapper/sv/OrderMapper.xml
index d740853..bab302b 100644
--- a/service/src/main/resources/mybatis/mapper/sv/OrderMapper.xml
+++ b/service/src/main/resources/mybatis/mapper/sv/OrderMapper.xml
@@ -399,15 +399,7 @@
 	<!-- api 根据用户Id，订单号查询订单 -->
 	<select id="findOrderSn" resultMap="OrderMap">
 		SELECT
-			id,
-			member_id,
-			order_sn,
-			price,
-			`type`,
-			platform_id,
-			to_money,
-            pay_status,
-			trade_sn
+		<include refid="Field"></include>
 		FROM
 			<include refid="tableName"></include>
 		WHERE order_sn = #{orderSn}