主页模块调试 以及部分代码修改

.idea/webContexts.xml

@@ -6,6 +6,8 @@
         <entry key="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/template/my/help/ship.jsp" value="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/template/my/help" />
         <entry key="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/template/my/index/index-new.jsp" value="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/template/my/index" />
         <entry key="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/template/my/index/index.jsp" value="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/template/my/index" />
+        <entry key="file://$PROJECT_DIR$/src/main/webapp/root/index_template.jsp" value="file://$PROJECT_DIR$/src/main/webapp/root" />
+        <entry key="file://$PROJECT_DIR$/src/main/webapp/root/my/index_template.jsp" value="file://$PROJECT_DIR$/src/main/webapp/root/my" />
       </map>
     </option>
   </component>

pom.xml

@@ -437,6 +437,12 @@
             <artifactId>spring-boot-starter-data-jpa</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.sitemesh</groupId>
+            <artifactId>sitemesh</artifactId>
+            <version>3.0.1</version>
+        </dependency>
+
     </dependencies>
 
     <build>

src/main/java/me/mofun/config/MySiteMeshFilter.java

@@ -0,0 +1,27 @@
+package me.mofun.config;
+
+import org.sitemesh.builder.SiteMeshFilterBuilder;
+import org.sitemesh.config.ConfigurableSiteMeshFilter;
+import org.springframework.stereotype.Component;
+
+@Component
+public class MySiteMeshFilter extends ConfigurableSiteMeshFilter {
+
+    @Override
+    protected void applyCustomConfiguration(SiteMeshFilterBuilder builder) {
+
+        // 添加排除规则
+        builder.addExcludedPath("*/productTypeMenuList.jsp");
+        builder.addExcludedPath("/menuList/productTypeMenuList.jsp");
+        builder.addExcludedPath("/WEB-INF/template/my/list/menuList/productTypeMenuList.jsp");
+        builder.addExcludedPath("/WEB-INF/template/my/list/menuList/productTypeMenuListResult.jsp");
+        builder.addExcludedPath("/editor/*");
+
+        // 添加装饰器映射
+        builder.addDecoratorPath("*/WEB-INF/template/*", "/my/template_footer.jsp")
+                .addDecoratorPath("*/WEB-INF/template/**", "/root/index_template.jsp")
+                .addDecoratorPath("*/WEB-INF/admin/*", "/admin_main.jsp")
+                .addDecoratorPath("*/WEB-INF/admin/*", "/admin_template.jsp")
+                .addDecoratorPath("*/WEB-INF/template/my/products/serviceLogic/*", "/serviceLogic_template.jsp");
+    }
+}

src/main/java/me/mofun/controller/IndexController.java

@@ -110,9 +110,9 @@ public class IndexController {
         initRecommendProduct(mav);
         initNewsList(mav);
         initIndexImgList(mav);
-//        initUpcomingProducts(mav);
+        initUpcomingProducts(mav);
         
-        mav.setViewName("/WEB-INF/template/my/index/index-new");
+        mav.setViewName("/WEB-INF/template/my/index/index");
         return mav;
     }
 

src/main/java/me/mofun/util/ProductTypeMenuList.java

@@ -12,14 +12,20 @@ import java.util.List;
 @Component
 public class ProductTypeMenuList {
 
-	@Autowired
-    IProducttypeService productTypeService;
-
-//    // 直接通过 Bean 调用，无需静态
-//    public List<MenuNode> getTypeSubList() {
-//        return productTypeService.getAllProductTypeTree();
-//    }
-//
+    @Autowired
+    private IProducttypeService productTypeService;
+
+    private static IProducttypeService theProductTypeService;
+
+    @PostConstruct
+    public void init() {
+        theProductTypeService = this.productTypeService;
+    }
+
+    // 直接通过 Bean 调用，无需静态
+    public static List<MenuNode> getTypeSubList() {
+        return theProductTypeService.getAllProductTypeTree();
+    }
 
 
 }

src/main/resources/mapper/SpellbuyproductMapper.xml

@@ -123,10 +123,51 @@
         <association property="user" resultMap="UserResultMap" />
     </resultMap>
 
+
+
+
     <!-- 用户、拍购商品和记录联合映射 -->
     <resultMap id="ProductSpellbuyproductDTOMap" type="me.mofun.entity.dto.ProductSpellbuyproductDTO">
-        <association property="spellbuyproduct" resultMap="BaseResultMap" />
-        <association property="product" resultMap="ProductResultMap" />
+        <association property="product" javaType="me.mofun.entity.Product">
+            <id property="productId" column="pt_productId" />
+            <result property="productName" column="pt_productName" />
+            <result property="productPrice" column="pt_productPrice" />
+            <result property="marketPrice" column="pt_marketPrice" />
+            <result property="singlePrice" column="pt_singlePrice" />
+            <result property="productLimit" column="pt_productLimit" />
+            <result property="productRealPrice" column="pt_productRealPrice" />
+            <result property="productTitle" column="pt_productTitle" />
+            <result property="productDetail" column="pt_productDetail" />
+            <result property="productType" column="pt_productType" />
+            <result property="productBrand" column="pt_productBrand" />
+            <result property="headImage" column="pt_headImage" />
+            <result property="status" column="pt_status" />
+            <result property="isShow" column="pt_isShow" />
+            <result property="isVirtual" column="pt_isVirtual" />
+            <result property="isNeedLogic" column="pt_isNeedLogic" />
+            <result property="logicURL" column="pt_logicURL" />
+            <result property="shopId" column="pt_shopId" />
+            <result property="authorId" column="pt_authorId" />
+            <result property="style" column="pt_style" />
+            <result property="attribute71" column="pt_attribute71" />
+        </association>
+        <association property="spellbuyproduct" javaType="me.mofun.entity.Spellbuyproduct">
+            <id property="spellbuyProductId" column="st_spellbuyProductId" />
+            <result property="fkProductId" column="st_fkProductId" />
+            <result property="spellbuyStartDate" column="st_spellbuyStartDate" />
+            <result property="spellbuyEndDate" column="st_spellbuyEndDate" />
+            <result property="spellbuyCount" column="st_spellbuyCount" />
+            <result property="spellbuyPrice" column="st_spellbuyPrice" />
+            <result property="marketPrice" column="st_marketPrice" />
+            <result property="actionName" column="st_actionName" />
+            <result property="spSinglePrice" column="st_spSinglePrice" />
+            <result property="productPeriod" column="st_productPeriod" />
+            <result property="spellbuyLimit" column="st_spellbuyLimit" />
+            <result property="spStatus" column="st_spStatus" />
+            <result property="spellbuyType" column="st_spellbuyType" />
+            <result property="attribute64" column="st_attribute64" />
+            <result property="attribute65" column="st_attribute65" />
+        </association>
     </resultMap>