- 退款流程基本走完

order/order-service-impl/src/main/resources/mapper/OrderReturnMapper.xml

@@ -12,6 +12,7 @@
         reason,
         `describe`,
         approval_time,
+        refuse_time,
         logistics_time,
         receiver_time,
         closing_time,
@@ -28,13 +29,13 @@
         INSERT INTO `order_return` (
          service_number, order_id, order_no, order_logistics_id,
          refund_price, reason, `describe`,
-         approval_time, logistics_time, receiver_time, closing_time,
+         approval_time, refuse_time, logistics_time, receiver_time, closing_time,
          service_type, status,
          create_time, update_time)
         VALUES (
         #{serviceNumber}, #{orderId}, #{orderNo}, #{orderLogisticsId},
         ${refundPrice}, #{reason}, #{describe},
-        #{approvalTime}, #{logisticsTime}, #{receiverTime}, #{closingTime},
+        #{approvalTime}, #{refuse_time}, #{logisticsTime}, #{receiverTime}, #{closingTime},
         #{serviceType}, #{status}, #{createTime}, #{updateTime})
     </insert>
 
@@ -58,20 +59,20 @@
             <if test="approvalTime != null">
                 , approval_time = #{approvalTime}
             </if>
+            <if test="refuseTime != null">
+                , refuse_time = #{refuseTime}
+            </if>
             <if test="logisticsTime != null">
                 , logistics_time = #{logisticsTime}
             </if>
             <if test="receiverTime != null">
                 , receiver_time = #{receiverTime}
             </if>
-            <if test="deliveryTime != null">
-                , delivery_time = #{deliveryTime}
-            </if>
             <if test="closingTime != null">
                 , closing_time = #{closingTime}
             </if>
-            <if test="returnType != null">
-                , return_type = #{returnType}
+            <if test="serviceType != null">
+                , service_type = #{serviceType}
             </if>
             <if test="status != null">
                 , status = #{status}
@@ -88,10 +89,10 @@
     <!--
         更新 - 根据 id 更新
     -->
-    <update id="updateByOrderId" parameterType="OrderReturnDO">
+    <update id="updateById" parameterType="OrderReturnDO">
         UPDATE `order_return`
         <include refid="updateFieldSql"/>
-        WHERE order_id = #{orderId}
+        WHERE id = #{id}
     </update>
 
     <!--
@@ -109,6 +110,12 @@
         列表查询 - where
     -->
     <sql id="selectListWhere">
+        <if test="status != null">
+            AND status = #{status}
+        </if>
+        <if test="serviceNumber != null">
+            AND service_number = #{serviceNumber}
+        </if>
         <if test="orderId != null">
             AND order_id = #{orderId}
         </if>