瀏覽代碼

微信移动端支付

guomengjiao 8 月之前
父節點
當前提交
da44630606

+ 10 - 9
.idea/workspace.xml

@@ -30,6 +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$/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" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -457,14 +458,7 @@
       <workItem from="1735970618647" duration="252000" />
       <workItem from="1735970895886" duration="8433000" />
       <workItem from="1736126123480" duration="510000" />
-      <workItem from="1736127959643" duration="11276000" />
-    </task>
-    <task id="LOCAL-00024" summary="更新">
-      <created>1697013185526</created>
-      <option name="number" value="00024" />
-      <option name="presentableId" value="LOCAL-00024" />
-      <option name="project" value="LOCAL" />
-      <updated>1697013185527</updated>
+      <workItem from="1736127959643" duration="13877000" />
     </task>
     <task id="LOCAL-00025" summary="研究报告的优化">
       <created>1734665103577</created>
@@ -802,7 +796,14 @@
       <option name="project" value="LOCAL" />
       <updated>1736147464276</updated>
     </task>
-    <option name="localTasksCounter" value="73" />
+    <task id="LOCAL-00073" summary="微信移动端支付">
+      <created>1736149385387</created>
+      <option name="number" value="00073" />
+      <option name="presentableId" value="LOCAL-00073" />
+      <option name="project" value="LOCAL" />
+      <updated>1736149385387</updated>
+    </task>
+    <option name="localTasksCounter" value="74" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

+ 11 - 0
modules/bjflapi/src/main/java/com/jeesite/modules/bjflapi/report/WebsiteUserOrderControllerApi.java

@@ -48,6 +48,17 @@ public class WebsiteUserOrderControllerApi extends AbstractController {
         return R.ok(websiteUserOrderService.findPage(websiteUserOrder));
     }
 
+    /**
+     * 我的订单详情
+     */
+    @WebsiteAuth
+    @PostMapping(value = "orderDetail")
+    public R<WebsiteUserOrder> orderDetail(WebsiteUserOrder websiteUserOrder) throws Exception {
+        String userId = getUserIdByRequest();
+        websiteUserOrder.setWebsiteUserId(userId);
+        return R.ok(websiteUserOrderService.getOne(websiteUserOrder));
+    }
+
     /**
      * 我的下载
      */

+ 4 - 0
modules/report/src/main/java/com/jeesite/modules/report/service/WebsiteUserOrderService.java

@@ -356,6 +356,10 @@ public class WebsiteUserOrderService extends CrudService<WebsiteUserOrderDao, We
 	public void refundOrder(WebsiteUserOrder websiteUserOrder) throws AlipayApiException {
 		logger.info("refundOrder ===>{}", websiteUserOrder.getId());
 		WebsiteUserOrder order = get(websiteUserOrder);
+		if (!websiteUserOrder.getOrderPayUrl().equals(Constants.WEBSITE_ORDER_URL)) {
+			logger.error("refundOrder not ===>{}", websiteUserOrder.getOrderPayUrl());
+			return;
+		}
 		if (!order.getPayStatus().equals(Constants.orderPayStatus.PAY_SUCCESS)) {
 			return;
 		}