支付宝移动端支付

.idea/workspace.xml

@@ -28,13 +28,12 @@
     </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" />
-      <change beforePath="$PROJECT_DIR$/modules/bjflapi/src/main/java/com/jeesite/modules/bjflapi/report/WebsiteUserControllerApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/modules/bjflapi/src/main/java/com/jeesite/modules/bjflapi/report/WebsiteUserControllerApi.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/modules/report/src/main/java/com/jeesite/modules/report/entity/WebsiteUser.java" beforeDir="false" afterPath="$PROJECT_DIR$/modules/report/src/main/java/com/jeesite/modules/report/entity/WebsiteUser.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/modules/report/src/main/java/com/jeesite/modules/report/service/ResearchBriefReportLabelService.java" beforeDir="false" afterPath="$PROJECT_DIR$/modules/report/src/main/java/com/jeesite/modules/report/service/ResearchBriefReportLabelService.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/util/AlipayUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/modules/report/src/main/java/com/jeesite/modules/report/util/AlipayUtil.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/modules/report/src/main/java/com/jeesite/modules/report/dao/ResearchBriefReportLabelRelevancyDao.java" beforeDir="false" afterPath="$PROJECT_DIR$/modules/report/src/main/java/com/jeesite/modules/report/dao/ResearchBriefReportLabelRelevancyDao.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/modules/report/src/main/java/com/jeesite/modules/report/entity/ResearchBriefReportLabelRelevancy.java" beforeDir="false" afterPath="$PROJECT_DIR$/modules/report/src/main/java/com/jeesite/modules/report/entity/ResearchBriefReportLabelRelevancy.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/resources/mappings/modules/report/ResearchBriefReportLabelRelevancyDao.xml" beforeDir="false" afterPath="$PROJECT_DIR$/modules/report/src/main/resources/mappings/modules/report/ResearchBriefReportLabelRelevancyDao.xml" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -96,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$/../../maintenance-support/maintenance-support-java" />
     <property name="project.structure.last.edited" value="Project" />
     <property name="project.structure.proportion" value="0.15" />
     <property name="project.structure.side.proportion" value="0.25287357" />
@@ -459,7 +458,7 @@
       <workItem from="1734579234738" duration="258000" />
       <workItem from="1734579502121" duration="1272000" />
       <workItem from="1734658594781" duration="126472000" />
-      <workItem from="1735184825354" duration="14148000" />
+      <workItem from="1735184825354" duration="15490000" />
     </task>
     <task id="LOCAL-00001" summary="1">
       <created>1676368709673</created>
@@ -797,7 +796,14 @@
       <option name="project" value="LOCAL" />
       <updated>1735200866094</updated>
     </task>
-    <option name="localTasksCounter" value="49" />
+    <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>
+    </task>
+    <option name="localTasksCounter" value="50" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -852,7 +858,6 @@
     </option>
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="更新模板配置" />
     <MESSAGE value="调查报告功能更新" />
     <MESSAGE value="调查报告优化" />
     <MESSAGE value="调查报告新增配置美元和元" />
@@ -877,7 +882,8 @@
     <MESSAGE value="简报功能修改" />
     <MESSAGE value="wx sdk" />
     <MESSAGE value="个人中心" />
-    <option name="LAST_COMMIT_MESSAGE" value="个人中心" />
+    <MESSAGE value="支付宝移动端支付" />
+    <option name="LAST_COMMIT_MESSAGE" value="支付宝移动端支付" />
   </component>
   <component name="XDebuggerManager">
     <watches-manager>

modules/report/src/main/java/com/jeesite/modules/report/dao/ResearchBriefReportLabelRelevancyDao.java

@@ -5,6 +5,8 @@ import com.jeesite.common.mybatis.annotation.MyBatisDao;
 import com.jeesite.modules.report.entity.ResearchBriefReportLabelRelevancy;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * 简报与分类关联DAO接口
  * @author gg
@@ -19,4 +21,6 @@ public interface ResearchBriefReportLabelRelevancyDao extends CrudDao<ResearchBr
     long findAnyLableId(@Param("id") String id);
 
     void deleteResearchBriefReportId(@Param("id") String id);
+
+    List<ResearchBriefReportLabelRelevancy> findAndNameList(@Param("relevancy") ResearchBriefReportLabelRelevancy relevancy);
 }

modules/report/src/main/java/com/jeesite/modules/report/entity/ResearchBriefReportLabelRelevancy.java

@@ -28,8 +28,9 @@ public class ResearchBriefReportLabelRelevancy extends DataEntity<ResearchBriefR
 	private String researchBriefReportId;		// 简报智库id
 	private String parentLableId;		// 上级分类id
 	private String lableId;		// 标签id
+	private String lableName;   // 标签名称
 
-	private List<String> lableIds;
+	private List<ResearchBriefReportLabelRelevancy> lableIds;
 
 	public ResearchBriefReportLabelRelevancy() {
 		this(null);
@@ -66,11 +67,19 @@ public class ResearchBriefReportLabelRelevancy extends DataEntity<ResearchBriefR
 		this.lableId = lableId;
 	}
 
-	public List<String> getLableIds() {
+	public List<ResearchBriefReportLabelRelevancy> getLableIds() {
 		return lableIds;
 	}
 
-	public void setLableIds(List<String> lableIds) {
+	public void setLableIds(List<ResearchBriefReportLabelRelevancy> lableIds) {
 		this.lableIds = lableIds;
 	}
+
+	public String getLableName() {
+		return lableName;
+	}
+
+	public void setLableName(String lableName) {
+		this.lableName = lableName;
+	}
 }

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

@@ -24,6 +24,7 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -71,8 +72,18 @@ public class ResearchBriefReportService extends CrudService<ResearchBriefReportD
 	}
 
 	private ResearchBriefReport convert(ResearchBriefReport r) {
-		r.setTopLabelName(researchBriefReportLabelRelevancyDao.findNames(r.getId(), 1));
-		r.setSecondLabelName(researchBriefReportLabelRelevancyDao.findNames(r.getId(), 2));
+		ResearchBriefReportLabelRelevancy where = new ResearchBriefReportLabelRelevancy();
+		where.setResearchBriefReportId(r.getId());
+		List<ResearchBriefReportLabelRelevancy> list = researchBriefReportLabelRelevancyDao.findAndNameList(where);
+		List<ResearchBriefReportLabelRelevancy> relevancies = new ArrayList<>();
+		Map<String, List<ResearchBriefReportLabelRelevancy>> listMap = list.stream().collect(Collectors.groupingBy(ResearchBriefReportLabelRelevancy::getParentLableId));
+		for (String lableId : listMap.keySet()) {
+			ResearchBriefReportLabelRelevancy relevancy = new ResearchBriefReportLabelRelevancy();
+			relevancy.setParentLableId(lableId);
+			relevancy.setLableIds(listMap.get(lableId));
+			relevancies.add(relevancy);
+		}
+		r.setRelevancies(relevancies);
 		return r;
 	}
 	
@@ -115,7 +126,7 @@ public class ResearchBriefReportService extends CrudService<ResearchBriefReportD
 				ResearchBriefReportLabelRelevancy newRelevancie = new ResearchBriefReportLabelRelevancy();
 				newRelevancie.setResearchBriefReportId(reportId);
 				newRelevancie.setParentLableId(r.getParentLableId());
-				newRelevancie.setLableId(l);
+				newRelevancie.setLableId(l.getLableId());
 				saveRelevancies.add(newRelevancie);
 				return l;
 			}).collect(Collectors.toList());

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

@@ -28,6 +28,13 @@
 		select count(1) from research_brief_report_label_relevancy where parent_lable_id = #{id} or lable_id = #{id}
 	</select>
 
+	<select id="findAndNameList"
+			resultType="com.jeesite.modules.report.entity.ResearchBriefReportLabelRelevancy">
+		select lr.*, rl.name lableName from research_brief_report_label_relevancy lr
+		left join research_brief_report_label rl on rl.id = lr.lable_id
+		where lr.research_brief_report_id = #{relevancy.id}
+	</select>
+
 	<delete id="deleteResearchBriefReportId">
 		delete from research_brief_report_label_relevancy
 		where research_brief_report_id = #{id}