wx sdk

.idea/libraries/Maven__com_github_wechatpay_apiv3_wechatpay_java_0_2_15.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.github.wechatpay-apiv3:wechatpay-java:0.2.15">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../../repository/com/github/wechatpay-apiv3/wechatpay-java/0.2.15/wechatpay-java-0.2.15.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../../repository/com/github/wechatpay-apiv3/wechatpay-java/0.2.15/wechatpay-java-0.2.15-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../../repository/com/github/wechatpay-apiv3/wechatpay-java/0.2.15/wechatpay-java-0.2.15-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__com_github_wechatpay_apiv3_wechatpay_java_core_0_2_15.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.github.wechatpay-apiv3:wechatpay-java-core:0.2.15">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../../repository/com/github/wechatpay-apiv3/wechatpay-java-core/0.2.15/wechatpay-java-core-0.2.15.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../../repository/com/github/wechatpay-apiv3/wechatpay-java-core/0.2.15/wechatpay-java-core-0.2.15-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../../repository/com/github/wechatpay-apiv3/wechatpay-java-core/0.2.15/wechatpay-java-core-0.2.15-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__com_google_code_gson_gson_2_9_1.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.google.code.gson:gson:2.9.1">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../../repository/com/google/code/gson/gson/2.9.1/gson-2.9.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../../repository/com/google/code/gson/gson/2.9.1/gson-2.9.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../../repository/com/google/code/gson/gson/2.9.1/gson-2.9.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/workspace.xml

@@ -30,7 +30,7 @@
   <component name="ChangeListManager">
     <list default="true" id="fc9366aa-6566-4981-8149-d75e02f8e884" name="默认的" comment="简报功能修改">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/jeesite/common/lang/DateUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/jeesite/common/lang/DateUtils.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/modules/bjflapi/src/main/java/com/jeesite/modules/bjflapi/report/WebsiteUserControllerApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/modules/bjflapi/src/main/java/com/jeesite/modules/bjflapi/report/WebsiteUserControllerApi.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/modules/report/src/main/java/com/jeesite/modules/report/service/WebsiteUserOrderService.java" beforeDir="false" afterPath="$PROJECT_DIR$/modules/report/src/main/java/com/jeesite/modules/report/service/WebsiteUserOrderService.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/modules/report/src/main/java/com/jeesite/modules/report/util/AlipayUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/modules/report/src/main/java/com/jeesite/modules/report/util/AlipayUtil.java" afterDir="false" />
     </list>
@@ -94,7 +94,7 @@
     <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/../../yicangzongtai/api" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../../yicangzongtai/shopapi" />
     <property name="project.structure.last.edited" value="Project" />
     <property name="project.structure.proportion" value="0.15" />
     <property name="project.structure.side.proportion" value="0.25287357" />
@@ -456,7 +456,7 @@
       <workItem from="1734268366747" duration="59000" />
       <workItem from="1734579234738" duration="258000" />
       <workItem from="1734579502121" duration="1272000" />
-      <workItem from="1734658594781" duration="121906000" />
+      <workItem from="1734658594781" duration="126054000" />
     </task>
     <task id="LOCAL-00001" summary="1">
       <created>1676368709673</created>
@@ -759,7 +759,14 @@
       <option name="project" value="LOCAL" />
       <updated>1735118500869</updated>
     </task>
-    <option name="localTasksCounter" value="44" />
+    <task id="LOCAL-00044" summary="简报功能修改">
+      <created>1735180352258</created>
+      <option name="number" value="00044" />
+      <option name="presentableId" value="LOCAL-00044" />
+      <option name="project" value="LOCAL" />
+      <updated>1735180352258</updated>
+    </task>
+    <option name="localTasksCounter" value="45" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -849,6 +856,11 @@
           <line>178</line>
           <option name="timeStamp" value="24" />
         </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/modules/report/src/main/java/com/jeesite/modules/report/service/WebsiteUserOrderService.java</url>
+          <line>204</line>
+          <option name="timeStamp" value="26" />
+        </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
     <watches-manager>

modules/bjflapi/src/main/java/com/jeesite/modules/bjflapi/report/WebsiteUserControllerApi.java

@@ -87,7 +87,7 @@ public class WebsiteUserControllerApi extends AbstractController {
         Map<String, Object> map = new HashMap<>();
         map.put("user", oldUser);
         map.put("token", token);
-        return map;
+        return R.ok(map);
     }
 
     @PostMapping(value = "register")
@@ -134,10 +134,10 @@ public class WebsiteUserControllerApi extends AbstractController {
      */
     @WebsiteAuth
     @PostMapping(value = "updatePwd")
-    public String updatePwd(WebsiteUserDto dto) throws Exception {
+    public Map<String, Object> updatePwd(WebsiteUserDto dto) throws Exception {
         String userId = getUserIdByRequest();
         WebsiteUser websiteUser = websiteUserService.get(userId);
-        return updatePass(websiteUser, dto.getNewPassword(), dto.getConfirmNewPassword());
+        return R.ok(updatePass(websiteUser, dto.getNewPassword(), dto.getConfirmNewPassword()));
     }
 
     private String updatePass(WebsiteUser websiteUser, String newPassword, String confirmNewPassword) {
@@ -183,20 +183,20 @@ public class WebsiteUserControllerApi extends AbstractController {
      */
     @PostMapping(value = "getWuValidCode")
     @ApiOperation(value = "获取找回密码的邮件验证码")
-    public String getWuValidCode(WebsiteUserDto dto) {
+    public Map<String, Object> getWuValidCode(WebsiteUserDto dto) {
         String email = dto.getEmail();
         if (StringUtils.isEmpty(email)) {
-            return "邮箱为空";
+            return R.error("邮箱为空");
         }
         WebsiteUser websiteUser = websiteUserService.findEmail(email);
         if (websiteUser == null) {
-            return "邮箱不存在";
+            return R.error("邮箱不存在");
         }
         String dateKey = "wuLastDate";
         // 操作是否频繁验证， 如果离上次获取验证码小于60秒，则提示操作频繁。
         Date date = UserUtils.getCache(dateKey);
         if (date != null && (System.currentTimeMillis()-date.getTime())/(1000L) < 60L){
-            return "您当前操作太频繁，请稍等一会再操作！";
+            return R.error("您当前操作太频繁，请稍等一会再操作！");
         }else{
             UserUtils.putCache(dateKey, new Date());
         }
@@ -209,7 +209,7 @@ public class WebsiteUserControllerApi extends AbstractController {
         // 准备邮件内容，包含重置密码链接
         String emailContent = "请点击以下链接重置密码: <a href='" + resetUrl + "'>" + resetUrl + "</a>";
         EmailUtils.send(email, "找回密码，请点击以下链接重置密码", emailContent);
-        return "成功";
+        return R.ok("成功");
     }
 
     /**

modules/report/jeesite-module-report.iml

@@ -72,7 +72,6 @@
     <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:3.1.0" level="project" />
     <orderEntry type="library" name="Maven: org.apache.poi:poi-scratchpad:4.1.2" level="project" />
     <orderEntry type="library" name="Maven: com.belerweb:pinyin4j:2.5.1" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.36" level="project" />
     <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.36" level="project" />
     <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.36" level="project" />
     <orderEntry type="library" name="Maven: org.slf4j:log4j-over-slf4j:1.7.36" level="project" />
@@ -206,5 +205,9 @@
     <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib-common:1.6.21" level="project" />
     <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib:1.6.21" level="project" />
     <orderEntry type="library" name="Maven: org.jetbrains:annotations:13.0" level="project" />
+    <orderEntry type="library" name="Maven: com.github.wechatpay-apiv3:wechatpay-java:0.2.15" level="project" />
+    <orderEntry type="library" name="Maven: com.github.wechatpay-apiv3:wechatpay-java-core:0.2.15" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.google.code.gson:gson:2.9.1" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.36" level="project" />
   </component>
 </module>

modules/report/pom.xml

@@ -50,6 +50,12 @@
 			<artifactId>alipay-sdk-java</artifactId>
 			<version>4.40.21.ALL</version>
 		</dependency>
+		<!--WX-->
+		<dependency>
+			<groupId>com.github.wechatpay-apiv3</groupId>
+			<artifactId>wechatpay-java</artifactId>
+			<version>0.2.15</version>
+		</dependency>
 	</dependencies>
 
 	<developers>

modules/report/src/main/java/com/jeesite/modules/report/service/WebsiteUserOrderService.java

@@ -200,7 +200,7 @@ public class WebsiteUserOrderService extends CrudService<WebsiteUserOrderDao, We
 	}
 
 	//定时任务会调用此方法
-	@Scheduled(cron ="0 0/5 * * * ? *")
+	@Scheduled(cron ="0 0/5 * * * ?")
 	public void zfbPayQuery() {
 		WebsiteUserOrder where = new WebsiteUserOrder();
 		where.setPayMethod(Constants.orderPayMethod.ZFB);
@@ -225,7 +225,7 @@ public class WebsiteUserOrderService extends CrudService<WebsiteUserOrderDao, We
 					}
 				}
 				//查是否超时
-				if (DateUtils.getMinDistanceOfTwoDate(order.getCreateDate(), new Date()) > 30){
+				if (DateUtils.getMinDistanceOfTwoDate(order.getCreateDate(), new Date()) > 10){
 					if (alipayUtil.payClose(order.getOrderNumber())) {
 						//支付宝订单关闭成功
 						order.setPayStatus(Constants.orderPayStatus.PAY_ERROR);

modules/report/src/main/java/com/jeesite/modules/report/util/AlipayUtil.java

@@ -55,7 +55,7 @@ public class AlipayUtil {
     /**
      * 订单超时时间
      */
-    private String timeout = "1m";
+    private String timeout = "10m";
     /**
      * 支付网关
      */

web/jeesite-web.iml

@@ -214,5 +214,8 @@
     <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib-common:1.6.21" level="project" />
     <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib:1.6.21" level="project" />
     <orderEntry type="library" name="Maven: org.jetbrains:annotations:13.0" level="project" />
+    <orderEntry type="library" name="Maven: com.github.wechatpay-apiv3:wechatpay-java:0.2.15" level="project" />
+    <orderEntry type="library" name="Maven: com.github.wechatpay-apiv3:wechatpay-java-core:0.2.15" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.google.code.gson:gson:2.9.1" level="project" />
   </component>
 </module>