微信移动端支付

.idea/workspace.xml

@@ -28,7 +28,9 @@
     </select>
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="fc9366aa-6566-4981-8149-d75e02f8e884" name="默认的" comment="微信移动端支付" />
+    <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" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -455,14 +457,7 @@
       <workItem from="1735970618647" duration="252000" />
       <workItem from="1735970895886" duration="8433000" />
       <workItem from="1736126123480" duration="510000" />
-      <workItem from="1736127959643" duration="14262000" />
-    </task>
-    <task id="LOCAL-00026" summary="网站用户注册">
-      <created>1734680578880</created>
-      <option name="number" value="00026" />
-      <option name="presentableId" value="LOCAL-00026" />
-      <option name="project" value="LOCAL" />
-      <updated>1734680578881</updated>
+      <workItem from="1736127959643" duration="15681000" />
     </task>
     <task id="LOCAL-00027" summary="修改密码">
       <created>1734684410671</created>
@@ -800,7 +795,14 @@
       <option name="project" value="LOCAL" />
       <updated>1736152131603</updated>
     </task>
-    <option name="localTasksCounter" value="75" />
+    <task id="LOCAL-00075" summary="微信移动端支付">
+      <created>1736152541359</created>
+      <option name="number" value="00075" />
+      <option name="presentableId" value="LOCAL-00075" />
+      <option name="project" value="LOCAL" />
+      <updated>1736152541359</updated>
+    </task>
+    <option name="localTasksCounter" value="76" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -892,7 +894,7 @@
         </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>183</line>
+          <line>188</line>
           <option name="timeStamp" value="7" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">

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

@@ -136,7 +136,7 @@ public class WebsiteUserOrderControllerApi extends AbstractController {
 
     @WebsiteAuth
     @PostMapping(value = "payOrder")
-    public R<String> payOrder(HttpServletRequest request, WebsiteUserOrder websiteUserOrder) throws Exception {
+    public R<WebsiteUserOrder> payOrder(HttpServletRequest request, WebsiteUserOrder websiteUserOrder) throws Exception {
         String userId = getUserIdByRequest();
         String reportId = websiteUserOrder.getResearchBriefReportId();
         if (StringUtils.isEmpty(reportId)) {

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

@@ -138,7 +138,7 @@ public class WebsiteUserOrderService extends CrudService<WebsiteUserOrderDao, We
 		super.delete(websiteUserOrder);
 	}
 
-	public R<String> saveAndPay(String userId, String payMethod, ResearchBriefReport researchBriefReport, HttpServletRequest request) {
+	public R<WebsiteUserOrder> saveAndPay(String userId, String payMethod, ResearchBriefReport researchBriefReport, HttpServletRequest request) {
 		if (researchBriefReport == null) {
 			return R.fail("简报为空");
 		}
@@ -186,7 +186,8 @@ public class WebsiteUserOrderService extends CrudService<WebsiteUserOrderDao, We
 		super.save(websiteUserOrder);
 		redisUtil.set(Constants.WEBSITE_ORDER_URL + websiteUserOrder.getId(), payResult);
 		redisUtil.expire(Constants.WEBSITE_ORDER_URL + websiteUserOrder.getId(), 600);
-		return R.ok("成功", payResult);
+		websiteUserOrder.setOrderPayUrl(payResult);
+		return R.ok(websiteUserOrder);
 	}
 
 	public String generateOrderNumber() {