fixbug first

src/main/resources/application.yml

@@ -71,8 +71,8 @@ ali:
     refund-notify-url: https://www.minbo.wang:8020/api/alipay/refundNotify
     privateKey: MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQCQke+mZsxNXJXMn2iUZRkhITWY9qPczwHMgRxl68JRuNzZE2AXhAc2ciF7EGob1y0al4hvJo5JUrDew9Zkv0BocAsPjLma3A9KFgj131xMuLxVvHtktkNSwwW9VIbOOhFAQAy3J9jt8PdEk40UONyu9J5Shjs6jbQ8RogdDuwuzKpNj0ZOTeUqgR6RME4xZ0VqvZe9XhVfq3QtVGttUzOpLPNg6boBy/5RqwC64lVFICMqjKkMW2NklVPBDFO46QwfWEbaA+APnd9bd+9WadyNySPb7kAK8GOlvZYfysy+QkOQdj/oebKWKzdKXpFnF+n52dYzeGTvckt1suDngwAFAgMBAAECggEAcPc39iTZe5HfE9d0FpCxBCw4/1+qRz4SP8SbdiC05Lq5B36WVYm7QRYJh2oaH8sR2XeTCpdsE2tj/Y21l1/Calkyq2HhHlraL5/sPIPeUa0ArVXsbZPmI2N0tq6376l8FWJ3DR876SGjdZh+YtDT0HogxIdS/LwBnB/Y+CvS7fWcqiMjcR4h28RU70CQqxpzYuPfqG6GZmByGyJAcdlhFAYgiksb+qZnkjoaKHsjb61xfUX4z+HGdQLqOlVKfNqIpiO7arXaeAb0RQiB8Lqi7fBvn8LLhlTmM1Hr4gyQO14lJmP5Vp2BIg9m5AC9vRkpZ9l79bUTIepDe9+Ovcx5eQKBgQDWZ5yoz8q8Z5VIfMSVTHO3wpfwOBM92S2c21hTsds7NezsMVqGcTuAcvbMW2i1MwxtS7kahXraRAxZnCDB9ZVJs+88xcgu5QJWZ1rJyrwEwB2gTQhColv+XZW6Ck/J6kk2/PG26rNQG6pg/xrKaMtPnXXyKCsdQTyEpr+mlNIJ2wKBgQCsnf4lIuwftCSm0jI73tO1Bb4U9TCIapKidnIhutbyg6u+hJMUTVDNkjsBnrTN24sSP7Cu4Zs/W4lkDqq86fHNEvnF+FouIfO/CwaGteDBNwXHSLM0D+zEBbK04bfoYi7lYZeDRPygFrM49Sxkp0MAmItDmXqbYRQBlhN1XVzznwKBgQCQ+72fFex1XOJBA0X345v4rlkKMxEn6J2EjXr8FbA3KO8OhQ0/DoD7CkLDzChRJ7UGj4cbXRnHUO69BevM3SHXlhp4ERKeS3Q6M2fcPwDHgZZHGPA2Bw6IQoaGKITt+EUMLx3Q4ILi7+JV9wwJxbV+H+9rEiidfsjKtuuwXMBvswKBgQChpElrCSrH/W8c8FSuD9l7+GapRXkvJW0uyW/S+h1yd66J96erKUNzXW339GAnLWErs4yGFynDyLn9gmaMBR6zBQP0SL5Z2N1hlreDyikvhZDZrtBw/kCexx8zlvMan2Z+0kaJXD6cwuUNfzkVADQUCMTQhpZzjhKn8ZtDGiyCzQKBgQCAhU0khG/ufZfQ089+1G7PAlErBr5MQaG40a2vfIWGtHkYyXq5N/3jow1bd2qsyLuz8mr2sWQeURK+B2xZridf6JtYz3gB+dLw0frlLKk4Q6jeehiRlE8H8tIYe/7KcgTmdIzEbo3lmyGMFAILvr/pSCWeUehQYR9PH91Qyi+Tog==
     #    publicKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArPG4JQ9YY9+tOeImQO0eNkp+NZkenJ9hMHEVVmwAHAI5BoJMCLvAm504BXSpgpqaiCJ6ARTwBkiDz4dyCMVfE3VE8+oMFtXqfHaZLhfd+X9VQNqRCz0HeR2IbjGnnbYxQOAEOM6z092UfNieG00HyU5yREfzjJkIcyuGeGgbIBG1gPpLhXsQKRhQYqp4Exgd4LX6qnKLPL90kJVkQnHcJkp+rCoQ5zS6ZUXE2d/2GzY7xi93uTU2CLMiZ7Vi2OZ1g7xY+yDQzTA/CseveJeW3rM6T8yBjlEJwsywEL5co3YqpJUIMIe/fLjhRRgj+JUq5w0sRqb3+CswQHIjgc71QwIDAQAB
-    appCertPath: /root/cert//appCertPublicKey_2021005174658269.crt
-    alipayCertPath: /root/cert//alipayCertPublicKey_RSA2.crt
+    appCertPath: /root/cert/appCertPublicKey_2021005174658269.crt
+    alipayCertPath: /root/cert/alipayCertPublicKey_RSA2.crt
     alipayRootCertPath: /root/cert/alipayRootCert.crt
 
 cert-path: /root/cert/

src/main/resources/mapper/RentRuleItemMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.sczx.pay.mapper.RentRuleItemMapper">
-    
+
     <!-- 结果映射 -->
     <resultMap id="BaseResultMap" type="com.sczx.pay.alipay.po.RentRuleItem">
         <id property="id" column="id"/>
@@ -17,27 +17,60 @@
         <result property="carRuleId" column="car_rule_id"/>
         <result property="carModelId" column="car_model_id"/>
         <result property="brandId" column="brand_id"/>
+        <result property="rentalDays" column="rental_days"/>
+        <result property="rentalPrice" column="rental_price"/>
     </resultMap>
-    
+
     <!-- 字段列表 -->
     <sql id="Base_Column_List">
-        id, out_item_id, ali_item_id, brand_name, model_name, category_name, 
-        dict_label, rule_name, image, battery_rule_id, car_rule_id, car_model_id, brand_id
+        id, out_item_id, ali_item_id, brand_name, model_name, category_name,
+        dict_label, rule_name, image, battery_rule_id, car_rule_id, car_model_id, brand_id,rental_days,rental_price
     </sql>
-    
+
     <!-- 查询所有 -->
     <select id="selectAll" resultMap="BaseResultMap">
         SELECT <include refid="Base_Column_List"/>
         FROM zc_rent_rule_item
     </select>
-    
+
     <!-- 根据ID查询 -->
     <select id="selectById" parameterType="Long" resultMap="BaseResultMap">
         SELECT <include refid="Base_Column_List"/>
         FROM zc_rent_rule_item
         WHERE id = #{id}
     </select>
-    
+
+    <select id="selectByItemId" parameterType="Long" resultMap="BaseResultMap">
+        SELECT <include refid="Base_Column_List"/>
+        FROM zc_rent_rule_item
+        WHERE out_item_id = #{outItemId}
+    </select>
+
+    <select id="selectByAliId" parameterType="Long" resultMap="BaseResultMap">
+        SELECT <include refid="Base_Column_List"/>
+        FROM zc_rent_rule_item
+        WHERE ali_item_id = #{aliItemId}
+    </select>
+
+    <select id="selectByIds" parameterType="map" resultMap="BaseResultMap">
+        SELECT <include refid="Base_Column_List"/>
+        FROM zc_rent_rule_item
+        <where>
+            <if test="batteryRuleId != null">
+                AND battery_rule_id = #{batteryRuleId}
+            </if>
+            <if test="carRuleId != null">
+                AND car_rule_id = #{carRuleId}
+            </if>
+            <if test="carModelId != null">
+                AND car_model_id = #{carModelId}
+            </if>
+            <if test="brandId != null">
+                AND brand_id = #{brandId}
+            </if>
+        </where>
+    </select>
+
     <!-- 插入 -->
     <insert id="insert" parameterType="com.sczx.pay.alipay.po.RentRuleItem">
         INSERT INTO zc_rent_rule_item (
@@ -53,32 +86,36 @@
             battery_rule_id,
             car_rule_id,
             car_model_id,
+            rental_days,
+            rental_price,
             brand_id
         ) VALUES (
-            #{id},
-            #{outItemId},
-            #{aliItemId},
-            #{brandName},
-            #{modelName},
-            #{categoryName},
-            #{dictLabel},
-            #{ruleName},
-            #{image},
-            #{batteryRuleId},
-            #{carRuleId},
-            #{carModelId},
-            #{brandId}
-        )
+                     #{id},
+                     #{outItemId},
+                     #{aliItemId},
+                     #{brandName},
+                     #{modelName},
+                     #{categoryName},
+                     #{dictLabel},
+                     #{ruleName},
+                     #{image},
+                     #{batteryRuleId},
+                     #{carRuleId},
+                     #{carModelId},
+                     #{rentalDays},
+                     #{rentalPrice},
+                     #{brandId}
+                 )
     </insert>
-    
+
     <!-- 批量插入 -->
     <insert id="insertBatch">
         INSERT INTO zc_rent_rule_item (
-            id, out_item_id, ali_item_id, brand_name, model_name, category_name,
-            dict_label, rule_name, image, battery_rule_id, car_rule_id, car_model_id, brand_id
+        id, out_item_id, ali_item_id, brand_name, model_name, category_name,
+        dict_label, rule_name, image, battery_rule_id, car_rule_id, car_model_id, brand_id,rental_days,rental_price
         ) VALUES
         <foreach collection="list" item="item" separator=",">
-        (
+            (
             #{item.id},
             #{item.outItemId},
             #{item.aliItemId},
@@ -91,11 +128,13 @@
             #{item.batteryRuleId},
             #{item.carRuleId},
             #{item.carModelId},
-            #{item.brandId}
-        )
+            #{item.brandId},
+            #{item.rentalDays},
+            #{item.rentalPrice},
+            )
         </foreach>
     </insert>
-    
+
     <!-- 更新 -->
     <update id="update" parameterType="com.sczx.pay.alipay.po.RentRuleItem">
         UPDATE zc_rent_rule_item
@@ -115,7 +154,7 @@
         </set>
         WHERE id = #{id}
     </update>
-    
+
     <!-- 根据ID删除 -->
     <delete id="deleteById" parameterType="Long">
         DELETE FROM zc_rent_rule_item WHERE id = #{id}