用户订单

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

@@ -18,4 +18,6 @@ public interface ResearchBriefReportDao extends CrudDao<ResearchBriefReport> {
     long findResearchBriefReportCount(@Param("rr") ResearchBriefReport researchBriefReport);
 
     List<ResearchBriefReport> findResearchBriefReportList(@Param("rr") ResearchBriefReport researchBriefReport);
+
+    long findAnyLableId(@Param("id") String id);
 }

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

@@ -17,8 +17,8 @@ import javax.validation.constraints.Size;
 		@Column(includeEntity=DataEntity.class),
 		@Column(name="name", attrName="name", label="名称", queryType=QueryType.LIKE),
 		@Column(name="parent_id", attrName="parentId", label="上级id 可以选择多个"),
-		@Column(name="level_num", attrName="levelNum", label="层次", isUpdateForce=true),
-		@Column(name="sort_num", attrName="sortNum", label="排序", isUpdateForce=true),
+		@Column(name="level_num", attrName="levelNum", label="层次"),
+		@Column(name="sort_num", attrName="sortNum", label="排序"),
 	}, orderBy="a.update_date DESC"
 )
 public class ResearchBriefReportLabel extends DataEntity<ResearchBriefReportLabel> {

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

@@ -21,13 +21,13 @@ import java.util.Date;
 		@Column(includeEntity=DataEntity.class),
 		@Column(name="order_number", attrName="orderNumber", label="订单号"),
 		@Column(name="website_user_id", attrName="websiteUserId", label="网站用户id"),
-		@Column(name="pay_date", attrName="payDate", label="支付日期", isUpdateForce=true),
+		@Column(name="pay_date", attrName="payDate", label="支付日期"),
 		@Column(name="pay_status", attrName="payStatus", label="状态 0-待支付 1-支付成功 2-支付失败"),
 		@Column(name="pay_method", attrName="payMethod", label="支付方式 1-微信 2-支付宝"),
-		@Column(name="pay_price", attrName="payPrice", label="支付单价", isUpdateForce=true),
+		@Column(name="pay_price", attrName="payPrice", label="支付单价"),
 		@Column(name="research_brief_report_id", attrName="researchBriefReportId", label="简报智库id"),
 		@Column(name="use_down", attrName="useDown", label="是否下载过 0否 1是"),
-		@Column(name="down_num", attrName="downNum", label="下载次数", isUpdateForce=true),
+		@Column(name="down_num", attrName="downNum", label="下载次数"),
 	}, orderBy="a.update_date DESC"
 )
 public class WebsiteUserOrder extends DataEntity<WebsiteUserOrder> {
@@ -42,6 +42,7 @@ public class WebsiteUserOrder extends DataEntity<WebsiteUserOrder> {
 	private String researchBriefReportId;		// 简报智库id
 	private String useDown;		// 是否下载过 0否 1是
 	private Integer downNum;		// 下载次数
+	private String researchBriefReportTitle;		// 简报智库标题
 
 	public WebsiteUserOrder() {
 		this(null);
@@ -131,5 +132,12 @@ public class WebsiteUserOrder extends DataEntity<WebsiteUserOrder> {
 	public void setDownNum(Integer downNum) {
 		this.downNum = downNum;
 	}
-	
+
+	public String getResearchBriefReportTitle() {
+		return researchBriefReportTitle;
+	}
+
+	public void setResearchBriefReportTitle(String researchBriefReportTitle) {
+		this.researchBriefReportTitle = researchBriefReportTitle;
+	}
 }

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

@@ -94,4 +94,8 @@ public class ResearchBriefReportLabelService extends CrudService<ResearchBriefRe
 	public List<ResearchBriefReportLabel> findNameAndLevel(ResearchBriefReportLabel researchBriefReportLabel) {
 		return dao.findNameAndLevel(researchBriefReportLabel);
 	}
+
+	public long findCountNew(ResearchBriefReportLabel researchBriefReportLabel) {
+		return dao.findPageCount(researchBriefReportLabel);
+	}
 }

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

@@ -96,5 +96,8 @@ public class ResearchBriefReportService extends CrudService<ResearchBriefReportD
 	public void delete(ResearchBriefReport researchBriefReport) {
 		super.delete(researchBriefReport);
 	}
-	
+
+	public long findAnyLableId(String id) {
+		return dao.findAnyLableId(id);
+	}
 }

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

@@ -1,13 +1,18 @@
 package com.jeesite.modules.report.service;
 
-import java.util.List;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
 import com.jeesite.common.entity.Page;
+import com.jeesite.common.lang.StringUtils;
 import com.jeesite.common.service.CrudService;
-import com.jeesite.modules.report.entity.WebsiteUserOrder;
+import com.jeesite.modules.report.dao.ResearchBriefReportDao;
 import com.jeesite.modules.report.dao.WebsiteUserOrderDao;
+import com.jeesite.modules.report.entity.ResearchBriefReport;
+import com.jeesite.modules.report.entity.WebsiteUserOrder;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 简报智库订单Service
@@ -16,7 +21,8 @@ import com.jeesite.modules.report.dao.WebsiteUserOrderDao;
  */
 @Service
 public class WebsiteUserOrderService extends CrudService<WebsiteUserOrderDao, WebsiteUserOrder> {
-	
+	@Resource
+	private ResearchBriefReportDao researchBriefReportDao;
 	/**
 	 * 获取单条数据
 	 * @param websiteUserOrder
@@ -24,7 +30,7 @@ public class WebsiteUserOrderService extends CrudService<WebsiteUserOrderDao, We
 	 */
 	@Override
 	public WebsiteUserOrder get(WebsiteUserOrder websiteUserOrder) {
-		return super.get(websiteUserOrder);
+		return convert(super.get(websiteUserOrder));
 	}
 	
 	/**
@@ -35,9 +41,22 @@ public class WebsiteUserOrderService extends CrudService<WebsiteUserOrderDao, We
 	 */
 	@Override
 	public Page<WebsiteUserOrder> findPage(WebsiteUserOrder websiteUserOrder) {
-		return super.findPage(websiteUserOrder);
+		Page<WebsiteUserOrder> page = super.findPage(websiteUserOrder);
+		page.setList(page.getList().stream().map(w -> convert(w)).collect(Collectors.toList()));
+		return page;
 	}
-	
+
+	private WebsiteUserOrder convert(WebsiteUserOrder r) {
+		if (StringUtils.isEmpty(r.getResearchBriefReportId())) {
+			return r;
+		}
+		ResearchBriefReport where = new ResearchBriefReport();
+		where.setId(r.getResearchBriefReportId());
+		ResearchBriefReport byEntity = researchBriefReportDao.getByEntity(where);
+		r.setResearchBriefReportTitle(byEntity.getTitle());
+		return r;
+	}
+
 	/**
 	 * 查询列表数据
 	 * @param websiteUserOrder

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

@@ -6,8 +6,11 @@ import com.jeesite.common.lang.StringUtils;
 import com.jeesite.common.web.BaseController;
 import com.jeesite.modules.report.entity.ResearchBriefReport;
 import com.jeesite.modules.report.entity.ResearchBriefReportLabel;
+import com.jeesite.modules.report.entity.WebsiteUserOrder;
 import com.jeesite.modules.report.service.ResearchBriefReportLabelService;
 import com.jeesite.modules.report.service.ResearchBriefReportService;
+import com.jeesite.modules.report.service.WebsiteUserOrderService;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -20,6 +23,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * 简报智库Controller
@@ -34,6 +38,8 @@ public class ResearchBriefReportController extends BaseController {
 	private ResearchBriefReportService researchBriefReportService;
 	@Autowired
 	private ResearchBriefReportLabelService researchBriefReportLabelService;
+	@Autowired
+	private WebsiteUserOrderService websiteUserOrderService;
 	
 	/**
 	 * 获取数据
@@ -110,6 +116,16 @@ public class ResearchBriefReportController extends BaseController {
 	@RequestMapping(value = "delete")
 	@ResponseBody
 	public String delete(ResearchBriefReport researchBriefReport) {
+		String id = researchBriefReport.getId();
+		if (StringUtils.isEmpty(id)) {
+			return renderResult(Global.FALSE, text("简报主键为空，无法删除！"));
+		}
+		WebsiteUserOrder where = new WebsiteUserOrder();
+		where.setResearchBriefReportId(id);
+		List<WebsiteUserOrder> list = websiteUserOrderService.findList(where);
+		if (CollectionUtils.isNotEmpty(list)) {
+			return renderResult(Global.FALSE, text("简报下面还存在用户订单，无法删除！"));
+		}
 		researchBriefReportService.delete(researchBriefReport);
 		return renderResult(Global.TRUE, text("删除简报智库成功！"));
 	}

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

@@ -4,9 +4,11 @@ import com.jeesite.common.collect.ListUtils;
 import com.jeesite.common.collect.MapUtils;
 import com.jeesite.common.config.Global;
 import com.jeesite.common.entity.Page;
+import com.jeesite.common.lang.StringUtils;
 import com.jeesite.common.web.BaseController;
 import com.jeesite.modules.report.entity.ResearchBriefReportLabel;
 import com.jeesite.modules.report.service.ResearchBriefReportLabelService;
+import com.jeesite.modules.report.service.ResearchBriefReportService;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -34,6 +36,8 @@ public class ResearchBriefReportLabelController extends BaseController {
 
 	@Autowired
 	private ResearchBriefReportLabelService researchBriefReportLabelService;
+	@Autowired
+	private ResearchBriefReportService researchBriefReportService;
 	
 	/**
 	 * 获取数据
@@ -131,6 +135,22 @@ public class ResearchBriefReportLabelController extends BaseController {
 	@RequestMapping(value = "delete")
 	@ResponseBody
 	public String delete(ResearchBriefReportLabel researchBriefReportLabel) {
+		String id = researchBriefReportLabel.getId();
+		if (StringUtils.isEmpty(id)) {
+			return renderResult(Global.FALSE, text("简报分类主键为空，无法删除！"));
+		}
+		//有没有被引用
+		ResearchBriefReportLabel where = new ResearchBriefReportLabel();
+		where.setParentId(id);
+		long countNew = researchBriefReportLabelService.findCountNew(where);
+		if (countNew > 0) {
+			return renderResult(Global.FALSE, text("简报分类下面还存在分类，无法删除！"));
+		}
+		//有没有研究报告使用
+		countNew = researchBriefReportService.findAnyLableId(id);
+		if (countNew > 0) {
+			return renderResult(Global.FALSE, text("简报分类下面还存在简报智库，无法删除！"));
+		}
 		researchBriefReportLabelService.delete(researchBriefReportLabel);
 		return renderResult(Global.TRUE, text("删除简报分类成功！"));
 	}

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

@@ -53,7 +53,7 @@ public class WebsiteUserOrderController extends BaseController {
 	/**
 	 * 查询列表数据
 	 */
-	@RequiresPermissions("report:websiteUserOrder:view")
+//	@RequiresPermissions("report:websiteUserOrder:view")
 	@RequestMapping(value = "listData")
 	@ResponseBody
 	public Page<WebsiteUserOrder> listData(WebsiteUserOrder websiteUserOrder, HttpServletRequest request, HttpServletResponse response) {
@@ -65,33 +65,11 @@ public class WebsiteUserOrderController extends BaseController {
 	/**
 	 * 查看编辑表单
 	 */
-	@RequiresPermissions("report:websiteUserOrder:view")
+//	@RequiresPermissions("report:websiteUserOrder:view")
 	@RequestMapping(value = "form")
 	public String form(WebsiteUserOrder websiteUserOrder, Model model) {
 		model.addAttribute("websiteUserOrder", websiteUserOrder);
 		return "modules/report/websiteUserOrderForm";
 	}
 
-	/**
-	 * 保存数据
-	 */
-	@RequiresPermissions("report:websiteUserOrder:edit")
-	@PostMapping(value = "save")
-	@ResponseBody
-	public String save(@Validated WebsiteUserOrder websiteUserOrder) {
-		websiteUserOrderService.save(websiteUserOrder);
-		return renderResult(Global.TRUE, text("保存简报智库订单成功！"));
-	}
-	
-	/**
-	 * 删除数据
-	 */
-	@RequiresPermissions("report:websiteUserOrder:edit")
-	@RequestMapping(value = "delete")
-	@ResponseBody
-	public String delete(WebsiteUserOrder websiteUserOrder) {
-		websiteUserOrderService.delete(websiteUserOrder);
-		return renderResult(Global.TRUE, text("删除简报智库订单成功！"));
-	}
-	
 }

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

@@ -35,4 +35,8 @@
         order by update_date desc
         limit ${rr.pageSize * (rr.pageNo - 1)},${rr.pageSize}
     </select>
+
+    <select id="findAnyLableId" resultType="java.lang.Long">
+        select count(1) from research_brief_report where status = '0' and (top_label_id = #{id} or second_label_id = #{id})
+    </select>
 </mapper>