yshop3.0-RC2版本

yshop-common/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>yshop</artifactId>
         <groupId>co.yixiang</groupId>
-        <version>3.0-alpha</version>
+        <version>3.0-RC2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -37,7 +37,7 @@
         <dependency>
             <groupId>co.yixiang</groupId>
             <artifactId>yshop-mproot</artifactId>
-            <version>3.0-alpha</version>
+            <version>3.0-RC2</version>
         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>

yshop-common/src/main/java/co/yixiang/constant/ShopConstants.java

@@ -161,5 +161,9 @@ public interface ShopConstants {
 
 	String YSHOP_EXPRESS_SERVICE = "yshop_express_service";
 
+	String YSHOP_REDIS_SYS_CITY_KEY = "yshop:city_list";
 
+	String YSHOP_REDIS_CITY_KEY = "yshop:city";
+
+	String YSHOP_APP_LOGIN_USER = "app-online-token";
 }

yshop-common/src/main/java/co/yixiang/enums/Brokerage.java

@@ -0,0 +1,20 @@
+package co.yixiang.enums;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @author hupeng
+ * 分销级别
+ */
+@Getter
+@AllArgsConstructor
+public enum Brokerage {
+
+    LEVEL_1(1,"一级"),
+    LEVEL_2(2,"二级");
+
+    private Integer value;
+    private String desc;
+}

yshop-common/src/main/java/co/yixiang/enums/ShippingTempEnum.java

@@ -0,0 +1,20 @@
+package co.yixiang.enums;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @author hupeng
+ * 运费模板类型枚举
+ */
+@Getter
+@AllArgsConstructor
+public enum ShippingTempEnum {
+    TYPE_1(1,"按件数"),
+    TYPE_2(2,"按重量"),
+    TYPE_3(3,"按体积");
+
+    private Integer value;
+    private String desc;
+}

yshop-common/src/main/java/co/yixiang/enums/SpecTypeEnum.java

@@ -0,0 +1,18 @@
+package co.yixiang.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @author hupeng
+ * 产品相关规格类型枚举
+ */
+@Getter
+@AllArgsConstructor
+public enum SpecTypeEnum {
+    TYPE_0(0,"单规格"),
+    TYPE_1(1,"多规格");
+
+    private Integer value;
+    private String desc;
+}

yshop-common/src/main/java/co/yixiang/event/TemplateBean.java

@@ -19,6 +19,7 @@ public class TemplateBean {
     private String price;
     private String deliveryName;
     private String deliveryId;
+    private String payType;
     private Long uid;
 
 }

yshop-common/src/main/java/co/yixiang/utils/TreeUtil.java

@@ -74,7 +74,7 @@ public class TreeUtil {
         List<CateDTO> childsList = new ArrayList<CateDTO>();
         //遍历集合元素,如果元素的Parentid==指定元素的id,则说明是该元素的子节点
         for (CateDTO t1 : list) {
-            if (t1.getPid() == t.getId() ) {
+            if (t1.getPid().equals(t.getId())) {
                 childsList.add(t1);
             }
         }