微信移动端支付

.idea/workspace.xml

@@ -28,10 +28,7 @@
     </select>
   </component>
   <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>
+    <list default="true" id="fc9366aa-6566-4981-8149-d75e02f8e884" name="默认的" comment="微信移动端支付" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -458,14 +455,7 @@
       <workItem from="1735970618647" duration="252000" />
       <workItem from="1735970895886" duration="8433000" />
       <workItem from="1736126123480" duration="510000" />
-      <workItem from="1736127959643" duration="13877000" />
-    </task>
-    <task id="LOCAL-00025" summary="研究报告的优化">
-      <created>1734665103577</created>
-      <option name="number" value="00025" />
-      <option name="presentableId" value="LOCAL-00025" />
-      <option name="project" value="LOCAL" />
-      <updated>1734665103577</updated>
+      <workItem from="1736127959643" duration="14262000" />
     </task>
     <task id="LOCAL-00026" summary="网站用户注册">
       <created>1734680578880</created>
@@ -803,7 +793,14 @@
       <option name="project" value="LOCAL" />
       <updated>1736149385387</updated>
     </task>
-    <option name="localTasksCounter" value="74" />
+    <task id="LOCAL-00074" summary="微信移动端支付">
+      <created>1736152131603</created>
+      <option name="number" value="00074" />
+      <option name="presentableId" value="LOCAL-00074" />
+      <option name="project" value="LOCAL" />
+      <updated>1736152131603</updated>
+    </task>
+    <option name="localTasksCounter" value="75" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

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

@@ -47,6 +47,8 @@ public class WebsiteUserOrder extends DataEntity<WebsiteUserOrder> {
 	private String orderPayUrl;
 
 	private String researchBriefReportTitle;
+	private String marketType;		// 所属分类
+	private String topLabelName;		// 一级标签id
 
 	private List<String> payMethodList;
 
@@ -162,6 +164,22 @@ public class WebsiteUserOrder extends DataEntity<WebsiteUserOrder> {
 		this.researchBriefReportTitle = researchBriefReportTitle;
 	}
 
+	public String getMarketType() {
+		return marketType;
+	}
+
+	public void setMarketType(String marketType) {
+		this.marketType = marketType;
+	}
+
+	public String getTopLabelName() {
+		return topLabelName;
+	}
+
+	public void setTopLabelName(String topLabelName) {
+		this.topLabelName = topLabelName;
+	}
+
 	public List<String> getPayMethodList() {
 		return payMethodList;
 	}

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

@@ -10,6 +10,7 @@ import com.jeesite.common.lang.DateUtils;
 import com.jeesite.common.lang.StringUtils;
 import com.jeesite.common.service.CrudService;
 import com.jeesite.modules.report.dao.ResearchBriefReportDao;
+import com.jeesite.modules.report.dao.ResearchBriefReportLabelRelevancyDao;
 import com.jeesite.modules.report.dao.WebsiteUserOrderDao;
 import com.jeesite.modules.report.dao.WebsiteUserOrderDownDao;
 import com.jeesite.modules.report.entity.ResearchBriefReport;
@@ -55,6 +56,8 @@ public class WebsiteUserOrderService extends CrudService<WebsiteUserOrderDao, We
 	private NotificationParser notificationParser;
 	@Resource
 	private RedisUtil redisUtil;
+	@Resource
+	private ResearchBriefReportLabelRelevancyDao researchBriefReportLabelRelevancyDao;
 
 	private static Logger logger = LoggerFactory.getLogger(WebsiteUserOrderService.class);
 
@@ -78,6 +81,8 @@ public class WebsiteUserOrderService extends CrudService<WebsiteUserOrderDao, We
 		where.setId(r.getResearchBriefReportId());
 		ResearchBriefReport byEntity = researchBriefReportDao.getByEntity(where);
 		r.setResearchBriefReportTitle(byEntity.getTitle());
+		r.setMarketType(byEntity.getMarketType());
+		r.setTopLabelName(researchBriefReportLabelRelevancyDao.findNames(byEntity.getId(), 1));
 		//下载
 		WebsiteUserOrderDown downWhere = new WebsiteUserOrderDown();
 		downWhere.setWebsiteUserOrderId(r.getId());