From 5fce4e825f5d1726a4202f6cb8b659cbf7fb52e2 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 14 一月 2025 16:28:51 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderRefundPassList.java | 6 +++++-
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java | 5 +++--
ruoyi-service/ruoyi-order/src/main/resources/mapper/order/RefundPassMapper.xml | 2 +-
3 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderRefundPassList.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderRefundPassList.java
index b909179..ffc8d6b 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderRefundPassList.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderRefundPassList.java
@@ -1,8 +1,11 @@
package com.ruoyi.order.vo;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+
+import java.time.LocalDateTime;
/**
* @author zhibing.pu
@@ -20,7 +23,8 @@
@ApiModelProperty("联系电话")
private String phone;
@ApiModelProperty("申请时间")
- private String createTime;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime createTime;
@ApiModelProperty("售后类型（1退货退款2仅退款）")
private Integer refundMethod;
@ApiModelProperty("申请原因")
diff --git a/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/RefundPassMapper.xml b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/RefundPassMapper.xml
index 28f8142..cdb63ef 100644
--- a/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/RefundPassMapper.xml
+++ b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/RefundPassMapper.xml
@@ -8,7 +8,7 @@
a.id,
b.order_number as orderNumber,
b.app_user_id as appUserId,
- DATE_FORMAT(a.create_time, '%Y-%m-%d %H:%m:%s') as createTime,
+ a.create_time as createTime,
a.refund_method as refundMethod,
a.refund_reason as refundReason,
a.pass_status as passStatus,
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java
index ffbdf33..446cb7c 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java
@@ -216,9 +216,10 @@
// 查询有没有门店绑定这个被删除的门店
List<Shop> shops = shopService.lambdaQuery().eq(Shop::getPid, shop.getId()).list();
for (Shop shop1 : shops) {
- shop1.setPid(0);
+ LambdaUpdateWrapper<Shop> set = new LambdaUpdateWrapper<Shop>().set(Shop::getPid, null)
+ .eq(Shop::getId,shop1.getId());
+ shopService.update(set);
}
- shopService.updateBatchById(shops);
appUserClient.clearBindShop(shop.getId());
UserShop userShop = new UserShop();
userShop.setShopId(shop.getId());
--
Gitblit v1.7.1