skyline 2 лет назад
Родитель
Сommit
cb2a41e1ff

+ 3 - 0
admin-web/src/views/admin/refund/index.vue

@@ -126,6 +126,9 @@
             <template v-else-if="'refund'===field.prop">
               {{u.fmt.fmtMoney(row[field.prop])}}
             </template>
+            <template v-else-if="'discountAmount'===field.prop">
+              {{u.fmt.fmtMoney(row[field.prop])}}
+            </template>
             <template v-else-if="'status'===field.prop">
               <ext-d-label type="Refund.status" v-model="row[field.prop]"/>
             </template>

+ 11 - 0
entity/src/main/java/com/kym/entity/miniapp/vo/RefundVo.java

@@ -66,6 +66,12 @@ public class RefundVo {
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime successTime;
 
+    /**
+     * 退款申请时间
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime createTime;
+
     /**
      * 退款状态:SUCCESS:退款成功 CLOSED:退款关闭 PROCESSING:退款处理中 ABNORMAL:退款异常
      */
@@ -81,6 +87,11 @@ public class RefundVo {
      */
     private Integer refund;
 
+    /**
+     * 不可退金额(分)
+     */
+    private Integer discountAmount;
+
     /**
      * 用户支付币种
      */

+ 4 - 0
mapper/src/main/resources/mappers/miniapp/RefundLogMapper.xml

@@ -34,9 +34,11 @@
         <result column="channel" property="channel" />
         <result column="user_received_account" property="userReceivedAccount" />
         <result column="success_time" property="successTime" />
+        <result column="create_time" property="createTime" />
         <result column="status" property="status" />
         <result column="total" property="total" />
         <result column="refund" property="refund" />
+        <result column="discount_amount" property="discountAmount" />
         <result column="currency" property="currency" />
         <result column="reason" property="reason" />
         <result column="adminUserId" property="admin_user_id" />
@@ -61,9 +63,11 @@
             t1.channel,
             t1.user_received_account,
             t1.success_time,
+            t1.create_time,
             t1.`status`,
             t1.`total`,
             t1.`refund`,
+            t1.`discount_amount`,
             t1.`channel`,
             t1.`currency`,
             t1.`reason`,