From 8afb2b52b65a6c58f4002cecf61a5db7e66525ba Mon Sep 17 00:00:00 2001
From: taozi <552920369@qq.com>
Date: Thu, 4 Jun 2020 18:30:30 +0800
Subject: [PATCH] =?UTF-8?q?bug--unique=E5=85=B3=E9=94=AE=E5=AD=97=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/shop/mapper/YxStoreProductReplyMapper.java        | 4 ++--
 .../resources/mapper/order/YxStoreOrderCartInfoMapper.xml     | 2 +-
 .../resources/mapper/shop/YxStoreProductAttrValueMapper.xml   | 2 +-
 .../main/resources/mapper/shop/YxStoreProductReplyMapper.xml  | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/mapper/YxStoreProductReplyMapper.java b/yshop-api/src/main/java/co/yixiang/modules/shop/mapper/YxStoreProductReplyMapper.java
index f446d3b5..8d51c933 100644
--- a/yshop-api/src/main/java/co/yixiang/modules/shop/mapper/YxStoreProductReplyMapper.java
+++ b/yshop-api/src/main/java/co/yixiang/modules/shop/mapper/YxStoreProductReplyMapper.java
@@ -29,7 +29,7 @@ public interface YxStoreProductReplyMapper extends BaseMapper<YxStoreProductRepl
             "A.merchant_reply_time as merchantReplyTime,A.pics as pictures,A.add_time as addTime," +
             "B.nickname,B.avatar,C.cart_info as cartInfo" +
             " from yx_store_product_reply A left join yx_user B " +
-            "on A.uid = B.uid left join yx_store_order_cart_info C on A.unique = C.unique" +
+            "on A.uid = B.uid left join yx_store_order_cart_info C on A.`unique` = C.`unique`" +
             " where A.product_id=#{productId} and A.is_del=0 and A.reply_type='product' " +
             "order by A.add_time DESC limit 1")
     YxStoreProductReplyQueryVo getReply(int productId);
@@ -39,7 +39,7 @@ public interface YxStoreProductReplyMapper extends BaseMapper<YxStoreProductRepl
             "A.merchant_reply_time as merchantReplyTime,A.pics as pictures,A.add_time as addTime," +
             "B.nickname,B.avatar,C.cart_info as cartInfo" +
             " from yx_store_product_reply A left join yx_user B " +
-            "on A.uid = B.uid left join yx_store_order_cart_info C on A.unique = C.unique" +
+            "on A.uid = B.uid left join yx_store_order_cart_info C on A.`unique` = C.`unique`" +
             " where A.product_id=#{productId} and A.is_del=0 and A.reply_type='product' " +
             "<if test='type == 1'>and A.product_score = 5</if>" +
             "<if test='type == 2'>and A.product_score &lt; 5 and A.product_score &gt; 2</if>" +
diff --git a/yshop-api/src/main/resources/mapper/order/YxStoreOrderCartInfoMapper.xml b/yshop-api/src/main/resources/mapper/order/YxStoreOrderCartInfoMapper.xml
index 15761087..acf8d7ae 100644
--- a/yshop-api/src/main/resources/mapper/order/YxStoreOrderCartInfoMapper.xml
+++ b/yshop-api/src/main/resources/mapper/order/YxStoreOrderCartInfoMapper.xml
@@ -4,7 +4,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, oid, cart_id, product_id, cart_info, unique
+        id, oid, cart_id, product_id, cart_info, `unique`
     </sql>
 
     <select id="getYxStoreOrderCartInfoById" resultType="co.yixiang.modules.order.web.vo.YxStoreOrderCartInfoQueryVo">
diff --git a/yshop-api/src/main/resources/mapper/shop/YxStoreProductAttrValueMapper.xml b/yshop-api/src/main/resources/mapper/shop/YxStoreProductAttrValueMapper.xml
index fc8a9740..97c72a82 100644
--- a/yshop-api/src/main/resources/mapper/shop/YxStoreProductAttrValueMapper.xml
+++ b/yshop-api/src/main/resources/mapper/shop/YxStoreProductAttrValueMapper.xml
@@ -4,7 +4,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, product_id, suk, stock, sales, price, image, unique, cost
+        id, product_id, suk, stock, sales, price, image, `unique`, cost
     </sql>
 
     <select id="getYxStoreProductAttrValueById" resultType="co.yixiang.modules.shop.web.vo.YxStoreProductAttrValueQueryVo">
diff --git a/yshop-api/src/main/resources/mapper/shop/YxStoreProductReplyMapper.xml b/yshop-api/src/main/resources/mapper/shop/YxStoreProductReplyMapper.xml
index 9d6ceb06..7ca0e729 100644
--- a/yshop-api/src/main/resources/mapper/shop/YxStoreProductReplyMapper.xml
+++ b/yshop-api/src/main/resources/mapper/shop/YxStoreProductReplyMapper.xml
@@ -4,7 +4,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, uid, oid, unique, product_id, reply_type, product_score, service_score, comment, pics, add_time, merchant_reply_content, merchant_reply_time, is_del, is_reply
+        id, uid, oid, `unique`, product_id, reply_type, product_score, service_score, comment, pics, add_time, merchant_reply_content, merchant_reply_time, is_del, is_reply
     </sql>
 
     <select id="getYxStoreProductReplyById" resultType="co.yixiang.modules.shop.web.vo.YxStoreProductReplyQueryVo">