From bd6c1c1c6642d57c85816a62d77c25c4e1a66a76 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 02 一月 2024 09:38:46 +0800
Subject: [PATCH] zjh 2024/01/02--1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/mall/MallAftersaleController.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/mall/MallAftersaleController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/mall/MallAftersaleController.java
index 0a7f26a..4cebf12 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/mall/MallAftersaleController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/mall/MallAftersaleController.java
@@ -7,6 +7,8 @@
import javax.servlet.http.HttpServletResponse;
import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.github.binarywang.wxpay.bean.request.WxPayRefundRequest;
import com.github.binarywang.wxpay.bean.result.WxPayRefundResult;
@@ -77,6 +79,12 @@
@ApiOperation(value = "鏌ヨ鍞悗鍒楄〃")
public TableDataInfo list(MallAftersale mallAftersale) {
startPage();
+ if(null !=mallAftersale.getEndTime()){
+ String endTime = mallAftersale.getEndTime();
+ DateTime dateTime = DateUtil.endOfDay(DateUtil.parse(endTime));
+ String format = DateUtil.format(dateTime, "yyyy-MM-dd HH:mm:ss");
+ mallAftersale.setEndTime(format);
+ }
List<MallAftersale> list = mallAftersaleService.selectMallAftersaleList(mallAftersale);
if(null !=list && list.size()>0){
for (MallAftersale aftersale : list) {
@@ -198,9 +206,6 @@
return AjaxResult.error("璁㈠崟閫�娆惧け璐�");
}
}
- //TODO 鍙戦�侀偖浠跺拰鐭俊閫氱煡锛岃繖閲岄噰鐢ㄥ紓姝ュ彂閫�
- // 閫�娆炬垚鍔熼�氱煡鐢ㄦ埛, 渚嬪鈥滄偍鐢宠鐨勮鍗曢��娆� [ 鍗曞彿:{1} ] 宸叉垚鍔燂紝璇疯�愬績绛夊緟鍒拌处銆傗��
- // 娉ㄦ剰璁㈠崟鍙峰彧鍙戝悗6浣�
/*notifyService.notifySmsTemplate(order.getMobile(), NotifyType.REFUND,
new String[]{order.getOrderSn().substring(8, 14)});*/
orderService.updateById(order);
--
Gitblit v1.8.0