Merge branch 'master' of http://server.kuaiyuman.cn:3000/evolve/car-wash-java

admin-h5/src/pages/user/list.vue

@@ -139,7 +139,7 @@
         </view>
         <view class="modal-footer">
           <button class="modal-btn cancel" @click="closeRefundModal">取消</button>
-          <button class="modal-btn confirm" @click="confirmRefund" :disabled="!refundReason.trim()">确认</button>
+          <button class="modal-btn confirm" @click="confirmRefund">确认</button>
         </view>
       </view>
     </view>
@@ -326,12 +326,10 @@ const closeRefundModal = () => {
 }
 
 const confirmRefund = async () => {
-  if (!refundReason.value.trim()) return
-
   try {
     const res = await applyRefund({
       userId: refundUser.value.userId,
-      reason: refundReason.value.trim()
+      reason: (refundReason.value || '').trim()
     })
     if (res && res.code === 200) {
       closeRefundModal()

admin-web/src/views/admin/account/index.vue

@@ -415,12 +415,8 @@ const handleUserRefundApply = (row:any) => {
     ).then((res: any) => {
       let {value, action} = res;
       if (action === 'confirm') {
-        if(!value){
-          Msg.message("请明确退款原因，否则无法发起本操作",'error')
-          return
-        }
         Msg.showLoading(`请等待`);
-        $body(`finance/applyRefund`,{userId:row.userId,reason:value}).then(()=>{
+        $body(`finance/applyRefund`,{userId:row.userId,reason:(value||'').trim()}).then(()=>{
           Msg.message("退款已发起")
           Msg.hideLoading()
           loadData(true)

car-wash-service/src/main/java/com/kym/service/wechat/impl/WxPayServiceImpl.java

@@ -588,7 +588,8 @@ public class WxPayServiceImpl implements WxPayService {
                     .setTotal(payLogs.get(0).getTotal())
                     .setRefund(refundAmount.get())
                     .setDiscountAmount(account.getDiscountAmount())
-                    .setOutRefundNo(OrderUtils.getOrderNo());
+                    .setOutRefundNo(OrderUtils.getOrderNo())
+                    .setReason(reason);
             refundLogService.save(refundLog);
         } else if (!CommUtil.isEmptyOrNull(payLogs) && payLogs.get(0).getTotal() < refundAmount.get()) {
             // 最后一次的充值金额不能覆盖退款金额，拆分成多笔退款