From bf7b975c7ebe94ac801d72671cefc4d6ec01d56e Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期一, 23 三月 2026 09:39:07 +0800
Subject: [PATCH] 小程序 接口开发
---
server/dmmall_service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java | 4 +-
server/dmmall_service/src/main/resources/application-dev.yml | 2
server/dmmall_service/src/main/resources/application-test.yml | 2
server/dmmall_service/src/main/resources/application-pro.yml | 10 ++++-
server/dmmall_admin/src/main/resources/application.yml | 2
server/dmmall_service/src/main/java/com/doumee/core/utils/GeneratePicUtil.java | 22 +++++-----
server/dmmall_service/src/main/java/com/doumee/service/business/GoodsorderService.java | 2 +
server/dmmall_web/src/main/java/com/doumee/api/web/UtilApi.java | 1
server/dmmall_admin/src/main/java/com/doumee/task/ScheduleTool.java | 18 +++++++++
server/dmmall_service/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java | 57 +++++++++++++++++++++++++++-
10 files changed, 99 insertions(+), 21 deletions(-)
diff --git a/server/dmmall_admin/src/main/java/com/doumee/task/ScheduleTool.java b/server/dmmall_admin/src/main/java/com/doumee/task/ScheduleTool.java
index ef3ba1a..d99d45c 100644
--- a/server/dmmall_admin/src/main/java/com/doumee/task/ScheduleTool.java
+++ b/server/dmmall_admin/src/main/java/com/doumee/task/ScheduleTool.java
@@ -131,6 +131,24 @@
}
/**
+ * 瀹氭椂鑷姩瀹屾垚 7 澶╂湭纭鏀惰揣鐨勭墿娴佸彂璐ц鍗�
+ * 姣� 10 鍒嗛挓鎵ц涓�娆�
+ */
+ @Scheduled(fixedDelay = 1000L * 60 * 10L )
+ public void autoCompleteOrder(){
+ if (timing) {
+ System.out.println("寮�濮嬫墽琛岃鍗曡嚜鍔ㄥ畬鎴愪换鍔�--------Begin------");
+ try {
+ goodsorderService.autoCompleteOrder();
+ System.out.println("璁㈠崟鑷姩瀹屾垚浠诲姟鎵ц鎴愬姛--------End------");
+ } catch (Exception e) {
+ System.out.println("璁㈠崟鑷姩瀹屾垚浠诲姟鎵ц澶辫触锛�" + e.getMessage());
+ }
+ }
+ }
+
+
+ /**
* 瀹氭椂瀹屾垚鍞悗鍗曠姸鎬�
*/
// @Scheduled(fixedDelay = 1000L * 10L )
diff --git a/server/dmmall_admin/src/main/resources/application.yml b/server/dmmall_admin/src/main/resources/application.yml
index 1df4a1a..b3e6363 100644
--- a/server/dmmall_admin/src/main/resources/application.yml
+++ b/server/dmmall_admin/src/main/resources/application.yml
@@ -8,7 +8,7 @@
# application:
# name: doumeemes
profiles:
- active: dev
+ active: pro
# JSON杩斿洖閰嶇疆
jackson:
diff --git a/server/dmmall_service/src/main/java/com/doumee/core/utils/GeneratePicUtil.java b/server/dmmall_service/src/main/java/com/doumee/core/utils/GeneratePicUtil.java
index 89f9c8d..c4bd328 100644
--- a/server/dmmall_service/src/main/java/com/doumee/core/utils/GeneratePicUtil.java
+++ b/server/dmmall_service/src/main/java/com/doumee/core/utils/GeneratePicUtil.java
@@ -24,7 +24,7 @@
@Slf4j
public class GeneratePicUtil {
- static String bg="https://shoeslxkj.oss-cn-beijing.aliyuncs.com/file/20230404/SysBaseBackGround/D56231512C0B4A4C9D06B02F9566B0B0.png";
+ static String bg="https://dynometacn.oss-cn-shanghai.aliyuncs.com/goods/20260319/feccd954-32f7-47e2-96fb-be102b643f1f.png";
static String headUrl = "https://shoeslxkj.oss-cn-beijing.aliyuncs.com/file/20230404/SysBaseBackGround/B802B64FE31447DCB030F13ECC7CA9F9.png";
@@ -339,22 +339,22 @@
g2.fillRect(0, 0, width, height);
//鑳屾櫙鍥剧墖
-// BufferedImage titles = ImageIO.read(new URL(bg));
-// g2.drawImage(titles, 1, 1, 894, 1305, null);
-// g2.drawRect(0, 0, width - 1, height - 1);
+ BufferedImage titles = ImageIO.read(new URL(bg));
+ g2.drawImage(titles, 1, 1, 894, 1305, null);
+ g2.drawRect(0, 0, width - 1, height - 1);
//澶撮儴鍥剧墖
BufferedImage headBg = ImageIO.read(new URL(headImg));
// BufferedImage headBg = getImgIO(imgurl);
g2.drawImage(headBg, 1, 1, 894, 1080, null);
g2.drawRect(0, 0, width - 1, height - 1);
- g2.setColor(Color.black);
- g2.setFont(new Font("榛戜綋", Font.PLAIN, 40));
- g2.drawString("闀挎寜璇嗗埆灏忕▼搴�", 46, 1180);
-
- g2.setColor(Color.gray);
- g2.setFont(new Font("榛戜綋", Font.PLAIN, 32));
- g2.drawString("鏌ョ湅鏇村绮惧僵鍐呭", 48, 1230);
+// g2.setColor(Color.black);
+// g2.setFont(new Font("榛戜綋", Font.PLAIN, 40));
+// g2.drawString("闀挎寜璇嗗埆灏忕▼搴�", 46, 1180);
+//
+// g2.setColor(Color.gray);
+// g2.setFont(new Font("榛戜綋", Font.PLAIN, 32));
+// g2.drawString("鏌ョ湅鏇村绮惧僵鍐呭", 48, 1230);
//璁剧疆浜岀淮鐮佸浘鐗�
// BufferedImage barcodeCode = ImageIO.read(new URL(wxQrCodeImg));
diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/GoodsorderService.java b/server/dmmall_service/src/main/java/com/doumee/service/business/GoodsorderService.java
index 1961abc..8f483f6 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/GoodsorderService.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/GoodsorderService.java
@@ -245,4 +245,6 @@
void autoCancelOrder();
+ void autoCompleteOrder();
+
}
diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
index 3680761..5f89bbe 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
@@ -2378,9 +2378,60 @@
this.cancel(goodsorder,null,"璁㈠崟鏈敮浠樿秴鏃惰嚜鍔ㄥ彇娑�");
}
}
-
-
-
}
+
+
+ /**
+ * 鑷姩瀹屾垚 7 澶╂湭纭鏀惰揣鐨勭墿娴佸彂璐ц鍗�
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void autoCompleteOrder(){
+ //鏌ヨ鍙戣揣鍚� 7 澶╂湭纭鏀惰揣鐨勮鍗曟暟鎹紙浠呭鐞嗗揩閫掗厤閫佽鍗曪級
+ List<Goodsorder> goodsOrderList = goodsorderMapper.selectList(
+ new QueryWrapper<Goodsorder>()
+ .eq("STATUS", Constants.OrderStatus.WAIT_RECEIVE.getKey())
+ .eq("RECEIVE_TYPE", Constants.ZERO) // 浠呭鐞嗗揩閫掗厤閫佽鍗�
+ .isNotNull("KD_CODE") // 鏈夌墿娴佸崟鍙�
+ .ne("KD_CODE", "") // 鐗╂祦鍗曞彿涓嶄负绌�
+ .apply(" KD_DATE IS NOT NULL ") // 鏈夊彂璐ф椂闂�
+ .apply(" NOW() >= DATE_SUB(KD_DATE, INTERVAL -7 DAY) ") // 鍙戣揣鍚� 7 澶�
+ );
+
+ if (!goodsOrderList.isEmpty()) {
+ for (Goodsorder order : goodsOrderList) {
+ try {
+ Goodsorder updateOrder = new Goodsorder();
+ updateOrder.setId(order.getId());
+ updateOrder.setStatus(Constants.OrderStatus.DONE.getKey());
+ updateOrder.setDoneDate(new Date());
+ updateOrder.setDoneInfo("鍙戣揣 7 澶╁悗绯荤粺鑷姩纭鏀惰揣");
+ goodsorderMapper.updateById(updateOrder);
+
+ //瀛樺湪鐜伴噾鏀粯 璧犻�� 绉垎
+ if(Constants.equalsInteger(updateOrder.getPayMethod(),Constants.ZERO)){
+ //璧犻�佹秷璐硅�呯Н鍒�
+ this.orderAddMemberIntegral(order);
+ //涓嬪崟瀹屾垚 鏍规嵁淇℃伅纭鏄惁闇�瑕佽禒閫侀個璇疯�呬紭鎯犲埜
+ this.orderDoneRewardInviteCoupon(order);
+ //缁忛攢鍟� 娣诲姞璧犻�佺Н鍒�
+ this.orderAddShopIntegral(order);
+ //缁忛攢鍟� 缁撶畻閲戦
+ this.orderAddShopCash(order);
+ }
+
+
+ System.out.println("璁㈠崟鑷姩瀹屾垚锛氳鍗� ID=" + order.getId() + ", 璁㈠崟缂栧彿=" + order.getCode());
+ } catch (Exception e) {
+ System.out.println("璁㈠崟鑷姩瀹屾垚澶辫触锛氳鍗� ID=" + order.getId() + ", 閿欒锛�" + e.getMessage());
+ }
+ }
+ }
+ }
+
+
+
+
+
}
diff --git a/server/dmmall_service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java b/server/dmmall_service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java
index 2c90010..8266ae6 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java
@@ -47,7 +47,7 @@
loginLog.setOsInfo(Utils.User_Client.getOS(request));
loginLog.setServerIp(Utils.Server.getIP());
// 鏍￠獙楠岃瘉鐮�
- /* try {
+ try {
captchaService.check(dto.getUuid(), dto.getCode());
} catch (Exception e) {
log.error(e.getMessage(), e);
@@ -55,7 +55,7 @@
loginLog.setSuccess(Boolean.FALSE);
systemLoginLogService.create(loginLog);
throw e;
- }*/
+ }
// 鏍￠獙鐢ㄦ埛鍚嶅拰瀵嗙爜
Subject subject = SecurityUtils.getSubject();
UsernamePasswordToken token = new UsernamePasswordToken(dto.getUsername(), dto.getPassword());
diff --git a/server/dmmall_service/src/main/resources/application-dev.yml b/server/dmmall_service/src/main/resources/application-dev.yml
index 9966b10..2f95bc2 100644
--- a/server/dmmall_service/src/main/resources/application-dev.yml
+++ b/server/dmmall_service/src/main/resources/application-dev.yml
@@ -71,4 +71,4 @@
########################瀹氭椂寮�鍚厤缃�########################
-timing: true
\ No newline at end of file
+timing: false
\ No newline at end of file
diff --git a/server/dmmall_service/src/main/resources/application-pro.yml b/server/dmmall_service/src/main/resources/application-pro.yml
index a101968..153af1a 100644
--- a/server/dmmall_service/src/main/resources/application-pro.yml
+++ b/server/dmmall_service/src/main/resources/application-pro.yml
@@ -50,11 +50,17 @@
wx:
pay:
appId: wx0115b948d647e9b2
- appSecret: 4b5b97d6770f1fc6b09a7019804739a7 #3462fa186da7cb06c544df8d8664b63a
+ appSecret: 4b5b97d6770f1fc6b09a7019804739a7
mchId: 1739990831
mchKey: u4TSNtv0wFP7WRfnxBgijYOtRhS9FvlM
- notifyUrl: https://dynj.ahapp.net/dmmall_interface/web/api/wxPayNotify #mall.myshopify.com
+ notifyUrl: https://mall.dynometacn.com/dmmall_web_api/web/api/wxPayNotify
keyPath: /usr/local/jars/apiclient_cert.p12
+# appId: wxcd2b89fd2ff065f8
+# appSecret: 3462fa186da7cb06c544df8d8664b63a
+# mchId: 1229817002
+# mchKey: u4TSNtv0wFP7WRfnxBgijYOtRhS9FvlM
+# notifyUrl: https://mall.dynometacn.com/dmmall_web_api/web/api/wxPayNotify
+# keyPath: /usr/local/jars/dm_apiclient_cert.p12
tencent:
map:
diff --git a/server/dmmall_service/src/main/resources/application-test.yml b/server/dmmall_service/src/main/resources/application-test.yml
index 56b6c1b..1a261f0 100644
--- a/server/dmmall_service/src/main/resources/application-test.yml
+++ b/server/dmmall_service/src/main/resources/application-test.yml
@@ -63,4 +63,4 @@
########################瀹氭椂寮�鍚厤缃�########################
-timing: true
\ No newline at end of file
+timing: false
\ No newline at end of file
diff --git a/server/dmmall_web/src/main/java/com/doumee/api/web/UtilApi.java b/server/dmmall_web/src/main/java/com/doumee/api/web/UtilApi.java
index 174999e..2d16404 100644
--- a/server/dmmall_web/src/main/java/com/doumee/api/web/UtilApi.java
+++ b/server/dmmall_web/src/main/java/com/doumee/api/web/UtilApi.java
@@ -71,6 +71,7 @@
public ApiResponse<List<Areas>> treeList (@RequestBody AreasDto pageWrap) {
Areas a = new Areas();
BeanUtils.copyProperties(pageWrap,a);
+ areasService.cacheData();
return ApiResponse.success(areasService.findList(a));
}
--
Gitblit v1.9.3