微信移动端支付

.idea/workspace.xml

@@ -30,9 +30,14 @@
   <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$/common/src/main/java/com/jeesite/common/constant/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/jeesite/common/constant/Constants.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/modules/report/src/main/java/com/jeesite/modules/report/entity/ResearchReport.java" beforeDir="false" afterPath="$PROJECT_DIR$/modules/report/src/main/java/com/jeesite/modules/report/entity/ResearchReport.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/modules/report/src/main/java/com/jeesite/modules/report/service/ResearchReportService.java" beforeDir="false" afterPath="$PROJECT_DIR$/modules/report/src/main/java/com/jeesite/modules/report/service/ResearchReportService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/modules/bjflapi/src/main/java/com/jeesite/modules/bjflapi/report/ResearchBriefReportControllerApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/modules/bjflapi/src/main/java/com/jeesite/modules/bjflapi/report/ResearchBriefReportControllerApi.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/modules/bjflapi/src/main/java/com/jeesite/modules/bjflapi/report/WebsiteUserOrderControllerApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/modules/bjflapi/src/main/java/com/jeesite/modules/bjflapi/report/WebsiteUserOrderControllerApi.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/entity/ResearchBriefReportLabel.java" beforeDir="false" afterPath="$PROJECT_DIR$/modules/report/src/main/java/com/jeesite/modules/report/entity/ResearchBriefReportLabel.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/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/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/ResearchBriefReportLabelDao.xml" beforeDir="false" afterPath="$PROJECT_DIR$/modules/report/src/main/resources/mappings/modules/report/ResearchBriefReportLabelDao.xml" 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" />
@@ -467,14 +472,7 @@
       <workItem from="1735970895886" duration="8433000" />
       <workItem from="1736126123480" duration="510000" />
       <workItem from="1736127959643" duration="53060000" />
-      <workItem from="1736385778472" duration="45750000" />
-    </task>
-    <task id="LOCAL-00042" summary="报告支付">
-      <created>1735112174030</created>
-      <option name="number" value="00042" />
-      <option name="presentableId" value="LOCAL-00042" />
-      <option name="project" value="LOCAL" />
-      <updated>1735112174030</updated>
+      <workItem from="1736385778472" duration="54586000" />
     </task>
     <task id="LOCAL-00043" summary="简报功能修改">
       <created>1735118500869</created>
@@ -812,7 +810,14 @@
       <option name="project" value="LOCAL" />
       <updated>1736502405347</updated>
     </task>
-    <option name="localTasksCounter" value="91" />
+    <task id="LOCAL-00091" summary="微信移动端支付">
+      <created>1736758338842</created>
+      <option name="number" value="00091" />
+      <option name="presentableId" value="LOCAL-00091" />
+      <option name="project" value="LOCAL" />
+      <updated>1736758338842</updated>
+    </task>
+    <option name="localTasksCounter" value="92" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -960,17 +965,17 @@
       <breakpoints>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/modules/report/src/main/java/com/jeesite/modules/report/service/ResearchReportService.java</url>
-          <line>735</line>
+          <line>729</line>
           <option name="timeStamp" value="28" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/modules/report/src/main/java/com/jeesite/modules/report/service/ResearchReportService.java</url>
-          <line>736</line>
+          <line>730</line>
           <option name="timeStamp" value="30" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/modules/report/src/main/java/com/jeesite/modules/report/service/ResearchReportService.java</url>
-          <line>741</line>
+          <line>735</line>
           <option name="timeStamp" value="31" />
         </line-breakpoint>
       </breakpoints>

modules/bjflapi/src/main/java/com/jeesite/modules/bjflapi/report/ResearchBriefReportControllerApi.java

@@ -58,7 +58,7 @@ public class ResearchBriefReportControllerApi {
     @ApiOperation(value = "简报智库", notes = "简报智库类别")
     public R<List<ResearchBriefReportLabel>> categoryList(ResearchBriefReportLabel label) {
         // 分类
-        return R.ok(researchBriefReportService.marketTypeList(label.getParentId()));
+        return R.ok(researchBriefReportService.marketTypeList(label.getParentId(), label.getMarketType()));
     }
 
     /**
@@ -68,9 +68,9 @@ public class ResearchBriefReportControllerApi {
      */
     @PostMapping(value = "/categoryPage")
     @ApiOperation(value = "简报智库", notes = "简报智库类别")
-    public R<List<ResearchBriefReportLabel>> categoryPage() {
+    public R<List<ResearchBriefReportLabel>> categoryPage(ResearchBriefReportLabel label) {
         // 分类
-        return R.ok(researchBriefReportService.categoryPage());
+        return R.ok(researchBriefReportService.categoryPage(label.getMarketType()));
     }
 
     /**

modules/bjflapi/src/main/java/com/jeesite/modules/bjflapi/report/WebsiteUserOrderControllerApi.java

@@ -202,4 +202,9 @@ public class WebsiteUserOrderControllerApi extends AbstractController {
     public void refundOrder(WebsiteUserOrder websiteUserOrder) throws AlipayApiException {
         websiteUserOrderService.refundOrder(websiteUserOrder);
     }
+
+    @PostMapping(value = "cancelOrder")
+    public R<String> cancelOrder(WebsiteUserOrder websiteUserOrder) throws AlipayApiException {
+        return websiteUserOrderService.cancelOrder(websiteUserOrder);
+    }
 }

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

@@ -10,11 +10,13 @@ public class ResearchReportDto implements Serializable {
         @ExcelField(title = "SUBJECT",attrName = "marketType",align = ExcelField.Align.AUTO,dictType = "reports_category_en",sort = 20),
         @ExcelField(title = "ABSTRACT",attrName = "reportScopeHtml",align = ExcelField.Align.AUTO,sort = 30),
         @ExcelField(title = "TABLE OF CONTENTS",attrName = "directoryHtml",align = ExcelField.Align.AUTO,sort = 40),
+        @ExcelField(title = "GENERALIZATION",attrName = "generalization",align = ExcelField.Align.AUTO,sort = 40),
     })
     private String title;		// 标题
     private String marketType;		// 所属分类
     private String reportScopeHtml;		// 研究范围
     private String directoryHtml;		// 目录
+    private String generalization; //市场概括
 
     public String getTitle() {
         return title;
@@ -48,5 +50,11 @@ public class ResearchReportDto implements Serializable {
         this.directoryHtml = directoryHtml;
     }
 
+    public String getGeneralization() {
+        return generalization;
+    }
 
+    public void setGeneralization(String generalization) {
+        this.generalization = generalization;
+    }
 }

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

@@ -36,6 +36,7 @@ public class ResearchBriefReportLabel extends DataEntity<ResearchBriefReportLabe
 
 	//1-查存在简报的标签
 	private Integer existReport;
+	private String marketType;		// 所属分类
 
 	public ResearchBriefReportLabel() {
 		this(null);
@@ -110,4 +111,12 @@ public class ResearchBriefReportLabel extends DataEntity<ResearchBriefReportLabe
 	public void setExistReport(Integer existReport) {
 		this.existReport = existReport;
 	}
+
+	public String getMarketType() {
+		return marketType;
+	}
+
+	public void setMarketType(String marketType) {
+		this.marketType = marketType;
+	}
 }

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

@@ -154,13 +154,14 @@ public class ResearchBriefReportService extends CrudService<ResearchBriefReportD
 		researchBriefReportLabelRelevancyDao.deleteResearchBriefReportId(researchBriefReport.getId());
 	}
 
-	public List<ResearchBriefReportLabel> marketTypeList(String parentId) {
+	public List<ResearchBriefReportLabel> marketTypeList(String parentId, String marketType) {
 		if (StringUtils.isEmpty(parentId)) {
 			parentId = "0";
 		}
 		ResearchBriefReportLabel where = new ResearchBriefReportLabel();
 		where.setParentId(parentId);
 		where.setExistReport(1);
+		where.setMarketType(marketType);
 		return researchBriefReportLabelDao.findLabelByReport(where);
 	}
 
@@ -273,12 +274,13 @@ public class ResearchBriefReportService extends CrudService<ResearchBriefReportD
 		return convertImage(list);
 	}
 
-	public List<ResearchBriefReportLabel> categoryPage() {
+	public List<ResearchBriefReportLabel> categoryPage(String marketType) {
 		ResearchBriefReportLabel label = new ResearchBriefReportLabel();
 		label.setPageNo(1);
 		label.setPageSize(20);
 		label.setNotParentId("0");
 		label.setExistReport(1);
+		label.setMarketType(marketType);
 		return researchBriefReportLabelDao.findLabelByReport(label);
 	}
 }

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

@@ -382,4 +382,28 @@ public class WebsiteUserOrderService extends CrudService<WebsiteUserOrderDao, We
 			alipayUtil.refund(order);
 		}
 	}
+
+	public R<String> cancelOrder(WebsiteUserOrder websiteUserOrder) throws AlipayApiException {
+		if (websiteUserOrder.getId() == null) {
+			return R.fail("订单为空");
+		}
+		WebsiteUserOrder order = get(websiteUserOrder);
+		if (order == null) {
+			return R.fail("订单为空");
+		}
+		if (!order.getPayStatus().equals(Constants.orderPayStatus.WAIT)) {
+			return R.fail("订单不是未支付状态");
+		}
+		if (order.getPayMethod().equals(Constants.orderPayMethod.WX)) {
+			wxPayService.payClose(order.getOrderNumber());
+		} else if (order.getPayMethod().equals(Constants.orderPayMethod.WX_H5)) {
+			wxPayH5Service.payClose(order.getOrderNumber());
+		} else {
+			alipayUtil.payClose(order.getOrderNumber());
+		}
+		//支付宝订单关闭成功
+		order.setPayStatus(Constants.orderPayStatus.PAY_ERROR);
+		super.update(order);
+		return R.ok();
+	}
 }

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

@@ -4,6 +4,7 @@ import com.jeesite.common.collect.ListUtils;
 import com.jeesite.common.config.Global;
 import com.jeesite.common.entity.Page;
 import com.jeesite.common.lang.DateUtils;
+import com.jeesite.common.lang.StringUtils;
 import com.jeesite.common.text.Html2PlainTxtUtils;
 import com.jeesite.common.utils.excel.ExcelExport;
 import com.jeesite.common.web.BaseController;
@@ -218,7 +219,10 @@ public class ResearchReportController extends BaseController {
 			sb.append(Html2PlainTxtUtils.convert(vo.getDirectoryHtml()));		//正文目录
 			sb.append("\r");
 			sb.append(Html2PlainTxtUtils.convert(vo.getChartsHtml()));		//图表目录
-
+			if (StringUtils.isNotEmpty(vo.getGeneralization())) {
+				sb.append("\r");
+				sb.append(Html2PlainTxtUtils.convert(vo.getGeneralization()));
+			}
 			response.setCharacterEncoding("utf-8");
 			response.setContentType("text/plain");
 			response.addHeader("Content-Disposition","attachment;filename="+new String(vo.getTitle().getBytes("gb2312"),"ISO8859-1")+".txt");
@@ -281,6 +285,7 @@ public class ResearchReportController extends BaseController {
 			listExcel = list.stream().map(vo -> {
 				vo.setReportScopeHtml(Html2PlainTxtUtils.convert(vo.getReportScopeHtml()));
 				vo.setDirectoryHtml(Html2PlainTxtUtils.convert(vo.getDirectoryHtml()));
+				vo.setGeneralization(Html2PlainTxtUtils.convert(vo.getGeneralization()));
 				return vo;
 			}).collect(Collectors.toList());
 		}
@@ -317,7 +322,10 @@ public class ResearchReportController extends BaseController {
 				sb.append(Html2PlainTxtUtils.convert(vo.getDirectoryHtml()));		//正文目录
 				sb.append("\r");
 				sb.append(Html2PlainTxtUtils.convert(vo.getChartsHtml()));		//图表目录
-
+				if (StringUtils.isNotEmpty(vo.getGeneralization())) {
+					sb.append("\r");
+					sb.append(Html2PlainTxtUtils.convert(vo.getGeneralization()));
+				}
 				/*File file = new File(basePath + TEMP_PATH + File.separator + vo.getTitle() + ".txt");
 				if(!file.exists()){
 					if(!file.getParentFile().isDirectory()) {

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

@@ -54,7 +54,12 @@
             AND (EXISTS (
             SELECT 1
             FROM research_brief_report_label_relevancy lr
-            WHERE lr.parent_lable_id = a.id or lr.lable_id = a.id))
+            inner join research_brief_report rbr on rbr.id = lr.research_brief_report_id
+            WHERE lr.parent_lable_id = a.id or lr.lable_id = a.id
+            <if test="info.marketType != null and info.marketType != ''">
+                and rbr.market_type = #{info.marketType}
+            </if>
+            ))
         </if>
     </sql>
 

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
+		select title,report_scope_html,market_type,directory_html,generalization
 		from research_report_view where report_id in
 		<foreach collection="ids.split(',')" item="id" separator="," open="(" close=")">
 			#{id}