Merge branch 'master' of dq/kmall-pt into master

kmall-admin/src/main/java/com/kmall/admin/controller/CategoryController.java

@@ -147,4 +147,18 @@ public class CategoryController {
 
         return R.ok().put("list", list);
     }
+
+    @RequestMapping("/query")
+    public R query(@RequestParam Map<String, Object> params) {
+        params.put("isShow", 1);
+        List<CategoryEntity> list = categoryService.queryList(params);
+        //添加顶级菜单
+        CategoryEntity root = new CategoryEntity();
+        root.setId(0);
+        root.setName("一级分类");
+        root.setParentId(-1);
+        root.setOpen(true);
+        list.add(root);
+        return R.ok().put("list", list);
+    }
 }

kmall-admin/src/main/java/com/kmall/admin/service/impl/CategoryServiceImpl.java

@@ -3,6 +3,7 @@ package com.kmall.admin.service.impl;
 import com.kmall.admin.dao.CategoryDao;
 import com.kmall.admin.entity.CategoryEntity;
 import com.kmall.admin.service.CategoryService;
+import com.kmall.api.contants.Dict;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -38,6 +39,9 @@ public class CategoryServiceImpl implements CategoryService {
 
     @Override
     public int save(CategoryEntity category) {
+        if (Dict.Level.item_L1.getItem().equals(category.getLevel())) {
+            category.setParentId(0);
+        }
         return categoryDao.save(category);
     }
 

kmall-admin/src/main/resources/mybatis/mapper/CategoryDao.xml

@@ -69,6 +69,9 @@
 		<if test="parentId != null and parentId != ''">
 			AND `parent_id` = #{parentId}
 		</if>
+		<if test="isShow != null and isShow != ''">
+			AND `is_show` = #{isShow}
+		</if>
         <choose>
             <when test="sidx != null and sidx.trim() != ''">
                 order by ${sidx} ${order}

kmall-admin/src/main/resources/spring/spring-context.xml

@@ -28,7 +28,9 @@
                 <value>classpath:conf/servlet.properties</value>
                 <value>classpath:conf/wx-mp.properties</value>
                 <value>classpath:conf/oms-merch.properties</value>
+                <value>classpath:conf/print-ticket.properties</value>
                 <value>classpath:conf/common.properties</value>
+                <value>classpath:conf/fastdfs.properties</value>
             </list>
         </property>
         <property name="fileEncoding" value="UTF-8"/>

kmall-admin/src/main/resources/spring/spring-main.xml

@@ -20,6 +20,7 @@
     <import resource="spring-wx-pay.xml"/>
     <import resource="spring-jdbc.xml"/>
     <import resource="spring-oms-merch.xml"/>
+    <import resource="spring-print-ticket.xml"/>
     <import resource="spring-common.xml"/>
 
 </beans>

kmall-admin/src/main/resources/spring/spring-print-ticket.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:context="http://www.springframework.org/schema/context"
+       xmlns:aop="http://www.springframework.org/schema/aop"
+       xmlns:mvc="http://www.springframework.org/schema/mvc"
+       xsi:schemaLocation="
+        http://www.springframework.org/schema/beans 
+        http://www.springframework.org/schema/beans/spring-beans-4.2.xsd
+        http://www.springframework.org/schema/context
+        http://www.springframework.org/schema/context/spring-context-4.2.xsd
+     	http://www.springframework.org/schema/aop
+     	http://www.springframework.org/schema/aop/spring-aop-4.2.xsd
+		http://www.springframework.org/schema/mvc
+     	http://www.springframework.org/schema/mvc/spring-mvc-4.2.xsd">
+
+
+    <bean id="printTicketProperties" class="com.kmall.common.service.print.ticket.PrintTicketProperties">
+        <property name="address" value="${ticket.address}"/>
+        <property name="summary" value="${ticket.summary}"/>
+        <property name="serviceTel" value="${ticket.serviceTel}"/>
+        <property name="url1" value="${ticket.url1}"/>
+        <property name="url2" value="${ticket.url2}"/>
+        <property name="url3" value="${ticket.url3}"/>
+    </bean>
+</beans>

kmall-api/src/main/java/com/kmall/api/contants/Dict.java

@@ -509,4 +509,36 @@ public class Dict {
             this.itemName = itemName;
         }
     }
+
+    /**
+     *  商品分类级别 L1:一级分类 L2：二级分类
+     */
+    public enum Level {
+        item_L1("L1", "一级分类"),
+        item_L2("L2", "二级分类");
+
+        private String item;
+        private String itemName;
+
+        Level(String item, String itemName) {
+            this.item = item;
+            this.itemName = itemName;
+        }
+
+        public String getItem() {
+            return item;
+        }
+
+        public void setItem(String item) {
+            this.item = item;
+        }
+
+        public String getItemName() {
+            return itemName;
+        }
+
+        public void setItemName(String itemName) {
+            this.itemName = itemName;
+        }
+    }
 }

kmall-framework/src/main/webapp/WEB-INF/web.xml

@@ -14,6 +14,7 @@
             classpath:spring/spring-wx-pay.xml,
             classpath:spring/spring-jdbc.xml,
             classpath:spring/spring-oms-merch.xml,
+            classpath:spring/spring-print-ticket.xml,
             classpath:spring/spring-common.xml,
             classpath*:kmall-*.xml
         </param-value>