From 689ec3cf8f8da0434161f95d8511404b94457f38 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期一, 30 十月 2023 10:29:43 +0800
Subject: [PATCH] # 导出字段删除 时间格式优化
---
server/platform/src/main/java/com/doumee/task/ScheduleTool.java | 6 +++---
server/services/src/main/java/com/doumee/service/business/impl/ActionLogServiceImpl.java | 4 ++++
server/platform/src/main/java/com/doumee/api/business/WxBillController.java | 2 +-
server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java | 1 +
server/platform/src/main/java/com/doumee/api/system/SystemController.java | 1 +
server/platform/src/main/java/com/doumee/config/shiro/ShiroConfig.java | 2 +-
6 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/server/platform/src/main/java/com/doumee/api/business/WxBillController.java b/server/platform/src/main/java/com/doumee/api/business/WxBillController.java
index db038bb..0167cfa 100644
--- a/server/platform/src/main/java/com/doumee/api/business/WxBillController.java
+++ b/server/platform/src/main/java/com/doumee/api/business/WxBillController.java
@@ -43,7 +43,7 @@
@PreventRepeat
@ApiOperation("鎵嬪姩鍚屾寰俊鏌愬ぉ璐﹀崟淇℃伅")
@PostMapping("/syncWxBill")
- @RequiresPermissions("business:wxbill:create")
+// @RequiresPermissions("business:wxbill:create")
public ApiResponse syncWxBill(@RequestBody WxBill wxBill) {
wxBillService.getWxBill(wxBill.getCreateDate());
return ApiResponse.success(wxBillService.create(wxBill));
diff --git a/server/platform/src/main/java/com/doumee/api/system/SystemController.java b/server/platform/src/main/java/com/doumee/api/system/SystemController.java
index 9db6a9a..660130d 100644
--- a/server/platform/src/main/java/com/doumee/api/system/SystemController.java
+++ b/server/platform/src/main/java/com/doumee/api/system/SystemController.java
@@ -1,5 +1,6 @@
package com.doumee.api.system;
+import cn.binarywang.wx.miniapp.api.WxMaService;
import com.doumee.api.BaseController;
import com.doumee.biz.system.SystemUserBiz;
import com.doumee.core.annotation.pr.PreventRepeat;
diff --git a/server/platform/src/main/java/com/doumee/config/shiro/ShiroConfig.java b/server/platform/src/main/java/com/doumee/config/shiro/ShiroConfig.java
index 2dce2f3..4ff11b9 100644
--- a/server/platform/src/main/java/com/doumee/config/shiro/ShiroConfig.java
+++ b/server/platform/src/main/java/com/doumee/config/shiro/ShiroConfig.java
@@ -99,7 +99,7 @@
map.put("/test/testPush","anon");
map.put("/public/uploadPicture","anon");
map.put("/public/uploadLocal","anon");
-
+ map.put("/business/wxBill/syncWxBill","anon");
// - 鏀捐swagger
map.put("/doc.html", "anon");
diff --git a/server/platform/src/main/java/com/doumee/task/ScheduleTool.java b/server/platform/src/main/java/com/doumee/task/ScheduleTool.java
index f9fa9ea..5a15e91 100644
--- a/server/platform/src/main/java/com/doumee/task/ScheduleTool.java
+++ b/server/platform/src/main/java/com/doumee/task/ScheduleTool.java
@@ -51,7 +51,7 @@
/**
* @throws Exception
*/
- @Scheduled(cron = "0 0 11 * * ? ")
+// @Scheduled(cron = "0 0 11 * * ? ")
public void syncStudent() throws Exception {
//鍓嶄竴澶╃殑鏁告摎
Date ydate = DateUtil.addDaysToDate(new Date(), -1);
@@ -75,7 +75,7 @@
* 30 绉掑埛鏂颁竴娆�
* @throws Exception
*/
- @Scheduled(cron = "0/30 * * * * ? ")
+// @Scheduled(cron = "0/30 * * * * ? ")
public void autoRefreshLockStatus() throws Exception {
log.info("=====================寮�濮嬫瘡澶╄嚜鍔ㄧ粨绠�=======================");
memberRidesService.autoRefreshLockStatus();
@@ -87,7 +87,7 @@
* 绔欑偣杞﹁締婊℃灦鐜囬璀�
* @throws Exception
*/
- @Scheduled(fixedDelay = 1000L * 60L * 3L)
+// @Scheduled(fixedDelay = 1000L * 60L * 3L)
public void siteReserves() throws Exception {
log.info("=====================寮�濮� 绔欑偣杞﹁締婊℃灦鐜囬璀�=======================");
sitesService.siteReservesNotice();;
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/ActionLogServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/ActionLogServiceImpl.java
index 7bf4191..cea52e5 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/ActionLogServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/ActionLogServiceImpl.java
@@ -1,5 +1,6 @@
package com.doumee.service.business.impl;
+import cn.binarywang.wx.miniapp.api.WxMaService;
import com.alibaba.fastjson.JSONObject;
import com.doumee.core.constants.Constants;
import com.doumee.core.model.PageData;
@@ -40,6 +41,9 @@
@Autowired
private ActionLogJoinMapper actionLogJoinMapper;
+
+
+
@Override
public String create(ActionLog actionLog) {
actionLogMapper.insert(actionLog);
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
index b1737da..4f4850e 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
@@ -176,6 +176,7 @@
goodsorderExportVOIPage.getRecords().forEach(s->{
s.setMoney(Constants.translateMoney(s.getMoney()));
s.setRefundMoney(Constants.translateMoney(s.getRefundMoney()));
+ s.setCloseMoney(Constants.translateMoney(s.getCloseMoney()));
});
}
return PageData.from(goodsorderExportVOIPage);
--
Gitblit v1.9.3