From 3f62a93a0b0d64984cf070d0ca307a55faf95085 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 29 四月 2025 16:06:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/RegionController.java | 7 +++++++
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/large/AnalysisOrderDataController.java | 8 +++++++-
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/WithdrawServiceImpl.java | 2 +-
3 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/RegionController.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/RegionController.java
index 3d29201..a902357 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/RegionController.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/RegionController.java
@@ -111,6 +111,13 @@
return R.ok(regionService.addressTree1(cityCodeList));
}
+ @GetMapping("/manageaddressTree1")
+ @ApiOperation(value = "选择城市:省市二级联动", tags = {"后台-首页"})
+ public R<List<Region>> manageaddressTree1() {
+ List<String> cityCodeList = new ArrayList<>();
+
+ return R.ok(regionService.addressTree1(cityCodeList));
+ }
}
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/large/AnalysisOrderDataController.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/large/AnalysisOrderDataController.java
index 533fc99..7a72e3f 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/large/AnalysisOrderDataController.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/large/AnalysisOrderDataController.java
@@ -7,6 +7,7 @@
import cn.afterturn.easypoi.excel.entity.ImportParams;
import cn.afterturn.easypoi.excel.entity.TemplateExportParams;
import cn.hutool.core.io.resource.ClassPathResource;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.admin.entity.MasterWorker;
@@ -20,6 +21,7 @@
import com.ruoyi.admin.vo.SiteLargeeVO;
import com.ruoyi.admin.vo.WorkersLargeeVO;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.utils.DateUtils;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.order.api.entity.Order;
@@ -246,7 +248,7 @@
orders.forEach(order -> {
AnalysisOrderData analysisOrderData = new AnalysisOrderData();
analysisOrderData.setOrderNum(order.getOrderNumber());
- analysisOrderData.setOrderDate(analysisOrderData.getOrderDate());
+ analysisOrderData.setOrderDate(order.getCreateTime());
// analysisOrderData.setOrderChannel(order.getOrderChannel());
analysisOrderData.setCity(order.getCity());
analysisOrderData.setOrderCategory(order.getServeName());
@@ -256,6 +258,10 @@
analysisOrderData.setState(order.getState());
analysisOrderDataList.add(analysisOrderData);
});
+ // 删除今日订单
+ analysisOrderDataService.remove(new QueryWrapper<AnalysisOrderData>().lambda()
+ .like(AnalysisOrderData::getOrderDate, new SimpleDateFormat("yyyy-MM-dd").format(new Date()))
+ );
analysisOrderDataService.saveBatch(analysisOrderDataList);
}
return R.ok();
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/WithdrawServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/WithdrawServiceImpl.java
index 8c87354..3299b4d 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/WithdrawServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/WithdrawServiceImpl.java
@@ -394,7 +394,7 @@
JSONObject.toJSONString(postMap),
"7EEA04429B006E12AAA421C002EC48BBEED5BE94",
"1665330417",
- "/usr/local/vx/apiclient_key.pem", "/v3/fund-app/mch-transfer/transfer-bills");
+ "D://apiclient_key.pem", "/v3/fund-app/mch-transfer/transfer-bills");
JSONObject jsonObject = JSONObject.parseObject(result);
// WithdrawDetail withdrawDetail = new WithdrawDetail();
// withdrawDetail.setWithdrawId(withdrawId);
--
Gitblit v1.7.1