b2c / gateway · Commits

Commit a552b93777be7622195685503bd344d85de31fed

Authored by weiliwhereareyou@163.com
1 parent 79217a85

修改domain pom ,商品接口开发

Inline Side-by-side
Showing 25 changed files with 400 additions and 86 deletions
mobsite-getway-domain/pom.xml
  View file @a552b93
... ... @@ -2,11 +2,11 @@
2 2 <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"
3 3 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
4 4 <modelVersion>4.0.0</modelVersion>
5   - <parent>
6   - <groupId>com.diligrp.mobsite</groupId>
7   - <artifactId>mobsite-getway</artifactId>
8   - <version>0.0.1-SNAPSHOT</version>
9   - </parent>
  5 + <!--<parent>-->
  6 + <!--<groupId>com.diligrp.mobsite</groupId>-->
  7 + <!--<artifactId>mobsite-getway</artifactId>-->
  8 + <!--<version>0.0.1-SNAPSHOT</version>-->
  9 + <!--</parent>-->
10 10  
11 11  
12 12 <groupId>com.b2c.mobsite</groupId>
... ... @@ -16,13 +16,78 @@
16 16 <url>http://maven.apache.org</url>
17 17 <properties>
18 18 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
  19 + <spring.version>4.2.8.RELEASE</spring.version>
  20 + <java.version>1.7</java.version>
  21 + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
19 22 </properties>
20 23  
21   -<!--<dependencies>-->
  24 +
  25 +
  26 + <build>
  27 + <plugins>
  28 + <plugin>
  29 + <groupId>org.apache.maven.plugins</groupId>
  30 + <artifactId>maven-compiler-plugin</artifactId>
  31 + <version>3.1</version>
  32 + <configuration>
  33 + <source>${java.version}</source>
  34 + <target>${java.version}</target>
  35 + <showWarnings>true</showWarnings>
  36 + </configuration>
  37 + </plugin>
  38 + </plugins>
  39 + </build>
  40 +
  41 +<dependencies>
  42 +
22 43 <!--<dependency>-->
23   - <!--<groupId>io.swagger</groupId>-->
24   - <!--<artifactId>swagger-annotations</artifactId>-->
25   - <!--<version>1.5.3</version>-->
  44 + <!--<groupId>jdk.tools</groupId>-->
  45 + <!--<artifactId>jdk.tools</artifactId>-->
  46 + <!--<version>1.7</version>-->
  47 + <!--<scope>system</scope>-->
  48 + <!--<systemPath>${JAVA_HOME}/lib/tools.jar</systemPath>-->
26 49 <!--</dependency>-->
27   -<!--</dependencies>-->
  50 +
  51 + <dependency>
  52 + <groupId>com.b2c.website</groupId>
  53 + <artifactId>diligrp-website-util</artifactId>
  54 + <version>0.0.2-SNAPSHOT</version>
  55 + <scope>provided</scope>
  56 + </dependency>
  57 +
  58 + <dependency>
  59 + <groupId>com.b2c.website.web</groupId>
  60 + <artifactId>diligrp-website-api</artifactId>
  61 + <version>1.0.5-SNAPSHOT</version>
  62 + <scope>provided</scope>
  63 + </dependency>
  64 +
  65 +
  66 + <dependency>
  67 + <groupId>com.b2c.orders</groupId>
  68 + <artifactId>b2c-orders-client</artifactId>
  69 + <version>0.0.2-SNAPSHOT</version>
  70 + <scope>provided</scope>
  71 + </dependency>
  72 +
  73 + <dependency>
  74 + <groupId>com.b2c.myapp</groupId>
  75 + <artifactId>myapp-sdk</artifactId>
  76 + <version>1.0-SNAPSHOT</version>
  77 + <scope>provided</scope>
  78 + </dependency>
  79 +
  80 + <!--<dependency>-->
  81 + <!--<groupId>org.nutz</groupId>-->
  82 + <!--<artifactId>nutz</artifactId>-->
  83 + <!--<version>1.b.50</version>-->
  84 + <!--</dependency>-->
  85 +
  86 + <dependency>
  87 + <groupId>io.swagger</groupId>
  88 + <artifactId>swagger-annotations</artifactId>
  89 + <version>1.5.3</version>
  90 + <scope>provided</scope>
  91 + </dependency>
  92 +</dependencies>
28 93 </project>
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/Category.java
  View file @a552b93
... ... @@ -36,11 +36,11 @@ public class Category {
36 36  
37 37 @ApiModelProperty(value = "父分类id")
38 38 private Long parentId;
39   - /**
40   - * 分类级别
41   - */
42   - @ApiModelProperty(value = "分类级别")
43   - private String level;
  39 + ///**
  40 + // * 分类级别
  41 + // */
  42 + //@ApiModelProperty(value = "分类级别")
  43 + //private String level;
44 44  
45 45 public Long getId() {
46 46 return id;
... ... @@ -77,13 +77,13 @@ public class Category {
77 77 this.parentId = parentId;
78 78 }
79 79  
80   - public String getLevel() {
81   - return level;
82   - }
83   -
84   - public void setLevel(String level) {
85   - this.level = level;
86   - }
  80 + //public String getLevel() {
  81 + // return level;
  82 + //}
  83 + //
  84 + //public void setLevel(String level) {
  85 + // this.level = level;
  86 + //}
87 87  
88 88 public static String getLevelTwo() {
89 89 return LEVEL_TWO;
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/Order.java
  View file @a552b93
1 1 package com.diligrp.mobsite.getway.domain.protocol;
2 2  
3 3 import java.io.Serializable;
4   -import java.util.Date;
5   -
6   -import com.b2c.orders.enums.DeliveryType;
7   -import com.b2c.orders.enums.OrderStatus;
8   -import com.b2c.orders.enums.PayStatus;
9   -import com.b2c.orders.enums.PayType;
10   -import com.fasterxml.jackson.annotation.JsonFormat;
11 4  
12 5 /**
13 6 * <B>Description</B> 订单 <br />
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/SKUInfo.java
  View file @a552b93
... ... @@ -20,7 +20,7 @@ public class SKUInfo {
20 20  
21 21 @ApiModelProperty(value = "商品id")
22 22 private long pid;
23   -
  23 + @ApiModelProperty(value = "decodeSku",required = true)
24 24 private String decodeSku;
25 25  
26 26 private Integer version;
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/common/GetCareResp.java
  View file @a552b93
1 1 package com.diligrp.mobsite.getway.domain.protocol.common;
2 2  
3   -import java.util.List;
4   -
5   -import org.nutz.json.JsonField;
6   -
7 3 import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
8 4 import com.diligrp.mobsite.getway.domain.protocol.ProductCategory;
9 5  
  6 +import java.util.List;
  7 +
10 8 /**
11 9 * <B>Description</B> 获取关注品类 <br />
12 10 * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/common/GetCityResp.java
  View file @a552b93
1 1 package com.diligrp.mobsite.getway.domain.protocol.common;
2 2  
3   -import java.util.List;
4   -
5   -import org.nutz.json.JsonField;
6   -
7 3 import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
8 4 import com.diligrp.mobsite.getway.domain.protocol.City;
9 5  
  6 +import java.util.List;
  7 +
10 8 /**
11 9 * <B>Description</B> 获取地区接口 <br />
12 10 * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/common/GetPickupResp.java
  View file @a552b93
... ... @@ -2,7 +2,6 @@ package com.diligrp.mobsite.getway.domain.protocol.common;
2 2  
3 3 import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
4 4 import com.diligrp.mobsite.getway.domain.protocol.PickupAddress;
5   -import org.nutz.json.JsonField;
6 5  
7 6 import java.util.List;
8 7  
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/common/GetUnitInfoResp.java
  View file @a552b93
... ... @@ -2,7 +2,6 @@ package com.diligrp.mobsite.getway.domain.protocol.common;
2 2  
3 3 import java.util.List;
4 4  
5   -import org.nutz.json.JsonField;
6 5  
7 6 import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
8 7 import com.diligrp.mobsite.getway.domain.protocol.common.model.UnitInfo;
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/common/model/UnitInfo.java
  View file @a552b93
1 1 package com.diligrp.mobsite.getway.domain.protocol.common.model;
2 2  
3   -import org.nutz.json.JsonField;
4   -
5 3  
6 4 /**
7 5 * <B>Description</B> 单位实体 <br />
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/detail/AddFavoriteShopReq.java
  View file @a552b93
1 1 package com.diligrp.mobsite.getway.domain.protocol.detail;
2 2  
3   -import org.nutz.json.JsonField;
4   -
5 3 import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
6 4  
7 5 /**
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/detail/GetShopDetailResp.java
  View file @a552b93
1 1 package com.diligrp.mobsite.getway.domain.protocol.detail;
2 2  
3 3 import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
4   -import org.nutz.json.JsonField;
5 4  
6 5 /**
7 6 * <B>Description</B> 店铺详情响应 <br />
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/detail/RemoveFavoriteShopReq.java
  View file @a552b93
1 1 package com.diligrp.mobsite.getway.domain.protocol.detail;
2 2  
3   -import org.nutz.json.JsonField;
4   -
5 3 import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
6 4  
7 5 /**
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/product/AddGoodsReq.java
  View file @a552b93
... ... @@ -2,6 +2,7 @@ package com.diligrp.mobsite.getway.domain.protocol.product;
2 2  
3 3 import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
4 4 import com.diligrp.mobsite.getway.domain.protocol.GoodsSuper;
  5 +import io.swagger.annotations.ApiModelProperty;
5 6  
6 7 /**
7 8 * Created by xxxzzz on 2016/12/28.
... ... @@ -9,8 +10,20 @@ import com.diligrp.mobsite.getway.domain.protocol.GoodsSuper;
9 10 public class AddGoodsReq extends BaseReq {
10 11  
11 12  
  13 + @ApiModelProperty(value = "店铺id")
  14 + private Long ShopId;
  15 +
12 16 private GoodsSuper goods;
13 17  
  18 +
  19 + public Long getShopId() {
  20 + return ShopId;
  21 + }
  22 +
  23 + public void setShopId(Long shopId) {
  24 + ShopId = shopId;
  25 + }
  26 +
14 27 public GoodsSuper getGoods() {
15 28 return goods;
16 29 }
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/product/AddProductCategoryReq.java
  View file @a552b93
... ... @@ -2,16 +2,27 @@ package com.diligrp.mobsite.getway.domain.protocol.product;
2 2  
3 3 import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
4 4 import com.diligrp.mobsite.getway.domain.protocol.Category;
  5 +import io.swagger.annotations.ApiModelProperty;
5 6  
6 7 /**
7 8 * Created by xxxzzz on 2016/12/28.
8 9 */
9 10 public class AddProductCategoryReq extends BaseReq {
10 11  
11   -
  12 + @ApiModelProperty(value = "店铺id")
  13 + private Integer shopId;
12 14  
13 15 private Category category;
14 16  
  17 +
  18 + public Integer getShopId() {
  19 + return shopId;
  20 + }
  21 +
  22 + public void setShopId(Integer shopId) {
  23 + this.shopId = shopId;
  24 + }
  25 +
15 26 public Category getCategory() {
16 27 return category;
17 28 }
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/product/UpdateProductCategoryReq.java
  View file @a552b93
... ... @@ -2,6 +2,7 @@ package com.diligrp.mobsite.getway.domain.protocol.product;
2 2  
3 3 import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
4 4 import com.diligrp.mobsite.getway.domain.protocol.Category;
  5 +import io.swagger.annotations.ApiModelProperty;
5 6  
6 7 /**
7 8 * Created by xxxzzz on 2016/12/28.
... ... @@ -9,9 +10,20 @@ import com.diligrp.mobsite.getway.domain.protocol.Category;
9 10 public class UpdateProductCategoryReq extends BaseReq {
10 11  
11 12  
  13 + @ApiModelProperty(value = "店铺id")
  14 + private Integer shopId;
12 15  
13 16 private Category category;
14 17  
  18 +
  19 + public Integer getShopId() {
  20 + return shopId;
  21 + }
  22 +
  23 + public void setShopId(Integer shopId) {
  24 + this.shopId = shopId;
  25 + }
  26 +
15 27 public Category getCategory() {
16 28 return category;
17 29 }
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/search/SearchProductByKeywordResp.java
  View file @a552b93
1 1 package com.diligrp.mobsite.getway.domain.protocol.search;
2 2  
3   -import java.util.List;
4   -
5   -import org.nutz.json.JsonField;
6   -
7   -import com.diligrp.mobsite.getway.domain.protocol.ProductCategory;
8 3  
9 4 /**
10 5 * <B>Description</B> 通过关键字搜索商品 <br />
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/user/GetRegisterNoReq.java
  View file @a552b93
1 1 package com.diligrp.mobsite.getway.domain.protocol.user;
2 2  
3 3  
  4 +import io.swagger.annotations.ApiModelProperty;
  5 +
4 6 /**
5 7 * <B>Description</B> 获取激光ID <br />
6 8 * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />
... ... @@ -15,8 +17,10 @@ public class GetRegisterNoReq {
15 17 /**
16 18 * 用户ID
17 19 */
  20 + @ApiModelProperty(value = "用户id")
18 21 private Long userId;
19 22  
  23 + @ApiModelProperty(value = "用户角色：10买家,20卖家")
20 24 private Long userRole;
21 25  
22 26  
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/user/GetRegisterNobyUidsReq.java
  View file @a552b93
1 1 package com.diligrp.mobsite.getway.domain.protocol.user;
2 2  
3   -import java.util.List;
  3 +import io.swagger.annotations.ApiModelProperty;
4 4  
5   -import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
  5 +import java.util.List;
6 6  
7 7 /**
8 8 * <B>Description</B> 批量查询极光号<br />
... ... @@ -14,7 +14,7 @@ import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
14 14 * @createTime 2014/9/23 15:46
15 15 */
16 16 @SuppressWarnings("serial")
17   -public class GetRegisterNobyUidsReq extends BaseReq {
  17 +public class GetRegisterNobyUidsReq {
18 18 /**
19 19 * 请求的用户ids
20 20 */
... ... @@ -22,8 +22,21 @@ public class GetRegisterNobyUidsReq extends BaseReq {
22 22 /**
23 23 * 平台 1：安卓,2：ios,3:pos,4:wap
24 24 */
  25 + @ApiModelProperty(value = "平台 1：安卓,2：ios,3:pos,4:wap")
25 26 private Integer platform;
26 27  
  28 + @ApiModelProperty(value = "用户角色：10买家,20卖家")
  29 + private Long userRole;
  30 +
  31 +
  32 + public Long getUserRole() {
  33 + return userRole;
  34 + }
  35 +
  36 + public void setUserRole(Long userRole) {
  37 + this.userRole = userRole;
  38 + }
  39 +
27 40 public List<Long> getUserIds() {
28 41 return userIds;
29 42 }
... ...
mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/GoodsRPC.java
  View file @a552b93
... ... @@ -13,6 +13,8 @@ import com.diligrp.mobsite.getway.domain.protocol.GoodsSuper;
13 13 import com.diligrp.titan.sdk.domain.Attribute;
14 14 import com.diligrp.titan.sdk.domain.Category;
15 15 import com.diligrp.titan.sdk.domain.Product;
  16 +import com.diligrp.titan.sdk.input.CategoryInput;
  17 +import com.diligrp.titan.sdk.input.PopProductView;
16 18  
17 19 import java.util.HashMap;
18 20 import java.util.List;
... ... @@ -114,4 +116,11 @@ public interface GoodsRPC {
114 116 List<Category> listCrumbs(Long cid);
115 117  
116 118  
  119 + Object addProductCategory(CategoryInput req,Long userId);
  120 +
  121 + Object updateProductCategory(CategoryInput input, Long userId);
  122 +
  123 + List<Category> searchProductCategory(String input, Long userId);
  124 +
  125 + Object addGoods(PopProductView req, Long userId);
117 126 }
... ...
mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/impl/GoodsRPCImpl.java
  View file @a552b93
... ... @@ -19,6 +19,8 @@ import com.diligrp.titan.sdk.TitanClient;
19 19 import com.diligrp.titan.sdk.domain.Attribute;
20 20 import com.diligrp.titan.sdk.domain.Category;
21 21 import com.diligrp.titan.sdk.domain.Product;
  22 +import com.diligrp.titan.sdk.input.CategoryInput;
  23 +import com.diligrp.titan.sdk.input.PopProductView;
22 24 import com.diligrp.titan.sdk.output.BaseOutput;
23 25 import com.diligrp.website.util.redis.RedisUtil;
24 26 import com.diligrp.website.util.security.Validator;
... ... @@ -194,15 +196,77 @@ public class GoodsRPCImpl implements GoodsRPC {
194 196 return categories;
195 197 }
196 198  
197   -
  199 + @Override
  200 + public Object addProductCategory(CategoryInput input,Long userId) {
  201 + BaseOutput<Object> output = null;
  202 + try {
  203 + output = titanClient.getCategoryService().insertCategory(input);
  204 + } catch (Exception e) {
  205 + logger.error("调用添加分类接口失败：[userId={},code={},result={}]",new Object[]{userId,output.getCode(),output.getResult()});
  206 + throw new ServiceException();
  207 +
  208 + }
  209 + if (output.getCode()!=200) {
  210 + logger.error("调用添加分类接口失败[userId={},code={},result={}]",
  211 + new Object[]{ userId,output.getCode(),output.getResult()});
  212 + throw new ServiceException(ResultCode.BUSINESS_FAILED,output.getResult());
  213 + }
  214 + return output.getData();
  215 + }
198 216  
  217 + @Override
  218 + public Object updateProductCategory(CategoryInput input, Long userId) {
  219 + BaseOutput<Object> output = null;
  220 + try {
  221 + output = titanClient.getCategoryService().updateCategory(input);
  222 + } catch (Exception e) {
  223 + logger.error("调用修改分类接口失败：[userId={},code={},result={}]",new Object[]{userId,output.getCode(),output.getResult()});
  224 + throw new ServiceException();
199 225  
200   -
  226 + }
  227 + if (output.getCode()!=200) {
  228 + logger.error("调用修改分类接口失败[userId={},code={},result={}]",
  229 + new Object[]{ userId,output.getCode(),output.getResult()});
  230 + throw new ServiceException(ResultCode.BUSINESS_FAILED,output.getResult());
  231 + }
  232 + return output.getData();
  233 + }
201 234  
  235 + @Override
  236 + public List<Category> searchProductCategory(String input, Long userId) {
  237 + BaseOutput<List<Category>> output = null;
  238 + try {
  239 + output = titanClient.getCategoryService().searchCategoryInfo(input);
  240 + } catch (Exception e) {
  241 + logger.error("搜索分类接口失败：[userId={},code={},result={}]",new Object[]{userId,output.getCode(),output.getResult()});
  242 + throw new ServiceException();
202 243  
  244 + }
  245 + if (output.getCode()!=200) {
  246 + logger.error("搜索分类接口失败[userId={},code={},result={}]",
  247 + new Object[]{ userId,output.getCode(),output.getResult()});
  248 + throw new ServiceException(ResultCode.BUSINESS_FAILED,output.getResult());
  249 + }
  250 + return output.getData();
  251 + }
203 252  
  253 + @Override
  254 + public Object addGoods(PopProductView input, Long userId) {
  255 + BaseOutput<Object> output = null;
  256 + try {
  257 + output = titanClient.getProductService().insertPopProduct(input,userId+"");
  258 + } catch (Exception e) {
  259 + logger.error("添加商品失败：[userId={},code={},result={}]",new Object[]{userId,output.getCode(),output.getResult()});
  260 + throw new ServiceException();
204 261  
  262 + }
  263 + if (output.getCode()!=200) {
  264 + logger.error("添加商品失败[userId={},code={},result={}]",
  265 + new Object[]{ userId,output.getCode(),output.getResult()});
  266 + throw new ServiceException(ResultCode.BUSINESS_FAILED,output.getResult());
  267 + }
  268 + return output.getData();
  269 + }
205 270  
206   -
207 271  
208 272 }
... ...
mobsite-getway-service/src/main/java/com/diligrp/mobsite/getway/service/buyer/home/impl/TopicServiceImpl.java
  View file @a552b93
... ... @@ -197,7 +197,7 @@ public class TopicServiceImpl implements TopicService {
197 197 category.setId(categoryDTO.getId());
198 198 category.setName(categoryDTO.getName());
199 199 category.setImgUrl(categoryDTO.getIcon());
200   - category.setLevel(categoryDTO.getCode());
  200 + //category.setLevel(categoryDTO.getCode());
201 201 try {
202 202 relateId = Long.valueOf(categoryDTO.getContent());
203 203 } catch (Exception e) {
... ...
mobsite-getway-service/src/main/java/com/diligrp/mobsite/getway/service/buyer/user/impl/UserServiceImpl.java
  View file @a552b93
... ... @@ -11,6 +11,7 @@ import com.diligrp.mobsite.getway.domain.except.ServiceException;
11 11 import com.diligrp.mobsite.getway.domain.protocol.login.*;
12 12 import com.diligrp.mobsite.getway.domain.protocol.register.*;
13 13 import com.diligrp.mobsite.getway.domain.protocol.user.*;
  14 +import com.diligrp.mobsite.getway.domain.protocol.user.model.RegisterNoPlatform;
14 15 import com.diligrp.mobsite.getway.manager.common.RegisterNoMapperManager;
15 16 import com.diligrp.mobsite.getway.rpc.*;
16 17 import com.diligrp.mobsite.getway.rpc.utils.UserRedisUtil;
... ... @@ -458,7 +459,40 @@ public class UserServiceImpl implements UserService {
458 459  
459 460 @Override
460 461 public GetRegisterNobyUidsResp getRegisterNobyUids(GetRegisterNobyUidsReq req) {
461   - return null;
  462 + GetRegisterNobyUidsResp resp = new GetRegisterNobyUidsResp();
  463 + Map<String, Object> param = new HashMap<String, Object>();
  464 + param.put("userids", req.getUserIds());
  465 + if (!Validator.isNull(req.getPlatform())) {
  466 + param.put("device_type",req.getPlatform().toString());
  467 + }
  468 + List<RegisterNoMapper> mappers = registerNoMapperManager.batchQuery(param);
  469 +
  470 + List<RegisterNoPlatform> registerNos = new ArrayList<RegisterNoPlatform>();
  471 + RegisterNoPlatform androidPlatform = new RegisterNoPlatform();
  472 + androidPlatform.setPlatform("android");
  473 + List<String> androids = new ArrayList<String>();
  474 + RegisterNoPlatform iosPlatform = new RegisterNoPlatform();
  475 + iosPlatform.setPlatform("ios");
  476 + List<String> iosids = new ArrayList<String>();
  477 + if (!Validator.isEmpty(mappers)) {
  478 + for (RegisterNoMapper registerNoMapper : mappers) {
  479 + if (!Validator.isNull(registerNoMapper.getDeviceType())) {
  480 + if (registerNoMapper.getDeviceType().equals(1)) {
  481 + androids.add(registerNoMapper.getRegisterNo());
  482 + }
  483 + if (registerNoMapper.getDeviceType().equals(2)) {
  484 + iosids.add(registerNoMapper.getRegisterNo());
  485 + }
  486 + }
  487 + }
  488 + }
  489 + androidPlatform.setIds(androids);
  490 + iosPlatform.setIds(iosids);
  491 + registerNos.add(androidPlatform);
  492 + registerNos.add(iosPlatform);
  493 + resp.setRegisterNos(registerNos);
  494 + resp.setCode(ResultCode.SUCCESS);
  495 + return resp;
462 496 }
463 497  
464 498 @Override
... ...
mobsite-getway-service/src/main/java/com/diligrp/mobsite/getway/service/seller/impl/SellerGoodsServiceImpl.java
  View file @a552b93
1 1 package com.diligrp.mobsite.getway.service.seller.impl;
2 2  
  3 +import com.diligrp.mobsite.getway.domain.protocol.Attribute;
  4 +import com.diligrp.mobsite.getway.domain.protocol.GoodsSuper;
  5 +import com.diligrp.mobsite.getway.domain.protocol.SKUInfo;
3 6 import com.diligrp.mobsite.getway.domain.protocol.product.*;
4 7 import com.diligrp.mobsite.getway.domain.protocol.saler.SellerUpdateProductReq;
5 8 import com.diligrp.mobsite.getway.domain.protocol.saler.product.*;
... ... @@ -7,12 +10,18 @@ import com.diligrp.mobsite.getway.rpc.ConfigRPC;
7 10 import com.diligrp.mobsite.getway.rpc.GoodsRPC;
8 11 import com.diligrp.mobsite.getway.rpc.UserRPC;
9 12 import com.diligrp.mobsite.getway.service.seller.SellerGoodsService;
  13 +import com.diligrp.titan.sdk.domain.Category;
  14 +import com.diligrp.titan.sdk.domain.Sku;
  15 +import com.diligrp.titan.sdk.input.CategoryInput;
  16 +import com.diligrp.titan.sdk.input.PopProductView;
  17 +import com.diligrp.website.util.security.Validator;
10 18 import com.yqyw.filter.client.KeyWordsClient;
11 19 import org.apache.log4j.Logger;
12 20 import org.springframework.beans.factory.annotation.Autowired;
13 21 import org.springframework.stereotype.Service;
14 22  
15 23 import javax.annotation.Resource;
  24 +import java.util.ArrayList;
16 25 import java.util.List;
17 26  
18 27 /**
... ... @@ -106,22 +115,102 @@ public class SellerGoodsServiceImpl implements SellerGoodsService {
106 115  
107 116 @Override
108 117 public AddProductCategoryResp addProductCategory(AddProductCategoryReq req) {
109   - return null;
  118 + AddProductCategoryResp resp = new AddProductCategoryResp();
  119 + CategoryInput input = new CategoryInput();
  120 + input.setName(req.getCategory().getName());
  121 + input.setShopId(req.getShopId());
  122 + input.setParent(req.getCategory().getParentId().intValue());
  123 + goodsRPC.addProductCategory(input,req.getUserId());
  124 + return resp;
110 125 }
111 126  
112 127 @Override
113 128 public UpdateProductCategoryResp updateProductCategory(UpdateProductCategoryReq req) {
114   - return null;
  129 + UpdateProductCategoryResp resp = new UpdateProductCategoryResp();
  130 + CategoryInput input = new CategoryInput();
  131 + input.setId(req.getCategory().getId());
  132 + input.setName(req.getCategory().getName());
  133 + input.setShopId(req.getShopId());
  134 + input.setParent(req.getCategory().getParentId().intValue());
  135 + goodsRPC.updateProductCategory(input,req.getUserId());
  136 + return resp;
115 137 }
116 138  
117 139 @Override
118 140 public SearchProductCategoryResp searchProductCategory(SearchProductCategoryReq req) {
119   - return null;
  141 + SearchProductCategoryResp resp = new SearchProductCategoryResp();
  142 + List<Category> categories = goodsRPC.searchProductCategory(req.getKeyword(),req.getUserId());
  143 + resp.setCategories(buildCategories(categories));
  144 + return resp;
  145 + }
  146 +
  147 + private List<com.diligrp.mobsite.getway.domain.protocol.Category> buildCategories(List<Category> categories) {
  148 + List<com.diligrp.mobsite.getway.domain.protocol.Category> categoryInfos = null;
  149 + if (!Validator.isEmpty(categories)){
  150 + categoryInfos = new ArrayList<>();
  151 + for(Category category:categories){
  152 + com.diligrp.mobsite.getway.domain.protocol.Category categoryInfo = new com.diligrp.mobsite.getway.domain.protocol.Category();
  153 + categoryInfo.setId((long)category.getCid());
  154 + categoryInfo.setName(category.getCname());
  155 + categoryInfo.setImgUrl(category.getIcon());
  156 + categoryInfo.setParentId((long)category.getPcid());
  157 + categoryInfos.add(categoryInfo);
  158 + }
  159 + }
  160 + return categoryInfos;
120 161 }
121 162  
122 163 @Override
123 164 public AddGoodsResp addGoods(AddGoodsReq req) {
124   - return null;
  165 + AddGoodsResp resp = new AddGoodsResp();
  166 + PopProductView input = new PopProductView();
  167 + buildAddGoodsInput(req,input);
  168 + goodsRPC.addGoods(input ,req.getUserId());
  169 + return resp;
  170 + }
  171 +
  172 + private void buildAddGoodsInput(AddGoodsReq req, PopProductView input) {
  173 + GoodsSuper goods = req.getGoods();
  174 + input.setName(goods.getName());
  175 + input.setIndexTop(goods.getIndexTop());
  176 + input.setPid(goods.getPid());
  177 + input.setSellerId(req.getUserId()+"");
  178 + input.setVendorId(req.getShopId()+"");
  179 + input.setCid(goods.getCid());
  180 + input.setCname(goods.getCname());
  181 + input.setDefaultPic(goods.getDefaultPic());
  182 + input.setPictures(goods.getPictures());
  183 + input.setSaleAtt(buildSaleAttr(goods.getSaleAtt()));
  184 + input.setSkus(bulidSkus(goods.getSkus()));
  185 + input.setDesc(goods.getDesc());
  186 + input.setProductType(goods.getProductType());
  187 +
  188 + }
  189 +
  190 + private List<Sku> bulidSkus(List<SKUInfo> skusInfo) {
  191 + List<Sku> skus = null;
  192 + if (!Validator.isEmpty(skusInfo)){
  193 + skus = new ArrayList<>();
  194 + for (SKUInfo info : skusInfo){
  195 + Sku sku = new Sku();
  196 +
  197 +
  198 +
  199 +
  200 + skus.add(sku);
  201 + }
  202 + }
  203 +
  204 +
  205 + return skus;
  206 + }
  207 +
  208 + private List<com.diligrp.titan.sdk.domain.Attribute> buildSaleAttr(List<Attribute> saleAtt) {
  209 +
  210 + List<com.diligrp.titan.sdk.domain.Attribute> attrs = null;
  211 +
  212 + return attrs;
  213 +
125 214 }
126 215  
127 216 @Override
... ...
mobsite-getway-web/src/main/java/com/diligrp/mobsite/getway/web/api/buyer/user/UserController.java
  View file @a552b93
... ... @@ -387,27 +387,51 @@ public class UserController extends BaseApiController {
387 387 }
388 388  
389 389  
390   - ///**
391   - // * 查询极光推送号
392   - // *
393   - // * getRegisterNo
394   - // */
395   - //@RequestMapping("/getRegisterNo")
396   - //@ResponseBody
397   - //public void getRegisterNo() {
398   - // GetRegisterNoReq req = getRequest(GetRegisterNoReq.class);
399   - // try {
400   - // GetRegisterNoResp resp = userService.getRegisterNo(req);
401   - // sendSuccessResp(resp);
402   - // } catch (ServiceException e){
403   - // LOGGER.error(String.format("Code=%s,ErrorMessage=%s",
404   - // e.getCode(), e.getMessage()), e);
405   - // sendError(e.getCode(), e.getMessage());
406   - // } catch (Exception e) {
407   - // LOGGER.error(String.format("ErrorMessage=%s", e.getMessage()), e);
408   - // sendError(e.getMessage());
409   - // }
410   - //}
  390 + /**
  391 + * 查询极光推送号
  392 + *
  393 + * getRegisterNo
  394 + */
  395 + @ApiOperation(value = "查询极光推送号", httpMethod = "POST" ,response = GetRegisterNoResp.class)
  396 + @RequestMapping(value = "/getRegisterNo",method = RequestMethod.POST)
  397 + @ResponseBody
  398 + public void getRegisterNo(@RequestBody GetRegisterNoReq temp) {
  399 + GetRegisterNoReq req = getRequest(GetRegisterNoReq.class);
  400 + try {
  401 + GetRegisterNoResp resp = userService.getRegisterNo(req);
  402 + sendSuccessResp(resp);
  403 + } catch (ServiceException e){
  404 + LOGGER.error(String.format("Code=%s,ErrorMessage=%s",
  405 + e.getCode(), e.getMessage()), e);
  406 + sendError(e.getCode(), e.getMessage());
  407 + } catch (Exception e) {
  408 + LOGGER.error(String.format("ErrorMessage=%s", e.getMessage()), e);
  409 + sendError(e.getMessage());
  410 + }
  411 + }
  412 +
  413 + /**
  414 + * 批量查询极光推送号
  415 + *
  416 + * getNosByUserids
  417 + */
  418 + @ApiOperation(value = "批量查询极光推送号", httpMethod = "POST" ,response = GetRegisterNobyUidsResp.class)
  419 + @RequestMapping(value = "/getRegisterNobyUids",method = RequestMethod.POST)
  420 + @ResponseBody
  421 + public void getRegisterNobyUids(@RequestBody GetRegisterNobyUidsReq temp) {
  422 + GetRegisterNobyUidsReq req = getRequest(GetRegisterNobyUidsReq.class);
  423 + try {
  424 + GetRegisterNobyUidsResp resp = userService.getRegisterNobyUids(req);
  425 + sendSuccessResp(resp);
  426 + } catch (ServiceException e){
  427 + LOGGER.error(String.format("Code=%s,ErrorMessage=%s",
  428 + e.getCode(), e.getMessage()), e);
  429 + sendError(e.getCode(), e.getMessage());
  430 + } catch (Exception e) {
  431 + LOGGER.error(String.format("ErrorMessage=%s", e.getMessage()), e);
  432 + sendError(e.getMessage());
  433 + }
  434 + }
411 435  
412 436  
413 437 ///**
... ...
... ... @@ -38,6 +38,7 @@
38 38 </plugins>
39 39 </build>
40 40  
  41 +
41 42 <dependencies>
42 43  
43 44 <dependency>
... ...