微信移动端支付

.idea/workspace.xml

@@ -30,7 +30,9 @@
   <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/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/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/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/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" />
@@ -93,7 +95,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$/../web_site" />
+    <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" />
@@ -467,14 +469,7 @@
       <workItem from="1736127959643" duration="53060000" />
       <workItem from="1736385778472" duration="73782000" />
       <workItem from="1737337698393" duration="12755000" />
-      <workItem from="1737443783514" duration="16279000" />
-    </task>
-    <task id="LOCAL-00049" summary="支付宝移动端支付">
-      <created>1735206001200</created>
-      <option name="number" value="00049" />
-      <option name="presentableId" value="LOCAL-00049" />
-      <option name="project" value="LOCAL" />
-      <updated>1735206001200</updated>
+      <workItem from="1737443783514" duration="22345000" />
     </task>
     <task id="LOCAL-00050" summary="支付宝移动端支付">
       <created>1735207434638</created>
@@ -812,7 +807,14 @@
       <option name="project" value="LOCAL" />
       <updated>1737446319550</updated>
     </task>
-    <option name="localTasksCounter" value="98" />
+    <task id="LOCAL-00098" summary="微信移动端支付">
+      <created>1737524556264</created>
+      <option name="number" value="00098" />
+      <option name="presentableId" value="LOCAL-00098" />
+      <option name="project" value="LOCAL" />
+      <updated>1737524556265</updated>
+    </task>
+    <option name="localTasksCounter" value="99" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -981,6 +983,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/web/ResearchReportController.java</url>
+          <line>220</line>
+          <option name="timeStamp" value="35" />
+        </line-breakpoint>
+      </breakpoints>
+    </breakpoint-manager>
     <watches-manager>
       <configuration name="SpringBootApplicationConfigurationType">
         <watch expression="query" />

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

@@ -16,6 +16,7 @@ public class ResearchReportDto implements Serializable {
     private String reportScopeHtml;		// 研究范围
     private String directoryHtml;		// 目录
     private String generalization; //市场概括
+    private String lang;
 
     public String getTitle() {
         return title;
@@ -56,4 +57,12 @@ public class ResearchReportDto implements Serializable {
     public void setGeneralization(String generalization) {
         this.generalization = generalization;
     }
+
+    public String getLang() {
+        return lang;
+    }
+
+    public void setLang(String lang) {
+        this.lang = lang;
+    }
 }

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

@@ -2,6 +2,7 @@ package com.jeesite.modules.report.web;
 
 import com.jeesite.common.collect.ListUtils;
 import com.jeesite.common.config.Global;
+import com.jeesite.common.constant.Constants;
 import com.jeesite.common.entity.Page;
 import com.jeesite.common.lang.DateUtils;
 import com.jeesite.common.lang.StringUtils;
@@ -53,6 +54,8 @@ public class ResearchReportController extends BaseController {
 	@Value("${file.baseDir}")
 	private String basePath;
 	private static final String TEMP_PATH = "/temp";
+	private static final String marketZH = "市场概况";
+	private static final String marketEN = "Market Profile";
 
 	/**
 	 * 获取数据
@@ -217,7 +220,11 @@ public class ResearchReportController extends BaseController {
 			sb.append(Html2PlainTxtUtils.convert(vo.getReportScopeHtml()));	//研究范围
 			if (StringUtils.isNotEmpty(vo.getGeneralization())) {
 				sb.append("\r\r\r\r");
-				sb.append("市场概况\r\r");
+				if (Constants.lang.ZH_CH.equals(vo.getLang())) {
+					sb.append(marketZH + "\r\r");
+				} else {
+					sb.append(marketEN + "\r\r");
+				}
 				sb.append(Html2PlainTxtUtils.convert(vo.getGeneralization()));
 			}
 			sb.append("\r\r");
@@ -287,7 +294,13 @@ public class ResearchReportController extends BaseController {
 			listExcel = list.stream().map(vo -> {
 				vo.setReportScopeHtml(Html2PlainTxtUtils.convert(vo.getReportScopeHtml()));
 				if (StringUtils.isNotEmpty(vo.getGeneralization())) {
-					vo.setReportScopeHtml(vo.getReportScopeHtml() + lineStr + lineStr + lineStr + lineStr + "市场概况" + lineStr + lineStr + Html2PlainTxtUtils.convert(vo.getGeneralization()));
+					String str;
+					if (Constants.lang.ZH_CH.equals(vo.getLang())) {
+						str = marketZH;
+					} else {
+						str = marketEN;
+					}
+					vo.setReportScopeHtml(vo.getReportScopeHtml() + lineStr + lineStr + lineStr + lineStr + str + lineStr + lineStr + Html2PlainTxtUtils.convert(vo.getGeneralization()));
 				}
 				vo.setDirectoryHtml(Html2PlainTxtUtils.convert(vo.getDirectoryHtml()));
 				return vo;
@@ -324,7 +337,11 @@ public class ResearchReportController extends BaseController {
 				sb.append(Html2PlainTxtUtils.convert(vo.getReportScopeHtml()));	//研究范围
 				if (StringUtils.isNotEmpty(vo.getGeneralization())) {
 					sb.append("\r\r\r\r");
-					sb.append("市场概况\r\r");
+					if (Constants.lang.ZH_CH.equals(vo.getLang())) {
+						sb.append(marketZH + "\r\r");
+					} else {
+						sb.append(marketEN + "\r\r");
+					}
 					sb.append(Html2PlainTxtUtils.convert(vo.getGeneralization()));
 				}
 				sb.append("\r\r");

modules/report/src/main/resources/mappings/modules/report/ResearchReportDao.xml

@@ -261,7 +261,7 @@
 
 	<select id="findListByIdArr" parameterType="java.lang.String"
 		resultType="com.jeesite.modules.report.dto.ResearchReportDto">
-		select title,report_scope_html,market_type,directory_html,generalization
+		select title,report_scope_html,market_type,directory_html,generalization,lang
 		from research_report_view where report_id in
 		<foreach collection="ids.split(',')" item="id" separator="," open="(" close=")">
 			#{id}