From 1754c1736a0a90c760511e3a7aace4df8698828b Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期五, 17 四月 2026 11:50:06 +0800
Subject: [PATCH] 小程序 接口开发
---
server/dmmall_web/src/main/resources/application.yml | 2
server/dmmall_service/src/main/resources/application-dev.yml | 19 ++++++---
server/dmmall_service/src/main/java/com/doumee/dao/web/dto/UserCenterVO.java | 1
server/dmmall_service/src/main/resources/application-pro.yml | 2
server/dmmall_service/src/main/java/com/doumee/dao/business/model/Areas.java | 54 ---------------------------
server/dmmall_service/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java | 3 -
6 files changed, 16 insertions(+), 65 deletions(-)
diff --git a/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Areas.java b/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Areas.java
index 7b90f19..75e67c6 100644
--- a/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Areas.java
+++ b/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Areas.java
@@ -136,58 +136,4 @@
}
}
-
- /**
- * 鐢ㄦ埛淇℃伅鎿嶄綔璁板綍琛�
- * @author 姹熻箘韫�
- * @date 2023/03/21 15:17
- */
- @Data
- @ApiModel("鐢ㄦ埛淇℃伅鎿嶄綔璁板綍琛�")
- @TableName("`member_history`")
- public static class MemberHistory {
-
- @ApiModelProperty(value = "涓婚敭", example = "1")
- @ExcelColumn(name="涓婚敭")
- private Integer id;
-
- @ApiModelProperty(value = "鍒涘缓浜虹紪鐮�", example = "1")
- @ExcelColumn(name="鍒涘缓浜虹紪鐮�")
- private Integer creator;
-
- @ApiModelProperty(value = "鍒涘缓鏃堕棿")
- @ExcelColumn(name="鍒涘缓鏃堕棿")
-
- private Date createDate;
-
- @ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
- @ExcelColumn(name="鏇存柊浜虹紪鐮�")
- private Integer editor;
-
- @ApiModelProperty(value = "鏇存柊鏃堕棿")
- @ExcelColumn(name="鏇存柊鏃堕棿")
-
- private Date editDate;
-
- @ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
- @ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�")
- private Integer isdeleted;
-
- @ApiModelProperty(value = "澶囨敞")
- @ExcelColumn(name="澶囨敞")
- private String remark;
-
- @ApiModelProperty(value = "鐢ㄦ埛缂栫爜锛堝叧鑱攎ember琛級", example = "1")
- @ExcelColumn(name="鐢ㄦ埛缂栫爜锛堝叧鑱攎ember琛級")
- private Integer memberId;
-
- @ApiModelProperty(value = "绫诲瀷 0绂佺敤 1鍚敤", example = "1")
- @ExcelColumn(name="绫诲瀷 0绂佺敤 1鍚敤")
- private Integer type;
-
- @ApiModelProperty(value = "鎿嶄綔澶囨敞")
- @ExcelColumn(name="鎿嶄綔澶囨敞")
- private String info;
-
- }
}
diff --git a/server/dmmall_service/src/main/java/com/doumee/dao/web/dto/UserCenterVO.java b/server/dmmall_service/src/main/java/com/doumee/dao/web/dto/UserCenterVO.java
index 72f47f1..8d77121 100644
--- a/server/dmmall_service/src/main/java/com/doumee/dao/web/dto/UserCenterVO.java
+++ b/server/dmmall_service/src/main/java/com/doumee/dao/web/dto/UserCenterVO.java
@@ -17,6 +17,7 @@
@ApiModelProperty(value = "绉垎瑙勫垯")
private String integralRule;
+
@ApiModelProperty(value = "閭�璇疯鍒欒鏄�")
private String invitelRule;
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 5f89bbe..34593eb 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
@@ -2141,9 +2141,6 @@
}
//鍔犲叆redis缂撳瓨锛屽埛鏂颁粖澶╁敭鍚庣紪鍙�0寮�濮�
RedisUtil.addObject(redisTemplate,Constants.RedisKeys.WITHDRAW_KEY,countWithdraw);
-
-
-
}
diff --git a/server/dmmall_service/src/main/resources/application-dev.yml b/server/dmmall_service/src/main/resources/application-dev.yml
index 2f95bc2..51155a9 100644
--- a/server/dmmall_service/src/main/resources/application-dev.yml
+++ b/server/dmmall_service/src/main/resources/application-dev.yml
@@ -48,12 +48,18 @@
########################寰俊鏀粯鐩稿叧閰嶇疆########################
wx:
pay:
- appId: wxcd2b89fd2ff065f8
- appSecret: 3462fa186da7cb06c544df8d8664b63a
- mchId: 1229817002
- mchKey: u4TSNtv0wFP7WRfnxBgijYOtRhS9FvlM
- notifyUrl: https://test.doumee.cn/dmmall_web_api/web/api/wxPayNotify
- keyPath: /usr/local/apiclient_cert.p12 #D:\DouMee\dmkjWxcert\apiclient_cert.p12 #
+ appId: wx6264b4f3a697cbe8
+ appSecret: 23734577e8978138c946b727f0394027
+ mchId: 1629568742
+ mchKey: NJTLJSTZYXZRGScaiwubuzichanbu666
+ notifyUrl: http://xiaopiqiu2.natapp1.cc/web/api/wxPayNotify
+ keyPath: D:\DouMee\gtxljcWxcert\apiclient_cert.p12
+# appId: wxcd2b89fd2ff065f8
+# appSecret: 3462fa186da7cb06c544df8d8664b63a
+# mchId: 1229817002
+# mchKey: u4TSNtv0wFP7WRfnxBgijYOtRhS9FvlM
+# notifyUrl: https://test.doumee.cn/dmmall_web_api/web/api/wxPayNotify
+# keyPath: /usr/local/apiclient_cert.p12 #D:\DouMee\dmkjWxcert\apiclient_cert.p12 #
#wx:
# pay:
@@ -64,6 +70,7 @@
# notifyUrl: http://xiaopiqiu2.natapp1.cc/web/api/wxPayNotify #https://test.doumee.cn/dmmall_web_api/web/api/wxPayNotify
# keyPath: D:\DouMee\1739990831_20260306_cert #D:\DouMee\dmkjWxcert\apiclient_cert.p12 #
+
tencent:
map:
remoteHost: https://apis.map.qq.com
diff --git a/server/dmmall_service/src/main/resources/application-pro.yml b/server/dmmall_service/src/main/resources/application-pro.yml
index 153af1a..a1b7b79 100644
--- a/server/dmmall_service/src/main/resources/application-pro.yml
+++ b/server/dmmall_service/src/main/resources/application-pro.yml
@@ -53,7 +53,7 @@
appSecret: 4b5b97d6770f1fc6b09a7019804739a7
mchId: 1739990831
mchKey: u4TSNtv0wFP7WRfnxBgijYOtRhS9FvlM
- notifyUrl: https://mall.dynometacn.com/dmmall_web_api/web/api/wxPayNotify
+ notifyUrl: https://dynometaie.com/dmmall_web_api/web/api/wxPayNotify
keyPath: /usr/local/jars/apiclient_cert.p12
# appId: wxcd2b89fd2ff065f8
# appSecret: 3462fa186da7cb06c544df8d8664b63a
diff --git a/server/dmmall_web/src/main/resources/application.yml b/server/dmmall_web/src/main/resources/application.yml
index 36aee93..44daf27 100644
--- a/server/dmmall_web/src/main/resources/application.yml
+++ b/server/dmmall_web/src/main/resources/application.yml
@@ -10,7 +10,7 @@
# application:
# name: doumeemes
profiles:
- active: pro
+ active: dev
# JSON杩斿洖閰嶇疆
jackson:
--
Gitblit v1.9.3