个人中心

.idea/workspace.xml

@@ -28,11 +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="wx sdk">
       <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/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/entity/WebsiteUserOrder.java" beforeDir="false" afterPath="$PROJECT_DIR$/modules/report/src/main/java/com/jeesite/modules/report/entity/WebsiteUserOrder.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" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -94,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$/../../yicangzongtai/shopapi" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../../yicangzongtai/api" />
     <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" />
@@ -456,7 +457,8 @@
       <workItem from="1734268366747" duration="59000" />
       <workItem from="1734579234738" duration="258000" />
       <workItem from="1734579502121" duration="1272000" />
-      <workItem from="1734658594781" duration="126054000" />
+      <workItem from="1734658594781" duration="126472000" />
+      <workItem from="1735184825354" duration="2599000" />
     </task>
     <task id="LOCAL-00001" summary="1">
       <created>1676368709673</created>
@@ -766,7 +768,21 @@
       <option name="project" value="LOCAL" />
       <updated>1735180352258</updated>
     </task>
-    <option name="localTasksCounter" value="45" />
+    <task id="LOCAL-00045" summary="wx sdk">
+      <created>1735184653308</created>
+      <option name="number" value="00045" />
+      <option name="presentableId" value="LOCAL-00045" />
+      <option name="project" value="LOCAL" />
+      <updated>1735184653308</updated>
+    </task>
+    <task id="LOCAL-00046" summary="wx sdk">
+      <created>1735184664592</created>
+      <option name="number" value="00046" />
+      <option name="presentableId" value="LOCAL-00046" />
+      <option name="project" value="LOCAL" />
+      <updated>1735184664592</updated>
+    </task>
+    <option name="localTasksCounter" value="47" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -821,7 +837,6 @@
     </option>
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="添加销量单位，价格单位" />
     <MESSAGE value="更新报告附件" />
     <MESSAGE value="更新模板配置" />
     <MESSAGE value="调查报告功能更新" />
@@ -846,16 +861,12 @@
     <MESSAGE value="报告下载" />
     <MESSAGE value="报告支付" />
     <MESSAGE value="简报功能修改" />
-    <option name="LAST_COMMIT_MESSAGE" value="简报功能修改" />
+    <MESSAGE value="wx sdk" />
+    <option name="LAST_COMMIT_MESSAGE" value="wx sdk" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
       <breakpoints>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/modules/core/src/main/java/com/jeesite/common/shiro/filter/FormFilter.java</url>
-          <line>178</line>
-          <option name="timeStamp" value="24" />
-        </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/modules/report/src/main/java/com/jeesite/modules/report/service/WebsiteUserOrderService.java</url>
           <line>204</line>

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

@@ -21,6 +21,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -230,4 +231,14 @@ public class WebsiteUserControllerApi extends AbstractController {
         redisUtil.del(Constants.PREFIX_USER_TOKEN + token);
         return "退出登录成功！";
     }
+
+    /**
+     * 个人信息
+     */
+    @WebsiteAuth
+    @GetMapping(value = "getUserInfo")
+    public WebsiteUser getUserInfo() throws Exception {
+        String userId = getUserIdByRequest();
+        return websiteUserService.get(userId);
+    }
 }

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

@@ -1,6 +1,7 @@
 package com.jeesite.modules.bjflapi.report;
 
 import com.jeesite.common.constant.Constants;
+import com.jeesite.common.entity.Page;
 import com.jeesite.common.lang.StringUtils;
 import com.jeesite.modules.bjflapi.AbstractController;
 import com.jeesite.modules.report.entity.ResearchBriefReport;
@@ -14,10 +15,7 @@ import com.jeesite.modules.sys.utils.R;
 import com.jeesite.modules.sys.utils.RedisUtil;
 import io.swagger.annotations.Api;
 import org.apache.commons.collections4.CollectionUtils;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -38,6 +36,28 @@ public class WebsiteUserOrderControllerApi extends AbstractController {
     @Resource
     private RedisUtil redisUtil;
 
+    /**
+     * 我的订单
+     */
+    @WebsiteAuth
+    @PostMapping(value = "orderList")
+    public Page<WebsiteUserOrder> orderList(WebsiteUserOrder websiteUserOrder) throws Exception {
+        String userId = getUserIdByRequest();
+        websiteUserOrder.setWebsiteUserId(userId);
+        return websiteUserOrderService.findPage(websiteUserOrder);
+    }
+
+    /**
+     * 我的下载
+     */
+    @WebsiteAuth
+    @PostMapping(value = "downList")
+    public Page<WebsiteUserOrderDown> downList(WebsiteUserOrderDown websiteUserOrderDown) throws Exception {
+        String userId = getUserIdByRequest();
+        websiteUserOrderDown.setWebsiteUserId(userId);
+        return websiteUserOrderDownService.findPage(websiteUserOrderDown);
+    }
+
     @PostMapping(value = "downFile")
     public Map<String, Object> downFile(HttpServletRequest request, WebsiteUserOrder websiteUserOrder) {
         String reportId = websiteUserOrder.getResearchBriefReportId();

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

@@ -40,9 +40,10 @@ public class WebsiteUserOrder extends DataEntity<WebsiteUserOrder> {
 	private String researchBriefReportId;		// 简报智库id
 	private String useDown;		// 是否下载过 0否 1是
 	private Integer downNum;		// 下载次数
-	private String researchBriefReportTitle;		// 简报智库标题
 	private String fileType;
 
+	private String researchBriefReportTitle;
+
 	public WebsiteUserOrder() {
 		this(null);
 	}
@@ -131,6 +132,14 @@ public class WebsiteUserOrder extends DataEntity<WebsiteUserOrder> {
 		this.downNum = downNum;
 	}
 
+	public String getFileType() {
+		return fileType;
+	}
+
+	public void setFileType(String fileType) {
+		this.fileType = fileType;
+	}
+
 	public String getResearchBriefReportTitle() {
 		return researchBriefReportTitle;
 	}
@@ -139,11 +148,4 @@ public class WebsiteUserOrder extends DataEntity<WebsiteUserOrder> {
 		this.researchBriefReportTitle = researchBriefReportTitle;
 	}
 
-	public String getFileType() {
-		return fileType;
-	}
-
-	public void setFileType(String fileType) {
-		this.fileType = fileType;
-	}
 }

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

@@ -200,7 +200,7 @@ public class WebsiteUserOrderService extends CrudService<WebsiteUserOrderDao, We
 	}
 
 	//定时任务会调用此方法
-	@Scheduled(cron ="0 0/5 * * * ?")
+//	@Scheduled(cron ="0 0/5 * * * ?")
 	public void zfbPayQuery() {
 		WebsiteUserOrder where = new WebsiteUserOrder();
 		where.setPayMethod(Constants.orderPayMethod.ZFB);