代码修复

.idea/compiler.xml

@@ -2,6 +2,7 @@
 <project version="4">
   <component name="CompilerConfiguration">
     <annotationProcessing>
+      <profile default="true" name="Default" enabled="true" />
       <profile name="Maven default annotation processors profile" enabled="true">
         <sourceOutputDir name="target/generated-sources/annotations" />
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
@@ -18,16 +19,16 @@
   </component>
   <component name="JavacSettings">
     <option name="ADDITIONAL_OPTIONS_OVERRIDE">
-      <module name="base-api" options="-parameters" />
+      <module name="base-api" options="" />
       <module name="base-core" options="-parameters" />
       <module name="base-tools" options="-parameters" />
       <module name="jeecg-system-cloud-api" options="-parameters" />
       <module name="jeecg-system-local-api" options="-parameters" />
-      <module name="module-base" options="-parameters" />
+      <module name="module-base" options="" />
       <module name="module-common" options="-parameters" />
       <module name="module-pay" options="-parameters" />
       <module name="module-system" options="-parameters" />
-      <module name="popularize-admin" options="-parameters" />
+      <module name="popularize-admin" options="" />
     </option>
   </component>
 </project>

.idea/encodings.xml

@@ -3,13 +3,10 @@
   <component name="Encoding">
     <file url="file://$PROJECT_DIR$/module-base/base-api/jeecg-system-cloud-api/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/module-base/base-api/jeecg-system-local-api/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/module-base/base-api/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/module-base/base-core/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/module-base/base-tools/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/module-base/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/module-common/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/module-pay/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/module-system/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
   </component>
 </project>

.idea/inspectionProfiles/Project_Default.xml

@@ -0,0 +1,6 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
+  </profile>
+</component>

.idea/popularize-admin.iml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4" />

module-base/base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java

@@ -90,7 +90,6 @@ public class ShiroConfig {
 
 
 
-
         filterChainDefinitionMap.put("/sys/oss/file/upload", "anon"); //图片上传验证放开
         filterChainDefinitionMap.put("/sys/common/upload", "anon"); //图片上传验证放开
         filterChainDefinitionMap.put("/sys/cas/client/validateLogin", "anon"); //cas验证登录

module-common/src/main/java/org/jeecg/api/controller/ApiOrderController.java

@@ -70,6 +70,14 @@ public class ApiOrderController {
     }
 
 
+    //收藏
+    @ApiOperation(value="收藏", notes="收藏")
+    @PostMapping(value = "/collect")
+    public Result<?> collect(@RequestHeader("X-Access-Token") String token, String id) {
+        return apiIndexService.collect(token,id);
+    }
+
+
 
 
 }

module-common/src/main/java/org/jeecg/api/controller/AppletMyInfoController.java

@@ -28,7 +28,7 @@ public class AppletMyInfoController {
     @ApiOperation(value="修改个人信息", notes="修改个人信息")
     public Result<?> updateInfo(@RequestHeader("X-Access-Token") String token,HanHaiMember member){
         HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
-
+        member.setId(hanHaiMember.getId());
     	hanHaiMemberService.updateById(member);
     	return Result.ok("修改成功");
     }

module-common/src/main/java/org/jeecg/api/service/ApiIndexService.java

@@ -56,6 +56,10 @@ public interface ApiIndexService {
     Result<?> invoice(String token, PopularizeInvoicing popularizeInvoicing);
 
 
+    //收藏
+    Result<?> collect(String token,String activityId);
+
+
 
     //获取招募列表数据带分页
     Result<?> getRecruitPageList(String title, PageBean pageBean);

module-common/src/main/java/org/jeecg/api/service/impl/ApiIndexServiceImpl.java

@@ -182,13 +182,12 @@ public class ApiIndexServiceImpl implements ApiIndexService {
 
     //获取订单列表数据带分页
     @Override
-    public Result<?> getOrderPageList(String token, PageBean pageBean){
-        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+    public Result<?> getOrderPageList(String token, PageBean pageBean){ HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
         Page<PopularizeOrder> page = new Page<PopularizeOrder>(pageBean.getPageNo(), pageBean.getPageSize());
         Page<PopularizeOrder> page1 = popularizeOrderService
                 .lambdaQuery()
                 .eq(PopularizeOrder::getUserId,hanHaiMember.getId())
-                .orderByDesc(PopularizeOrder::getCreateTime)
+//                .orderByDesc(PopularizeOrder::getCreateTime)
                 .page(page);
         return Result.OK(page1);
     }
@@ -260,6 +259,17 @@ public class ApiIndexServiceImpl implements ApiIndexService {
     }
 
 
+    //收藏
+    @Override
+    public Result<?> collect(String token,String activityId){
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        PopularizeCollect byId = popularizeCollectService.getById(activityId);
+        byId.setUserId(hanHaiMember.getId());
+        byId.setCreateTime(new Date());
+        popularizeCollectService.save(byId);
+        return Result.OK("收藏成功");
+    }
+
 
     //获取招募列表数据带分页
     @Override