微信移动端支付

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

@@ -2,6 +2,7 @@ package com.jeesite.modules.report.dao;
 
 import com.jeesite.common.dao.CrudDao;
 import com.jeesite.common.mybatis.annotation.MyBatisDao;
+import com.jeesite.modules.report.entity.ResearchBriefReport;
 import com.jeesite.modules.report.entity.WebsiteUserOrderDown;
 
 /**
@@ -11,5 +12,6 @@ import com.jeesite.modules.report.entity.WebsiteUserOrderDown;
  */
 @MyBatisDao
 public interface WebsiteUserOrderDownDao extends CrudDao<WebsiteUserOrderDown> {
-	
+
+    ResearchBriefReport findReport(String websiteUserOrderId);
 }

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

@@ -29,6 +29,8 @@ public class WebsiteUserOrderDown extends DataEntity<WebsiteUserOrderDown> {
 	private String fileName;		// 文件名
 	private Integer downNum;		// 下载次数
 
+	private ResearchBriefReport report;
+
 	public WebsiteUserOrderDown() {
 		this(null);
 	}
@@ -71,5 +73,12 @@ public class WebsiteUserOrderDown extends DataEntity<WebsiteUserOrderDown> {
 	public void setDownNum(Integer downNum) {
 		this.downNum = downNum;
 	}
-	
+
+	public ResearchBriefReport getReport() {
+		return report;
+	}
+
+	public void setReport(ResearchBriefReport report) {
+		this.report = report;
+	}
 }

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

@@ -8,6 +8,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 网站订单文件下载信息Service
@@ -24,7 +25,9 @@ public class WebsiteUserOrderDownService extends CrudService<WebsiteUserOrderDow
 	 */
 	@Override
 	public Page<WebsiteUserOrderDown> findPage(WebsiteUserOrderDown websiteUserOrderDown) {
-		return super.findPage(websiteUserOrderDown);
+		Page<WebsiteUserOrderDown> page = super.findPage(websiteUserOrderDown);
+		page.setList(page.getList().stream().map(w -> convert(w)).collect(Collectors.toList()));
+		return page;
 	}
 	
 	/**
@@ -36,6 +39,11 @@ public class WebsiteUserOrderDownService extends CrudService<WebsiteUserOrderDow
 	public List<WebsiteUserOrderDown> findList(WebsiteUserOrderDown websiteUserOrderDown) {
 		return super.findList(websiteUserOrderDown);
 	}
+
+	private WebsiteUserOrderDown convert(WebsiteUserOrderDown websiteUserOrderDown) {
+		websiteUserOrderDown.setReport(dao.findReport(websiteUserOrderDown.getWebsiteUserOrderId()));
+		return websiteUserOrderDown;
+	}
 	
 	/**
 	 * 保存数据（插入或更新）

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

@@ -11,5 +11,10 @@
 		</where>
 		ORDER BY ${sqlMap.order.toSql()}
 	</select> -->
-	
+
+    <select id="findReport" resultType="com.jeesite.modules.report.entity.ResearchBriefReport">
+        select rbr.* from website_user_order wo
+              INNER JOIN research_brief_report rbr on rbr.id = wo.research_brief_report_id
+        where wo.status = '0' and wo.id = #{websiteUserOrderId}
+    </select>
 </mapper>