Merge branch 'dev' of http://git3.nong12.com/b2c/gateway into dev

Jiang
2 parents 22fd8294 b2077871
Showing 6 changed files with 46 additions and 71 deletions
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/Attribute.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/AttributeValue.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/SKUInfo.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/product/AddGoodsReq.java
mobsite-getway-service/src/main/java/com/diligrp/mobsite/getway/service/seller/impl/SellerGoodsServiceImpl.java
pom.xml
@@ -18,12 +18,12 @@ public class Attribute {
      * 商品属性Id
      */
     @ApiModelProperty(value = "商品属性id")
-    private Long id;
+    private Long attId;
     /**
      * 商品属性名称
      */
     @ApiModelProperty(value = "商品属性名称")
-    private String name;
+    private String attName;
     /**
      * 属性取值
@@ -40,38 +40,20 @@ public class Attribute {
      * @createTime Aug 14, 2014 7:48:02 PM
      * @author wujianjun
      */
-    public Long getId() {
-        return id;
+    public Long getAttId() {
+        return attId;
     }
-    /**
-     * set value of Attribute.id
-     * @param id the id to set
-     * @createTime Aug 14, 2014 7:48:02 PM
-     * @author wujianjun
-     */
-    public void setId(Long id) {
-        this.id = id;
+    public void setAttId(Long attId) {
+        this.attId = attId;
     }
-    /**
-     * get value of Attribute.name
-     * @return the name
-     * @createTime Aug 14, 2014 7:48:02 PM
-     * @author wujianjun
-     */
-    public String getName() {
-        return name;
+    public String getAttName() {
+        return attName;
     }
-    /**
-     * set value of Attribute.name
-     * @param name the name to set
-     * @createTime Aug 14, 2014 7:48:02 PM
-     * @author wujianjun
-     */
-    public void setName(String name) {
-        this.name = name;
+    public void setAttName(String attName) {
+        this.attName = attName;
     }
     /**
@@ -27,12 +27,12 @@ public class AttributeValue {
      * 属性值ID
      */
     @ApiModelProperty(value = "属性值id")
-    private Long id;
+    private Long attValueId;
     /**
      * 属性值名称
      */
     @ApiModelProperty(value = "属性值名称")
-    private String name;
+    private String attValueName;
     /**
      * sku是否失效
@@ -40,47 +40,22 @@ public class AttributeValue {
      */
     private Integer validType = VALID_TYPE_NO;
-    /**
-     * get value of AttributeValue.id
-     * @return the id
-     * @createTime Aug 14, 2014 7:49:03 PM
-     * @author wujianjun
-     */
-    public Long getId() {
-        return id;
+    public Long getAttValueId() {
+        return attValueId;
     }
-    /**
-     * set value of AttributeValue.id
-     * @param id the id to set
-     * @createTime Aug 14, 2014 7:49:03 PM
-     * @author wujianjun
-     */
-    public void setId(Long id) {
-        this.id = id;
+    public void setAttValueId(Long attValueId) {
+        this.attValueId = attValueId;
     }
-    /**
-     * get value of AttributeValue.name
-     * @return the name
-     * @createTime Aug 14, 2014 7:49:03 PM
-     * @author wujianjun
-     */
-    public String getName() {
-        return name;
+    public String getAttValueName() {
+        return attValueName;
     }
-    /**
-     * set value of AttributeValue.name
-     * @param name the name to set
-     * @createTime Aug 14, 2014 7:49:03 PM
-     * @author wujianjun
-     */
-    public void setName(String name) {
-        this.name = name;
+    public void setAttValueName(String attValueName) {
+        this.attValueName = attValueName;
     }
-    
     /**
      * get value of AttributeValue.validType
      * @return the validType
@@ -67,4 +67,12 @@ public class SKUInfo {
     public void setStatus(Integer status) {
         this.status = status;
     }
+
+    public String getSku() {
+        return sku;
+    }
+
+    public void setSku(String sku) {
+        this.sku = sku;
+    }
 }
@@ -11,17 +11,16 @@ public class AddGoodsReq  extends BaseReq {
     @ApiModelProperty(value = "店铺id")
-    private Long ShopId;
+    private Long shopId;
     private GoodsSuper goods;
-
     public Long getShopId() {
-        return ShopId;
+        return shopId;
     }
     public void setShopId(Long shopId) {
-        ShopId = shopId;
+        this.shopId = shopId;
     }
     public GoodsSuper getGoods() {
@@ -217,8 +217,7 @@ public class SellerGoodsServiceImpl implements SellerGoodsService {
             skus = new ArrayList<>();
             for (SKUInfo info : skusInfo) {
                 Sku sku = new Sku();
-
-
+                sku.setSku(info.getSku());
                 skus.add(sku);
             }
         }
@@ -256,7 +255,19 @@ public class SellerGoodsServiceImpl implements SellerGoodsService {
     @Override
     public ListCategoryResp listCategory(ListCategoryReq req) {
-        return null;
+        List<Category> categories = goodsRPC.listCategory(req.getParentId(), req.getShopId());
+        ListCategoryResp resp = new ListCategoryResp();
+        List<com.diligrp.mobsite.getway.domain.protocol.Category> list = new ArrayList<>();
+        for (Category category : categories) {
+            com.diligrp.mobsite.getway.domain.protocol.Category c = new com.diligrp.mobsite.getway.domain.protocol.Category();
+            c.setName(category.getCname());
+            c.setImgUrl(category.getIcon());
+            c.setParentId((long) category.getPcid());
+            list.add(c);
+        }
+        resp.setCategories(list);
+
+        return resp;
     }
     @Override
@@ -10,7 +10,7 @@
 	<url>http://maven.apache.org</url>
 	<properties>
 		<spring.version>4.2.8.RELEASE</spring.version>
-		<java.version>1.7</java.version>
+		<java.version>1.8</java.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>