修改domain pom ,商品接口开发

weiliwhereareyou@163.com
1 parent 79217a85
Showing 25 changed files with 400 additions and 86 deletions
mobsite-getway-domain/pom.xml
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/Category.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/Order.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/common/GetCareResp.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/common/GetCityResp.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/common/GetPickupResp.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/common/GetUnitInfoResp.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/common/model/UnitInfo.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/detail/AddFavoriteShopReq.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/detail/GetShopDetailResp.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/detail/RemoveFavoriteShopReq.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/product/AddGoodsReq.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/product/AddProductCategoryReq.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/product/UpdateProductCategoryReq.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/search/SearchProductByKeywordResp.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/user/GetRegisterNoReq.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/user/GetRegisterNobyUidsReq.java
mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/GoodsRPC.java
mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/impl/GoodsRPCImpl.java
@@ -2,11 +2,11 @@
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>com.diligrp.mobsite</groupId>
-    <artifactId>mobsite-getway</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
-  </parent>
+  <!--<parent>-->
+    <!--<groupId>com.diligrp.mobsite</groupId>-->
+    <!--<artifactId>mobsite-getway</artifactId>-->
+    <!--<version>0.0.1-SNAPSHOT</version>-->
+  <!--</parent>-->
   <groupId>com.b2c.mobsite</groupId>
@@ -16,13 +16,78 @@
   <url>http://maven.apache.org</url>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+      <spring.version>4.2.8.RELEASE</spring.version>
+      <java.version>1.7</java.version>
+      <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
-<!--<dependencies>-->
+
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.1</version>
+        <configuration>
+          <source>${java.version}</source>
+          <target>${java.version}</target>
+          <showWarnings>true</showWarnings>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+<dependencies>
+
   <!--<dependency>-->
-    <!--<groupId>io.swagger</groupId>-->
-    <!--<artifactId>swagger-annotations</artifactId>-->
-    <!--<version>1.5.3</version>-->
+    <!--<groupId>jdk.tools</groupId>-->
+    <!--<artifactId>jdk.tools</artifactId>-->
+    <!--<version>1.7</version>-->
+    <!--<scope>system</scope>-->
+    <!--<systemPath>${JAVA_HOME}/lib/tools.jar</systemPath>-->
   <!--</dependency>-->
-<!--</dependencies>-->
+
+  <dependency>
+    <groupId>com.b2c.website</groupId>
+    <artifactId>diligrp-website-util</artifactId>
+    <version>0.0.2-SNAPSHOT</version>
+    <scope>provided</scope>
+  </dependency>
+
+  <dependency>
+    <groupId>com.b2c.website.web</groupId>
+    <artifactId>diligrp-website-api</artifactId>
+    <version>1.0.5-SNAPSHOT</version>
+    <scope>provided</scope>
+  </dependency>
+
+
+  <dependency>
+    <groupId>com.b2c.orders</groupId>
+    <artifactId>b2c-orders-client</artifactId>
+    <version>0.0.2-SNAPSHOT</version>
+    <scope>provided</scope>
+  </dependency>
+
+  <dependency>
+    <groupId>com.b2c.myapp</groupId>
+    <artifactId>myapp-sdk</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <scope>provided</scope>
+  </dependency>
+
+  <!--<dependency>-->
+    <!--<groupId>org.nutz</groupId>-->
+    <!--<artifactId>nutz</artifactId>-->
+    <!--<version>1.b.50</version>-->
+  <!--</dependency>-->
+
+  <dependency>
+    <groupId>io.swagger</groupId>
+    <artifactId>swagger-annotations</artifactId>
+    <version>1.5.3</version>
+    <scope>provided</scope>
+  </dependency>
+</dependencies>
 </project>
@@ -36,11 +36,11 @@ public class Category {
 	@ApiModelProperty(value = "父分类id")
     private Long parentId;
-    /**
-     * 分类级别
-     */
-	@ApiModelProperty(value = "分类级别")
-    private String level;
+    ///**
+    // * 分类级别
+    // */
+    //@ApiModelProperty(value = "分类级别")
+    //private String level;
     public Long getId() {
         return id;
@@ -77,13 +77,13 @@ public class Category {
 		this.parentId = parentId;
 	}
-	public String getLevel() {
-		return level;
-	}
-
-	public void setLevel(String level) {
-		this.level = level;
-	}
+	//public String getLevel() {
+	//	return level;
+	//}
+    //
+	//public void setLevel(String level) {
+	//	this.level = level;
+	//}
 	public static String getLevelTwo() {
 		return LEVEL_TWO;
 package com.diligrp.mobsite.getway.domain.protocol;
 import java.io.Serializable;
-import java.util.Date;
-
-import com.b2c.orders.enums.DeliveryType;
-import com.b2c.orders.enums.OrderStatus;
-import com.b2c.orders.enums.PayStatus;
-import com.b2c.orders.enums.PayType;
-import com.fasterxml.jackson.annotation.JsonFormat;
 /**
  * <B>Description</B> 订单 <br />
@@ -20,7 +20,7 @@ public class SKUInfo {
     @ApiModelProperty(value = "商品id")
     private long pid;
-
+    @ApiModelProperty(value = "decodeSku",required = true)
     private String decodeSku;
     private Integer version;
 package com.diligrp.mobsite.getway.domain.protocol.common;
-import java.util.List;
-
-import org.nutz.json.JsonField;
-
 import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
 import com.diligrp.mobsite.getway.domain.protocol.ProductCategory;
+import java.util.List;
+
 /**
  * <B>Description</B> 获取关注品类 <br />
  * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />
 package com.diligrp.mobsite.getway.domain.protocol.common;
-import java.util.List;
-
-import org.nutz.json.JsonField;
-
 import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
 import com.diligrp.mobsite.getway.domain.protocol.City;
+import java.util.List;
+
 /**
  * <B>Description</B> 获取地区接口 <br />
  * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />
@@ -2,7 +2,6 @@ package com.diligrp.mobsite.getway.domain.protocol.common;
 import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
 import com.diligrp.mobsite.getway.domain.protocol.PickupAddress;
-import org.nutz.json.JsonField;
 import java.util.List;
@@ -2,7 +2,6 @@ package com.diligrp.mobsite.getway.domain.protocol.common;
 import java.util.List;
-import org.nutz.json.JsonField;
 import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
 import com.diligrp.mobsite.getway.domain.protocol.common.model.UnitInfo;
 package com.diligrp.mobsite.getway.domain.protocol.common.model;
-import org.nutz.json.JsonField;
-
 /**
  * <B>Description</B> 单位实体 <br />
 package com.diligrp.mobsite.getway.domain.protocol.detail;
-import org.nutz.json.JsonField;
-
 import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
 /**
 package com.diligrp.mobsite.getway.domain.protocol.detail;
 import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
-import org.nutz.json.JsonField;
 /**
  * <B>Description</B> 店铺详情响应 <br />
 package com.diligrp.mobsite.getway.domain.protocol.detail;
-import org.nutz.json.JsonField;
-
 import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
 /**
@@ -2,6 +2,7 @@ package com.diligrp.mobsite.getway.domain.protocol.product;
 import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
 import com.diligrp.mobsite.getway.domain.protocol.GoodsSuper;
+import io.swagger.annotations.ApiModelProperty;
 /**
  * Created by xxxzzz on 2016/12/28.
@@ -9,8 +10,20 @@ import com.diligrp.mobsite.getway.domain.protocol.GoodsSuper;
 public class AddGoodsReq  extends BaseReq {
+    @ApiModelProperty(value = "店铺id")
+    private Long ShopId;
+
     private GoodsSuper goods;
+
+    public Long getShopId() {
+        return ShopId;
+    }
+
+    public void setShopId(Long shopId) {
+        ShopId = shopId;
+    }
+
     public GoodsSuper getGoods() {
         return goods;
     }
@@ -2,16 +2,27 @@ package com.diligrp.mobsite.getway.domain.protocol.product;
 import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
 import com.diligrp.mobsite.getway.domain.protocol.Category;
+import io.swagger.annotations.ApiModelProperty;
 /**
  * Created by xxxzzz on 2016/12/28.
  */
 public class AddProductCategoryReq extends BaseReq {
-
+    @ApiModelProperty(value = "店铺id")
+    private Integer shopId;
     private Category category;
+
+    public Integer getShopId() {
+        return shopId;
+    }
+
+    public void setShopId(Integer shopId) {
+        this.shopId = shopId;
+    }
+
     public Category getCategory() {
         return category;
     }
@@ -2,6 +2,7 @@ package com.diligrp.mobsite.getway.domain.protocol.product;
 import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
 import com.diligrp.mobsite.getway.domain.protocol.Category;
+import io.swagger.annotations.ApiModelProperty;
 /**
  * Created by xxxzzz on 2016/12/28.
@@ -9,9 +10,20 @@ import com.diligrp.mobsite.getway.domain.protocol.Category;
 public class UpdateProductCategoryReq extends BaseReq {
+    @ApiModelProperty(value = "店铺id")
+    private Integer shopId;
     private Category category;
+
+    public Integer getShopId() {
+        return shopId;
+    }
+
+    public void setShopId(Integer shopId) {
+        this.shopId = shopId;
+    }
+
     public Category getCategory() {
         return category;
     }
 package com.diligrp.mobsite.getway.domain.protocol.search;
-import java.util.List;
-
-import org.nutz.json.JsonField;
-
-import com.diligrp.mobsite.getway.domain.protocol.ProductCategory;
 /**
  * <B>Description</B> 通过关键字搜索商品 <br />
 package com.diligrp.mobsite.getway.domain.protocol.user;
+import io.swagger.annotations.ApiModelProperty;
+
 /**
  * <B>Description</B> 获取激光ID <br />
  * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />
@@ -15,8 +17,10 @@ public class GetRegisterNoReq {
 	/**
 	 * 用户ID
 	 */
+	@ApiModelProperty(value = "用户id")
 	private Long userId;
+	@ApiModelProperty(value = "用户角色：10买家,20卖家")
 	private Long userRole;
 package com.diligrp.mobsite.getway.domain.protocol.user;
-import java.util.List;
+import io.swagger.annotations.ApiModelProperty;
-import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
+import java.util.List;
 /**
  * <B>Description</B> 批量查询极光号<br />
@@ -14,7 +14,7 @@ import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
  * @createTime 2014/9/23 15:46
  */
 @SuppressWarnings("serial")
-public class GetRegisterNobyUidsReq extends BaseReq {
+public class GetRegisterNobyUidsReq  {
 	/**
 	 * 请求的用户ids
 	 */
@@ -22,8 +22,21 @@ public class GetRegisterNobyUidsReq extends BaseReq {
 	/**
 	 * 平台 1：安卓,2：ios,3:pos,4:wap
 	 */
+	@ApiModelProperty(value = "平台 1：安卓,2：ios,3:pos,4:wap")
 	private Integer platform;
+	@ApiModelProperty(value = "用户角色：10买家,20卖家")
+	private Long userRole;
+
+
+	public Long getUserRole() {
+		return userRole;
+	}
+
+	public void setUserRole(Long userRole) {
+		this.userRole = userRole;
+	}
+
 	public List<Long> getUserIds() {
 		return userIds;
 	}
@@ -13,6 +13,8 @@ import com.diligrp.mobsite.getway.domain.protocol.GoodsSuper;
 import com.diligrp.titan.sdk.domain.Attribute;
 import com.diligrp.titan.sdk.domain.Category;
 import com.diligrp.titan.sdk.domain.Product;
+import com.diligrp.titan.sdk.input.CategoryInput;
+import com.diligrp.titan.sdk.input.PopProductView;
 import java.util.HashMap;
 import java.util.List;
@@ -114,4 +116,11 @@ public interface GoodsRPC {
 	List<Category> listCrumbs(Long cid);
+	Object addProductCategory(CategoryInput req,Long userId);
+
+	Object updateProductCategory(CategoryInput input, Long userId);
+
+	List<Category> searchProductCategory(String input, Long userId);
+
+	Object addGoods(PopProductView req, Long userId);
 }
@@ -19,6 +19,8 @@ import com.diligrp.titan.sdk.TitanClient;
 import com.diligrp.titan.sdk.domain.Attribute;
 import com.diligrp.titan.sdk.domain.Category;
 import com.diligrp.titan.sdk.domain.Product;
+import com.diligrp.titan.sdk.input.CategoryInput;
+import com.diligrp.titan.sdk.input.PopProductView;
 import com.diligrp.titan.sdk.output.BaseOutput;
 import com.diligrp.website.util.redis.RedisUtil;
 import com.diligrp.website.util.security.Validator;
@@ -194,15 +196,77 @@ public class GoodsRPCImpl implements GoodsRPC {
         return categories;
     }
-    
+    @Override
+    public Object addProductCategory(CategoryInput input,Long userId) {
+        BaseOutput<Object> output = null;
+        try {
+            output = titanClient.getCategoryService().insertCategory(input);
+        } catch (Exception e) {
+            logger.error("调用添加分类接口失败：[userId={},code={},result={}]",new Object[]{userId,output.getCode(),output.getResult()});
+            throw new ServiceException();
+
+        }
+        if (output.getCode()!=200) {
+            logger.error("调用添加分类接口失败[userId={},code={},result={}]",
+                    new Object[]{ userId,output.getCode(),output.getResult()});
+            throw new ServiceException(ResultCode.BUSINESS_FAILED,output.getResult());
+        }
+        return output.getData();
+    }
+    @Override
+    public Object updateProductCategory(CategoryInput input, Long userId) {
+        BaseOutput<Object> output = null;
+        try {
+            output = titanClient.getCategoryService().updateCategory(input);
+        } catch (Exception e) {
+            logger.error("调用修改分类接口失败：[userId={},code={},result={}]",new Object[]{userId,output.getCode(),output.getResult()});
+            throw new ServiceException();
-    
+        }
+        if (output.getCode()!=200) {
+            logger.error("调用修改分类接口失败[userId={},code={},result={}]",
+                    new Object[]{ userId,output.getCode(),output.getResult()});
+            throw new ServiceException(ResultCode.BUSINESS_FAILED,output.getResult());
+        }
+        return output.getData();
+    }
+    @Override
+    public List<Category> searchProductCategory(String input, Long userId) {
+        BaseOutput<List<Category>>  output = null;
+        try {
+            output = titanClient.getCategoryService().searchCategoryInfo(input);
+        } catch (Exception e) {
+            logger.error("搜索分类接口失败：[userId={},code={},result={}]",new Object[]{userId,output.getCode(),output.getResult()});
+            throw new ServiceException();
+        }
+        if (output.getCode()!=200) {
+            logger.error("搜索分类接口失败[userId={},code={},result={}]",
+                    new Object[]{ userId,output.getCode(),output.getResult()});
+            throw new ServiceException(ResultCode.BUSINESS_FAILED,output.getResult());
+        }
+        return output.getData();
+    }
+    @Override
+    public Object addGoods(PopProductView input, Long userId) {
+        BaseOutput<Object> output = null;
+        try {
+            output = titanClient.getProductService().insertPopProduct(input,userId+"");
+        } catch (Exception e) {
+            logger.error("添加商品失败：[userId={},code={},result={}]",new Object[]{userId,output.getCode(),output.getResult()});
+            throw new ServiceException();
+        }
+        if (output.getCode()!=200) {
+            logger.error("添加商品失败[userId={},code={},result={}]",
+                    new Object[]{ userId,output.getCode(),output.getResult()});
+            throw new ServiceException(ResultCode.BUSINESS_FAILED,output.getResult());
+        }
+        return output.getData();
+    }
-    
 }
@@ -197,7 +197,7 @@ public class TopicServiceImpl implements TopicService {
 			category.setId(categoryDTO.getId());
 			category.setName(categoryDTO.getName());
 			category.setImgUrl(categoryDTO.getIcon());
-			category.setLevel(categoryDTO.getCode());
+			//category.setLevel(categoryDTO.getCode());
 			try {
 				relateId = Long.valueOf(categoryDTO.getContent());
 			} catch (Exception e) {
@@ -11,6 +11,7 @@ import com.diligrp.mobsite.getway.domain.except.ServiceException;
 import com.diligrp.mobsite.getway.domain.protocol.login.*;
 import com.diligrp.mobsite.getway.domain.protocol.register.*;
 import com.diligrp.mobsite.getway.domain.protocol.user.*;
+import com.diligrp.mobsite.getway.domain.protocol.user.model.RegisterNoPlatform;
 import com.diligrp.mobsite.getway.manager.common.RegisterNoMapperManager;
 import com.diligrp.mobsite.getway.rpc.*;
 import com.diligrp.mobsite.getway.rpc.utils.UserRedisUtil;
@@ -458,7 +459,40 @@ public class UserServiceImpl implements UserService {
     @Override
     public GetRegisterNobyUidsResp getRegisterNobyUids(GetRegisterNobyUidsReq req) {
-        return null;
+        GetRegisterNobyUidsResp resp = new GetRegisterNobyUidsResp();
+        Map<String, Object> param = new HashMap<String, Object>();
+        param.put("userids", req.getUserIds());
+        if (!Validator.isNull(req.getPlatform())) {
+            param.put("device_type",req.getPlatform().toString());
+        }
+        List<RegisterNoMapper> mappers = registerNoMapperManager.batchQuery(param);
+
+        List<RegisterNoPlatform> registerNos = new ArrayList<RegisterNoPlatform>();
+        RegisterNoPlatform androidPlatform = new RegisterNoPlatform();
+        androidPlatform.setPlatform("android");
+        List<String> androids = new ArrayList<String>();
+        RegisterNoPlatform iosPlatform = new RegisterNoPlatform();
+        iosPlatform.setPlatform("ios");
+        List<String> iosids = new ArrayList<String>();
+        if (!Validator.isEmpty(mappers)) {
+            for (RegisterNoMapper registerNoMapper : mappers) {
+                if (!Validator.isNull(registerNoMapper.getDeviceType())) {
+                    if (registerNoMapper.getDeviceType().equals(1)) {
+                        androids.add(registerNoMapper.getRegisterNo());
+                    }
+                    if (registerNoMapper.getDeviceType().equals(2)) {
+                        iosids.add(registerNoMapper.getRegisterNo());
+                    }
+                }
+            }
+        }
+        androidPlatform.setIds(androids);
+        iosPlatform.setIds(iosids);
+        registerNos.add(androidPlatform);
+        registerNos.add(iosPlatform);
+        resp.setRegisterNos(registerNos);
+        resp.setCode(ResultCode.SUCCESS);
+        return resp;
     }
     @Override
 package com.diligrp.mobsite.getway.service.seller.impl;
+import com.diligrp.mobsite.getway.domain.protocol.Attribute;
+import com.diligrp.mobsite.getway.domain.protocol.GoodsSuper;
+import com.diligrp.mobsite.getway.domain.protocol.SKUInfo;
 import com.diligrp.mobsite.getway.domain.protocol.product.*;
 import com.diligrp.mobsite.getway.domain.protocol.saler.SellerUpdateProductReq;
 import com.diligrp.mobsite.getway.domain.protocol.saler.product.*;
@@ -7,12 +10,18 @@ import com.diligrp.mobsite.getway.rpc.ConfigRPC;
 import com.diligrp.mobsite.getway.rpc.GoodsRPC;
 import com.diligrp.mobsite.getway.rpc.UserRPC;
 import com.diligrp.mobsite.getway.service.seller.SellerGoodsService;
+import com.diligrp.titan.sdk.domain.Category;
+import com.diligrp.titan.sdk.domain.Sku;
+import com.diligrp.titan.sdk.input.CategoryInput;
+import com.diligrp.titan.sdk.input.PopProductView;
+import com.diligrp.website.util.security.Validator;
 import com.yqyw.filter.client.KeyWordsClient;
 import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.List;
 /**
@@ -106,22 +115,102 @@ public class SellerGoodsServiceImpl implements SellerGoodsService {
     @Override
     public AddProductCategoryResp addProductCategory(AddProductCategoryReq req) {
-        return null;
+        AddProductCategoryResp resp = new AddProductCategoryResp();
+        CategoryInput input = new CategoryInput();
+        input.setName(req.getCategory().getName());
+        input.setShopId(req.getShopId());
+        input.setParent(req.getCategory().getParentId().intValue());
+        goodsRPC.addProductCategory(input,req.getUserId());
+        return resp;
     }
     @Override
     public UpdateProductCategoryResp updateProductCategory(UpdateProductCategoryReq req) {
-        return null;
+        UpdateProductCategoryResp resp = new UpdateProductCategoryResp();
+        CategoryInput input = new CategoryInput();
+        input.setId(req.getCategory().getId());
+        input.setName(req.getCategory().getName());
+        input.setShopId(req.getShopId());
+        input.setParent(req.getCategory().getParentId().intValue());
+        goodsRPC.updateProductCategory(input,req.getUserId());
+        return resp;
     }
     @Override
     public SearchProductCategoryResp searchProductCategory(SearchProductCategoryReq req) {
-        return null;
+        SearchProductCategoryResp resp = new SearchProductCategoryResp();
+        List<Category> categories = goodsRPC.searchProductCategory(req.getKeyword(),req.getUserId());
+        resp.setCategories(buildCategories(categories));
+        return resp;
+    }
+
+    private List<com.diligrp.mobsite.getway.domain.protocol.Category> buildCategories(List<Category> categories) {
+        List<com.diligrp.mobsite.getway.domain.protocol.Category>  categoryInfos = null;
+        if (!Validator.isEmpty(categories)){
+            categoryInfos = new ArrayList<>();
+            for(Category category:categories){
+                com.diligrp.mobsite.getway.domain.protocol.Category categoryInfo = new com.diligrp.mobsite.getway.domain.protocol.Category();
+                categoryInfo.setId((long)category.getCid());
+                categoryInfo.setName(category.getCname());
+                categoryInfo.setImgUrl(category.getIcon());
+                categoryInfo.setParentId((long)category.getPcid());
+                categoryInfos.add(categoryInfo);
+            }
+        }
+        return categoryInfos;
     }
     @Override
     public AddGoodsResp addGoods(AddGoodsReq req) {
-        return null;
+        AddGoodsResp resp = new AddGoodsResp();
+        PopProductView input = new PopProductView();
+        buildAddGoodsInput(req,input);
+        goodsRPC.addGoods(input ,req.getUserId());
+        return resp;
+    }
+
+    private void buildAddGoodsInput(AddGoodsReq req, PopProductView input) {
+        GoodsSuper goods = req.getGoods();
+        input.setName(goods.getName());
+        input.setIndexTop(goods.getIndexTop());
+        input.setPid(goods.getPid());
+        input.setSellerId(req.getUserId()+"");
+        input.setVendorId(req.getShopId()+"");
+        input.setCid(goods.getCid());
+        input.setCname(goods.getCname());
+        input.setDefaultPic(goods.getDefaultPic());
+        input.setPictures(goods.getPictures());
+        input.setSaleAtt(buildSaleAttr(goods.getSaleAtt()));
+        input.setSkus(bulidSkus(goods.getSkus()));
+        input.setDesc(goods.getDesc());
+        input.setProductType(goods.getProductType());
+
+    }
+
+    private List<Sku> bulidSkus(List<SKUInfo> skusInfo) {
+        List<Sku> skus = null;
+        if (!Validator.isEmpty(skusInfo)){
+            skus = new ArrayList<>();
+            for (SKUInfo info : skusInfo){
+                Sku sku = new Sku();
+
+
+
+
+                skus.add(sku);
+            }
+        }
+
+
+        return skus;
+    }
+
+    private List<com.diligrp.titan.sdk.domain.Attribute> buildSaleAttr(List<Attribute> saleAtt) {
+
+        List<com.diligrp.titan.sdk.domain.Attribute>  attrs = null;
+
+        return attrs;
+
     }
     @Override
@@ -387,27 +387,51 @@ public class UserController extends BaseApiController {
     }
-    ///**
-    // * 查询极光推送号
-    // *
-    // * getRegisterNo
-    // */
-    //@RequestMapping("/getRegisterNo")
-    //@ResponseBody
-    //public void getRegisterNo() {
-    //    GetRegisterNoReq req = getRequest(GetRegisterNoReq.class);
-    //    try {
-    //        GetRegisterNoResp resp = userService.getRegisterNo(req);
-    //        sendSuccessResp(resp);
-    //    } catch (ServiceException e){
-    //        LOGGER.error(String.format("Code=%s,ErrorMessage=%s",
-    //                e.getCode(), e.getMessage()), e);
-    //        sendError(e.getCode(), e.getMessage());
-    //    } catch (Exception e) {
-    //        LOGGER.error(String.format("ErrorMessage=%s", e.getMessage()), e);
-    //        sendError(e.getMessage());
-    //    }
-    //}
+    /**
+     * 查询极光推送号
+     *
+     * getRegisterNo
+     */
+    @ApiOperation(value = "查询极光推送号", httpMethod = "POST"  ,response = GetRegisterNoResp.class)
+    @RequestMapping(value = "/getRegisterNo",method = RequestMethod.POST)
+    @ResponseBody
+    public void getRegisterNo(@RequestBody  GetRegisterNoReq temp) {
+        GetRegisterNoReq req = getRequest(GetRegisterNoReq.class);
+        try {
+            GetRegisterNoResp resp = userService.getRegisterNo(req);
+            sendSuccessResp(resp);
+        } catch (ServiceException e){
+            LOGGER.error(String.format("Code=%s,ErrorMessage=%s",
+                    e.getCode(), e.getMessage()), e);
+            sendError(e.getCode(), e.getMessage());
+        } catch (Exception e) {
+            LOGGER.error(String.format("ErrorMessage=%s", e.getMessage()), e);
+            sendError(e.getMessage());
+        }
+    }
+
+    /**
+     * 批量查询极光推送号
+     *
+     * getNosByUserids
+     */
+    @ApiOperation(value = "批量查询极光推送号", httpMethod = "POST"  ,response = GetRegisterNobyUidsResp.class)
+    @RequestMapping(value = "/getRegisterNobyUids",method = RequestMethod.POST)
+    @ResponseBody
+    public void getRegisterNobyUids(@RequestBody  GetRegisterNobyUidsReq temp) {
+        GetRegisterNobyUidsReq req = getRequest(GetRegisterNobyUidsReq.class);
+        try {
+            GetRegisterNobyUidsResp resp = userService.getRegisterNobyUids(req);
+            sendSuccessResp(resp);
+        } catch (ServiceException e){
+            LOGGER.error(String.format("Code=%s,ErrorMessage=%s",
+                    e.getCode(), e.getMessage()), e);
+            sendError(e.getCode(), e.getMessage());
+        } catch (Exception e) {
+            LOGGER.error(String.format("ErrorMessage=%s", e.getMessage()), e);
+            sendError(e.getMessage());
+        }
+    }
     ///**
@@ -38,6 +38,7 @@
 		</plugins>
 	</build>
+
 	<dependencies>
 		<dependency>