Prechádzať zdrojové kódy

退款新增状态NEW:已申请

skyline 2 rokov pred
rodič
commit
75adc9f8c5

+ 2 - 2
admin-web/src/views/admin/refund/index.vue

@@ -133,7 +133,7 @@
               <ext-d-label type="Refund.status" v-model="row[field.prop]"/>
             </template>
             <template v-else-if="'action'===field.prop">
-              <el-button v-if="row.status==='PROCESSING'"  size="small" plain  type="warning" @click="onRefundClick(row)">退款</el-button>
+              <el-button v-if="row.status==='NEW'"  size="small" plain  type="warning" @click="onRefundClick(row)">退款</el-button>
             </template>
             <template v-else>
               <div>{{ row[field.prop] }}</div>
@@ -167,7 +167,7 @@ const queryRef = ref();
 //定义变量
 const state = reactive({
   formQuery: {
-    status:'PROCESSING'
+    status:'NEW'
   },
   pageQuery: {
     pageNum: 1,

+ 2 - 1
entity/src/main/java/com/kym/entity/miniapp/RefundLog.java

@@ -26,6 +26,7 @@ public class RefundLog extends BaseEntity {
     public static final String STATUS_退款关闭 = "CLOSED";
     public static final String STATUS_退款处理中 = "PROCESSING";
     public static final String STATUS_退款异常 = "ABNORMAL";
+    public static final String STATUS_退款已申请 = "NEW";
 
     private static final long serialVersionUID = 1L;
 
@@ -70,7 +71,7 @@ public class RefundLog extends BaseEntity {
     private LocalDateTime successTime;
 
     /**
-     * 退款状态:SUCCESS:退款成功 CLOSED:退款关闭 PROCESSING:退款处理中 ABNORMAL:退款异常
+     * 退款状态:SUCCESS:退款成功 CLOSED:退款关闭 PROCESSING:退款处理中 ABNORMAL:退款异常  NEW:已申请(自定义)
      */
     private String status;
 

+ 1 - 1
service/src/main/java/com/kym/service/wechat/impl/WxPayServiceImpl.java

@@ -516,7 +516,7 @@ public class WxPayServiceImpl implements WxPayService {
         refundLog.setCurrency(refund.getAmount().getCurrency());
         refundLog.setAdminUserId(StpUtil.getLoginIdAsLong());
         refundLog.setAdminUsername(StpUtil.getSession().getString("username"));
-        refundLog.setStatus(RefundLog.STATUS_退款处理中);
+        refundLog.setStatus(RefundLog.STATUS_退款已申请);
         refundLogService.updateById(refundLog);
 
     }