Merge branch 'develop/express'

# Conflicts:
#	src/main/resources/application-dev.yml

src/main/resources/application-dev.yml

@@ -3,7 +3,7 @@ spring:
   redis:
     open: false  # 是否开启redis缓存  true开启   false关闭
     database: 0
-    host: 39.106.36.183
+    host: 59.110.212.44
     port: 6379
     password: Jgll2015   # 密码（默认为空）
     timeout: 6000000ms  # 连接超时时长（毫秒）
@@ -19,7 +19,6 @@ spring:
       driver-class-name: com.mysql.cj.jdbc.Driver
       url: jdbc:mysql://59.110.212.44:3306/e_book_test?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true
       username: root
-#      password: HSXY1234hsxy
       password: Jgll2023Nutty
       initial-size: 10
       max-active: 100
@@ -73,5 +72,5 @@ aliyun:
 server:
   port: 9200
 
-redisAddress: redis://39.106.36.183:6379
+redisAddress: redis://59.110.212.44:6379
 redisPassword: Jgll2015

src/main/resources/mapper/book/BuyOrderDao.xml

@@ -5,7 +5,7 @@
 
     <!-- 可根据自己的需求，是否要使用 -->
     <resultMap type="com.peanut.modules.book.entity.BuyOrder" id="buyOrderMap">
-        <result property="orderId" column="order_id"/>
+        <result property="id" column="id"/>
         <result property="orderSn" column="order_sn"/>
         <result property="userId" column="user_id"/>
         <result property="shippingUser" column="shipping_user"/>

src/main/resources/mapper/book/ShopProductBookDao.xml

@@ -17,7 +17,7 @@
         SELECT spb.book_id
         FROM shop_product_book spb
                  LEFT JOIN buy_order_detail bod ON spb.product_id = bod.product_id
-                 LEFT JOIN buy_order bo ON bo.order_id = bod.order_id
+                 LEFT JOIN buy_order bo ON bo.id = bod.order_id
         WHERE bo.order_sn = #{orderSn}
           AND spb.del_flag != -1
     </select>

src/main/resources/mapper/book/ShopProductDao.xml

@@ -50,7 +50,7 @@
         order by a.sort desc
     </select>
 
-    <select id="getTotalWeight" parameterType="list">
+    <select id="getTotalWeight" parameterType="list" resultType="java.lang.Integer">
         select sum(weight) from shop_product where product_id in
         <foreach collection="list" item="id" index="index" open="(" close=")" separator=",">
             #{id}

src/main/resources/mapper/book/UserRecordDao.xml

@@ -4,7 +4,7 @@
 <mapper namespace="com.peanut.modules.book.dao.UserRecordDao">
 
     <!-- 可根据自己的需求，是否要使用 -->
-    <resultMap type="com.peanut.modules.book.entity.UserRecordEntity" id="UserRecordMap">
+    <resultMap type="com.peanut.modules.book.entity.UserRecord" id="UserRecordMap">
         <result property="id" column="oid"/>
         <result property="createDate" column="createDate"/>
         <result property="type" column="type"/>