微信移动端支付

.idea/workspace.xml

@@ -30,10 +30,6 @@
   <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/bjflapi/src/main/java/com/jeesite/modules/bjflapi/report/ResearchBriefReportControllerApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/modules/bjflapi/src/main/java/com/jeesite/modules/bjflapi/report/ResearchBriefReportControllerApi.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/modules/report/src/main/java/com/jeesite/modules/report/entity/ResearchBriefReport.java" beforeDir="false" afterPath="$PROJECT_DIR$/modules/report/src/main/java/com/jeesite/modules/report/entity/ResearchBriefReport.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/modules/report/src/main/java/com/jeesite/modules/report/service/ResearchBriefReportLabelRelevancyService.java" beforeDir="false" afterPath="$PROJECT_DIR$/modules/report/src/main/java/com/jeesite/modules/report/service/ResearchBriefReportLabelRelevancyService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/modules/report/src/main/resources/mappings/modules/report/ResearchBriefReportDao.xml" beforeDir="false" afterPath="$PROJECT_DIR$/modules/report/src/main/resources/mappings/modules/report/ResearchBriefReportDao.xml" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -461,14 +457,7 @@
       <workItem from="1735970618647" duration="252000" />
       <workItem from="1735970895886" duration="8433000" />
       <workItem from="1736126123480" duration="510000" />
-      <workItem from="1736127959643" duration="41215000" />
-    </task>
-    <task id="LOCAL-00035" summary="简报">
-      <created>1734938692187</created>
-      <option name="number" value="00035" />
-      <option name="presentableId" value="LOCAL-00035" />
-      <option name="project" value="LOCAL" />
-      <updated>1734938692188</updated>
+      <workItem from="1736127959643" duration="42187000" />
     </task>
     <task id="LOCAL-00036" summary="简报查询">
       <created>1734947692048</created>
@@ -806,7 +795,14 @@
       <option name="project" value="LOCAL" />
       <updated>1736307147621</updated>
     </task>
-    <option name="localTasksCounter" value="84" />
+    <task id="LOCAL-00084" summary="微信移动端支付">
+      <created>1736315372103</created>
+      <option name="number" value="00084" />
+      <option name="presentableId" value="LOCAL-00084" />
+      <option name="project" value="LOCAL" />
+      <updated>1736315372103</updated>
+    </task>
+    <option name="localTasksCounter" value="85" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -889,6 +885,15 @@
     <option name="LAST_COMMIT_MESSAGE" value="微信移动端支付" />
   </component>
   <component name="XDebuggerManager">
+    <breakpoint-manager>
+      <breakpoints>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/modules/report/src/main/java/com/jeesite/modules/report/service/ResearchBriefReportService.java</url>
+          <line>108</line>
+          <option name="timeStamp" value="12" />
+        </line-breakpoint>
+      </breakpoints>
+    </breakpoint-manager>
     <watches-manager>
       <configuration name="SpringBootApplicationConfigurationType">
         <watch expression="query" />

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

@@ -25,8 +25,15 @@ public class WebsiteUserOrderDownService extends CrudService<WebsiteUserOrderDow
 	 */
 	@Override
 	public Page<WebsiteUserOrderDown> findPage(WebsiteUserOrderDown websiteUserOrderDown) {
+		Integer pageSize = websiteUserOrderDown.getPageSize();
 		Page<WebsiteUserOrderDown> page = super.findPage(websiteUserOrderDown);
 		page.setList(page.getList().stream().map(w -> convert(w)).collect(Collectors.toList()));
+		long total = super.findCount(websiteUserOrderDown);
+		long count = total / pageSize;
+		if(total % pageSize > 0){
+			count = count +1;
+		}
+		page.setCount(count);
 		return page;
 	}
 	

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

@@ -68,8 +68,15 @@ public class WebsiteUserOrderService extends CrudService<WebsiteUserOrderDao, We
 	 */
 	@Override
 	public Page<WebsiteUserOrder> findPage(WebsiteUserOrder websiteUserOrder) {
+		int pageSize = websiteUserOrder.getPageSize();
 		Page<WebsiteUserOrder> page = super.findPage(websiteUserOrder);
 		page.setList(page.getList().stream().map(w -> convert(w)).collect(Collectors.toList()));
+		long total = super.findCount(websiteUserOrder);
+		long count = total / pageSize;
+		if(total % pageSize > 0){
+			count = count +1;
+		}
+		page.setCount(count);
 		return page;
 	}