fix:退货列表返回退款状态

cooleshow-mall/mall-admin/src/main/java/com/yonge/cooleshow/admin/service/impl/OmsOrderReturnApplyServiceImpl.java

@@ -120,6 +120,7 @@ public class OmsOrderReturnApplyServiceImpl implements OmsOrderReturnApplyServic
         OrderRefundRes orderRefundRes = adapayPaymentService.orderRefund(refundReq);
         if (orderRefundRes.isStatus()) {
             UserOrderRefund userOrderRefund = new UserOrderRefund();
+            userOrderRefund.setReturnId(returnApply.getId());
             userOrderRefund.setOrderNo(orderRefundRes.getRefundOrderNo());
             userOrderRefund.setTransNo(orderRefundRes.getTransNo());
             userOrderRefund.setPayTransNo(orderRefundRes.getPayTransNo());

cooleshow-mall/mall-mbg/src/main/java/com/yonge/cooleshow/mbg/model/UserOrderRefund.java

@@ -19,6 +19,9 @@ public class UserOrderRefund {
     @ApiModelProperty(value = "")
     private Long id;
 
+    @ApiModelProperty("退货id")
+    private Long returnId;
+
     /**
      * 订单号
      */
@@ -73,6 +76,14 @@ public class UserOrderRefund {
     @ApiModelProperty(value = "")
     private Date updateTime;
 
+    public Long getReturnId() {
+        return returnId;
+    }
+
+    public void setReturnId(Long returnId) {
+        this.returnId = returnId;
+    }
+
     public Long getId() {
         return id;
     }

cooleshow-mall/mall-mbg/src/main/resources/config/mybatis/UserOrderRefundMapper.xml

@@ -5,6 +5,7 @@
     <!--@mbg.generated-->
     <!--@Table user_order_refund-->
     <id column="id_" jdbcType="BIGINT" property="id" />
+    <result column="return_id_" jdbcType="VARCHAR" property="returnId" />
     <result column="order_no_" jdbcType="VARCHAR" property="orderNo" />
     <result column="trans_no_" jdbcType="VARCHAR" property="transNo" />
     <result column="pay_trans_no_" jdbcType="VARCHAR" property="payTransNo" />
@@ -79,7 +80,7 @@
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
     id_, order_no_, trans_no_, pay_trans_no_, refund_amt_, fee_amt_, status_, pay_fail_msg_, 
-    arrival_time_, create_time_, update_time_
+    arrival_time_, create_time_, update_time_,return_id_
   </sql>
   <select id="selectByExample" parameterType="com.yonge.cooleshow.mbg.model.UserOrderRefundExample" resultMap="BaseResultMap">
     <!--@mbg.generated-->
@@ -120,11 +121,11 @@
     insert into user_order_refund (order_no_, trans_no_, pay_trans_no_, 
       refund_amt_, fee_amt_, status_, 
       pay_fail_msg_, arrival_time_, create_time_, 
-      update_time_)
+      update_time_,return_id_)
     values (#{orderNo,jdbcType=VARCHAR}, #{transNo,jdbcType=VARCHAR}, #{payTransNo,jdbcType=VARCHAR}, 
       #{refundAmt,jdbcType=DECIMAL}, #{feeAmt,jdbcType=DECIMAL}, #{status,jdbcType=VARCHAR}, 
       #{payFailMsg,jdbcType=VARCHAR}, #{arrivalTime,jdbcType=TIMESTAMP}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{updateTime,jdbcType=TIMESTAMP})
+      #{updateTime,jdbcType=TIMESTAMP},#{returnId})
   </insert>
   <insert id="insertSelective" keyColumn="id_" keyProperty="id" parameterType="com.yonge.cooleshow.mbg.model.UserOrderRefund" useGeneratedKeys="true">
     <!--@mbg.generated-->
@@ -160,6 +161,9 @@
       <if test="updateTime != null">
         update_time_,
       </if>
+      <if test="returnId != null">
+        return_id_,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="orderNo != null">
@@ -192,6 +196,9 @@
       <if test="updateTime != null">
         #{updateTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="returnId != null">
+        #{returnId},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.yonge.cooleshow.mbg.model.UserOrderRefundExample" resultType="java.lang.Long">
@@ -238,6 +245,9 @@
       <if test="record.updateTime != null">
         update_time_ = #{record.updateTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="record.returnId != null">
+        return_id_ = #{record.returnId,jdbcType=BIGINT},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -256,6 +266,7 @@
       pay_fail_msg_ = #{record.payFailMsg,jdbcType=VARCHAR},
       arrival_time_ = #{record.arrivalTime,jdbcType=TIMESTAMP},
       create_time_ = #{record.createTime,jdbcType=TIMESTAMP},
+      return_id_ = #{record.returnId,jdbcType=BIGINT},
       update_time_ = #{record.updateTime,jdbcType=TIMESTAMP}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -295,6 +306,9 @@
       <if test="updateTime != null">
         update_time_ = #{updateTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="returnId != null">
+        return_id_ = #{returnId,jdbcType=BIGINT},
+      </if>
     </set>
     where id_ = #{id,jdbcType=BIGINT}
   </update>
@@ -310,6 +324,7 @@
       pay_fail_msg_ = #{payFailMsg,jdbcType=VARCHAR},
       arrival_time_ = #{arrivalTime,jdbcType=TIMESTAMP},
       create_time_ = #{createTime,jdbcType=TIMESTAMP},
+      return_id_ = #{returnId,jdbcType=BIGINT},
       update_time_ = #{updateTime,jdbcType=TIMESTAMP}
     where id_ = #{id,jdbcType=BIGINT}
   </update>

cooleshow-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/dto/OmsOrderReturnApplyVo.java

@@ -0,0 +1,37 @@
+package com.yonge.cooleshow.portal.dto;
+
+import com.yonge.cooleshow.mbg.model.OmsOrderReturnApply;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.Date;
+
+/**
+ * Description
+ *
+ * @author liujunchi
+ * @date 2022-05-25
+ */
+public class OmsOrderReturnApplyVo extends OmsOrderReturnApply {
+
+    @ApiModelProperty("到账时间")
+    private Date arrivalTime;
+
+    @ApiModelProperty("退款状态 pending 交易处理中 succeeded 交易成功 failed 交易失败")
+    private String refundStatus;
+
+    public Date getArrivalTime() {
+        return arrivalTime;
+    }
+
+    public void setArrivalTime(Date arrivalTime) {
+        this.arrivalTime = arrivalTime;
+    }
+
+    public String getRefundStatus() {
+        return refundStatus;
+    }
+
+    public void setRefundStatus(String refundStatus) {
+        this.refundStatus = refundStatus;
+    }
+}

cooleshow-mall/mall-portal/src/main/resources/config/mybatis/OmsOrderReturnApplyDao.xml

@@ -4,19 +4,21 @@
     <resultMap id="returnApplyDetailResultMap" type="com.yonge.cooleshow.portal.dto.OmsOrderReturnApplyResult" extends="com.yonge.cooleshow.mbg.mapper.OmsOrderReturnApplyMapper.BaseResultMap">
         <association property="companyAddress" resultMap="com.yonge.cooleshow.mbg.mapper.OmsCompanyAddressMapper.BaseResultMap" columnPrefix="ca_"/>
     </resultMap>
+
+    <resultMap id="returnApplyDetailResult" type="com.yonge.cooleshow.portal.dto.OmsOrderReturnApplyVo" extends="com.yonge.cooleshow.mbg.mapper.OmsOrderReturnApplyMapper.BaseResultMap">
+
+        <result column="arrival_time_" jdbcType="VARCHAR" property="arrivalTime" />
+        <result column="refundStatus" jdbcType="VARCHAR" property="refundStatus" />
+    </resultMap>
     <select id="getList" resultMap="com.yonge.cooleshow.mbg.mapper.OmsOrderReturnApplyMapper.BaseResultMap">
         SELECT
-        oora.id,
-        oora.create_time,
-        oora.member_username,
-        oora.product_real_price,
-        oora.product_count,
-        oora.return_name,
-        oora.status,
-        oora.handle_time
+        oora.*,
+        uor.arrival_time_,
+        uor.status_ as refundStatus
         FROM
         oms_order_return_apply oora
         left join oms_order oo on oo.id = order_id
+        left join user_order_refund uor on uor.return_id_ = oora.id
         WHERE
         1 = 1
         <if test="queryParam.id!=null">