b2c / gateway · Commits

Commit 6b18dfaabcaea12bcbb750cb97ffce87ae75ba91

Authored by alexyang
2 parents 264846e0 940b1908
build: skipped

Merge remote-tracking branch 'origin/dev'

Inline Side-by-side
Showing 40 changed files with 907 additions and 3130 deletions

Too many changes to show.
Reload with full diff Plain diff Email patch

To preserve performance only 40 of 646 files are displayed.

.gitignore 0 → 100644
  View file @6b18dfa
  1 +#target/
  2 +target/
  3 +
  4 +# IDEA #
  5 +.idea/
  6 +*.iml
  7 +
  8 +# Eclipse #
  9 +.settings/
  10 +.classpath
  11 +.project
  12 +
  13 +# Log #
  14 +logs/
  15 +*.log%
  16 +
  17 +#mac
  18 +.DS_Store
  19 +
  20 +#svn
  21 +.svn
0 \ No newline at end of file 22 \ No newline at end of file
detached-commit.txt 0 → 100644
  View file @6b18dfa
mobsite-getway-dao/pom.xml
  View file @6b18dfa
@@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@
11 </properties> 11 </properties>
12 <dependencies> 12 <dependencies>
13 <dependency> 13 <dependency>
14 - <groupId>com.diligrp.mobsite</groupId> 14 + <groupId>com.b2c.mobsite</groupId>
15 <artifactId>mobsite-getway-domain</artifactId> 15 <artifactId>mobsite-getway-domain</artifactId>
16 <version>0.0.1-SNAPSHOT</version> 16 <version>0.0.1-SNAPSHOT</version>
17 </dependency> 17 </dependency>
mobsite-getway-domain/pom.xml
  View file @6b18dfa
@@ -2,25 +2,92 @@ @@ -2,25 +2,92 @@
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" 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 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 3 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
4 <modelVersion>4.0.0</modelVersion> 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>  
10 - <groupId>com.diligrp.mobsite</groupId> 5 + <!--<parent>-->
  6 + <!--<groupId>com.diligrp.mobsite</groupId>-->
  7 + <!--<artifactId>mobsite-getway</artifactId>-->
  8 + <!--<version>0.0.1-SNAPSHOT</version>-->
  9 + <!--</parent>-->
  10 +
  11 +
  12 + <groupId>com.b2c.mobsite</groupId>
11 <artifactId>mobsite-getway-domain</artifactId> 13 <artifactId>mobsite-getway-domain</artifactId>
12 <version>0.0.1-SNAPSHOT</version> 14 <version>0.0.1-SNAPSHOT</version>
13 <name>mobsite-getway-domain</name> 15 <name>mobsite-getway-domain</name>
14 <url>http://maven.apache.org</url> 16 <url>http://maven.apache.org</url>
15 <properties> 17 <properties>
16 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> 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>
17 </properties> 22 </properties>
18 - <dependencies>  
19 - <dependency>  
20 - <groupId>junit</groupId>  
21 - <artifactId>junit</artifactId>  
22 - <version>3.8.1</version>  
23 - <scope>test</scope>  
24 - </dependency>  
25 - </dependencies> 23 +
  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 +
  43 + <!--<dependency>-->
  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>-->
  49 + <!--</dependency>-->
  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.4-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>
26 </project> 93 </project>
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/RegisterNoMapper.java
  View file @6b18dfa
@@ -23,6 +23,10 @@ public class RegisterNoMapper extends BaseDomain { @@ -23,6 +23,10 @@ public class RegisterNoMapper extends BaseDomain {
23 */ 23 */
24 private Long userid; 24 private Long userid;
25 /** 25 /**
  26 + * 用户类型:10-买家，20-卖家
  27 + */
  28 + private Integer userType;
  29 + /**
26 * 注册ID 30 * 注册ID
27 */ 31 */
28 private String registerNo; 32 private String registerNo;
@@ -36,6 +40,15 @@ public class RegisterNoMapper extends BaseDomain { @@ -36,6 +40,15 @@ public class RegisterNoMapper extends BaseDomain {
36 */ 40 */
37 private Integer deviceType; 41 private Integer deviceType;
38 42
  43 +
  44 + public Integer getUserType() {
  45 + return userType;
  46 + }
  47 +
  48 + public void setUserType(Integer userType) {
  49 + this.userType = userType;
  50 + }
  51 +
39 public void setUserid(Long userid) { 52 public void setUserid(Long userid) {
40 this.userid = userid; 53 this.userid = userid;
41 } 54 }
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/base/BaseListReq.java
  View file @6b18dfa
@@ -2,6 +2,7 @@ @@ -2,6 +2,7 @@
2 package com.diligrp.mobsite.getway.domain.base; 2 package com.diligrp.mobsite.getway.domain.base;
3 3
4 import com.diligrp.mobsite.getway.domain.protocol.BaseReq; 4 import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
  5 +import io.swagger.annotations.ApiModelProperty;
5 6
6 /** 7 /**
7 * 列表请求基类 8 * 列表请求基类
@@ -20,6 +21,7 @@ public class BaseListReq extends BaseReq { @@ -20,6 +21,7 @@ public class BaseListReq extends BaseReq {
20 /** 21 /**
21 * 页码 22 * 页码
22 */ 23 */
  24 + @ApiModelProperty(value = "页码",required = true)
23 private Integer pageNum; 25 private Integer pageNum;
24 26
25 public Integer getPageNum() { 27 public Integer getPageNum() {
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/common/Constant.java
  View file @6b18dfa
@@ -121,6 +121,11 @@ public class Constant { @@ -121,6 +121,11 @@ public class Constant {
121 /** 121 /**
122 * 用户 122 * 用户
123 */ 123 */
  124 + public static final int USER_ROLE_BUYER = 10;//买家
  125 + public static final int USER_ROLE_SELLER = 20;//卖家
  126 +
  127 + public static final String USER_ROLE_SIGN_BUYER = "buyer";//买家
  128 + public static final String USER_ROLE_SIGN_SELLER = "seller";//卖家
124 public static final int USER_TYPE_PERSONAL = 1; 129 public static final int USER_TYPE_PERSONAL = 1;
125 public static final int USER_TYPE_COMPANY = 2; 130 public static final int USER_TYPE_COMPANY = 2;
126 public static final int USER_AUTH_RESULT_NOTAUTH = 100;//未认证 131 public static final int USER_AUTH_RESULT_NOTAUTH = 100;//未认证
@@ -165,8 +170,8 @@ public class Constant { @@ -165,8 +170,8 @@ public class Constant {
165 /** 170 /**
166 * 代购订单使用 171 * 代购订单使用
167 */ 172 */
168 - public static final Long OPERATOR_ROLE_BUYER = 10L; //操作人角色 10买家  
169 - public static final Long OPERATOR_ROLE_SELLER = 20L; //操作人角色 20卖家 173 + public static final Integer OPERATOR_ROLE_BUYER = 10; //操作人角色 10买家
  174 + public static final Integer OPERATOR_ROLE_SELLER = 20; //操作人角色 20卖家
170 /** 是否选择代找物流:1-是，2-否*/ 175 /** 是否选择代找物流:1-是，2-否*/
171 public static final Integer QUERYPARAM_ISAGENTLOGISTICS_YES = 1; 176 public static final Integer QUERYPARAM_ISAGENTLOGISTICS_YES = 1;
172 public static final Integer QUERYPARAM_ISAGENTLOGISTICS_NO = 0; 177 public static final Integer QUERYPARAM_ISAGENTLOGISTICS_NO = 0;
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/common/ErrorMessage.java
  View file @6b18dfa
@@ -45,9 +45,11 @@ public final class ErrorMessage { @@ -45,9 +45,11 @@ public final class ErrorMessage {
45 public static final String USER_NOT_LOGIN = "用户没有登录，请登录"; 45 public static final String USER_NOT_LOGIN = "用户没有登录，请登录";
46 public static final String USER_LOGIN_MULTI = "你的账号在其他设备登录，您被迫下线！"; 46 public static final String USER_LOGIN_MULTI = "你的账号在其他设备登录，您被迫下线！";
47 public static final String USER_NOT_EXIST = "用户信息不存在，请重新操作"; 47 public static final String USER_NOT_EXIST = "用户信息不存在，请重新操作";
  48 + public static final String USER_SEARCH_FAILED = "查询用户信息失败";
48 public static final String USER_PASSWORD_WRONG = "原始密码输入错误，请重新输入"; 49 public static final String USER_PASSWORD_WRONG = "原始密码输入错误，请重新输入";
49 public static final String USER_MOBILE_EXIST = "手机号码已经存在，请重新输入"; 50 public static final String USER_MOBILE_EXIST = "手机号码已经存在，请重新输入";
50 public static final String USER_MOBILE_NOT_EXIST = "用户不存在，请重新输入"; 51 public static final String USER_MOBILE_NOT_EXIST = "用户不存在，请重新输入";
  52 + public static final String USER_UPDATE_INFO = "更新用户信息失败";
51 public static final String USER_CONSIGNEE_SET_DEFAULT_FAILED = "设置默认提货人失败"; 53 public static final String USER_CONSIGNEE_SET_DEFAULT_FAILED = "设置默认提货人失败";
52 public static final String USER_AUTH_USER_PASS = "您提交的身份证号已经被认证"; 54 public static final String USER_AUTH_USER_PASS = "您提交的身份证号已经被认证";
53 public static final String USER_AUTH_ENTERPRISE_PASS = "每个企业仅能注册一次"; 55 public static final String USER_AUTH_ENTERPRISE_PASS = "每个企业仅能注册一次";
@@ -63,7 +65,7 @@ public final class ErrorMessage { @@ -63,7 +65,7 @@ public final class ErrorMessage {
63 public static final String SELLER_NOT_OPEN_SHOP ="您还未开通店铺，请到网站进行开通"; 65 public static final String SELLER_NOT_OPEN_SHOP ="您还未开通店铺，请到网站进行开通";
64 public static final String SELLER_SHOP_NOT_AUDIT ="您的店铺还未审核通过，请等待审核"; 66 public static final String SELLER_SHOP_NOT_AUDIT ="您的店铺还未审核通过，请等待审核";
65 public static final String USER_FAVORITE_ADD_ERROR ="添加收藏失败，请重新操作"; 67 public static final String USER_FAVORITE_ADD_ERROR ="添加收藏失败，请重新操作";
66 - 68 + public static final String BUYER_NOT_OPEN_SHOP ="您还未绑定店铺";
67 69
68 70
69 /** 71 /**
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/common/RedisKey.java
  View file @6b18dfa
@@ -15,20 +15,26 @@ public final class RedisKey { @@ -15,20 +15,26 @@ public final class RedisKey {
15 15
16 public static final int USER_SEND_VERICODE_EXPIRE_TIME = 10*60;//发送验证码失效时间，10分钟 16 public static final int USER_SEND_VERICODE_EXPIRE_TIME = 10*60;//发送验证码失效时间，10分钟
17 17
18 - public static final String PNR_GETWAY = "PNR_GETWAY"; 18 + public static final String ZDAPP_GETWAY = "ZDAPP_GETWAY";
19 19
20 //登录信息 20 //登录信息
21 - public static final String USER_LOGININFO = PNR_GETWAY+":USER:LOGININFO";  
22 - public static final String USER_DEVICEID = PNR_GETWAY+":USER:DEVICEID";  
23 - public static final String USER_REGISTERNO = PNR_GETWAY+":USER:REGISTERNO"; 21 + public static final String USER_LOGININFO = ZDAPP_GETWAY+":USER:LOGININFO";
  22 + public static final String USER_DEVICEID = ZDAPP_GETWAY+":USER:DEVICEID";
  23 + public static final String USER_REGISTERNO = ZDAPP_GETWAY+":USER:REGISTERNO";
  24 +
  25 + public static final String USER_SELLER_SHOPID = ZDAPP_GETWAY+":SELLER:SHOPID";
  26 +
  27 + public static final String USER_BUYER_CURRENTSHOPID = ZDAPP_GETWAY+":BUYER:SHOPID";
  28 +
  29 + public static final String USER_BUYER_SHOPUSERID = ZDAPP_GETWAY+":BUYER:SHOPUSERID";
24 30
25 //门卫登录信息 31 //门卫登录信息
26 - public static final String GUARD_LOGININFO = PNR_GETWAY+":GUARD:LOGININFO"; 32 + public static final String GUARD_LOGININFO = ZDAPP_GETWAY+":GUARD:LOGININFO";
27 33
28 //门卫登录session 34 //门卫登录session
29 - public static final String GUARD_SESSSION = PNR_GETWAY+":GUARD:SESSSION"; 35 + public static final String GUARD_SESSSION = ZDAPP_GETWAY+":GUARD:SESSSION";
30 36
31 - public static final String USER = PNR_GETWAY+":USER"; 37 + public static final String USER = ZDAPP_GETWAY+":USER";
32 public static final String USER_AUTH_CODE_REGISTER = USER+":AUTH_CODE_REGISTER";//注册验证码 38 public static final String USER_AUTH_CODE_REGISTER = USER+":AUTH_CODE_REGISTER";//注册验证码
33 public static final String USER_AUTH_CODE_MODIFY_PWD_AND_PHONE = USER+":USER_AUTH_CODE_MODIFY_PWD_AND_PHONE";//修改密码 39 public static final String USER_AUTH_CODE_MODIFY_PWD_AND_PHONE = USER+":USER_AUTH_CODE_MODIFY_PWD_AND_PHONE";//修改密码
34 40
@@ -39,21 +45,21 @@ public final class RedisKey { @@ -39,21 +45,21 @@ public final class RedisKey {
39 public static final String USER_AUTH_CODE = USER+":AUTH_CODE"; 45 public static final String USER_AUTH_CODE = USER+":AUTH_CODE";
40 46
41 //延迟退出 暂时未调用 47 //延迟退出 暂时未调用
42 - public static final String LOGOUT = PNR_GETWAY+":LOGOUT"; 48 + public static final String LOGOUT = ZDAPP_GETWAY+":LOGOUT";
43 //订单cookieValue 49 //订单cookieValue
44 - public static final String COOKIE_VALUE = PNR_GETWAY+":COOKIE_VALUE"; 50 + public static final String COOKIE_VALUE = ZDAPP_GETWAY+":COOKIE_VALUE";
45 51
46 //根据城市ID获取提货点 52 //根据城市ID获取提货点
47 public static final int GETPICKUPLISTBYCITYID_TIME = 10*60; 53 public static final int GETPICKUPLISTBYCITYID_TIME = 10*60;
48 54
49 //专题标题 55 //专题标题
50 public static final int TOPIC_EXPIRE_TIME = 10; 56 public static final int TOPIC_EXPIRE_TIME = 10;
51 - public static final String TOPIC_BAR = PNR_GETWAY+":TOPIC:BAR";  
52 - public static final String TOPIC_CATEGORY = PNR_GETWAY+":TOPIC:CATEGORY";//专题标题 57 + public static final String TOPIC_BAR = ZDAPP_GETWAY+":TOPIC:BAR";
  58 + public static final String TOPIC_CATEGORY = ZDAPP_GETWAY+":TOPIC:CATEGORY";//专题标题
53 59
54 //商品缓存 60 //商品缓存
55 public static final int PRODUCT_EXPIRE_TIME = 3*60; 61 public static final int PRODUCT_EXPIRE_TIME = 3*60;
56 - public static final String PRODUCT = PNR_GETWAY+":PRODUCT"; 62 + public static final String PRODUCT = ZDAPP_GETWAY+":PRODUCT";
57 public static final String PRODUCT_PRODUCTDETAIL = PRODUCT+":PRODUCT_DETAIL"; 63 public static final String PRODUCT_PRODUCTDETAIL = PRODUCT+":PRODUCT_DETAIL";
58 public static final String PRODUCT_CATEGORY = PRODUCT+":PRODUCT_CATEGORY"; 64 public static final String PRODUCT_CATEGORY = PRODUCT+":PRODUCT_CATEGORY";
59 65
@@ -61,7 +67,7 @@ public final class RedisKey { @@ -61,7 +67,7 @@ public final class RedisKey {
61 * 订单缓存 67 * 订单缓存
62 */ 68 */
63 public static final int ORDER_EXPIRE_TIME = 10; 69 public static final int ORDER_EXPIRE_TIME = 10;
64 - public static final String ORDER = PNR_GETWAY + ":ORDER"; 70 + public static final String ORDER = ZDAPP_GETWAY + ":ORDER";
65 public static final String ORDER_SUM_INFO = ORDER + ":SUM_INFO"; 71 public static final String ORDER_SUM_INFO = ORDER + ":SUM_INFO";
66 public static final String ORDER_AGREEMENT = ORDER + ":AGREEMENT"; 72 public static final String ORDER_AGREEMENT = ORDER + ":AGREEMENT";
67 73
@@ -69,7 +75,7 @@ public final class RedisKey { @@ -69,7 +75,7 @@ public final class RedisKey {
69 * 配置缓存，config 75 * 配置缓存，config
70 */ 76 */
71 public static final int CONFIG_EXPIRE_TIME = 3*60*60; 77 public static final int CONFIG_EXPIRE_TIME = 3*60*60;
72 - public static final String CONFIG = PNR_GETWAY+":CONFIG"; 78 + public static final String CONFIG = ZDAPP_GETWAY+":CONFIG";
73 public static final String CONFIG_PROVINCE_CITY_ADDRESS = CONFIG+":PROVINCE_CITY_ADDRESS"; 79 public static final String CONFIG_PROVINCE_CITY_ADDRESS = CONFIG+":PROVINCE_CITY_ADDRESS";
74 public static final String CONFIG_SYSTEM_CONFIG = CONFIG + ":SYSTEM_CONFIG"; 80 public static final String CONFIG_SYSTEM_CONFIG = CONFIG + ":SYSTEM_CONFIG";
75 public static final String CONFIG_SMS_CONTENT = CONFIG + ":SMS_CONTENT"; 81 public static final String CONFIG_SMS_CONTENT = CONFIG + ":SMS_CONTENT";
@@ -94,7 +100,7 @@ public final class RedisKey { @@ -94,7 +100,7 @@ public final class RedisKey {
94 * 店铺信息 100 * 店铺信息
95 */ 101 */
96 public static final int SHOP_EXPIRE_TIME = 3*60; 102 public static final int SHOP_EXPIRE_TIME = 3*60;
97 - public static final String SHOP = PNR_GETWAY+":SHOP"; 103 + public static final String SHOP = ZDAPP_GETWAY+":SHOP";
98 public static final String SHOP_INFO = SHOP+"INFO"; 104 public static final String SHOP_INFO = SHOP+"INFO";
99 public static final String SHOP_SEND_ADDRESS = SHOP+"SEND_ADDRESS"; 105 public static final String SHOP_SEND_ADDRESS = SHOP+"SEND_ADDRESS";
100 106
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/common/ResultCode.java
  View file @6b18dfa
@@ -47,6 +47,8 @@ public final class ResultCode { @@ -47,6 +47,8 @@ public final class ResultCode {
47 * 用户电话已经存在 47 * 用户电话已经存在
48 */ 48 */
49 public static final int USER_MOBILE_EXIST = 1100; 49 public static final int USER_MOBILE_EXIST = 1100;
  50 +
  51 +
50 /** 52 /**
51 * 设置默认提货人失败 53 * 设置默认提货人失败
52 */ 54 */
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/common/enums/OrderRefundStateEnum.java deleted 100644 → 0
  View file @264846e
1 -package com.diligrp.mobsite.getway.domain.common.enums;  
2 -  
3 -import com.diligrp.mobsite.getway.domain.common.Constant;  
4 -  
5 -  
6 -/**  
7 - * <B>Description</B> 订单退款状态 <br />  
8 - * <B>Copyright</B> Copyright (c) 2015 www.diligrp.com All rights reserved. <br />  
9 - * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />  
10 - * <B>Company</B> 地利集团  
11 - * @createTime 2015年4月30日 下午2:12:45  
12 - * @author zhangshirui  
13 - */  
14 -public enum OrderRefundStateEnum {  
15 - /**  
16 - * 10卖家待审核，20卖家审核通过，30卖家审核不通过，40申请退款取消，50平台申诉处理中，60退款申诉成功，70退款申诉失败，80退款申诉取消  
17 - * 10待审核  
18 - */  
19 - STATE_WAIT_APPROVE(10,"卖家审核中","我们已通知卖家尽快处理，请耐心等待"),  
20 - /**  
21 - * 20-审核通过  
22 - */  
23 - STATE_APPROVED(20,"卖家同意退款","退款金额"+Constant.ORDER_REPLACE_MONEY+"元已返还到您的付款账户中，请注意查收"),  
24 - /**  
25 - * 30-审核不通过  
26 - */  
27 - STATE_NOT_APPROVED(30,"卖家拒绝退款",""),  
28 - /**  
29 - * 40-取消  
30 - */  
31 - STATE_CANCELED(40,"已取消",""),  
32 - /**  
33 - * 50-处理中  
34 - */  
35 - STATE_PROCESSING(50,"平台申诉处理中","我们会在三个工作日内处理完您的退款申诉，如有疑问请咨询客服"),  
36 - STATE_APPLY_SUCCESS(60,"申诉成功","退款金额"+Constant.ORDER_REPLACE_MONEY+"元已返还到您的付款账户中，请注意查收！"),  
37 - STATE_APPLY_FAILED(70,"申诉失败","经调查，按平台规则，决定驳回您的申诉"),  
38 - STATE_APPLY_CANCELED(80,"申诉取消",""),  
39 -  
40 - STATE_WaitRepayment(90,"卖家审核通过等待打款","");  
41 -  
42 - private int state;  
43 - private String stateName;  
44 - private String stateDesc;  
45 -  
46 - private OrderRefundStateEnum(int state,String stateName,String stateDesc){  
47 - this.state = state;  
48 - this.stateName = stateName;  
49 - this.stateDesc = stateDesc;  
50 - }  
51 -  
52 - public int getState(){  
53 - return this.state;  
54 - }  
55 -  
56 - public String getStateName(){  
57 - return this.stateName;  
58 - }  
59 -  
60 - public String getStateDesc(){  
61 - return this.stateDesc;  
62 - }  
63 -  
64 - public static OrderRefundStateEnum getEnumByState(int state){  
65 - for(OrderRefundStateEnum stateEnum : OrderRefundStateEnum.values()){  
66 - if (state == stateEnum.getState()) {  
67 - return stateEnum;  
68 - }  
69 - }  
70 - return null;  
71 - }  
72 -}  
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/AddCartProduct.java
  View file @6b18dfa
1 package com.diligrp.mobsite.getway.domain.protocol; 1 package com.diligrp.mobsite.getway.domain.protocol;
2 2
3 -import java.util.List; 3 +import io.swagger.annotations.ApiModelProperty;
  4 +
  5 +import javax.validation.constraints.Min;
  6 +import javax.validation.constraints.NotNull;
4 7
5 /** 8 /**
6 * <B>Description</B> 合并进货单商品信息 <br /> 9 * <B>Description</B> 合并进货单商品信息 <br />
@@ -18,131 +21,60 @@ public class AddCartProduct implements java.io.Serializable{ @@ -18,131 +21,60 @@ public class AddCartProduct implements java.io.Serializable{
18 /** 21 /**
19 * 商品id 22 * 商品id
20 */ 23 */
21 - private Long productId;  
22 - /**  
23 - * Sku版本  
24 - */  
25 - private Integer version; 24 + @ApiModelProperty(value = "商品id",required = true)
  25 + @NotNull(message = "商品id不能为空")
  26 + private Long pid;
  27 +
26 /** 28 /**
27 * SKU 29 * SKU
28 */ 30 */
29 - private List<Long> sku;  
30 - /**  
31 - * 店铺ID  
32 - */  
33 - private Long shopId;  
34 - /**  
35 - * 价格方式：1-普通价格方式，2-价格区间方式  
36 - */  
37 - private Integer priceType;  
38 - /**  
39 - * TODO 后期需要删除，价格区间  
40 - */  
41 - @Deprecated  
42 - private List<Quotation> quotationList; 31 + @ApiModelProperty(value = "sku",required = true)
  32 + @NotNull(message = "sku不能为空")
  33 + private String sku;
  34 +
43 /** 35 /**
44 * 普通价格 36 * 普通价格
45 */ 37 */
  38 + @ApiModelProperty(value = "价格",required = true)
  39 + @NotNull(message = "价格不能为空")
46 private Long price; 40 private Long price;
47 /** 41 /**
48 * 购买数量 42 * 购买数量
49 */ 43 */
50 - private Integer amount;  
51 - 44 + @ApiModelProperty(value = "数量",required = true)
  45 + @Min(value = 0,message = "数量必须大于0")
  46 + private Integer quantity;
52 47
53 - public Long getPrice() {  
54 - return price;  
55 - }  
56 48
57 - public void setPrice(Long price) {  
58 - this.price = price;  
59 - }  
60 -  
61 - public Integer getAmount() {  
62 - return amount;  
63 - }  
64 -  
65 - public void setAmount(Integer amount) {  
66 - this.amount = amount;  
67 - }  
68 -  
69 - /**  
70 - * @return the sku  
71 - */  
72 - public List<Long> getSku() {  
73 - return sku; 49 + public Long getPid() {
  50 + return pid;
74 } 51 }
75 52
76 - /**  
77 - * @param sku the sku to set  
78 - */  
79 - public void setSku(List<Long> sku) {  
80 - this.sku = sku; 53 + public void setPid(Long pid) {
  54 + this.pid = pid;
81 } 55 }
82 56
83 - /**  
84 - * @return the productId  
85 - */  
86 - public Long getProductId() {  
87 - return productId;  
88 - }  
89 -  
90 - /**  
91 - * @param productId the productId to set  
92 - */  
93 - public void setProductId(Long productId) {  
94 - this.productId = productId; 57 + public String getSku() {
  58 + return sku;
95 } 59 }
96 60
97 - /**  
98 - * @return the priceType  
99 - */  
100 - public Integer getPriceType() {  
101 - return priceType; 61 + public void setSku(String sku) {
  62 + this.sku = sku;
102 } 63 }
103 64
104 - /**  
105 - * @param priceType the priceType to set  
106 - */  
107 - public void setPriceType(Integer priceType) {  
108 - this.priceType = priceType; 65 + public Long getPrice() {
  66 + return price;
109 } 67 }
110 68
111 - /**  
112 - * @return the quotationList  
113 - */  
114 - public List<Quotation> getQuotationList() {  
115 - return quotationList; 69 + public void setPrice(Long price) {
  70 + this.price = price;
116 } 71 }
117 72
118 - /**  
119 - * @param quotationList the quotationList to set  
120 - */  
121 - public void setQuotationList(List<Quotation> quotationList) {  
122 - this.quotationList = quotationList; 73 + public Integer getQuantity() {
  74 + return quantity;
123 } 75 }
124 76
125 - /**  
126 - * @return the version  
127 - */  
128 - public Integer getVersion() {  
129 - return version; 77 + public void setQuantity(Integer quantity) {
  78 + this.quantity = quantity;
130 } 79 }
131 -  
132 - /**  
133 - * @param version the version to set  
134 - */  
135 - public void setVersion(Integer version) {  
136 - this.version = version;  
137 - }  
138 -  
139 -  
140 - public Long getShopId() {  
141 - return shopId;  
142 - }  
143 -  
144 -  
145 - public void setShopId(Long shopId) {  
146 - this.shopId = shopId;  
147 - }  
148 } 80 }
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/AppraiseInfo.java deleted 100644 → 0
  View file @264846e
1 -package com.diligrp.mobsite.getway.domain.protocol;  
2 -  
3 -import java.util.Date;  
4 -  
5 -/**  
6 - * <B>Description</B> 评价信息 <br />  
7 - * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />  
8 - * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />  
9 - * <B>Company</B> 地利集团  
10 - * @createTime Aug 14, 2014 8:36:41 PM  
11 - * @author wujianjun  
12 - */  
13 -public class AppraiseInfo {  
14 -  
15 - /**  
16 - * 评分  
17 - */  
18 - private Float score;  
19 - /**  
20 - * 评价者-会员名  
21 - */  
22 - private String creator;  
23 - /**  
24 - * 评价内容  
25 - */  
26 - private String content;  
27 - /**  
28 - * 评价时间  
29 - */  
30 - private Date createTime;  
31 -  
32 - /**  
33 - * get value of AppraiseInfo.score  
34 - * @return the score  
35 - * @createTime Aug 14, 2014 8:39:22 PM  
36 - * @author wujianjun  
37 - */  
38 - public Float getScore() {  
39 - return score;  
40 - }  
41 -  
42 - /**  
43 - * set value of AppraiseInfo.score  
44 - * @param score the score to set  
45 - * @createTime Aug 14, 2014 8:39:22 PM  
46 - * @author wujianjun  
47 - */  
48 - public void setScore(Float score) {  
49 - this.score = score;  
50 - }  
51 -  
52 - /**  
53 - * get value of AppraiseInfo.creator  
54 - * @return the creator  
55 - * @createTime Aug 14, 2014 8:39:22 PM  
56 - * @author wujianjun  
57 - */  
58 - public String getCreator() {  
59 - return creator;  
60 - }  
61 -  
62 - /**  
63 - * set value of AppraiseInfo.creator  
64 - * @param creator the creator to set  
65 - * @createTime Aug 14, 2014 8:39:22 PM  
66 - * @author wujianjun  
67 - */  
68 - public void setCreator(String creator) {  
69 - this.creator = creator;  
70 - }  
71 -  
72 - /**  
73 - * get value of AppraiseInfo.content  
74 - * @return the content  
75 - * @createTime Aug 14, 2014 8:39:22 PM  
76 - * @author wujianjun  
77 - */  
78 - public String getContent() {  
79 - return content;  
80 - }  
81 -  
82 - /**  
83 - * set value of AppraiseInfo.content  
84 - * @param content the content to set  
85 - * @createTime Aug 14, 2014 8:39:22 PM  
86 - * @author wujianjun  
87 - */  
88 - public void setContent(String content) {  
89 - this.content = content;  
90 - }  
91 -  
92 - /**  
93 - * get value of AppraiseInfo.createTime  
94 - * @return the createTime  
95 - * @createTime Aug 14, 2014 8:39:22 PM  
96 - * @author wujianjun  
97 - */  
98 - public Date getCreateTime() {  
99 - return createTime;  
100 - }  
101 -  
102 - /**  
103 - * set value of AppraiseInfo.createTime  
104 - * @param createTime the createTime to set  
105 - * @createTime Aug 14, 2014 8:39:22 PM  
106 - * @author wujianjun  
107 - */  
108 - public void setCreateTime(Date createTime) {  
109 - this.createTime = createTime;  
110 - }  
111 -  
112 -}  
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/Attribute.java
  View file @6b18dfa
1 package com.diligrp.mobsite.getway.domain.protocol; 1 package com.diligrp.mobsite.getway.domain.protocol;
2 2
  3 +import io.swagger.annotations.ApiModelProperty;
  4 +
3 import java.util.List; 5 import java.util.List;
4 6
5 /** 7 /**
@@ -15,55 +17,43 @@ public class Attribute { @@ -15,55 +17,43 @@ public class Attribute {
15 /** 17 /**
16 * 商品属性Id 18 * 商品属性Id
17 */ 19 */
18 - private Long id; 20 + @ApiModelProperty(value = "商品属性id")
  21 + private Long attId;
19 /** 22 /**
20 * 商品属性名称 23 * 商品属性名称
21 */ 24 */
22 - private String name; 25 + @ApiModelProperty(value = "商品属性名称")
  26 + private String attName;
23 27
24 /** 28 /**
25 * 属性取值 29 * 属性取值
26 */ 30 */
  31 + @ApiModelProperty(value = "商品属性值")
27 private List<AttributeValue> values; 32 private List<AttributeValue> values;
28 33
  34 +
  35 +
  36 +
29 /** 37 /**
30 * get value of Attribute.id 38 * get value of Attribute.id
31 * @return the id 39 * @return the id
32 * @createTime Aug 14, 2014 7:48:02 PM 40 * @createTime Aug 14, 2014 7:48:02 PM
33 * @author wujianjun 41 * @author wujianjun
34 */ 42 */
35 - public Long getId() {  
36 - return id; 43 + public Long getAttId() {
  44 + return attId;
37 } 45 }
38 46
39 - /**  
40 - * set value of Attribute.id  
41 - * @param id the id to set  
42 - * @createTime Aug 14, 2014 7:48:02 PM  
43 - * @author wujianjun  
44 - */  
45 - public void setId(Long id) {  
46 - this.id = id; 47 + public void setAttId(Long attId) {
  48 + this.attId = attId;
47 } 49 }
48 50
49 - /**  
50 - * get value of Attribute.name  
51 - * @return the name  
52 - * @createTime Aug 14, 2014 7:48:02 PM  
53 - * @author wujianjun  
54 - */  
55 - public String getName() {  
56 - return name; 51 + public String getAttName() {
  52 + return attName;
57 } 53 }
58 54
59 - /**  
60 - * set value of Attribute.name  
61 - * @param name the name to set  
62 - * @createTime Aug 14, 2014 7:48:02 PM  
63 - * @author wujianjun  
64 - */  
65 - public void setName(String name) {  
66 - this.name = name; 55 + public void setAttName(String attName) {
  56 + this.attName = attName;
67 } 57 }
68 58
69 /** 59 /**
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/AttributeValue.java
  View file @6b18dfa
1 package com.diligrp.mobsite.getway.domain.protocol; 1 package com.diligrp.mobsite.getway.domain.protocol;
2 2
3 3
  4 +import io.swagger.annotations.ApiModelProperty;
  5 +
4 /** 6 /**
5 * <B>Description</B> 属性值 <br /> 7 * <B>Description</B> 属性值 <br />
6 * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br /> 8 * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />
@@ -24,11 +26,13 @@ public class AttributeValue { @@ -24,11 +26,13 @@ public class AttributeValue {
24 /** 26 /**
25 * 属性值ID 27 * 属性值ID
26 */ 28 */
27 - private Long id; 29 + @ApiModelProperty(value = "属性值id")
  30 + private Long attValueId;
28 /** 31 /**
29 * 属性值名称 32 * 属性值名称
30 */ 33 */
31 - private String name; 34 + @ApiModelProperty(value = "属性值名称")
  35 + private String attValueName;
32 36
33 /** 37 /**
34 * sku是否失效 38 * sku是否失效
@@ -36,47 +40,22 @@ public class AttributeValue { @@ -36,47 +40,22 @@ public class AttributeValue {
36 */ 40 */
37 private Integer validType = VALID_TYPE_NO; 41 private Integer validType = VALID_TYPE_NO;
38 42
39 - /**  
40 - * get value of AttributeValue.id  
41 - * @return the id  
42 - * @createTime Aug 14, 2014 7:49:03 PM  
43 - * @author wujianjun  
44 - */  
45 - public Long getId() {  
46 - return id; 43 + public Long getAttValueId() {
  44 + return attValueId;
47 } 45 }
48 46
49 - /**  
50 - * set value of AttributeValue.id  
51 - * @param id the id to set  
52 - * @createTime Aug 14, 2014 7:49:03 PM  
53 - * @author wujianjun  
54 - */  
55 - public void setId(Long id) {  
56 - this.id = id; 47 + public void setAttValueId(Long attValueId) {
  48 + this.attValueId = attValueId;
57 } 49 }
58 50
59 - /**  
60 - * get value of AttributeValue.name  
61 - * @return the name  
62 - * @createTime Aug 14, 2014 7:49:03 PM  
63 - * @author wujianjun  
64 - */  
65 - public String getName() {  
66 - return name; 51 + public String getAttValueName() {
  52 + return attValueName;
67 } 53 }
68 54
69 - /**  
70 - * set value of AttributeValue.name  
71 - * @param name the name to set  
72 - * @createTime Aug 14, 2014 7:49:03 PM  
73 - * @author wujianjun  
74 - */  
75 - public void setName(String name) {  
76 - this.name = name; 55 + public void setAttValueName(String attValueName) {
  56 + this.attValueName = attValueName;
77 } 57 }
78 58
79 -  
80 /** 59 /**
81 * get value of AttributeValue.validType 60 * get value of AttributeValue.validType
82 * @return the validType 61 * @return the validType
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/BaseReq.java
  View file @6b18dfa
@@ -21,8 +21,8 @@ public class BaseReq implements java.io.Serializable { @@ -21,8 +21,8 @@ public class BaseReq implements java.io.Serializable {
21 /** 21 /**
22 * 设备ID 22 * 设备ID
23 */ 23 */
24 - @Deprecated  
25 - private String deviceId; 24 + //@Deprecated
  25 + //private String deviceId;
26 /** 26 /**
27 * get value of BaseReq.token 27 * get value of BaseReq.token
28 * @return the token 28 * @return the token
@@ -43,30 +43,9 @@ public class BaseReq implements java.io.Serializable { @@ -43,30 +43,9 @@ public class BaseReq implements java.io.Serializable {
43 this.token = token; 43 this.token = token;
44 } 44 }
45 45
46 - /**  
47 - * get value of BaseReq.deviceId  
48 - * @return the deviceId  
49 - * @createTime Aug 12, 2014 4:47:24 PM  
50 - * @author wujianjun  
51 - */  
52 - public String getDeviceId() {  
53 - //TODO 后期需要删除  
54 - if (this.deviceId != null) {  
55 - return deviceId;  
56 - }else {  
57 - return token == null ? null:this.getToken().getDeviceId();  
58 - }  
59 - }  
60 46
61 - /**  
62 - * set value of BaseReq.deviceId  
63 - * @param deviceId the deviceId to set  
64 - * @createTime Aug 12, 2014 4:47:24 PM  
65 - * @author wujianjun  
66 - */  
67 - @Deprecated  
68 - public void setDeviceId(String deviceId) {  
69 - this.deviceId = deviceId; 47 + public String getDeviceId() {
  48 + return token == null ? null:token.getDeviceId();
70 } 49 }
71 50
72 /** 51 /**
@@ -79,6 +58,11 @@ public class BaseReq implements java.io.Serializable { @@ -79,6 +58,11 @@ public class BaseReq implements java.io.Serializable {
79 return token == null ? null:token.getUserId(); 58 return token == null ? null:token.getUserId();
80 } 59 }
81 60
  61 +
  62 + public Integer getUserRole() {
  63 + return token == null ? null:token.getUserRole();
  64 + }
  65 +
82 /** 66 /**
83 *获取经度 67 *获取经度
84 * */ 68 * */
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/Category.java
  View file @6b18dfa
1 package com.diligrp.mobsite.getway.domain.protocol; 1 package com.diligrp.mobsite.getway.domain.protocol;
2 2
3 3
  4 +import io.swagger.annotations.ApiModelProperty;
4 5
5 /** 6 /**
6 * <B>Description</B> 商品分类 <br /> 7 * <B>Description</B> 商品分类 <br />
@@ -18,27 +19,28 @@ public class Category { @@ -18,27 +19,28 @@ public class Category {
18 /** 19 /**
19 * 分类id 20 * 分类id
20 */ 21 */
  22 + @ApiModelProperty(value = "分类id")
21 private Long id; 23 private Long id;
22 - @Deprecated  
23 - private Long Id; 24 +
24 /** 25 /**
25 * 分类名 26 * 分类名
26 */ 27 */
  28 + @ApiModelProperty(value = "分类名称")
27 private String name; 29 private String name;
28 - @Deprecated  
29 - private String Name; 30 +
30 /** 31 /**
31 * 分类图标地址 32 * 分类图标地址
32 */ 33 */
  34 + @ApiModelProperty(value = "分类图标")
33 private String imgUrl; 35 private String imgUrl;
34 - /**  
35 - * 关联分类id  
36 - */  
37 - private Long relateId;  
38 - /**  
39 - * 分类级别  
40 - */  
41 - private String level; 36 +
  37 + @ApiModelProperty(value = "父分类id")
  38 + private Long parentId;
  39 + ///**
  40 + // * 分类级别
  41 + // */
  42 + //@ApiModelProperty(value = "分类级别")
  43 + //private String level;
42 44
43 public Long getId() { 45 public Long getId() {
44 return id; 46 return id;
@@ -46,7 +48,7 @@ public class Category { @@ -46,7 +48,7 @@ public class Category {
46 48
47 public void setId(Long id) { 49 public void setId(Long id) {
48 this.id = id; 50 this.id = id;
49 - this.Id = id; 51 +
50 } 52 }
51 53
52 public String getName() { 54 public String getName() {
@@ -54,7 +56,7 @@ public class Category { @@ -54,7 +56,7 @@ public class Category {
54 } 56 }
55 57
56 public void setName(String name) { 58 public void setName(String name) {
57 - this.Name = name; 59 +
58 this.name = name; 60 this.name = name;
59 } 61 }
60 62
@@ -66,21 +68,22 @@ public class Category { @@ -66,21 +68,22 @@ public class Category {
66 this.imgUrl = imgUrl; 68 this.imgUrl = imgUrl;
67 } 69 }
68 70
69 - public Long getRelateId() {  
70 - return relateId;  
71 - }  
72 71
73 - public void setRelateId(Long relateId) {  
74 - this.relateId = relateId; 72 + public Long getParentId() {
  73 + return parentId;
75 } 74 }
76 75
77 - public String getLevel() {  
78 - return level; 76 + public void setParentId(Long parentId) {
  77 + this.parentId = parentId;
79 } 78 }
80 79
81 - public void setLevel(String level) {  
82 - this.level = level;  
83 - } 80 + //public String getLevel() {
  81 + // return level;
  82 + //}
  83 + //
  84 + //public void setLevel(String level) {
  85 + // this.level = level;
  86 + //}
84 87
85 public static String getLevelTwo() { 88 public static String getLevelTwo() {
86 return LEVEL_TWO; 89 return LEVEL_TWO;
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/CategoryChoice.java deleted 100644 → 0
  View file @264846e
1 -package com.diligrp.mobsite.getway.domain.protocol;  
2 -  
3 -import java.util.List;  
4 -  
5 -  
6 -/**  
7 - * <B>Description</B> 商品分类，搜索筛选协议体 <br />  
8 - * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />  
9 - * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />  
10 - * <B>Company</B> 地利集团  
11 - * @createTime 2014年9月12日 下午5:12:27  
12 - * @author zhangshirui  
13 - */  
14 -public class CategoryChoice extends Category{  
15 -  
16 - private List<Category> categoryList;  
17 -  
18 - /**  
19 - * get value of CategoryChoice.categoryList  
20 - * @return the categoryList  
21 - * @createTime 2014年9月16日 上午10:32:09  
22 - * @author zhangshirui  
23 - */  
24 - public List<Category> getCategoryList() {  
25 - return categoryList;  
26 - }  
27 -  
28 -  
29 - /**  
30 - * set value of CategoryChoice.categoryList  
31 - * @param categoryList the categoryList to set  
32 - * @createTime 2014年9月16日 上午10:32:09  
33 - * @author zhangshirui  
34 - */  
35 - public void setCategoryList(List<Category> categoryList) {  
36 - this.categoryList = categoryList;  
37 - }  
38 -  
39 -}  
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/City.java
  View file @6b18dfa
1 package com.diligrp.mobsite.getway.domain.protocol; 1 package com.diligrp.mobsite.getway.domain.protocol;
2 2
3 3
  4 +import io.swagger.annotations.ApiModelProperty;
4 5
5 /** 6 /**
6 * <B>Description</B> 城市信息 <br /> 7 * <B>Description</B> 城市信息 <br />
@@ -23,22 +24,27 @@ public class City { @@ -23,22 +24,27 @@ public class City {
23 /** 24 /**
24 * 城市 ID 25 * 城市 ID
25 */ 26 */
  27 + @ApiModelProperty(value = "城市id")
26 private Long id; 28 private Long id;
27 /** 29 /**
28 * 城市级别 30 * 城市级别
29 */ 31 */
  32 + @ApiModelProperty(value = "城市级别")
30 private Integer level; 33 private Integer level;
31 /** 34 /**
32 * 城市名称 35 * 城市名称
33 */ 36 */
  37 + @ApiModelProperty(value = "城市name")
34 private String name; 38 private String name;
35 /** 39 /**
36 * 是否子级分类，HASNEXT_* 40 * 是否子级分类，HASNEXT_*
37 */ 41 */
  42 + @ApiModelProperty(value = "是否子级分类：1有，2否")
38 private Integer hasNext; 43 private Integer hasNext;
39 /** 44 /**
40 * 父级地区ID 45 * 父级地区ID
41 */ 46 */
  47 + @ApiModelProperty(value = "父级地区ID")
42 private Long pid; 48 private Long pid;
43 49
44 /** 50 /**
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/CleanCartItem.java deleted 100644 → 0
  View file @264846e
1 -package com.diligrp.mobsite.getway.domain.protocol;  
2 -  
3 -  
4 -/**  
5 - * <B>Description</B> 移除购物车商品信息 <br />  
6 - * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />  
7 - * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />  
8 - * <B>Company</B> 地利集团  
9 - *  
10 - * @author wujianjun  
11 - * @createTime 2014/8/26 17:17  
12 - */  
13 -public class CleanCartItem {  
14 - /**  
15 - * SKU信息  
16 - */  
17 - private String sku;  
18 - /**  
19 - * 提货点ID  
20 - */  
21 - private Integer pickupId;  
22 -  
23 -  
24 - public String getSku() {  
25 - return sku;  
26 - }  
27 -  
28 - public void setSku(String sku) {  
29 - this.sku = sku;  
30 - }  
31 -  
32 - public Integer getPickupId() {  
33 - return pickupId;  
34 - }  
35 -  
36 - public void setPickupId(Integer pickupId) {  
37 - this.pickupId = pickupId;  
38 - }  
39 -}  
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/DeliveryConsigneeInfo.java deleted 100644 → 0
  View file @264846e
1 -package com.diligrp.mobsite.getway.domain.protocol;  
2 -  
3 -import java.io.Serializable;  
4 -  
5 -/**  
6 - * Created by xxxzzz on 2016/9/18.  
7 - */  
8 -public class DeliveryConsigneeInfo implements Serializable {  
9 -  
10 - private String name;  
11 -  
12 - private String mobile;  
13 -  
14 -  
15 -}  
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/shop/CountLogisticsLineReq.java renamed to mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/GetShopDeliveryTimeReq.java
  View file @6b18dfa
1 -package com.diligrp.mobsite.getway.domain.protocol.shop; 1 +package com.diligrp.mobsite.getway.domain.protocol;
2 2
3 -import com.diligrp.mobsite.getway.domain.protocol.BaseReq; 3 +import com.diligrp.mobsite.getway.domain.base.BaseListReq;
  4 +import io.swagger.annotations.ApiModelProperty;
4 5
5 /** 6 /**
6 - * <B>Description</B> 路线管理-获取线路条数 <br />  
7 - * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />  
8 - * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />  
9 - * <B>Company</B> 地利集团  
10 - * @author wujiaqiang 7 + * Created by xxxzzz on 2016/12/21.
11 */ 8 */
12 -public class CountLogisticsLineReq extends BaseReq { 9 +public class GetShopDeliveryTimeReq extends BaseReq{
  10 + @ApiModelProperty(value = "店铺ID")
  11 + private Long shopId;
13 12
14 - /**  
15 - * 店铺id  
16 - */  
17 - private Long shopId; 13 + public Long getShopId() {
  14 + return shopId;
  15 + }
18 16
19 - public Long getShopId() {  
20 - return shopId;  
21 - }  
22 -  
23 - public void setShopId(Long shopId) {  
24 - this.shopId = shopId;  
25 - }  
26 - 17 + public void setShopId(Long shopId) {
  18 + this.shopId = shopId;
  19 + }
27 } 20 }
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/GetShopDeliveryTimeResp.java 0 → 100644
  View file @6b18dfa
  1 +package com.diligrp.mobsite.getway.domain.protocol;
  2 +
  3 +import com.diligrp.mobsite.getway.domain.protocol.shop.DeliveryTimeInfo;
  4 +import io.swagger.annotations.ApiModelProperty;
  5 +
  6 +import java.util.List;
  7 +
  8 +/**
  9 + * Created by xxxzzz on 2016/12/21.
  10 + */
  11 +public class GetShopDeliveryTimeResp extends BaseResp {
  12 +
  13 +
  14 +
  15 + @ApiModelProperty(value = "时间段",required = true)
  16 + private List<DeliveryTimeInfo> deliveryTimeInfos;
  17 +
  18 +
  19 + public List<DeliveryTimeInfo> getDeliveryTimeInfos() {
  20 + return deliveryTimeInfos;
  21 + }
  22 +
  23 + public void setDeliveryTimeInfos(List<DeliveryTimeInfo> deliveryTimeInfos) {
  24 + this.deliveryTimeInfos = deliveryTimeInfos;
  25 + }
  26 +
  27 +
  28 +}
  29 +
  30 +
  31 +
  32 +
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/Goods.java
  View file @6b18dfa
@@ -11,155 +11,10 @@ package com.diligrp.mobsite.getway.domain.protocol; @@ -11,155 +11,10 @@ package com.diligrp.mobsite.getway.domain.protocol;
11 */ 11 */
12 public class Goods extends GoodsSuper{ 12 public class Goods extends GoodsSuper{
13 13
14 - /**  
15 - * 10-地利自营  
16 - * 20-代销  
17 - * 30-第三方卖家  
18 - * 40-询价商品  
19 - */  
20 - public static final int FLAG_DILI = 10;  
21 - public static final int FLAG_AGENT_SALE = 20;  
22 - public static final int FLAG_THIRD_PARTY = 30;  
23 - public static final int FLAG_CONSULT = 40;  
24 -  
25 - /**  
26 - * 1-商品未收藏  
27 - * 2-用户已收藏  
28 - */  
29 - public static final int FAVORITES_FLAG_NO = 1;  
30 - public static final int FAVORITES_FLAG_YES = 2;  
31 -  
32 - /**  
33 - * 商品分类ID  
34 - */  
35 - private Long categoryId;  
36 - /**  
37 - * 收藏标识  
38 - */  
39 - private Integer favoritesFlag;  
40 - /**  
41 - * 商品销售类型标识  
42 - */  
43 - private Integer saleType;  
44 - /**  
45 - * 销售数量  
46 - */  
47 - private Long salesNum;  
48 - /**  
49 - * 商品所在地  
50 - */  
51 - private String locationAddr;  
52 -  
53 - /**  
54 - * 店铺信息  
55 - */  
56 - private ShopIntroduction shopInfo;  
57 -  
58 -  
59 - /**  
60 - * 是否允许合作市场以外的市场进行交割 1-允许 2-不允许  
61 - */  
62 - private int isAllowDelivery;  
63 -  
64 -  
65 - public int getIsAllowDelivery() {  
66 - return isAllowDelivery;  
67 - }  
68 -  
69 - public void setIsAllowDelivery(int isAllowDelivery) {  
70 - this.isAllowDelivery = isAllowDelivery;  
71 - }  
72 14
73 - /**  
74 - * get value of Goods.favoritesFlag  
75 - * @return the favoritesFlag  
76 - * @createTime 2014年9月12日 下午2:38:14  
77 - * @author zhangshirui  
78 - */  
79 - public Integer getFavoritesFlag() {  
80 - return favoritesFlag;  
81 - }  
82 15
83 16
84 - /**  
85 - * set value of Goods.favoritesFlag  
86 - * @param favoritesFlag the favoritesFlag to set  
87 - * @createTime 2014年9月12日 下午2:38:14  
88 - * @author zhangshirui  
89 - */  
90 - public void setFavoritesFlag(Integer favoritesFlag) {  
91 - this.favoritesFlag = favoritesFlag;  
92 - }  
93 -  
94 - /**  
95 - * @return the categoryId  
96 - */  
97 - public Long getCategoryId() {  
98 - return categoryId;  
99 - }  
100 -  
101 - /**  
102 - * @param categoryId the categoryId to set  
103 - */  
104 - public void setCategoryId(Long categoryId) {  
105 - this.categoryId = categoryId;  
106 - }  
107 -  
108 -  
109 -  
110 - /**  
111 - * get value of Goods.saleType  
112 - * @return the saleType  
113 - * @createTime 2014年10月31日 下午5:17:56  
114 - * @author zhangshirui  
115 - */  
116 - public Integer getSaleType() {  
117 - return saleType;  
118 - }  
119 -  
120 -  
121 -  
122 - /**  
123 - * set value of Goods.saleType  
124 - * @param saleType the saleType to set  
125 - * @createTime 2014年10月31日 下午5:17:56  
126 - * @author zhangshirui  
127 - */  
128 - public void setSaleType(Integer saleType) {  
129 - this.saleType = saleType;  
130 - }  
131 -  
132 -  
133 -  
134 - public Long getSalesNum() {  
135 - return salesNum;  
136 - }  
137 -  
138 -  
139 -  
140 - public void setSalesNum(Long salesNum) {  
141 - this.salesNum = salesNum;  
142 - }  
143 -  
144 -  
145 -  
146 - public String getLocationAddr() {  
147 - return locationAddr;  
148 - }  
149 -  
150 -  
151 -  
152 - public void setLocationAddr(String locationAddr) {  
153 - this.locationAddr = locationAddr;  
154 - }  
155 -  
156 17
157 - public ShopIntroduction getShopInfo() {  
158 - return shopInfo;  
159 - }  
160 18
161 19
162 - public void setShopInfo(ShopIntroduction shopInfo) {  
163 - this.shopInfo = shopInfo;  
164 - }  
165 } 20 }
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/GoodsSuper.java
  View file @6b18dfa
1 package com.diligrp.mobsite.getway.domain.protocol; 1 package com.diligrp.mobsite.getway.domain.protocol;
2 2
  3 +import io.swagger.annotations.ApiModelProperty;
  4 +
3 import java.io.Serializable; 5 import java.io.Serializable;
4 import java.util.List; 6 import java.util.List;
5 7
@@ -13,356 +15,137 @@ import java.util.List; @@ -13,356 +15,137 @@ import java.util.List;
13 * @author zhangshirui 15 * @author zhangshirui
14 */ 16 */
15 public class GoodsSuper implements Serializable{ 17 public class GoodsSuper implements Serializable{
16 -  
17 -  
18 - /**  
19 - * 价格方式：  
20 - * 1-普通价格方式  
21 - */  
22 - public static final int PRICE_TYPE_NORMAL = 1;  
23 - /**  
24 - * 2-价格区间方式  
25 - */  
26 - public static final int PRICE_TYPE_QUOTATION = 2;  
27 -  
28 - /**  
29 - * 最小起批量  
30 - */  
31 - public static final int MINWHOLESALE_DEFAULT_MIN = 1;  
32 -  
33 - /**  
34 - * 商品状态：  
35 - * 1-库存为零，销售完毕  
36 - * 2-商品状态：已下架或删除  
37 - * 3-在售并且正常  
38 - */  
39 - /**  
40 - * 1-已售罄，销售完毕  
41 - */  
42 - public static final int STATE_SOLD_OUT = 1;  
43 - /**  
44 - * 2-商品状态：已下架或删除  
45 - */  
46 - public static final int STATE_DOWN_DEL=2;  
47 - /**  
48 - * 3-在售并且正常  
49 - */  
50 - public static final int STATE_ON_SALE = 3;  
51 -  
52 - /**  
53 - * 商品ID  
54 - */  
55 - private Long id;  
56 - /**  
57 - * 商品标题  
58 - */  
59 - private String title;  
60 - /**  
61 - * 商品默认图片  
62 - */ 18 +
  19 +
  20 + @ApiModelProperty(value = "商品id" )
  21 + private Long pid;
  22 + @ApiModelProperty(value = "商品状态：-1删除,3在售,4下架" )
  23 + private Integer state;
  24 + @ApiModelProperty(value = "商品名称",required = true)
  25 + private String name;
  26 + @ApiModelProperty(value = "商品单位",required = true)
  27 + private String unit;
  28 + @ApiModelProperty(value = "分类id",required = true)
  29 + private Integer cid;
  30 + @ApiModelProperty(value = "分类名称")
  31 + private String cname;
  32 + @ApiModelProperty(value = "商品类型：0普通商品,1促销商品",required = true)
  33 + private int productType;
  34 + @ApiModelProperty(value = "默认图片",required = true)
63 private String defaultPic; 35 private String defaultPic;
64 - /**  
65 - * 商品图片  
66 - */ 36 + @ApiModelProperty(value = "商品图片",required = true)
67 private List<String> pictures; 37 private List<String> pictures;
68 - /**  
69 - * 单位  
70 - */  
71 - private String unit;  
72 - /**  
73 - * 状态 -2=预览 -1=删除 1=待审核（新建）2=审核失败 3=在售 4=仓库中 5=待上架 6=过期下架 7=手动下架  
74 - */  
75 - private Integer state;  
76 -  
77 - /**  
78 - * 价格展示类型：1-普通方式，2-价格区间方式  
79 - */  
80 - private Integer priceType;  
81 - /**  
82 - * 价格  
83 - */  
84 - private Long price = 0L;  
85 -  
86 - /**  
87 - * 商品最低价格  
88 - */  
89 - private Long minPrice = 0L;  
90 -  
91 - /**  
92 - * 商品最高价格  
93 - */  
94 - private Long maxPrice = 0L;  
95 -  
96 - /**  
97 - * 价格区间  
98 - */  
99 - private List<Quotation> quotationList;  
100 - /**  
101 - * 最少起批量  
102 - * 默认为1  
103 - */  
104 - private Integer minWholesale = MINWHOLESALE_DEFAULT_MIN;  
105 -  
106 - /**  
107 - * 是否为特价商品 2是 1不是  
108 - * */  
109 - private Integer hasSpecial;  
110 -  
111 - /**  
112 - * 是否为推广商品 2 ：是 1 ：不是  
113 - * */  
114 - private Integer hasPromotion;  
115 -  
116 - /**  
117 - * get value of GoodsSuper.id  
118 - * @return the id  
119 - * @createTime 2014年9月1日 下午3:34:23  
120 - * @author zhangshirui  
121 - */  
122 - public Long getId() {  
123 - return id;  
124 - } 38 + @ApiModelProperty(value = "商品描述",required = true)
  39 + private String desc;
  40 + @ApiModelProperty(value = "skus",required = true)
  41 + private List<SKUInfo> skus;
  42 + @ApiModelProperty(value = "销售属性",required = true)
  43 + private List<Attribute> saleAtt;
  44 + @ApiModelProperty(value = "是否首页推荐：0是,1否",required = true)
  45 + private Integer indexTop;
125 46
126 -  
127 - /**  
128 - * set value of GoodsSuper.id  
129 - * @param id the id to set  
130 - * @createTime 2014年9月1日 下午3:34:23  
131 - * @author zhangshirui  
132 - */  
133 - public void setId(Long id) {  
134 - this.id = id;  
135 - }  
136 47
137 -  
138 - /**  
139 - * get value of GoodsSuper.title  
140 - * @return the title  
141 - * @createTime 2014年9月1日 下午3:34:23  
142 - * @author zhangshirui  
143 - */  
144 - public String getTitle() {  
145 - return title; 48 + public Integer getState() {
  49 + return state;
146 } 50 }
147 51
148 -  
149 - /**  
150 - * set value of GoodsSuper.title  
151 - * @param title the title to set  
152 - * @createTime 2014年9月1日 下午3:34:23  
153 - * @author zhangshirui  
154 - */  
155 - public void setTitle(String title) {  
156 - this.title = title; 52 + public void setState(Integer state) {
  53 + this.state = state;
157 } 54 }
158 55
159 -  
160 - /**  
161 - * get value of GoodsSuper.pictures  
162 - * @return the pictures  
163 - * @createTime 2014年9月1日 下午3:34:23  
164 - * @author zhangshirui  
165 - */  
166 - public List<String> getPictures() {  
167 - return pictures; 56 + public String getName() {
  57 + return name;
168 } 58 }
169 59
170 -  
171 - /**  
172 - * set value of GoodsSuper.pictures  
173 - * @param pictures the pictures to set  
174 - * @createTime 2014年9月1日 下午3:34:23  
175 - * @author zhangshirui  
176 - */  
177 - public void setPictures(List<String> pictures) {  
178 - this.pictures = pictures; 60 + public void setName(String name) {
  61 + this.name = name;
179 } 62 }
180 63
181 -  
182 - /**  
183 - * get value of GoodsSuper.priceType  
184 - * @return the priceType  
185 - * @createTime 2014年9月18日 上午9:29:18  
186 - * @author zhangshirui  
187 - */  
188 - public Integer getPriceType() {  
189 - return priceType; 64 + public Integer getCid() {
  65 + return cid;
190 } 66 }
191 67
192 -  
193 -  
194 - /**  
195 - * set value of GoodsSuper.priceType  
196 - * @param priceType the priceType to set  
197 - * @createTime 2014年9月18日 上午9:29:18  
198 - * @author zhangshirui  
199 - */  
200 - public void setPriceType(Integer priceType) {  
201 - this.priceType = priceType; 68 + public void setCid(Integer cid) {
  69 + this.cid = cid;
202 } 70 }
203 71
204 -  
205 -  
206 - /**  
207 - * get value of GoodsSuper.quotationList  
208 - * @return the quotationList  
209 - * @createTime 2014年9月18日 上午9:29:18  
210 - * @author zhangshirui  
211 - */  
212 - public List<Quotation> getQuotationList() {  
213 - return quotationList; 72 + public String getCname() {
  73 + return cname;
214 } 74 }
215 75
216 -  
217 -  
218 - /**  
219 - * set value of GoodsSuper.quotationList  
220 - * @param quotationList the quotationList to set  
221 - * @createTime 2014年9月18日 上午9:29:18  
222 - * @author zhangshirui  
223 - */  
224 - public void setQuotationList(List<Quotation> quotationList) {  
225 - this.quotationList = quotationList; 76 + public void setCname(String cname) {
  77 + this.cname = cname;
226 } 78 }
227 79
228 -  
229 -  
230 - /**  
231 - * get value of GoodsSuper.unit  
232 - * @return the unit  
233 - * @createTime 2014年9月18日 下午3:44:44  
234 - * @author zhangshirui  
235 - */  
236 - public String getUnit() {  
237 - return unit; 80 + public int getProductType() {
  81 + return productType;
238 } 82 }
239 83
240 -  
241 -  
242 - /**  
243 - * set value of GoodsSuper.unit  
244 - * @param unit the unit to set  
245 - * @createTime 2014年9月18日 下午3:44:44  
246 - * @author zhangshirui  
247 - */  
248 - public void setUnit(String unit) {  
249 - this.unit = unit; 84 + public void setProductType(int productType) {
  85 + this.productType = productType;
250 } 86 }
251 87
252 -  
253 -  
254 - /**  
255 - * get value of GoodsSuper.state  
256 - * @return the state  
257 - * @createTime 2014年9月18日 下午3:47:47  
258 - * @author zhangshirui  
259 - */  
260 - public Integer getState() {  
261 - return state; 88 + public String getDefaultPic() {
  89 + return defaultPic;
262 } 90 }
263 91
264 -  
265 -  
266 - /**  
267 - * set value of GoodsSuper.state  
268 - * @param state the state to set  
269 - * @createTime 2014年9月18日 下午3:47:47  
270 - * @author zhangshirui  
271 - */  
272 - public void setState(Integer state) {  
273 - this.state = state; 92 + public void setDefaultPic(String defaultPic) {
  93 + this.defaultPic = defaultPic;
274 } 94 }
275 95
  96 + public List<String> getPictures() {
  97 + return pictures;
  98 + }
276 99
277 - /**  
278 - * @return the price  
279 - */  
280 - public Long getPrice() {  
281 - return price;  
282 - }  
283 -  
284 -  
285 - /**  
286 - * @param price the price to set  
287 - */  
288 - public void setPrice(Long price) {  
289 - this.price = price;  
290 - }  
291 -  
292 -  
293 - /**  
294 - * @return the minPrice  
295 - */  
296 - public Long getMinPrice() {  
297 - return minPrice;  
298 - }  
299 -  
300 -  
301 - /**  
302 - * @param minPrice the minPrice to set  
303 - */  
304 - public void setMinPrice(Long minPrice) {  
305 - this.minPrice = minPrice;  
306 - }  
307 -  
308 -  
309 - /**  
310 - * @return the maxPrice  
311 - */  
312 - public Long getMaxPrice() {  
313 - return maxPrice;  
314 - }  
315 -  
316 -  
317 - /**  
318 - * @param maxPrice the maxPrice to set  
319 - */  
320 - public void setMaxPrice(Long maxPrice) {  
321 - this.maxPrice = maxPrice;  
322 - }  
323 - 100 + public void setPictures(List<String> pictures) {
  101 + this.pictures = pictures;
  102 + }
324 103
325 - /**  
326 - * @return the defaultPic  
327 - */  
328 - public String getDefaultPic() {  
329 - return defaultPic;  
330 - } 104 + public String getDesc() {
  105 + return desc;
  106 + }
331 107
  108 + public void setDesc(String desc) {
  109 + this.desc = desc;
  110 + }
332 111
333 - /**  
334 - * @param defaultPic the defaultPic to set  
335 - */  
336 - public void setDefaultPic(String defaultPic) {  
337 - this.defaultPic = defaultPic;  
338 - } 112 + public List<SKUInfo> getSkus() {
  113 + return skus;
  114 + }
339 115
  116 + public void setSkus(List<SKUInfo> skus) {
  117 + this.skus = skus;
  118 + }
340 119
341 -  
342 - public Integer getMinWholesale() {  
343 - return minWholesale; 120 + public List<Attribute> getSaleAtt() {
  121 + return saleAtt;
344 } 122 }
345 123
  124 + public void setSaleAtt(List<Attribute> saleAtt) {
  125 + this.saleAtt = saleAtt;
  126 + }
346 127
347 -  
348 - public void setMinWholesale(Integer minWholesale) {  
349 - this.minWholesale = minWholesale; 128 + public Long getPid() {
  129 + return pid;
350 } 130 }
351 131
  132 + public void setPid(Long pid) {
  133 + this.pid = pid;
  134 + }
352 135
353 - public Integer getHasSpecial() {  
354 - return hasSpecial;  
355 - } 136 + public Integer getIndexTop() {
  137 + return indexTop;
  138 + }
356 139
357 - public void setHasSpecial(Integer hasSpecial) {  
358 - this.hasSpecial = hasSpecial;  
359 - } 140 + public void setIndexTop(Integer indexTop) {
  141 + this.indexTop = indexTop;
  142 + }
360 143
361 - public Integer getHasPromotion() {  
362 - return hasPromotion; 144 + public String getUnit() {
  145 + return unit;
363 } 146 }
364 147
365 - public void setHasPromotion(Integer hasPromotion) {  
366 - this.hasPromotion = hasPromotion; 148 + public void setUnit(String unit) {
  149 + this.unit = unit;
367 } 150 }
368 } 151 }
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/Market.java
  View file @6b18dfa
1 package com.diligrp.mobsite.getway.domain.protocol; 1 package com.diligrp.mobsite.getway.domain.protocol;
2 2
3 import java.io.Serializable; 3 import java.io.Serializable;
4 -import java.util.List;  
5 -  
6 4
7 5
8 /** 6 /**
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/Order.java
  View file @6b18dfa
1 package com.diligrp.mobsite.getway.domain.protocol; 1 package com.diligrp.mobsite.getway.domain.protocol;
2 2
3 -import com.diligrp.mobsite.getway.domain.protocol.order.model.MarketInfo;  
4 -import com.diligrp.mobsite.getway.domain.protocol.order.model.OrderSumInfo;  
5 -  
6 import java.io.Serializable; 3 import java.io.Serializable;
7 -import java.util.List; 4 +import java.math.BigDecimal;
8 5
9 /** 6 /**
10 * <B>Description</B> 订单 <br /> 7 * <B>Description</B> 订单 <br />
11 - * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br /> 8 + * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved.
  9 + * <br />
12 * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br /> 10 * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
13 * <B>Company</B> 地利集团 11 * <B>Company</B> 地利集团
14 * 12 *
15 * @createTime 2014年9月1日 下午3:17:28 13 * @createTime 2014年9月1日 下午3:17:28
16 * @author zhangshirui 14 * @author zhangshirui
17 */ 15 */
18 -public class Order extends OrderSumInfo implements Serializable{  
19 -  
20 - /**  
21 - * 是否已评论,1是,0否  
22 - */  
23 - public static final int IS_COMMENTED_YES = 1;  
24 - /**  
25 - * 否：0  
26 - */  
27 - public static final int IS_COMMENTED_NO = 0;  
28 -  
29 - /**  
30 - * 订单状态:(10待付款，20待备货，30备货中，40待提货，50已提货,60已过期,70已取消,80已申请退款，90已退款，100提货超时)  
31 - */  
32 - private Integer orderState;  
33 -  
34 - /**  
35 - * 订单状态名称  
36 - */  
37 - private String stateName;  
38 -  
39 - /**  
40 - * 支付方式  
41 - */  
42 - private Integer payType;  
43 - /**  
44 - * 总金额  
45 - */  
46 - private Long totalAmount;  
47 - /**  
48 - * 应付金额  
49 - */  
50 - private Long realPayAmount;  
51 - /**  
52 - * 优惠金额  
53 - */  
54 - private Long discountAmount;  
55 - /**  
56 - * 邮费  
57 - */  
58 - private Long postage;  
59 - /**  
60 - * 提交订单时间  
61 - */  
62 - private Long submitTime;  
63 - /**  
64 - * 订单提交日期格式化，后期需要去掉  
65 - */  
66 - private String submitDate;  
67 - /**  
68 - * 订单详情页最上面  
69 - */  
70 - private String orderDescription;  
71 - /**  
72 - * 是否评论  
73 - */  
74 - private Integer isCommented;  
75 - /**  
76 - * 卖家id  
77 - */  
78 - private Long sellerId; 16 +public class Order implements Serializable {
79 17
80 /** 18 /**
81 - * 卖家姓名  
82 - */  
83 - private String sellerName;  
84 - /**  
85 - * 卖家电话 19 + *
86 */ 20 */
87 - private String sellerMobile; 21 + private static final long serialVersionUID = 552215083930422779L;
88 22
  23 + private Long id;
89 /** 24 /**
90 * 店铺id 25 * 店铺id
91 */ 26 */
92 private Long shopId; 27 private Long shopId;
93 - /**  
94 - * 店铺名称  
95 - */  
96 - private String shopName;  
97 - /**  
98 - * 店铺联系电话  
99 - */  
100 - private String contactMobile;  
101 - /**  
102 - * 订单商品列表  
103 - */  
104 - private List<OrderProduct> orderProducts;  
105 - /**  
106 - * 提货留言  
107 - */  
108 - private String pickUserMsg;  
109 - /**  
110 - * 提货人信息  
111 - */  
112 - private ConsigneeInfo consigneeInfo;  
113 - /**  
114 - * 提货时间  
115 - * TODO 后期需要删除  
116 - */  
117 - @Deprecated  
118 - private String pickDate;  
119 - /**  
120 - * 最晚提货时间  
121 - */  
122 - private Long pickupEndTime;  
123 - /**  
124 - * 提货地点  
125 - */  
126 - private String pickAddress;  
127 - /**  
128 - * 市场信息  
129 - */  
130 - private MarketInfo marketInfo;  
131 - /**  
132 - * 交易识别码  
133 - */  
134 - private String tradeCode;  
135 - /**  
136 - * 提货验证码  
137 - */  
138 - private String deliveryVerCode;  
139 - /**  
140 - * 申请退款id  
141 - */  
142 - private Long refundId;  
143 - /**  
144 - * 配送方式：10：上门自提，20送货上门  
145 - */ 28 + /** 配送类型 */
146 private Integer deliveryType; 29 private Integer deliveryType;
  30 + /** 订单状态 */
  31 + private Integer orderStatus;
  32 + /** 支付状态 */
  33 + private Integer payStatus;
  34 + /** 买家备注说明 */
  35 + private String buyerMemo;
  36 + /** 支付时间 */
  37 + private String payTime;
  38 + /**
  39 + * 送货时间
  40 + */
  41 + private String deliveryTime;
  42 + /** 提货时间 */
  43 + private String reservationTime;
  44 + /** 订单提交时间 */
  45 + private String submitTime;
  46 + /** 支付类型 */
  47 + private Integer payType;
  48 + /** 总金额 */
  49 + private BigDecimal totalPrice;
147 /** 50 /**
148 - * 提货方式名称  
149 - */  
150 - private String deliveryName;  
151 - /**  
152 - * 剩余提货时间  
153 - */  
154 - private Float remainPickTime;  
155 - /**  
156 - * 已经延期次数  
157 - */  
158 - private Integer delayedPickupNum;  
159 -  
160 - /**  
161 - * 物流及验收备注  
162 - */  
163 - private String logisticsRemarks;  
164 -  
165 -  
166 - /**  
167 - * 店铺所在地省id  
168 - */  
169 - private Long shopLocationProvinceId;  
170 - /**  
171 - * 店铺所在地省name  
172 - */  
173 - private String shopLocationProvinceName;  
174 -  
175 - /**  
176 - * 店铺所在地市id  
177 - */  
178 - private Long shopLocationCityId;  
179 - /**  
180 - * 店铺所在地市name  
181 - */  
182 - private String shopLocationCityName;  
183 -  
184 - /**  
185 - * 店铺所在地区id  
186 - */  
187 - private Long shopLocationRegionId;  
188 - /**  
189 - * 店铺所在地区name  
190 - */  
191 - private String shopLocationRegionName;  
192 -  
193 - /**  
194 - * 店铺发货地址  
195 - */  
196 - private String shopSendAddress;  
197 -  
198 -  
199 - public String getSellerName() {  
200 - return sellerName;  
201 - }  
202 -  
203 - public void setSellerName(String sellerName) {  
204 - this.sellerName = sellerName;  
205 - }  
206 -  
207 - public String getSellerMobile() {  
208 - return sellerMobile;  
209 - }  
210 -  
211 - public void setSellerMobile(String sellerMobile) {  
212 - this.sellerMobile = sellerMobile;  
213 - }  
214 -  
215 - public String getShopSendAddress() {  
216 - return shopSendAddress;  
217 - }  
218 -  
219 - public void setShopSendAddress(String shopSendAddress) {  
220 - this.shopSendAddress = shopSendAddress;  
221 - }  
222 -  
223 - /**  
224 - * 订单商品总总量  
225 - */  
226 - private Long orderWeight;  
227 -  
228 - public Integer getDelayedPickupNum() {  
229 - return delayedPickupNum;  
230 - }  
231 -  
232 - public void setDelayedPickupNum(Integer delayedPickupNum) {  
233 - this.delayedPickupNum = delayedPickupNum;  
234 - }  
235 -  
236 - /**  
237 - * get value of Order.realPayAmount  
238 - *  
239 - * @return the realPayAmount  
240 - * @createTime 2014年9月1日 下午6:04:58  
241 - * @author zhangshirui  
242 - */  
243 - public Long getRealPayAmount() {  
244 - return realPayAmount;  
245 - }  
246 -  
247 - /**  
248 - * set value of Order.realPayAmount  
249 - *  
250 - * @param realPayAmount  
251 - * the realPayAmount to set  
252 - * @createTime 2014年9月1日 下午6:04:58  
253 - * @author zhangshirui  
254 - */  
255 - public void setRealPayAmount(Long realPayAmount) {  
256 - this.realPayAmount = realPayAmount;  
257 - }  
258 -  
259 - /**  
260 - * get value of Order.stateName  
261 - *  
262 - * @return the stateName  
263 - * @createTime 2014年9月3日 下午6:23:05  
264 - * @author zhangshirui  
265 - */  
266 - public String getStateName() {  
267 - return stateName;  
268 - }  
269 -  
270 - /**  
271 - * set value of Order.stateName  
272 - *  
273 - * @param stateName  
274 - * the stateName to set  
275 - * @createTime 2014年9月3日 下午6:23:05  
276 - * @author zhangshirui  
277 - */  
278 - public void setStateName(String stateName) {  
279 - this.stateName = stateName;  
280 - }  
281 -  
282 - /**  
283 - * @return the orderProducts  
284 - */  
285 - public List<OrderProduct> getOrderProducts() {  
286 - return orderProducts;  
287 - }  
288 -  
289 - /**  
290 - * @param orderProducts  
291 - * the orderProducts to set  
292 - */  
293 - public void setOrderProducts(List<OrderProduct> orderProducts) {  
294 - this.orderProducts = orderProducts;  
295 - }  
296 -  
297 - /**  
298 - * get value of Order.orderState  
299 - *  
300 - * @return the orderState  
301 - * @createTime 2014年10月13日 下午5:41:01  
302 - * @author zhangshirui  
303 - */  
304 - public Integer getOrderState() {  
305 - return orderState;  
306 - }  
307 -  
308 - /**  
309 - * set value of Order.orderState  
310 - *  
311 - * @param orderState  
312 - * the orderState to set  
313 - * @createTime 2014年10月13日 下午5:41:01  
314 - * @author zhangshirui  
315 - */  
316 - public void setOrderState(Integer orderState) {  
317 - this.orderState = orderState;  
318 - }  
319 -  
320 - /**  
321 - * get value of Order.shopName  
322 - *  
323 - * @return the shopName  
324 - * @createTime 2014年10月14日 下午4:42:05  
325 - * @author zhangshirui  
326 - */  
327 - public String getShopName() {  
328 - return shopName;  
329 - }  
330 -  
331 - /**  
332 - * set value of Order.shopName  
333 - *  
334 - * @param shopName  
335 - * the shopName to set  
336 - * @createTime 2014年10月14日 下午4:42:05  
337 - * @author zhangshirui  
338 - */  
339 - public void setShopName(String shopName) {  
340 - this.shopName = shopName;  
341 - }  
342 -  
343 - /**  
344 - * get value of Order.sellerId  
345 - *  
346 - * @return the sellerId  
347 - * @createTime 2014年10月14日 下午4:50:56  
348 - * @author zhangshirui  
349 - */  
350 - public Long getSellerId() {  
351 - return sellerId;  
352 - }  
353 -  
354 - /**  
355 - * set value of Order.sellerId  
356 - *  
357 - * @param sellerId  
358 - * the sellerId to set  
359 - * @createTime 2014年10月14日 下午4:50:56  
360 - * @author zhangshirui  
361 - */  
362 - public void setSellerId(Long sellerId) {  
363 - this.sellerId = sellerId;  
364 - }  
365 -  
366 - /**  
367 - * get value of Order.tradeCode  
368 - *  
369 - * @return the tradeCode  
370 - * @createTime 2014年10月15日 上午9:20:44  
371 - * @author zhangshirui  
372 - */  
373 - public String getTradeCode() {  
374 - return tradeCode;  
375 - }  
376 -  
377 - /**  
378 - * set value of Order.tradeCode  
379 - *  
380 - * @param tradeCode  
381 - * the tradeCode to set  
382 - * @createTime 2014年10月15日 上午9:20:44  
383 - * @author zhangshirui  
384 - */  
385 - public void setTradeCode(String tradeCode) {  
386 - this.tradeCode = tradeCode;  
387 - }  
388 -  
389 - /**  
390 - * get value of Order.payType  
391 - *  
392 - * @return the payType  
393 - * @createTime 2014年10月15日 上午10:43:45  
394 - * @author zhangshirui  
395 - */  
396 - public Integer getPayType() {  
397 - return payType;  
398 - }  
399 -  
400 - /**  
401 - * set value of Order.payType  
402 - *  
403 - * @param payType  
404 - * the payType to set  
405 - * @createTime 2014年10月15日 上午10:43:45  
406 - * @author zhangshirui  
407 - */  
408 - public void setPayType(Integer payType) {  
409 - this.payType = payType;  
410 - }  
411 -  
412 - /**  
413 - * get value of Order.orderDescription  
414 - *  
415 - * @return the orderDescription  
416 - * @createTime 2014年10月15日 下午5:59:18  
417 - * @author zhangshirui  
418 - */  
419 - public String getOrderDescription() {  
420 - return orderDescription;  
421 - }  
422 -  
423 - /**  
424 - * set value of Order.orderDescription  
425 - *  
426 - * @param orderDescription  
427 - * the orderDescription to set  
428 - * @createTime 2014年10月15日 下午5:59:18  
429 - * @author zhangshirui  
430 - */  
431 - public void setOrderDescription(String orderDescription) {  
432 - this.orderDescription = orderDescription;  
433 - }  
434 -  
435 - /**  
436 - * get value of Order.isCommented  
437 - *  
438 - * @return the isCommented  
439 - * @createTime 2014年10月16日 上午11:03:19  
440 - * @author zhangshirui  
441 - */  
442 - public Integer getIsCommented() {  
443 - return isCommented;  
444 - }  
445 -  
446 - /**  
447 - * set value of Order.isCommented  
448 - *  
449 - * @param isCommented  
450 - * the isCommented to set  
451 - * @createTime 2014年10月16日 上午11:03:19  
452 - * @author zhangshirui  
453 - */  
454 - public void setIsCommented(Integer isCommented) {  
455 - this.isCommented = isCommented;  
456 - }  
457 -  
458 - /**  
459 - * get value of Order.refundId  
460 - *  
461 - * @return the refundId  
462 - * @createTime 2014年10月22日 上午11:38:05  
463 - * @author zhangshirui  
464 - */  
465 - public Long getRefundId() {  
466 - return refundId;  
467 - }  
468 -  
469 - /**  
470 - * set value of Order.refundId  
471 - *  
472 - * @param refundId  
473 - * the refundId to set  
474 - * @createTime 2014年10月22日 上午11:38:05  
475 - * @author zhangshirui 51 + * 接单后修改的价格
476 */ 52 */
477 - public void setRefundId(Long refundId) {  
478 - this.refundId = refundId;  
479 - } 53 + private Long realTotalPrice;
480 54
481 - /**  
482 - * get value of Order.contactMobile  
483 - *  
484 - * @return the contactMobile  
485 - * @createTime 2014年10月31日 下午5:23:55  
486 - * @author zhangshirui  
487 - */  
488 - public String getContactMobile() {  
489 - return contactMobile; 55 + public Long getId() {
  56 + return id;
490 } 57 }
491 58
492 - /**  
493 - * set value of Order.contactMobile  
494 - *  
495 - * @param contactMobile  
496 - * the contactMobile to set  
497 - * @createTime 2014年10月31日 下午5:23:55  
498 - * @author zhangshirui  
499 - */  
500 - public void setContactMobile(String contactMobile) {  
501 - this.contactMobile = contactMobile; 59 + public void setId(Long id) {
  60 + this.id = id;
502 } 61 }
503 62
504 public Long getShopId() { 63 public Long getShopId() {
@@ -517,184 +76,84 @@ public class Order extends OrderSumInfo implements Serializable{ @@ -517,184 +76,84 @@ public class Order extends OrderSumInfo implements Serializable{
517 this.deliveryType = deliveryType; 76 this.deliveryType = deliveryType;
518 } 77 }
519 78
520 - public Long getDiscountAmount() {  
521 - return discountAmount;  
522 - }  
523 -  
524 - public void setDiscountAmount(Long discountAmount) {  
525 - this.discountAmount = discountAmount; 79 + public Integer getOrderStatus() {
  80 + return orderStatus;
526 } 81 }
527 82
528 - public Long getPostage() {  
529 - return postage; 83 + public void setOrderStatus(Integer orderStatus) {
  84 + this.orderStatus = orderStatus;
530 } 85 }
531 86
532 - public void setPostage(Long postage) {  
533 - this.postage = postage; 87 + public Integer getPayStatus() {
  88 + return payStatus;
534 } 89 }
535 90
536 - public ConsigneeInfo getConsigneeInfo() {  
537 - return consigneeInfo; 91 + public void setPayStatus(Integer payStatus) {
  92 + this.payStatus = payStatus;
538 } 93 }
539 94
540 - public void setConsigneeInfo(ConsigneeInfo consigneeInfo) {  
541 - this.consigneeInfo = consigneeInfo; 95 + public String getBuyerMemo() {
  96 + return buyerMemo;
542 } 97 }
543 98
544 - public String getPickUserMsg() {  
545 - return pickUserMsg; 99 + public void setBuyerMemo(String buyerMemo) {
  100 + this.buyerMemo = buyerMemo;
546 } 101 }
547 102
548 - public void setPickUserMsg(String pickUserMsg) {  
549 - this.pickUserMsg = pickUserMsg; 103 + public String getPayTime() {
  104 + return payTime;
550 } 105 }
551 106
552 - public String getPickAddress() {  
553 - return pickAddress; 107 + public void setPayTime(String payTime) {
  108 + this.payTime = payTime;
554 } 109 }
555 110
556 - public void setPickAddress(String pickAddress) {  
557 - this.pickAddress = pickAddress; 111 + public String getDeliveryTime() {
  112 + return deliveryTime;
558 } 113 }
559 114
560 - public MarketInfo getMarketInfo() {  
561 - return marketInfo; 115 + public void setDeliveryTime(String deliveryTime) {
  116 + this.deliveryTime = deliveryTime;
562 } 117 }
563 118
564 - public void setMarketInfo(MarketInfo marketInfo) {  
565 - this.marketInfo = marketInfo; 119 + public String getReservationTime() {
  120 + return reservationTime;
566 } 121 }
567 122
568 - public String getDeliveryName() {  
569 - return deliveryName; 123 + public void setReservationTime(String reservationTime) {
  124 + this.reservationTime = reservationTime;
570 } 125 }
571 126
572 - public void setDeliveryName(String deliveryName) {  
573 - this.deliveryName = deliveryName;  
574 - }  
575 -  
576 -  
577 - public Long getTotalAmount() {  
578 - return totalAmount;  
579 - }  
580 -  
581 -  
582 - public void setTotalAmount(Long totalAmount) {  
583 - this.totalAmount = totalAmount;  
584 - }  
585 -  
586 -  
587 - public Float getRemainPickTime() {  
588 - return remainPickTime;  
589 - }  
590 -  
591 -  
592 - public void setRemainPickTime(Float remainPickTime) {  
593 - this.remainPickTime = remainPickTime;  
594 - }  
595 -  
596 - public String getPickDate() {  
597 - return pickDate;  
598 - }  
599 -  
600 - public void setPickDate(String pickDate) {  
601 - this.pickDate = pickDate;  
602 - }  
603 -  
604 - public Long getPickupEndTime() {  
605 - return pickupEndTime;  
606 - }  
607 -  
608 -  
609 - public void setPickupEndTime(Long pickupEndTime) {  
610 - this.pickupEndTime = pickupEndTime;  
611 - }  
612 -  
613 - public String getDeliveryVerCode() {  
614 - return deliveryVerCode;  
615 - }  
616 -  
617 - public void setDeliveryVerCode(String deliveryVerCode) {  
618 - this.deliveryVerCode = deliveryVerCode;  
619 - }  
620 -  
621 - public Long getSubmitTime() { 127 + public String getSubmitTime() {
622 return submitTime; 128 return submitTime;
623 } 129 }
624 130
625 - public void setSubmitTime(Long submitTime) { 131 + public void setSubmitTime(String submitTime) {
626 this.submitTime = submitTime; 132 this.submitTime = submitTime;
627 } 133 }
628 134
629 - public String getLogisticsRemarks() {  
630 - return logisticsRemarks;  
631 - }  
632 -  
633 - public void setLogisticsRemarks(String logisticsRemarks) {  
634 - this.logisticsRemarks = logisticsRemarks;  
635 - }  
636 -  
637 - public String getSubmitDate() {  
638 - return submitDate;  
639 - }  
640 -  
641 - public void setSubmitDate(String submitDate) {  
642 - this.submitDate = submitDate;  
643 - }  
644 -  
645 - public Long getShopLocationProvinceId() {  
646 - return shopLocationProvinceId;  
647 - }  
648 -  
649 - public void setShopLocationProvinceId(Long shopLocationProvinceId) {  
650 - this.shopLocationProvinceId = shopLocationProvinceId;  
651 - }  
652 -  
653 - public String getShopLocationProvinceName() {  
654 - return shopLocationProvinceName;  
655 - }  
656 -  
657 - public void setShopLocationProvinceName(String shopLocationProvinceName) {  
658 - this.shopLocationProvinceName = shopLocationProvinceName;  
659 - }  
660 -  
661 - public Long getShopLocationCityId() {  
662 - return shopLocationCityId;  
663 - }  
664 -  
665 - public void setShopLocationCityId(Long shopLocationCityId) {  
666 - this.shopLocationCityId = shopLocationCityId;  
667 - }  
668 -  
669 - public String getShopLocationCityName() {  
670 - return shopLocationCityName;  
671 - }  
672 -  
673 - public void setShopLocationCityName(String shopLocationCityName) {  
674 - this.shopLocationCityName = shopLocationCityName; 135 + public Integer getPayType() {
  136 + return payType;
675 } 137 }
676 138
677 - public Long getShopLocationRegionId() {  
678 - return shopLocationRegionId; 139 + public void setPayType(Integer payType) {
  140 + this.payType = payType;
679 } 141 }
680 142
681 - public void setShopLocationRegionId(Long shopLocationRegionId) {  
682 - this.shopLocationRegionId = shopLocationRegionId; 143 + public BigDecimal getTotalPrice() {
  144 + return totalPrice;
683 } 145 }
684 146
685 - public String getShopLocationRegionName() {  
686 - return shopLocationRegionName; 147 + public void setTotalPrice(BigDecimal totalPrice) {
  148 + this.totalPrice = totalPrice;
687 } 149 }
688 150
689 - public void setShopLocationRegionName(String shopLocationRegionName) {  
690 - this.shopLocationRegionName = shopLocationRegionName; 151 + public Long getRealTotalPrice() {
  152 + return realTotalPrice;
691 } 153 }
692 154
693 - public Long getOrderWeight() {  
694 - return orderWeight; 155 + public void setRealTotalPrice(Long realTotalPrice) {
  156 + this.realTotalPrice = realTotalPrice;
695 } 157 }
696 158
697 - public void setOrderWeight(Long orderWeight) {  
698 - this.orderWeight = orderWeight;  
699 - }  
700 } 159 }
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/OrderItem.java
  View file @6b18dfa
1 package com.diligrp.mobsite.getway.domain.protocol; 1 package com.diligrp.mobsite.getway.domain.protocol;
2 2
  3 +import java.math.BigDecimal;
3 4
  5 +import javax.validation.constraints.NotNull;
  6 +
  7 +import io.swagger.annotations.ApiModelProperty;
  8 +import io.swagger.annotations.ApiParam;
4 9
5 /** 10 /**
6 * <B>Description</B> 订单具体项<br /> 11 * <B>Description</B> 订单具体项<br />
7 - * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br /> 12 + * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved.
  13 + * <br />
8 * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br /> 14 * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
9 * <B>Company</B> 地利集团 15 * <B>Company</B> 地利集团
  16 + *
10 * @createTime 2014年9月19日 上午11:55:57 17 * @createTime 2014年9月19日 上午11:55:57
11 - * @author zhangshirui 18 + * @author Chris
12 */ 19 */
13 public class OrderItem { 20 public class OrderItem {
14 -  
15 - /**  
16 - * 进货单id  
17 - */  
18 - private Long cartId;  
19 - /**  
20 - * 购买数量  
21 - */  
22 - private Integer amount;  
23 - /**  
24 - * 价格-单位：分  
25 - */  
26 - private Long price;  
27 - /**  
28 - * 最新价格  
29 - */  
30 - private Long newPrice;  
31 - /**  
32 - * 商品sku  
33 - */  
34 - private String sku;  
35 -  
36 - /**  
37 - * 商品id  
38 - * */  
39 - private Long productId;  
40 -  
41 -  
42 - /**  
43 - * 是否为特价商品  
44 - * */  
45 - private Integer hasSpecial;  
46 21
47 -  
48 - public Integer getAmount() {  
49 - return amount;  
50 - }  
51 -  
52 - public void setAmount(Integer amount) {  
53 - this.amount = amount;  
54 - }  
55 - public Long getPrice() {  
56 - return price;  
57 - }  
58 - public void setPrice(Long price) {  
59 - this.price = price;  
60 - }  
61 - public String getSku() {  
62 - return sku;  
63 - }  
64 - public void setSku(String sku) {  
65 - this.sku = sku;  
66 - }  
67 - public Long getCartId() {  
68 - return cartId;  
69 - }  
70 - public void setCartId(Long cartId) {  
71 - this.cartId = cartId;  
72 - }  
73 -  
74 - public Long getNewPrice() {  
75 - return newPrice; 22 + @ApiParam("sku编号")
  23 + @NotNull(message = "sku编号不能为空")
  24 + private String sku;
  25 + @ApiParam("购买数量")
  26 + @NotNull(message = "购买数量不能为空")
  27 + private BigDecimal amount;
  28 + @ApiModelProperty("sku价格")
  29 + private Long skuPrice;
  30 +
  31 + public String getSku() {
  32 + return sku;
76 } 33 }
77 34
78 - public void setNewPrice(Long newPrice) {  
79 - this.newPrice = newPrice; 35 + public void setSku(String sku) {
  36 + this.sku = sku;
80 } 37 }
81 38
82 - public Long getProductId() {  
83 - return productId; 39 + public BigDecimal getAmount() {
  40 + return amount;
84 } 41 }
85 42
86 - public void setProductId(Long productId) {  
87 - this.productId = productId; 43 + public void setAmount(BigDecimal amount) {
  44 + this.amount = amount;
88 } 45 }
89 46
90 - public Integer getHasSpecial() {  
91 - return hasSpecial; 47 + public Long getSkuPrice() {
  48 + return skuPrice;
92 } 49 }
93 50
94 - public void setHasSpecial(Integer hasSpecial) {  
95 - this.hasSpecial = hasSpecial; 51 + public void setSkuPrice(Long skuPrice) {
  52 + this.skuPrice = skuPrice;
96 } 53 }
  54 +
97 } 55 }
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/OrderProduct.java
  View file @6b18dfa
1 package com.diligrp.mobsite.getway.domain.protocol; 1 package com.diligrp.mobsite.getway.domain.protocol;
2 2
3 -import java.util.Map; 3 +import io.swagger.annotations.ApiModelProperty;
4 4
5 5
6 /** 6 /**
@@ -16,83 +16,32 @@ public class OrderProduct extends GoodsSuper { @@ -16,83 +16,32 @@ public class OrderProduct extends GoodsSuper {
16 /** 16 /**
17 * 购买数量 17 * 购买数量
18 */ 18 */
  19 + @ApiModelProperty(value = "购买数量")
19 private Integer buyNum; 20 private Integer buyNum;
20 21
21 - /**  
22 - * 商品属性map  
23 - */  
24 - private Map<String,String> attributeMap;  
25 - 22 +// /**
  23 +// * 商品属性map
  24 +// */
  25 +// private Map<String,String> attributeMap;
  26 +//
  27 +
  28 +//
26 // /** 29 // /**
27 -// * 商品服务列表 30 +// * 商品sku
28 // */ 31 // */
29 -// private List<Service> serviceList;  
30 -  
31 - /**  
32 - * 商品sku  
33 - */  
34 - private String sku; 32 +// private String sku;
  33 +//
  34 +// /**
  35 +// *商品当前价格
  36 +// * */
  37 +// private Long currentPrice;
35 38
36 - /**  
37 - *商品当前价格  
38 - * */  
39 - private Long currentPrice;  
40 39
41 - /**  
42 - * @return the buyNum  
43 - */  
44 public Integer getBuyNum() { 40 public Integer getBuyNum() {
45 return buyNum; 41 return buyNum;
46 } 42 }
47 43
48 - /**  
49 - * @param buyNum the buyNum to set  
50 - */  
51 public void setBuyNum(Integer buyNum) { 44 public void setBuyNum(Integer buyNum) {
52 this.buyNum = buyNum; 45 this.buyNum = buyNum;
53 } 46 }
54 -  
55 - /**  
56 - * @return the attributeMap  
57 - */  
58 - public Map<String, String> getAttributeMap() {  
59 - return attributeMap;  
60 - }  
61 -  
62 - /**  
63 - * @param attributeMap the attributeMap to set  
64 - */  
65 - public void setAttributeMap(Map<String, String> attributeMap) {  
66 - this.attributeMap = attributeMap;  
67 - }  
68 -  
69 - /**  
70 - * get value of OrderProduct.sku  
71 - * @return the sku  
72 - * @createTime 2014年10月22日 下午2:55:49  
73 - * @author zhangshirui  
74 - */  
75 - public String getSku() {  
76 - return sku;  
77 - }  
78 -  
79 -  
80 - /**  
81 - * set value of OrderProduct.sku  
82 - * @param sku the sku to set  
83 - * @createTime 2014年10月22日 下午2:55:49  
84 - * @author zhangshirui  
85 - */  
86 - public void setSku(String sku) {  
87 - this.sku = sku;  
88 - }  
89 -  
90 -  
91 - public Long getCurrentPrice() {  
92 - return currentPrice;  
93 - }  
94 -  
95 - public void setCurrentPrice(Long currentPrice) {  
96 - this.currentPrice = currentPrice;  
97 - }  
98 } 47 }
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/PicSupplyMessage.java
  View file @6b18dfa
@@ -10,7 +10,7 @@ package com.diligrp.mobsite.getway.domain.protocol; @@ -10,7 +10,7 @@ package com.diligrp.mobsite.getway.domain.protocol;
10 * @author wujianjun 10 * @author wujianjun
11 * @createTime 2014/9/9 14:18 11 * @createTime 2014/9/9 14:18
12 */ 12 */
13 -public class PicSupplyMessage extends SupplyMessage { 13 +public class PicSupplyMessage {
14 /** 14 /**
15 * 图片地址 15 * 图片地址
16 * 多张图片，以分号分隔 16 * 多张图片，以分号分隔
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/ConsigneeInfo.java renamed to mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/PickInfo.java
  View file @6b18dfa
1 package com.diligrp.mobsite.getway.domain.protocol; 1 package com.diligrp.mobsite.getway.domain.protocol;
2 2
3 -import java.io.Serializable; 3 +import io.swagger.annotations.ApiModelProperty;
4 4
  5 +import java.io.Serializable;
5 6
6 /** 7 /**
7 * <B>Description</B> 提货人信息 <br /> 8 * <B>Description</B> 提货人信息 <br />
8 - * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br /> 9 + * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved.
  10 + * <br />
9 * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br /> 11 * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
10 * <B>Company</B> 地利集团 12 * <B>Company</B> 地利集团
11 * 13 *
12 * @author wujianjun 14 * @author wujianjun
13 * @createTime 2014/8/28 10:37 15 * @createTime 2014/8/28 10:37
14 */ 16 */
15 -public class ConsigneeInfo implements Serializable {  
16 -  
17 - private static final long serialVersionUID = 8718494787385584082L;  
18 -  
19 - /**  
20 - * 默认提货人-是  
21 - */  
22 - public static final int ISDEFAULT_YES = 2;  
23 - /**  
24 - * 默认提货人-否  
25 - */  
26 - public static final int ISDEFAULT_NO = 1;  
27 -  
28 - /**  
29 - * 是否市场内交割-是  
30 - */  
31 - public static final int DELIVERYTYPE_YES = 1;  
32 - /**  
33 - * 是否市场内交割-否  
34 - */  
35 - public static final int DELIVERYTYPE_NO = 2;  
36 -  
37 - /**  
38 - * id  
39 - */  
40 - private Long id;  
41 - /**  
42 - * 用户姓名名字  
43 - */  
44 - private String name;  
45 - /**  
46 - * 电话  
47 - */  
48 - private String mobile;  
49 - /**  
50 - * 身份证号  
51 - */  
52 - private String idCard;  
53 - /**  
54 - * 是否为默认提货人  
55 - */  
56 - private Integer isDefault;  
57 - /**  
58 - * 城市地址编号  
59 - */  
60 - private Long cityAddressNo;  
61 - /**  
62 - * 城市地址  
63 - */  
64 - private String cityAddress;  
65 - /**  
66 - * 街道地址  
67 - */  
68 - private String streetAddress;  
69 -  
70 - /**  
71 - * 交割类型：1-市场内 2-市场外  
72 - */  
73 - private Integer deliveryType;  
74 -  
75 -  
76 - private Long marketId;  
77 -  
78 -  
79 - public Long getMarketId() {  
80 - return marketId;  
81 - }  
82 -  
83 - public void setMarketId(Long marketId) {  
84 - this.marketId = marketId;  
85 - }  
86 -  
87 - public Integer getDeliveryType() {  
88 - return deliveryType;  
89 - }  
90 -  
91 - public void setDeliveryType(Integer deliveryType) {  
92 - this.deliveryType = deliveryType;  
93 - }  
94 -  
95 - public String getIdCard() {  
96 - return idCard;  
97 - }  
98 -  
99 - public void setIdCard(String idCard) {  
100 - this.idCard = idCard;  
101 - }  
102 -  
103 - public Long getId() {  
104 - return id;  
105 - }  
106 -  
107 - public void setId(Long id) {  
108 - this.id = id;  
109 - }  
110 -  
111 - public String getName() {  
112 - return name;  
113 - }  
114 -  
115 - public void setName(String name) {  
116 - this.name = name;  
117 - }  
118 -  
119 - public String getMobile() {  
120 - return mobile;  
121 - }  
122 -  
123 - public void setMobile(String mobile) {  
124 - this.mobile = mobile;  
125 - }  
126 -  
127 - public Integer getIsDefault() {  
128 - return isDefault;  
129 - }  
130 -  
131 - public void setIsDefault(Integer isDefault) {  
132 - this.isDefault = isDefault;  
133 - }  
134 -  
135 -  
136 - public Long getCityAddressNo() {  
137 - return cityAddressNo;  
138 - }  
139 -  
140 -  
141 - public void setCityAddressNo(Long cityAddressNo) {  
142 - this.cityAddressNo = cityAddressNo;  
143 - }  
144 -  
145 -  
146 - public String getCityAddress() {  
147 - return cityAddress;  
148 - }  
149 -  
150 -  
151 - public void setCityAddress(String cityAddress) {  
152 - this.cityAddress = cityAddress;  
153 - }  
154 -  
155 -  
156 - public String getStreetAddress() {  
157 - return streetAddress;  
158 - }  
159 -  
160 -  
161 - public void setStreetAddress(String streetAddress) {  
162 - this.streetAddress = streetAddress;  
163 - } 17 +public class PickInfo implements Serializable {
  18 +
  19 + private static final long serialVersionUID = 8718494787385584082L;
  20 +
  21 + /**
  22 + * 默认提货人-是
  23 + */
  24 + public static final int ISDEFAULT_YES = 1;
  25 + /**
  26 + * 默认提货人-否
  27 + */
  28 + public static final int ISDEFAULT_NO = 2;
  29 +
  30 + /**
  31 + * id
  32 + */
  33 + @ApiModelProperty(value = "收货人id")
  34 + private Long id;
  35 + /**
  36 + * 用户姓名名字
  37 + */
  38 + @ApiModelProperty(value = "收货人姓名")
  39 + private String name;
  40 + /**
  41 + * 电话
  42 + */
  43 + @ApiModelProperty(value = "收货人电话")
  44 + private String mobile;
  45 +
  46 + /**
  47 + * 是否为默认提货人
  48 + */
  49 + @ApiModelProperty(value = "是否为默认提货人:1-是，2-否")
  50 + private Integer isDefault;
  51 +
  52 + /**
  53 + * 城市地址
  54 + */
  55 + @ApiModelProperty(value = "城市id")
  56 + private Long cityId;
  57 + /**
  58 + * 城市地址
  59 + */
  60 + @ApiModelProperty(value = "城市描述")
  61 + private String cityAddress;
  62 + /**
  63 + * 街道地址
  64 + */
  65 + @ApiModelProperty(value = "街道地址")
  66 + private String streetAddress;
  67 +
  68 + public Long getCityId() {
  69 + return cityId;
  70 + }
  71 +
  72 + public void setCityId(Long cityId) {
  73 + this.cityId = cityId;
  74 + }
  75 +
  76 + public Long getId() {
  77 + return id;
  78 + }
  79 +
  80 + public void setId(Long id) {
  81 + this.id = id;
  82 + }
  83 +
  84 + public String getName() {
  85 + return name;
  86 + }
  87 +
  88 + public void setName(String name) {
  89 + this.name = name;
  90 + }
  91 +
  92 + public String getMobile() {
  93 + return mobile;
  94 + }
  95 +
  96 + public void setMobile(String mobile) {
  97 + this.mobile = mobile;
  98 + }
  99 +
  100 + public Integer getIsDefault() {
  101 + return isDefault;
  102 + }
  103 +
  104 + public void setIsDefault(Integer isDefault) {
  105 + this.isDefault = isDefault;
  106 + }
  107 +
  108 + public String getCityAddress() {
  109 + return cityAddress;
  110 + }
  111 +
  112 + public void setCityAddress(String cityAddress) {
  113 + this.cityAddress = cityAddress;
  114 + }
  115 +
  116 + public String getStreetAddress() {
  117 + return streetAddress;
  118 + }
  119 +
  120 + public void setStreetAddress(String streetAddress) {
  121 + this.streetAddress = streetAddress;
  122 + }
164 } 123 }
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/ProductCategory.java
  View file @6b18dfa
1 package com.diligrp.mobsite.getway.domain.protocol; 1 package com.diligrp.mobsite.getway.domain.protocol;
2 2
3 3
  4 +import io.swagger.annotations.ApiModelProperty;
4 5
5 /** 6 /**
6 * <B>Description</B> 产品分类 <br /> 7 * <B>Description</B> 产品分类 <br />
@@ -20,33 +21,21 @@ public class ProductCategory extends Category{ @@ -20,33 +21,21 @@ public class ProductCategory extends Category{
20 * 没有子分类 21 * 没有子分类
21 */ 22 */
22 public static final Integer HASNEXT_NO = 2; 23 public static final Integer HASNEXT_NO = 2;
23 -  
24 - /**  
25 - * 是否关注  
26 - * 1-关注  
27 - */  
28 - public static final Integer FOCUS_YES = 1;  
29 - /**  
30 - * 是否关注  
31 - * 2-未关注  
32 - */  
33 - public static final Integer FOCUS_NO = 2; 24 +
34 25
35 /** 26 /**
36 * 是否子级分类，HASNEXT_* 27 * 是否子级分类，HASNEXT_*
37 */ 28 */
  29 + @ApiModelProperty(value = "是否有子分类：1-有,2-没有")
38 private Integer hasNext; 30 private Integer hasNext;
39 31
40 /** 32 /**
41 * 父级分类ID 33 * 父级分类ID
42 */ 34 */
  35 + @ApiModelProperty(value = "父分类id")
43 private Long pid; 36 private Long pid;
44 37
45 - /**  
46 - * 是否关注  
47 - */  
48 - private Integer isFocus;  
49 - 38 +
50 /** 39 /**
51 * get value of ProductCategory.pid 40 * get value of ProductCategory.pid
52 * @return the pid 41 * @return the pid
@@ -87,18 +76,6 @@ public class ProductCategory extends Category{ @@ -87,18 +76,6 @@ public class ProductCategory extends Category{
87 this.hasNext = hasNext; 76 this.hasNext = hasNext;
88 } 77 }
89 78
90 - /**  
91 - * @return the isFocus  
92 - */  
93 - public Integer getIsFocus() {  
94 - return isFocus;  
95 - }  
96 79
97 - /**  
98 - * @param isFocus the isFocus to set  
99 - */  
100 - public void setIsFocus(Integer isFocus) {  
101 - this.isFocus = isFocus;  
102 - }  
103 80
104 } 81 }
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/ProductIntroduction.java
  View file @6b18dfa
1 package com.diligrp.mobsite.getway.domain.protocol; 1 package com.diligrp.mobsite.getway.domain.protocol;
2 2
3 -import com.diligrp.mobsite.getway.domain.protocol.product.model.VideoInfo;  
4 -  
5 -import java.util.List;  
6 -  
7 -  
8 /** 3 /**
9 * <B>Description</B> 商品简介 <br /> 4 * <B>Description</B> 商品简介 <br />
10 * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br /> 5 * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />
@@ -13,280 +8,9 @@ import java.util.List; @@ -13,280 +8,9 @@ import java.util.List;
13 * @createTime Aug 14, 2014 8:24:48 PM 8 * @createTime Aug 14, 2014 8:24:48 PM
14 * @author wujianjun 9 * @author wujianjun
15 */ 10 */
16 -public class ProductIntroduction extends Goods {  
17 -  
18 - /**  
19 - * 产地  
20 - */  
21 - private String producingArea;  
22 - /**  
23 - * 商品分享地址  
24 - */  
25 - private String shareURL;  
26 - /**  
27 - * 交易量（带单位）  
28 - */  
29 - private String transVolume;  
30 - /**  
31 - * 商品所在地id  
32 - */  
33 - private Integer locationid;  
34 - /**  
35 - * 分类名称  
36 - */  
37 - private String categoryName;  
38 - /**  
39 - * 分类价格指数  
40 - * 1-有，2没有  
41 - */  
42 - @Deprecated  
43 - private Integer categoryIndex;  
44 - /**  
45 - * 商家联系电话  
46 - */  
47 - private String contactMobile;  
48 - /**  
49 - * 卖家id  
50 - */  
51 - private Long sellerId;  
52 - /**  
53 - * 店铺简介信息  
54 - */  
55 - private ShopIntroduction shopIntroduction;  
56 - /**  
57 - * 好评率  
58 - */  
59 - private Float praiseRate;  
60 - /**  
61 - * 评论人数  
62 - */  
63 - private Integer commentNum;  
64 - /**  
65 - * 每单位数量  
66 - */  
67 - private String singleBoxCount;  
68 - /**  
69 - * 每单位重量  
70 - */  
71 - private String singleBoxweight;  
72 - /**  
73 - * 视频信息  
74 - */  
75 - private List<VideoInfo> videos;  
76 -  
77 -  
78 -  
79 -  
80 -  
81 - public String getShareURL() {  
82 - return shareURL;  
83 - }  
84 -  
85 - public void setShareURL(String shareURL) {  
86 - this.shareURL = shareURL;  
87 - }  
88 -  
89 - /**  
90 - * get value of ProductIntroduction.producingArea  
91 - * @return the producingArea  
92 - * @createTime Aug 14, 2014 8:31:09 PM  
93 - * @author wujianjun  
94 - */  
95 - public String getProducingArea() {  
96 - return producingArea;  
97 - }  
98 -  
99 - /**  
100 - * set value of ProductIntroduction.producingArea  
101 - * @param producingArea the producingArea to set  
102 - * @createTime Aug 14, 2014 8:31:09 PM  
103 - * @author wujianjun  
104 - */  
105 - public void setProducingArea(String producingArea) {  
106 - this.producingArea = producingArea;  
107 - }  
108 -  
109 - /**  
110 - * get value of ProductIntroduction.transVolume  
111 - * @return the transVolume  
112 - * @createTime Aug 14, 2014 8:31:09 PM  
113 - * @author wujianjun  
114 - */  
115 - public String getTransVolume() {  
116 - return transVolume;  
117 - }  
118 -  
119 - /**  
120 - * set value of ProductIntroduction.transVolume  
121 - * @param transVolume the transVolume to set  
122 - * @createTime Aug 14, 2014 8:31:09 PM  
123 - * @author wujianjun  
124 - */  
125 - public void setTransVolume(String transVolume) {  
126 - this.transVolume = transVolume;  
127 - }  
128 -  
129 - /**  
130 - * get value of ProductIntroduction.locationid  
131 - * @return the locationid  
132 - * @createTime 2014年9月17日 下午3:56:28  
133 - * @author zhangshirui  
134 - */  
135 - public Integer getLocationid() {  
136 - return locationid;  
137 - }  
138 -  
139 -  
140 - /**  
141 - * set value of ProductIntroduction.locationid  
142 - * @param locationid the locationid to set  
143 - * @createTime 2014年9月17日 下午3:56:28  
144 - * @author zhangshirui  
145 - */  
146 - public void setLocationid(Integer locationid) {  
147 - this.locationid = locationid;  
148 - }  
149 -  
150 -  
151 - /**  
152 - * get value of ProductIntroduction.categoryName  
153 - * @return the categoryName  
154 - * @createTime 2014年10月29日 下午3:48:16  
155 - * @author zhangshirui  
156 - */  
157 - public String getCategoryName() {  
158 - return categoryName;  
159 - }  
160 -  
161 -  
162 - /**  
163 - * set value of ProductIntroduction.categoryName  
164 - * @param categoryName the categoryName to set  
165 - * @createTime 2014年10月29日 下午3:48:16  
166 - * @author zhangshirui  
167 - */  
168 - public void setCategoryName(String categoryName) {  
169 - this.categoryName = categoryName;  
170 - }  
171 -  
172 -  
173 - /**  
174 - * get value of ProductIntroduction.contactMobile  
175 - * @return the contactMobile  
176 - * @createTime 2014年10月31日 下午5:26:07  
177 - * @author zhangshirui  
178 - */  
179 - public String getContactMobile() {  
180 - return contactMobile;  
181 - }  
182 - 11 +public class ProductIntroduction extends GoodsSuper {
183 12
184 - /**  
185 - * set value of ProductIntroduction.contactMobile  
186 - * @param contactMobile the contactMobile to set  
187 - * @createTime 2014年10月31日 下午5:26:07  
188 - * @author zhangshirui  
189 - */  
190 - public void setContactMobile(String contactMobile) {  
191 - this.contactMobile = contactMobile;  
192 - }  
193 -  
194 -  
195 - /**  
196 - * get value of ProductIntroduction.shopIntroduction  
197 - * @return the shopIntroduction  
198 - * @createTime 2014年11月3日 下午8:07:46  
199 - * @author zhangshirui  
200 - */  
201 - public ShopIntroduction getShopIntroduction() {  
202 - return shopIntroduction;  
203 - }  
204 -  
205 -  
206 - /**  
207 - * set value of ProductIntroduction.shopIntroduction  
208 - * @param shopIntroduction the shopIntroduction to set  
209 - * @createTime 2014年11月3日 下午8:07:46  
210 - * @author zhangshirui  
211 - */  
212 - public void setShopIntroduction(ShopIntroduction shopIntroduction) {  
213 - this.shopIntroduction = shopIntroduction;  
214 - }  
215 -  
216 -  
217 - /**  
218 - * get value of ProductIntroduction.categoryIndex  
219 - * @return the categoryIndex  
220 - * @createTime 2014年11月4日 下午5:29:24  
221 - * @author zhangshirui  
222 - */  
223 - public Integer getCategoryIndex() {  
224 - return categoryIndex;  
225 - }  
226 -  
227 -  
228 - /**  
229 - * set value of ProductIntroduction.categoryIndex  
230 - * @param categoryIndex the categoryIndex to set  
231 - * @createTime 2014年11月4日 下午5:29:24  
232 - * @author zhangshirui  
233 - */  
234 - public void setCategoryIndex(Integer categoryIndex) {  
235 - this.categoryIndex = categoryIndex;  
236 - }  
237 -  
238 -  
239 - public Long getSellerId() {  
240 - return sellerId;  
241 - }  
242 -  
243 -  
244 - public void setSellerId(Long sellerId) {  
245 - this.sellerId = sellerId;  
246 - }  
247 -  
248 -  
249 - public Float getPraiseRate() {  
250 - return praiseRate;  
251 - }  
252 -  
253 -  
254 - public void setPraiseRate(Float praiseRate) {  
255 - this.praiseRate = praiseRate;  
256 - }  
257 -  
258 -  
259 - public Integer getCommentNum() {  
260 - return commentNum;  
261 - }  
262 -  
263 -  
264 - public void setCommentNum(Integer commentNum) {  
265 - this.commentNum = commentNum;  
266 - }  
267 -  
268 - public String getSingleBoxCount() {  
269 - return singleBoxCount;  
270 - }  
271 -  
272 - public void setSingleBoxCount(String singleBoxCount) {  
273 - this.singleBoxCount = singleBoxCount;  
274 - }  
275 -  
276 - public List<VideoInfo> getVideos() {  
277 - return videos;  
278 - }  
279 -  
280 - public void setVideos(List<VideoInfo> videos) {  
281 - this.videos = videos;  
282 - }  
283 13
284 - public String getSingleBoxweight() {  
285 - return singleBoxweight;  
286 - }  
287 14
288 - public void setSingleBoxweight(String singleBoxweight) {  
289 - this.singleBoxweight = singleBoxweight;  
290 - }  
291 15
292 } 16 }
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/ProductSku.java
  View file @6b18dfa
@@ -3,214 +3,223 @@ package com.diligrp.mobsite.getway.domain.protocol; @@ -3,214 +3,223 @@ package com.diligrp.mobsite.getway.domain.protocol;
3 import java.util.List; 3 import java.util.List;
4 import java.util.Map; 4 import java.util.Map;
5 5
  6 +import io.swagger.annotations.ApiModelProperty;
6 7
7 /** 8 /**
8 * <B>Description</B> 商品属性 <br /> 9 * <B>Description</B> 商品属性 <br />
9 - * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br /> 10 + * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved.
  11 + * <br />
10 * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br /> 12 * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
11 * <B>Company</B> 地利集团 13 * <B>Company</B> 地利集团
  14 + *
12 * @createTime 2014年9月17日 下午6:19:19 15 * @createTime 2014年9月17日 下午6:19:19
13 * @author zhangshirui 16 * @author zhangshirui
14 */ 17 */
15 public class ProductSku { 18 public class ProductSku {
16 -  
17 - /**  
18 - * 商品状态：1-库存为零，销售完毕,2-商品状态：已下架或删除,3-在售并且正常  
19 - * 1-库存为零，销售完毕  
20 - */  
21 - public static final int STATE_SOLD_OUT = 1;  
22 - /**  
23 - * 2-已下架或删除  
24 - */  
25 - public static final int STATE_DOWN_DEL=2;  
26 - /**  
27 - * 3-在售并且正常  
28 - */  
29 - public static final int STATE_ON_SALE = 3;  
30 -  
31 - /**  
32 - * 购物车项sk  
33 - */  
34 - private String sku;  
35 -  
36 - /**  
37 - * 属性map  
38 - */  
39 - private Map<String,String> attributeMap;  
40 -  
41 - /**  
42 - * 价格类型  
43 - */  
44 - private Integer priceType;  
45 -  
46 - /**  
47 - * 最新价格  
48 - */  
49 - private Long price;  
50 -  
51 - /**  
52 - * 之前的价格  
53 - */  
54 - private Long oldPrice;  
55 -  
56 - /**  
57 - * 购买数量  
58 - */  
59 - private Integer buyNum;  
60 -  
61 - /**  
62 - * sku商品的状态  
63 - */  
64 - private Integer state;  
65 -  
66 - /**  
67 - * 选择的服务  
68 - */  
69 - private List<Service> serviceList;  
70 -  
71 -  
72 - /**  
73 - * get value of ProductAttribute.sku  
74 - * @return the sku  
75 - * @createTime 2014年9月17日 下午6:27:08  
76 - * @author zhangshirui  
77 - */  
78 - public String getSku() {  
79 - return sku;  
80 - }  
81 -  
82 -  
83 - /**  
84 - * set value of ProductAttribute.sku  
85 - * @param sku the sku to set  
86 - * @createTime 2014年9月17日 下午6:27:08  
87 - * @author zhangshirui  
88 - */  
89 - public void setSku(String sku) {  
90 - this.sku = sku;  
91 - }  
92 -  
93 -  
94 - /**  
95 - * get value of ProductAttribute.attributeMap  
96 - * @return the attributeMap  
97 - * @createTime 2014年9月17日 下午6:27:08  
98 - * @author zhangshirui  
99 - */  
100 - public Map<String, String> getAttributeMap() {  
101 - return attributeMap;  
102 - }  
103 -  
104 -  
105 - /**  
106 - * set value of ProductAttribute.attributeMap  
107 - * @param attributeMap the attributeMap to set  
108 - * @createTime 2014年9月17日 下午6:27:08  
109 - * @author zhangshirui  
110 - */  
111 - public void setAttributeMap(Map<String, String> attributeMap) {  
112 - this.attributeMap = attributeMap;  
113 - }  
114 -  
115 -  
116 - /**  
117 - * get value of ProductAttribute.priceType  
118 - * @return the priceType  
119 - * @createTime 2014年9月17日 下午6:27:08  
120 - * @author zhangshirui  
121 - */  
122 - public Integer getPriceType() {  
123 - return priceType;  
124 - }  
125 -  
126 -  
127 - /**  
128 - * set value of ProductAttribute.priceType  
129 - * @param priceType the priceType to set  
130 - * @createTime 2014年9月17日 下午6:27:08  
131 - * @author zhangshirui  
132 - */  
133 - public void setPriceType(Integer priceType) {  
134 - this.priceType = priceType;  
135 - }  
136 -  
137 -  
138 - /**  
139 - * get value of ProductAttribute.price  
140 - * @return the price  
141 - * @createTime 2014年9月17日 下午6:27:08  
142 - * @author zhangshirui  
143 - */  
144 - public Long getPrice() {  
145 - return price;  
146 - }  
147 -  
148 -  
149 - /**  
150 - * set value of ProductAttribute.price  
151 - * @param price the price to set  
152 - * @createTime 2014年9月17日 下午6:27:08  
153 - * @author zhangshirui  
154 - */  
155 - public void setPrice(Long price) {  
156 - this.price = price;  
157 - }  
158 -  
159 -  
160 - /**  
161 - * get value of ProductAttribute.buyNum  
162 - * @return the buyNum  
163 - * @createTime 2014年9月17日 下午6:27:08  
164 - * @author zhangshirui  
165 - */  
166 - public Integer getBuyNum() {  
167 - return buyNum;  
168 - }  
169 -  
170 -  
171 - /**  
172 - * set value of ProductAttribute.buyNum  
173 - * @param buyNum the buyNum to set  
174 - * @createTime 2014年9月17日 下午6:27:08  
175 - * @author zhangshirui  
176 - */  
177 - public void setBuyNum(Integer buyNum) {  
178 - this.buyNum = buyNum;  
179 - }  
180 -  
181 -  
182 - /**  
183 - * get value of ProductAttribute.serviceList  
184 - * @return the serviceList  
185 - * @createTime 2014年9月17日 下午6:27:08  
186 - * @author zhangshirui  
187 - */  
188 - public List<Service> getServiceList() {  
189 - return serviceList;  
190 - }  
191 -  
192 -  
193 - /**  
194 - * set value of ProductAttribute.serviceList  
195 - * @param serviceList the serviceList to set  
196 - * @createTime 2014年9月17日 下午6:27:08  
197 - * @author zhangshirui  
198 - */  
199 - public void setServiceList(List<Service> serviceList) {  
200 - this.serviceList = serviceList;  
201 - }  
202 19
  20 + /**
  21 + * 商品状态：1-库存为零，销售完毕,2-商品状态：已下架或删除,3-在售并且正常 1-库存为零，销售完毕
  22 + */
  23 + public static final int STATE_SOLD_OUT = 1;
  24 + /**
  25 + * 2-已下架或删除
  26 + */
  27 + public static final int STATE_DOWN_DEL = 2;
  28 + /**
  29 + * 3-在售并且正常
  30 + */
  31 + public static final int STATE_ON_SALE = 3;
  32 +
  33 + /**
  34 + * 购物车项sk
  35 + */
  36 + private String sku;
  37 +
  38 + /**
  39 + * 属性map
  40 + */
  41 + private Map<String, String> attributeMap;
  42 +
  43 + /**
  44 + * 价格类型
  45 + */
  46 + private Integer priceType;
  47 +
  48 + /**
  49 + * 最新价格
  50 + */
  51 + private Long price;
  52 +
  53 + /**
  54 + * 之前的价格
  55 + */
  56 + private Long oldPrice;
  57 +
  58 + /**
  59 + * 购买数量
  60 + */
  61 + private Integer buyNum;
  62 +
  63 + /**
  64 + * sku商品的状态
  65 + */
  66 + private Integer state;
  67 +
  68 + /**
  69 + * 选择的服务
  70 + */
  71 + private List<Service> serviceList;
  72 + @ApiModelProperty("商品id")
  73 + private Long productId;
  74 + @ApiModelProperty("商品名称")
  75 + private String productName;
  76 +
  77 + /**
  78 + * get value of ProductAttribute.sku
  79 + *
  80 + * @return the sku
  81 + * @createTime 2014年9月17日 下午6:27:08
  82 + * @author zhangshirui
  83 + */
  84 + public String getSku() {
  85 + return sku;
  86 + }
  87 +
  88 + /**
  89 + * set value of ProductAttribute.sku
  90 + *
  91 + * @param sku
  92 + * the sku to set
  93 + * @createTime 2014年9月17日 下午6:27:08
  94 + * @author zhangshirui
  95 + */
  96 + public void setSku(String sku) {
  97 + this.sku = sku;
  98 + }
  99 +
  100 + /**
  101 + * get value of ProductAttribute.attributeMap
  102 + *
  103 + * @return the attributeMap
  104 + * @createTime 2014年9月17日 下午6:27:08
  105 + * @author zhangshirui
  106 + */
  107 + public Map<String, String> getAttributeMap() {
  108 + return attributeMap;
  109 + }
  110 +
  111 + /**
  112 + * set value of ProductAttribute.attributeMap
  113 + *
  114 + * @param attributeMap
  115 + * the attributeMap to set
  116 + * @createTime 2014年9月17日 下午6:27:08
  117 + * @author zhangshirui
  118 + */
  119 + public void setAttributeMap(Map<String, String> attributeMap) {
  120 + this.attributeMap = attributeMap;
  121 + }
  122 +
  123 + /**
  124 + * get value of ProductAttribute.priceType
  125 + *
  126 + * @return the priceType
  127 + * @createTime 2014年9月17日 下午6:27:08
  128 + * @author zhangshirui
  129 + */
  130 + public Integer getPriceType() {
  131 + return priceType;
  132 + }
  133 +
  134 + /**
  135 + * set value of ProductAttribute.priceType
  136 + *
  137 + * @param priceType
  138 + * the priceType to set
  139 + * @createTime 2014年9月17日 下午6:27:08
  140 + * @author zhangshirui
  141 + */
  142 + public void setPriceType(Integer priceType) {
  143 + this.priceType = priceType;
  144 + }
  145 +
  146 + /**
  147 + * get value of ProductAttribute.price
  148 + *
  149 + * @return the price
  150 + * @createTime 2014年9月17日 下午6:27:08
  151 + * @author zhangshirui
  152 + */
  153 + public Long getPrice() {
  154 + return price;
  155 + }
  156 +
  157 + /**
  158 + * set value of ProductAttribute.price
  159 + *
  160 + * @param price
  161 + * the price to set
  162 + * @createTime 2014年9月17日 下午6:27:08
  163 + * @author zhangshirui
  164 + */
  165 + public void setPrice(Long price) {
  166 + this.price = price;
  167 + }
  168 +
  169 + /**
  170 + * get value of ProductAttribute.buyNum
  171 + *
  172 + * @return the buyNum
  173 + * @createTime 2014年9月17日 下午6:27:08
  174 + * @author zhangshirui
  175 + */
  176 + public Integer getBuyNum() {
  177 + return buyNum;
  178 + }
  179 +
  180 + /**
  181 + * set value of ProductAttribute.buyNum
  182 + *
  183 + * @param buyNum
  184 + * the buyNum to set
  185 + * @createTime 2014年9月17日 下午6:27:08
  186 + * @author zhangshirui
  187 + */
  188 + public void setBuyNum(Integer buyNum) {
  189 + this.buyNum = buyNum;
  190 + }
  191 +
  192 + /**
  193 + * get value of ProductAttribute.serviceList
  194 + *
  195 + * @return the serviceList
  196 + * @createTime 2014年9月17日 下午6:27:08
  197 + * @author zhangshirui
  198 + */
  199 + public List<Service> getServiceList() {
  200 + return serviceList;
  201 + }
  202 +
  203 + /**
  204 + * set value of ProductAttribute.serviceList
  205 + *
  206 + * @param serviceList
  207 + * the serviceList to set
  208 + * @createTime 2014年9月17日 下午6:27:08
  209 + * @author zhangshirui
  210 + */
  211 + public void setServiceList(List<Service> serviceList) {
  212 + this.serviceList = serviceList;
  213 + }
203 214
204 public Integer getState() { 215 public Integer getState() {
205 return state; 216 return state;
206 } 217 }
207 218
208 -  
209 public void setState(Integer state) { 219 public void setState(Integer state) {
210 this.state = state; 220 this.state = state;
211 } 221 }
212 222
213 -  
214 /** 223 /**
215 * @return the oldPrice 224 * @return the oldPrice
216 */ 225 */
@@ -218,11 +227,27 @@ public class ProductSku { @@ -218,11 +227,27 @@ public class ProductSku {
218 return oldPrice; 227 return oldPrice;
219 } 228 }
220 229
221 -  
222 /** 230 /**
223 - * @param oldPrice the oldPrice to set 231 + * @param oldPrice
  232 + * the oldPrice to set
224 */ 233 */
225 public void setOldPrice(Long oldPrice) { 234 public void setOldPrice(Long oldPrice) {
226 this.oldPrice = oldPrice; 235 this.oldPrice = oldPrice;
227 } 236 }
  237 +
  238 + public Long getProductId() {
  239 + return productId;
  240 + }
  241 +
  242 + public void setProductId(Long productId) {
  243 + this.productId = productId;
  244 + }
  245 +
  246 + public String getProductName() {
  247 + return productName;
  248 + }
  249 +
  250 + public void setProductName(String productName) {
  251 + this.productName = productName;
  252 + }
228 } 253 }
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/Quotation.java deleted 100644 → 0
  View file @264846e
1 -package com.diligrp.mobsite.getway.domain.protocol;  
2 -  
3 -  
4 -  
5 -/**  
6 - * <B>Description</B> 价格区间 <br />  
7 - * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />  
8 - * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />  
9 - * <B>Company</B> 地利集团  
10 - * @createTime 2014年9月9日 下午2:21:47  
11 - * @author zhangshirui  
12 - */  
13 -public class Quotation {  
14 -  
15 - private Integer id;  
16 - /**  
17 - * 区间最大量  
18 - */  
19 - private Integer maxScope;  
20 -  
21 - /**  
22 - * 区间最小量  
23 - */  
24 - private Integer minScope;  
25 -  
26 - /**  
27 - * 区间价格  
28 - */  
29 - private Integer price;  
30 -  
31 -  
32 - /**  
33 - * get value of Quotation.maxScope  
34 - * @return the maxScope  
35 - * @createTime 2014年9月9日 下午5:14:11  
36 - * @author zhangshirui  
37 - */  
38 - public Integer getMaxScope() {  
39 - return maxScope;  
40 - }  
41 -  
42 -  
43 - /**  
44 - * set value of Quotation.maxScope  
45 - * @param maxScope the maxScope to set  
46 - * @createTime 2014年9月9日 下午5:14:11  
47 - * @author zhangshirui  
48 - */  
49 - public void setMaxScope(Integer maxScope) {  
50 - this.maxScope = maxScope;  
51 - }  
52 -  
53 -  
54 - /**  
55 - * get value of Quotation.minScope  
56 - * @return the minScope  
57 - * @createTime 2014年9月9日 下午5:14:11  
58 - * @author zhangshirui  
59 - */  
60 - public Integer getMinScope() {  
61 - return minScope;  
62 - }  
63 -  
64 -  
65 - /**  
66 - * set value of Quotation.minScope  
67 - * @param minScope the minScope to set  
68 - * @createTime 2014年9月9日 下午5:14:11  
69 - * @author zhangshirui  
70 - */  
71 - public void setMinScope(Integer minScope) {  
72 - this.minScope = minScope;  
73 - }  
74 -  
75 -  
76 - /**  
77 - * get value of Quotation.price  
78 - * @return the price  
79 - * @createTime 2014年9月9日 下午5:14:11  
80 - * @author zhangshirui  
81 - */  
82 - public Integer getPrice() {  
83 - return price;  
84 - }  
85 -  
86 -  
87 - /**  
88 - * set value of Quotation.price  
89 - * @param price the price to set  
90 - * @createTime 2014年9月9日 下午5:14:11  
91 - * @author zhangshirui  
92 - */  
93 - public void setPrice(Integer price) {  
94 - this.price = price;  
95 - }  
96 -  
97 -  
98 -  
99 - public Integer getId() {  
100 - return id;  
101 - }  
102 -  
103 -  
104 -  
105 - public void setId(Integer id) {  
106 - this.id = id;  
107 - }  
108 -  
109 -}  
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/SKUInfo.java
  View file @6b18dfa
1 package com.diligrp.mobsite.getway.domain.protocol; 1 package com.diligrp.mobsite.getway.domain.protocol;
2 2
3 -import java.util.List; 3 +import io.swagger.annotations.ApiModelProperty;
4 4
5 /** 5 /**
6 * <B>Description</B> 商品SKU信息 <br /> 6 * <B>Description</B> 商品SKU信息 <br />
@@ -12,151 +12,67 @@ import java.util.List; @@ -12,151 +12,67 @@ import java.util.List;
12 * @createTime 2014/8/25 17:06 12 * @createTime 2014/8/25 17:06
13 */ 13 */
14 public class SKUInfo { 14 public class SKUInfo {
15 - /**  
16 - * 最少起批量  
17 - */  
18 - private Integer minWholesale;  
19 - /**  
20 - * 库存  
21 - */  
22 - private Integer stockNum;  
23 - /**  
24 - * 属性组成的列表  
25 - */  
26 - private List<Long> sku;  
27 - /**  
28 - * 加密的sku  
29 - */  
30 - private String encodeSku;  
31 - /**  
32 - * 未加密的sku,规则：pid:attrId...  
33 - * 1000003313:1270:1275  
34 - */ 15 + @ApiModelProperty(value = "sku",required = true)
  16 + private String sku;
  17 +
  18 + @ApiModelProperty(value = "价格",required = true)
  19 + private int price;
  20 +
  21 + @ApiModelProperty(value = "商品id")
  22 + private long pid;
  23 + @ApiModelProperty(value = "decodeSku",required = true)
35 private String decodeSku; 24 private String decodeSku;
36 - /**  
37 - * 价格  
38 - */  
39 - private Long price;  
40 -  
41 - /**  
42 - * SKU版本  
43 - */ 25 +
44 private Integer version; 26 private Integer version;
45 - /**  
46 - * sku状态  
47 - */ 27 + @ApiModelProperty(value = "商品状态：1删除,3在售,4下架")
48 private Integer status; 28 private Integer status;
49 - /**  
50 - * SKU版本，添加进货单时需要回传  
51 - *  
52 - * @return  
53 - */  
54 - public Integer getVersion() {  
55 - return version;  
56 - }  
57 29
58 - /**  
59 - * 设置SKU版本  
60 - *  
61 - * @param version  
62 - */  
63 - public void setVersion(Integer version) {  
64 - this.version = version;  
65 - }  
66 30
67 - /**  
68 - * 剩余库存量  
69 - *  
70 - * @return  
71 - */  
72 - public Integer getStockNum() {  
73 - return stockNum; 31 + public int getPrice() {
  32 + return price;
74 } 33 }
75 34
76 - /**  
77 - * 剩余库存量  
78 - *  
79 - * @param stockNum  
80 - */  
81 - public void setStockNum(Integer stockNum) {  
82 - this.stockNum = stockNum; 35 + public void setPrice(int price) {
  36 + this.price = price;
83 } 37 }
84 38
85 - /**  
86 - * 由销售属性值ID组成的sku串  
87 - *  
88 - * @return  
89 - */  
90 - public List<Long> getSku() {  
91 - return sku; 39 + public long getPid() {
  40 + return pid;
92 } 41 }
93 42
94 - /**  
95 - * 由销售属性值ID组成的sku串  
96 - *  
97 - * @param sku  
98 - */  
99 - public void setSku(List<Long> sku) {  
100 - this.sku = sku; 43 + public void setPid(long pid) {
  44 + this.pid = pid;
101 } 45 }
102 46
103 - /**  
104 - * 价格  
105 - *  
106 - * @return  
107 - */  
108 - public Long getPrice() {  
109 - return price; 47 + public String getDecodeSku() {
  48 + return decodeSku;
110 } 49 }
111 50
112 - /**  
113 - * 价格  
114 - *  
115 - * @param price  
116 - */  
117 - public void setPrice(Long price) {  
118 - this.price = price; 51 + public void setDecodeSku(String decodeSku) {
  52 + this.decodeSku = decodeSku;
119 } 53 }
120 54
121 -  
122 - /**  
123 - * 最少起批量  
124 - * minWholesale  
125 - */  
126 - public Integer getMinWholesale() {  
127 - return minWholesale; 55 + public Integer getVersion() {
  56 + return version;
128 } 57 }
129 58
130 -  
131 - /**  
132 - * 最少起批量  
133 - * minWholesale  
134 - */  
135 - public void setMinWholesale(Integer minWholesale) {  
136 - this.minWholesale = minWholesale; 59 + public void setVersion(Integer version) {
  60 + this.version = version;
137 } 61 }
138 62
139 - public String getEncodeSku() {  
140 - return encodeSku;  
141 - }  
142 -  
143 - public void setEncodeSku(String encodeSku) {  
144 - this.encodeSku = encodeSku;  
145 - }  
146 -  
147 - public String getDecodeSku() {  
148 - return decodeSku;  
149 - } 63 + public Integer getStatus() {
  64 + return status;
  65 + }
150 66
151 - public void setDecodeSku(String decodeSku) {  
152 - this.decodeSku = decodeSku;  
153 - } 67 + public void setStatus(Integer status) {
  68 + this.status = status;
  69 + }
154 70
155 - public Integer getStatus() {  
156 - return status;  
157 - } 71 + public String getSku() {
  72 + return sku;
  73 + }
158 74
159 - public void setStatus(Integer status) {  
160 - this.status = status;  
161 - } 75 + public void setSku(String sku) {
  76 + this.sku = sku;
  77 + }
162 } 78 }
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/SupplyMessage.java deleted 100644 → 0
  View file @264846e
1 -package com.diligrp.mobsite.getway.domain.protocol;  
2 -  
3 -import java.util.Date;  
4 -  
5 -/**  
6 - * <B>Description</B> 供应消息 <br />  
7 - * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />  
8 - * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />  
9 - * <B>Company</B> 地利集团  
10 - *  
11 - * @author wujianjun  
12 - * @createTime 2014/9/10 18:24  
13 - */  
14 -public class SupplyMessage {  
15 - /**  
16 - * 文本供应消息  
17 - */  
18 - public static final int MESSAGE_TYPE_TEXT = 1;  
19 - /**  
20 - * 图片供应消息  
21 - */  
22 - public static final int MESSAGE_TYPE_PIC = 2;  
23 -  
24 - /**  
25 - * * 1-审核通过，2-已过期，3-已关闭,4-审核失败,5-待审核  
26 - * 进行中-审核通过  
27 - */  
28 - public static final int STATUS_PASS = 1;  
29 - /**  
30 - * 已过期  
31 - */  
32 - public static final int STATUS_OVER_TIME = 2;  
33 - /**  
34 - * 已经关闭  
35 - */  
36 - public static final int STATUS_CLOSEED = 3;  
37 - /**  
38 - * 审核失败  
39 - */  
40 - public static final int STATUS_UNPASS = 4;  
41 - /**  
42 - * 待审核  
43 - */  
44 - public static final int STATUS_AUDITING = 5;  
45 -  
46 - /**  
47 - * 消息ID  
48 - */  
49 - protected Long id;  
50 - /**  
51 - * 商品品类ID  
52 - */  
53 - protected Long categoryId;  
54 - /**  
55 - * 商品名称 -- 品类名  
56 - */  
57 - protected String productName;  
58 - /**  
59 - * 状态  
60 - */  
61 - protected Integer status;  
62 - /**  
63 - * 发布时间  
64 - */  
65 - protected Date createTime;  
66 - /**  
67 - * 发布者  
68 - */  
69 - protected Long creator;  
70 - /**  
71 - * 发布者名称  
72 - */  
73 - protected String creatorName;  
74 - /**  
75 - * 发布者手机号  
76 - */  
77 - protected String creatorMobile;  
78 - /**  
79 - * 消息类型  
80 - */  
81 - private Integer messageType;  
82 - /**  
83 - * 市场id  
84 - */  
85 - private Long marketId;  
86 - /**  
87 - * 提货点名字  
88 - */  
89 - private String mName;  
90 - /**  
91 - * 描述  
92 - */  
93 - private String remark;  
94 -  
95 -  
96 - public String getCreatorMobile() {  
97 - return creatorMobile;  
98 - }  
99 -  
100 - public void setCreatorMobile(String creatorMobile) {  
101 - this.creatorMobile = creatorMobile;  
102 - }  
103 -  
104 - public Integer getMessageType() {  
105 - return messageType;  
106 - }  
107 -  
108 - public void setMessageType(Integer messageType) {  
109 - this.messageType = messageType;  
110 - }  
111 -  
112 - public String getProductName() {  
113 - return productName;  
114 - }  
115 -  
116 - public void setProductName(String productName) {  
117 - this.productName = productName;  
118 - }  
119 -  
120 - public Integer getStatus() {  
121 - return status;  
122 - }  
123 -  
124 - public void setStatus(Integer status) {  
125 - this.status = status;  
126 - }  
127 -  
128 - public Date getCreateTime() {  
129 - return createTime;  
130 - }  
131 -  
132 - public void setCreateTime(Date createTime) {  
133 - this.createTime = createTime;  
134 - }  
135 -  
136 - public Long getId() {  
137 - return id;  
138 - }  
139 -  
140 - public void setId(Long id) {  
141 - this.id = id;  
142 - }  
143 -  
144 - public Long getCategoryId() {  
145 - return categoryId;  
146 - }  
147 -  
148 - public void setCategoryId(Long categoryId) {  
149 - this.categoryId = categoryId;  
150 - }  
151 -  
152 - public Long getCreator() {  
153 - return creator;  
154 - }  
155 -  
156 - public void setCreator(Long creator) {  
157 - this.creator = creator;  
158 - }  
159 -  
160 - public String getCreatorName() {  
161 - return creatorName;  
162 - }  
163 -  
164 - public void setCreatorName(String creatorName) {  
165 - this.creatorName = creatorName;  
166 - }  
167 -  
168 -  
169 - /**  
170 - * get value of SupplyMessage.marketId  
171 - * @return the marketId  
172 - * @createTime 2014年11月25日 上午10:08:43  
173 - * @author zhangshirui  
174 - */  
175 - public Long getMarketId() {  
176 - return marketId;  
177 - }  
178 -  
179 -  
180 - /**  
181 - * set value of SupplyMessage.marketId  
182 - * @param marketId the marketId to set  
183 - * @createTime 2014年11月25日 上午10:08:44  
184 - * @author zhangshirui  
185 - */  
186 - public void setMarketId(Long marketId) {  
187 - this.marketId = marketId;  
188 - }  
189 -  
190 -  
191 - /**  
192 - * get value of SupplyMessage.remark  
193 - * @return the remark  
194 - * @createTime 2014年11月26日 下午5:09:30  
195 - * @author zhangshirui  
196 - */  
197 - public String getRemark() {  
198 - return remark;  
199 - }  
200 -  
201 -  
202 - /**  
203 - * set value of SupplyMessage.remark  
204 - * @param remark the remark to set  
205 - * @createTime 2014年11月26日 下午5:09:30  
206 - * @author zhangshirui  
207 - */  
208 - public void setRemark(String remark) {  
209 - this.remark = remark;  
210 - }  
211 -  
212 -  
213 - /* (non-Javadoc)  
214 - * @see java.lang.Object#hashCode()  
215 - */  
216 - @Override  
217 - public int hashCode() {  
218 - final int prime = 31;  
219 - int result = 1;  
220 - result = prime * result + ((id == null) ? 0 : id.hashCode());  
221 - return result;  
222 - }  
223 -  
224 - /* (non-Javadoc)  
225 - * @see java.lang.Object#equals(java.lang.Object)  
226 - */  
227 - @Override  
228 - public boolean equals(Object obj) {  
229 - if (this == obj)  
230 - return true;  
231 - if (obj == null)  
232 - return false;  
233 - if (getClass() != obj.getClass())  
234 - return false;  
235 - SupplyMessage other = (SupplyMessage) obj;  
236 - if (id == null) {  
237 - if (other.id != null)  
238 - return false;  
239 - } else if (!id.equals(other.id))  
240 - return false;  
241 - return true;  
242 - }  
243 -  
244 -  
245 - public String getmName() {  
246 - return mName;  
247 - }  
248 -  
249 -  
250 - public void setmName(String mName) {  
251 - this.mName = mName;  
252 - }  
253 -}  
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/TextSupplyMessage.java deleted 100644 → 0
  View file @264846e
1 -package com.diligrp.mobsite.getway.domain.protocol;  
2 -  
3 -  
4 -/**  
5 - * <B>Description</B> 文本供应消息 <br />  
6 - * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />  
7 - * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />  
8 - * <B>Company</B> 地利集团  
9 - *  
10 - * @author wujianjun  
11 - * @createTime 2014/9/9 11:48  
12 - */  
13 -public class TextSupplyMessage extends SupplyMessage {  
14 - /**  
15 - * 商品产地  
16 - */  
17 - private Long producingArea;  
18 - /**  
19 - * 商品产地名称  
20 - */  
21 - private String producingAreaName;  
22 - /**  
23 - * 商品所在地名称  
24 - */  
25 - private String locationName;  
26 - /**  
27 - * 商品所在地ID  
28 - */  
29 - private Long locationId;  
30 -  
31 - /**  
32 - * 提货点ID  
33 - */  
34 - private Long packupAddrCode;  
35 - /**  
36 - * 库存量  
37 - */  
38 - private Long stockNum;  
39 - /**  
40 - * 起批量  
41 - */  
42 - private Long minNum;  
43 - /**  
44 - * 价格  
45 - */  
46 - private Long price;  
47 - /**  
48 - * 销售单位  
49 - */  
50 - private Long saleUnit;  
51 - /**  
52 - * 销售单位  
53 - */  
54 - private String saleUnitName;  
55 -  
56 - public Long getProducingArea() {  
57 - return producingArea;  
58 - }  
59 -  
60 - public void setProducingArea(Long producingArea) {  
61 - this.producingArea = producingArea;  
62 - }  
63 -  
64 - public String getProducingAreaName() {  
65 - return producingAreaName;  
66 - }  
67 -  
68 - public void setProducingAreaName(String producingAreaName) {  
69 - this.producingAreaName = producingAreaName;  
70 - }  
71 -  
72 - public String getLocationName() {  
73 - return locationName;  
74 - }  
75 -  
76 - public void setLocationName(String locationName) {  
77 - this.locationName = locationName;  
78 - }  
79 -  
80 - public Long getLocationId() {  
81 - return locationId;  
82 - }  
83 -  
84 - public void setLocationId(Long locationId) {  
85 - this.locationId = locationId;  
86 - }  
87 -  
88 - public Long getPackupAddrCode() {  
89 - return packupAddrCode;  
90 - }  
91 -  
92 - public void setPackupAddrCode(Long packupAddrCode) {  
93 - this.packupAddrCode = packupAddrCode;  
94 - }  
95 -  
96 - public Long getStockNum() {  
97 - return stockNum;  
98 - }  
99 -  
100 - public void setStockNum(Long stockNum) {  
101 - this.stockNum = stockNum;  
102 - }  
103 -  
104 - public Long getMinNum() {  
105 - return minNum;  
106 - }  
107 -  
108 - public void setMinNum(Long minNum) {  
109 - this.minNum = minNum;  
110 - }  
111 -  
112 - public Long getPrice() {  
113 - return price;  
114 - }  
115 -  
116 - public void setPrice(Long price) {  
117 - this.price = price;  
118 - }  
119 -  
120 - public Long getSaleUnit() {  
121 - return saleUnit;  
122 - }  
123 -  
124 - public void setSaleUnit(Long saleUnit) {  
125 - this.saleUnit = saleUnit;  
126 - }  
127 -  
128 - public String getSaleUnitName() {  
129 - return saleUnitName;  
130 - }  
131 -  
132 - public void setSaleUnitName(String saleUnitName) {  
133 - this.saleUnitName = saleUnitName;  
134 - }  
135 -}  
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/Token.java
  View file @6b18dfa
1 package com.diligrp.mobsite.getway.domain.protocol; 1 package com.diligrp.mobsite.getway.domain.protocol;
2 2
3 import com.diligrp.mobsite.getway.domain.common.enums.DeviceTypeEnum; 3 import com.diligrp.mobsite.getway.domain.common.enums.DeviceTypeEnum;
  4 +import io.swagger.annotations.ApiModelProperty;
4 5
5 6
6 /** 7 /**
@@ -17,6 +18,7 @@ public class Token { @@ -17,6 +18,7 @@ public class Token {
17 /** 18 /**
18 * 用户ID 19 * 用户ID
19 */ 20 */
  21 + @ApiModelProperty("用户ID")
20 private Long userId; 22 private Long userId;
21 /** 23 /**
22 * 当前终端所在市场ID 24 * 当前终端所在市场ID
@@ -25,18 +27,22 @@ public class Token { @@ -25,18 +27,22 @@ public class Token {
25 /** 27 /**
26 * 终端与服务端协定的密文 28 * 终端与服务端协定的密文
27 */ 29 */
  30 + @ApiModelProperty("终端与服务端协定的密文:__diligrp_mobsite_getway__")
28 private String secretkey; 31 private String secretkey;
29 /** 32 /**
30 * 设备ID 33 * 设备ID
31 */ 34 */
  35 + @ApiModelProperty("设备ID")
32 private String deviceId; 36 private String deviceId;
33 /** 37 /**
34 * app版本编号 38 * app版本编号
35 */ 39 */
  40 +
36 private String version; 41 private String version;
37 /** 42 /**
38 * 设备类型 43 * 设备类型
39 */ 44 */
  45 + @ApiModelProperty("设备ID:1-安卓,2-ios")
40 private Integer deviceType = DeviceTypeEnum.ANDROID_MOBILE.getType(); 46 private Integer deviceType = DeviceTypeEnum.ANDROID_MOBILE.getType();
41 /** 47 /**
42 * 手机系统版本 48 * 手机系统版本
@@ -46,12 +52,28 @@ public class Token { @@ -46,12 +52,28 @@ public class Token {
46 /** 52 /**
47 * 经度 53 * 经度
48 */ 54 */
  55 + @ApiModelProperty("经度")
49 private Double longitude; 56 private Double longitude;
50 /** 57 /**
51 * 纬度 58 * 纬度
52 */ 59 */
  60 + @ApiModelProperty("纬度")
53 private Double latitude; 61 private Double latitude;
54 62
  63 + /**
  64 + * 用户角色
  65 + */
  66 + @ApiModelProperty("用户角色:10-买家，20-卖家")
  67 + private Integer userRole;
  68 +
  69 +
  70 + public Integer getUserRole() {
  71 + return userRole;
  72 + }
  73 +
  74 + public void setUserRole(Integer userRole) {
  75 + this.userRole = userRole;
  76 + }
55 77
56 public Long getUserId() { 78 public Long getUserId() {
57 return userId; 79 return userId;
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/act/model/ActModel.java deleted 100644 → 0
  View file @264846e
1 -package com.diligrp.mobsite.getway.domain.protocol.act.model;  
2 -  
3 -import java.io.Serializable;  
4 -  
5 -/**  
6 - * <B>Description</B> 七巧板model <br />  
7 - * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />  
8 - * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />  
9 - * <B>Company</B> 地利集团  
10 - *  
11 - * @author wujianjun  
12 - * @createTime 2016-1-14 15:38:37  
13 - */  
14 -public class ActModel implements Serializable {  
15 - /**  
16 - * 开始时间  
17 - */  
18 - private Long startTime;  
19 - /**  
20 - * 结束时间  
21 - */  
22 - private Long endTime;  
23 - /**  
24 - * 图片地址  
25 - */  
26 - private String imgUrl;  
27 - /**  
28 - * 题目  
29 - */  
30 - private String title;  
31 - /**  
32 - * 关键字  
33 - */  
34 - private String keywords;  
35 - /**  
36 - * 描述  
37 - */  
38 - private String desc;  
39 - /**  
40 - * 活动名字  
41 - */  
42 - private String name;  
43 - /**  
44 - * 连接码  
45 - */  
46 - private String uri;  
47 -  
48 - public String getDesc() {  
49 - return desc;  
50 - }  
51 -  
52 - public void setDesc(String desc) {  
53 - this.desc = desc;  
54 - }  
55 -  
56 - public Long getEndTime() {  
57 - return endTime;  
58 - }  
59 -  
60 - public void setEndTime(Long endTime) {  
61 - this.endTime = endTime;  
62 - }  
63 -  
64 - public String getImgUrl() {  
65 - return imgUrl;  
66 - }  
67 -  
68 - public void setImgUrl(String imgUrl) {  
69 - this.imgUrl = imgUrl;  
70 - }  
71 -  
72 - public String getKeywords() {  
73 - return keywords;  
74 - }  
75 -  
76 - public void setKeywords(String keywords) {  
77 - this.keywords = keywords;  
78 - }  
79 -  
80 - public String getName() {  
81 - return name;  
82 - }  
83 -  
84 - public void setName(String name) {  
85 - this.name = name;  
86 - }  
87 -  
88 - public Long getStartTime() {  
89 - return startTime;  
90 - }  
91 -  
92 - public void setStartTime(Long startTime) {  
93 - this.startTime = startTime;  
94 - }  
95 -  
96 - public String getTitle() {  
97 - return title;  
98 - }  
99 -  
100 - public void setTitle(String title) {  
101 - this.title = title;  
102 - }  
103 -  
104 - public String getUri() {  
105 - return uri;  
106 - }  
107 -  
108 - public void setUri(String uri) {  
109 - this.uri = uri;  
110 - }  
111 -}