微信移动端支付

.idea/workspace.xml

@@ -30,15 +30,8 @@
   <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/bjflapi/src/main/java/com/jeesite/modules/bjflapi/report/WebsiteUserOrderControllerApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/modules/bjflapi/src/main/java/com/jeesite/modules/bjflapi/report/WebsiteUserOrderControllerApi.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/modules/report/src/main/java/com/jeesite/modules/report/dto/ResearchReportDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/modules/report/src/main/java/com/jeesite/modules/report/dto/ResearchReportDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/modules/report/src/main/java/com/jeesite/modules/report/entity/ResearchBriefReportLabel.java" beforeDir="false" afterPath="$PROJECT_DIR$/modules/report/src/main/java/com/jeesite/modules/report/entity/ResearchBriefReportLabel.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/modules/report/src/main/java/com/jeesite/modules/report/service/ResearchBriefReportService.java" beforeDir="false" afterPath="$PROJECT_DIR$/modules/report/src/main/java/com/jeesite/modules/report/service/ResearchBriefReportService.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/web/ResearchReportController.java" beforeDir="false" afterPath="$PROJECT_DIR$/modules/report/src/main/java/com/jeesite/modules/report/web/ResearchReportController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/modules/report/src/main/resources/mappings/modules/report/ResearchBriefReportLabelDao.xml" beforeDir="false" afterPath="$PROJECT_DIR$/modules/report/src/main/resources/mappings/modules/report/ResearchBriefReportLabelDao.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/modules/report/src/main/resources/mappings/modules/report/ResearchReportDao.xml" beforeDir="false" afterPath="$PROJECT_DIR$/modules/report/src/main/resources/mappings/modules/report/ResearchReportDao.xml" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -100,7 +93,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$/../../maintenance-support/maintenance-support-java" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../admin_page" />
     <property name="project.structure.last.edited" value="SDKs" />
     <property name="project.structure.proportion" value="0.15" />
     <property name="project.structure.side.proportion" value="0.25287357" />
@@ -472,21 +465,7 @@
       <workItem from="1735970895886" duration="8433000" />
       <workItem from="1736126123480" duration="510000" />
       <workItem from="1736127959643" duration="53060000" />
-      <workItem from="1736385778472" duration="54586000" />
-    </task>
-    <task id="LOCAL-00043" summary="简报功能修改">
-      <created>1735118500869</created>
-      <option name="number" value="00043" />
-      <option name="presentableId" value="LOCAL-00043" />
-      <option name="project" value="LOCAL" />
-      <updated>1735118500869</updated>
-    </task>
-    <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>
+      <workItem from="1736385778472" duration="68222000" />
     </task>
     <task id="LOCAL-00045" summary="wx sdk">
       <created>1735184653308</created>
@@ -817,7 +796,21 @@
       <option name="project" value="LOCAL" />
       <updated>1736758338842</updated>
     </task>
-    <option name="localTasksCounter" value="92" />
+    <task id="LOCAL-00092" summary="微信移动端支付">
+      <created>1736822730595</created>
+      <option name="number" value="00092" />
+      <option name="presentableId" value="LOCAL-00092" />
+      <option name="project" value="LOCAL" />
+      <updated>1736822730595</updated>
+    </task>
+    <task id="LOCAL-00093" summary="微信移动端支付">
+      <created>1736908680180</created>
+      <option name="number" value="00093" />
+      <option name="presentableId" value="LOCAL-00093" />
+      <option name="project" value="LOCAL" />
+      <updated>1736908680267</updated>
+    </task>
+    <option name="localTasksCounter" value="94" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -837,6 +830,31 @@
   <component name="Vcs.Log.Tabs.Properties">
     <option name="TAB_STATES">
       <map>
+        <entry key="6983cda7-8f61-4202-a48f-1e3ed2cc2638">
+          <value>
+            <State>
+              <option name="SHOW_ONLY_AFFECTED_CHANGES" value="true" />
+              <option name="FILTERS">
+                <map>
+                  <entry key="branch">
+                    <value>
+                      <list>
+                        <option value="HEAD" />
+                      </list>
+                    </value>
+                  </entry>
+                  <entry key="roots">
+                    <value>
+                      <list>
+                        <option value="$PROJECT_DIR$" />
+                      </list>
+                    </value>
+                  </entry>
+                </map>
+              </option>
+            </State>
+          </value>
+        </entry>
         <entry key="MAIN">
           <value>
             <State>
@@ -978,6 +996,21 @@
           <line>735</line>
           <option name="timeStamp" value="31" />
         </line-breakpoint>
+        <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>164</line>
+          <option name="timeStamp" value="32" />
+        </line-breakpoint>
+        <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>283</line>
+          <option name="timeStamp" value="33" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/modules/report/src/main/java/com/jeesite/modules/report/service/ResearchReportService.java</url>
+          <line>914</line>
+          <option name="timeStamp" value="34" />
+        </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
     <watches-manager>

modules/report/src/main/java/com/jeesite/modules/report/dto/ResearchReportDto.java

@@ -10,7 +10,6 @@ public class ResearchReportDto implements Serializable {
         @ExcelField(title = "SUBJECT",attrName = "marketType",align = ExcelField.Align.AUTO,dictType = "reports_category_en",sort = 20),
         @ExcelField(title = "ABSTRACT",attrName = "reportScopeHtml",align = ExcelField.Align.AUTO,sort = 30),
         @ExcelField(title = "TABLE OF CONTENTS",attrName = "directoryHtml",align = ExcelField.Align.AUTO,sort = 40),
-        @ExcelField(title = "GENERALIZATION",attrName = "generalization",align = ExcelField.Align.AUTO,sort = 40),
     })
     private String title;		// 标题
     private String marketType;		// 所属分类

modules/report/src/main/java/com/jeesite/modules/report/web/ResearchReportController.java

@@ -213,16 +213,17 @@ public class ResearchReportController extends BaseController {
 			ResearchReport vo = researchReportService.researchReportForm(researchReport);
 			StringBuffer sb = new StringBuffer();
 			sb.append(vo.getTitle());	//标题
-			sb.append("\r");
+			sb.append("\r\r");
 			sb.append(Html2PlainTxtUtils.convert(vo.getReportScopeHtml()));	//研究范围
-			sb.append("\r");
-			sb.append(Html2PlainTxtUtils.convert(vo.getDirectoryHtml()));		//正文目录
-			sb.append("\r");
-			sb.append(Html2PlainTxtUtils.convert(vo.getChartsHtml()));		//图表目录
+			sb.append("\r\r");
 			if (StringUtils.isNotEmpty(vo.getGeneralization())) {
-				sb.append("\r");
+				sb.append("\r\r");
+				sb.append("市场概况\r\r");
 				sb.append(Html2PlainTxtUtils.convert(vo.getGeneralization()));
 			}
+			sb.append(Html2PlainTxtUtils.convert(vo.getDirectoryHtml()));		//正文目录
+			sb.append("\r\r");
+			sb.append(Html2PlainTxtUtils.convert(vo.getChartsHtml()));		//图表目录
 			response.setCharacterEncoding("utf-8");
 			response.setContentType("text/plain");
 			response.addHeader("Content-Disposition","attachment;filename="+new String(vo.getTitle().getBytes("gb2312"),"ISO8859-1")+".txt");
@@ -284,8 +285,10 @@ public class ResearchReportController extends BaseController {
 		if(!list.isEmpty()){
 			listExcel = list.stream().map(vo -> {
 				vo.setReportScopeHtml(Html2PlainTxtUtils.convert(vo.getReportScopeHtml()));
+				if (StringUtils.isNotEmpty(vo.getGeneralization())) {
+					vo.setReportScopeHtml(vo.getReportScopeHtml() + "\r\r市场概况\r\r" + Html2PlainTxtUtils.convert(vo.getGeneralization()));
+				}
 				vo.setDirectoryHtml(Html2PlainTxtUtils.convert(vo.getDirectoryHtml()));
-				vo.setGeneralization(Html2PlainTxtUtils.convert(vo.getGeneralization()));
 				return vo;
 			}).collect(Collectors.toList());
 		}
@@ -316,16 +319,17 @@ public class ResearchReportController extends BaseController {
 			for(ResearchReport vo: list) {
 				StringBuffer sb = new StringBuffer();
 				sb.append(vo.getTitle());	//标题
-				sb.append("\r");
+				sb.append("\r\r");
 				sb.append(Html2PlainTxtUtils.convert(vo.getReportScopeHtml()));	//研究范围
-				sb.append("\r");
-				sb.append(Html2PlainTxtUtils.convert(vo.getDirectoryHtml()));		//正文目录
-				sb.append("\r");
-				sb.append(Html2PlainTxtUtils.convert(vo.getChartsHtml()));		//图表目录
 				if (StringUtils.isNotEmpty(vo.getGeneralization())) {
-					sb.append("\r");
+					sb.append("\r\r");
+					sb.append("市场概况\r\r");
 					sb.append(Html2PlainTxtUtils.convert(vo.getGeneralization()));
 				}
+				sb.append("\r\r");
+				sb.append(Html2PlainTxtUtils.convert(vo.getDirectoryHtml()));		//正文目录
+				sb.append("\r\r");
+				sb.append(Html2PlainTxtUtils.convert(vo.getChartsHtml()));		//图表目录
 				/*File file = new File(basePath + TEMP_PATH + File.separator + vo.getTitle() + ".txt");
 				if(!file.exists()){
 					if(!file.getParentFile().isDirectory()) {