初始化项目 (06cb9858) | Commits | b2c / order

Browse Code »

Commit 06cb98588915ab2830f7d2a8719202be0d5d982d

Authored by Jiang 2016-11-29 18:04:34 +0800

0 parents

初始化项目

Inline Side-by-side

Showing 70 changed files with 4699 additions and 0 deletions

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

To preserve performance only 70 of 829 files are displayed.

.gitignore 0 → 100644

View file @06cb985

	1	+++ a/.gitignore
	1	+*.iml
	2	+.idea
	3	+.classpath
	4	+*/target/
	5	+*/webapp/WEB-INF/classes
	6	+*/webapp/WEB-INF/lib
	7	+*.MF
	8	+**/WEB-INF/classes/
	9	+**/WEB-INF/lib
	10	+**/.settings/
	11	+**/.classpath
	12	+**/.project
	13	+**/catalina.base_IS_UNDEFINED
0	14	\ No newline at end of file
...	...

README.md 0 → 100644

View file @06cb985

	1	+++ a/README.md
	1	+orders
0	2	\ No newline at end of file
...	...

mvnpackage_develop.bat 0 → 100644

View file @06cb985

	1	+++ a/mvnpackage_develop.bat
	1	+@echo mvn -U clean package -Dskiptest -Pdevelop ¿ªÊ¼Ö´ÐÐ...
	2	+@call mvn -U clean package -Dskiptest -Pdevelop
	3	+@echo mvn -U clean package -Dskiptest -Pdevelop ...Ö´ÐÐÍê³É
	4	+pause
0	5	\ No newline at end of file
...	...

mvnpackage_product.bat 0 → 100644

View file @06cb985

	1	+++ a/mvnpackage_product.bat
	1	+@echo mvn -U clean package -Dskiptest -Pproduct ¿ªÊ¼Ö´ÐÐ...
	2	+@call mvn -U clean package -Dskiptest -Pproduct -X
	3	+@echo mvn -U clean package -Dskiptest -Pproduct ...Ö´ÐÐÍê³É
	4	+pause
0	5	\ No newline at end of file
...	...

mvnpackage_test.bat 0 → 100644

View file @06cb985

	1	+++ a/mvnpackage_test.bat
	1	+@echo mvn -U clean package -Dskiptest -Ptest ¿ªÊ¼Ö´ÐÐ...
	2	+@call mvn -U clean package -Dskiptest -Ptest
	3	+@echo mvn -U clean package -Dskiptest -Ptest ...Ö´ÐÐÍê³É
	4	+pause
0	5	\ No newline at end of file
...	...

orders-client/mvnpackage.bat 0 → 100644

View file @06cb985

	1	+++ a/orders-client/mvnpackage.bat
	1	+@call mvn -U clean package -Dskiptest source:jar
	2	+pause
0	3	\ No newline at end of file
...	...

orders-client/pom.xml 0 → 100644

View file @06cb985

	1	+++ a/orders-client/pom.xml
	1	+<?xml version="1.0" encoding="UTF-8"?>
	2	+<project
	3	+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
	4	+ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
	5	+ <modelVersion>4.0.0</modelVersion>
	6	+ <parent>
	7	+ <groupId>com.b2c.orders</groupId>
	8	+ <artifactId>orders</artifactId>
	9	+ <version>1.1-SNAPSHOT</version>
	10	+ </parent>
	11	+ <artifactId>orders-client</artifactId>
	12	+ <packaging>jar</packaging>
	13	+ <name>orders-client</name>
	14	+ <version>1.1.0-SNAPSHOT</version>
	15	+
	16	+ <dependencies>
	17	+ <dependency>
	18	+ <groupId>com.github.kevinsawicki</groupId>
	19	+ <artifactId>http-request</artifactId>
	20	+ </dependency>
	21	+ <!-- JSON -->
	22	+ <dependency>
	23	+ <groupId>com.alibaba</groupId>
	24	+ <artifactId>fastjson</artifactId>
	25	+ </dependency>
	26	+ <!-- common logging replacer -->
	27	+ <dependency>
	28	+ <groupId>org.slf4j</groupId>
	29	+ <artifactId>slf4j-api</artifactId>
	30	+ </dependency>
	31	+ <dependency>
	32	+ <groupId>junit</groupId>
	33	+ <artifactId>junit</artifactId>
	34	+ <scope>test</scope>
	35	+ </dependency>
	36	+ <dependency>
	37	+ <groupId>org.hibernate</groupId>
	38	+ <artifactId>hibernate-validator</artifactId>
	39	+ </dependency>
	40	+ <!-- 订单的公共信息，如果public有更改，也需要同步上传到maven -->
	41	+ <dependency>
	42	+ <groupId>com.b2c.orders</groupId>
	43	+ <artifactId>orders-public</artifactId>
	44	+ <version>${project.parent.version}</version>
	45	+ </dependency>
	46	+ </dependencies>
	47	+
	48	+ <reporting>
	49	+ <outputDirectory>target/report</outputDirectory>
	50	+ <plugins>
	51	+ <plugin>
	52	+ <groupId>org.apache.maven.plugins</groupId>
	53	+ <artifactId>maven-javadoc-plugin</artifactId>
	54	+ <version>2.9.1</version>
	55	+ </plugin>
	56	+ </plugins>
	57	+ </reporting>
	58	+
	59	+ <build>
	60	+ <plugins>
	61	+ <plugin>
	62	+ <artifactId>maven-source-plugin</artifactId>
	63	+ </plugin>
	64	+ </plugins>
	65	+ </build>
	66	+</project>
0	67	\ No newline at end of file
...	...

orders-client/readme.txt 0 → 100644

View file @06cb985

	1	+++ a/orders-client/readme.txt
	1	+2015-08-11
	2	+1.增加现场交易订单流程，现场交易的交货方式为30
	3	+2.增加出场api，出场订单查询、确认订单出场
	4	+3.订单列表查询，增加查询条件买家姓名和买家电话号码
	5	+2015-06-02
	6	+1 域名切换，将orders.dili7.com切换至orders.nong12.com
	7	+2015-05-27
	8	+1、增加订单来源属性comeFrom，属性值 PC:10,iOS:20,Android:30,Wap:40。提交订单时，此属性必传。
	9	+2015-05-20
	10	+1、所有接口输入参数启用opUserRole属性必传
	11	+2、RefundService服务新增接口 submitRefundAppeal提交退款申诉
	12	+ /**
	13	+ * 提交退款申诉.
	14	+ * @param input
	15	+ * @return 返回退款申诉单ID
	16	+ */
	17	+ public BaseOutput<Long> submitRefundAppeal(SumbitRefundAppealInput input);
	18	+
	19	+3、退款返回实体RefundInfo增加属性：
	20	+ //退款申诉相关属性=======================
	21	+ /** 是否可发起退款申诉，0否，1是 */
	22	+ private Integer appealEnable;
	23	+ /** 退款申诉内容 */
	24	+ private String appealResaon;
	25	+ /** 退款申诉凭证 -图片url */
	26	+ private List<String> appealImgUrls = new ArrayList<>();
	27	+ /** 退款申诉审核意见 */
	28	+ private String auditAppealComment;
	29	+ /** 退款申诉金额 */
	30	+ private Long appealPrice;
	31	+ /** 退款申诉实际退款金额 */
	32	+ private Long appealRealPrice;
	33	+
	34	+2015-04-28
	35	+1、GetOrderListInput增加属性oneSearchContent(模糊搜索：目前支持订单编号和商品名称)
	36	+2、统计接口StatisticsService入参StatisticsOrderAmountInput增加属性
	37	+ /*统计条件：支付方式。10：线上付款 20：线下付款 30：提货付款 40：赊账付款/
	38	+ private List<Integer> payTypeList=new ArrayList<Integer>();
	39	+ /**
	40	+ * 统计条件：订单状态-多状态查询：订单状态(10待付款，15待审核(赊账订单有效)，30备货中，40待提货，45待收货，50已提货,60已失效,70已取消,80申请退款中，90已退款，100提货超时)
	41	+ */
	42	+ private Set<Integer> orderState = new HashSet<Integer>();
	43	+3、GetOrderListInput增加属性isCommented(订单是否已评论：0未评论，1已评论)
	44	+2015-04-27
	45	+1、OrderInfo对象增加postagePriceOriginal productsTotalPrice productsTotalPriceOriginal 字段；打开orderRealPrice字段
	46	+2015-04-25
	47	+1、BaseOutput对象增加errorData字段，用于表示出现错误的数据
	48	+2、ResultCode增加具体的错误码，便于前端处理
	49	+2015-04-23
	50	+1、订单查询增加payType查询条件
	51	+2015-04-20
	52	+1、方法删除
	53	+ OrderService.stockIn()
	54	+ OrderService.submitDelayPayment(Long orderId, Date delayTime, Long opUserId)
	55	+2、CommonDataService.getWebOrderStatusList接口增加输入参数
	56	+ 且:订单状态增加：15待审核、45待收货，40名称调整为待提货
	57	+ /**
	58	+ * 获取订单状态列表
	59	+ * @param type 10默认订单状态列表，20赊帐付款订单状态列表
	60	+ * @return
	61	+ */
	62	+ public BaseOutput<LinkedHashMap<Integer,String>> getWebOrderStatusList(Integer type);
	63	+3、增加赊帐付款订单审核接口
	64	+ /**
	65	+ * PNR-审核赊帐付款订单(第三方订单有效)
	66	+ * @param orderId 订单ID
	67	+ * @param pass true审批通过，false审批不通过
	68	+ * @param opUserId 操作人ID
	69	+ * @return BaseOutput<Integer>
	70	+ */
	71	+ public BaseOutput<Integer> auditCreditOrder(Long orderId, boolean pass, Long opUserId);
	72	+4、ModifyOrderInfoInput属性调整
	73	+ 新增属性：新商品总金额(newTotalPriceOfProducts)
	74	+ 删除属性：优惠金额(pricePrivilege)
	75	+5、OrderSubmitInput属性payType增加可选值：40赊账付款
	76	+6、增加新评论方法：OrderService.commentedSku(Long orderId, Long orderItemId, Long opUserId)；
	77	+ 不再推荐使用评论方法：OrderService.commentedSku(Long orderId, String sku, Long opUserId)
	78	+7、 OrderInfo：删除属性 /** 待付金额 */ private Long waitPrice;
	79	+8、ShipInfoInput和ShipInfo增加属性：memo 备注
	80	+9、OrderService增加方法：提交延迟结算(本方法默认延期3天)
	81	+ /**
	82	+ * PNR-提交延迟结算(本方法默认延期3天)(第三方订单有效)
	83	+ * @param orderId 订单ID
	84	+ * @param opUserId 操作人ID
	85	+ * @param opUserRole 操作人角色：10买家，20卖家
	86	+ * @return BaseOutput<DelayPaymentInfo>
	87	+ */
	88	+ public BaseOutput<DelayPaymentInfo> submitDelayPayment(Long orderId, Long opUserId,Long opUserRole);
	89	+
	90	+2014-12-15
	91	+1、增加http请求readTimeout超时设置为10s
	92	+2014-06-30
	93	+1、增加passport登录校验，必须登录主站后才能使用订单接口
	94	+2、 OrderInfo类增加属性:
	95	+ public String identifyNo;//线下付款15位校验码
	96	+3、退款详情查询对象：com.diligrp.orders.client.domain.output。RefundInfo 增加字段 String auditComment; 退款申请时，后天操作审核意见。
	97	+2014-06-20
	98	+1、拆分购物车返回实体对象（拆单）com.diligrp.orders.client.domain.output.CartItem 增加商品所属店铺id long storeId;起批量(商品最小购买量) int minNum;
	99	+2、退款相关API接口（com.diligrp.orders.client.service。RefundService）增加根据订单号查询申请待审核状态的退款单的退款金额 getApplyRefundMoney(long orderId);
	100	+3、查看订单详情/跳转到支付银行选择页验证/立即付款验证/合并支付验证在待支付状态下，新增加逻辑判断：
	101	+ 待付款前提下，如果商品处于下架状态，则不会更新订单商品项数据,同时也不纳入订单总金额计算之中，返回订单列的商品
	102	+ 项目中包含：商品状态预览-2，删除-1，待审核1，审核失败2，在售商品3,仓库中商品4（-1删除，4在架，其他则是下架）
	103	+
	104	+2014-06-19
	105	+1、取消订单接口cancelOrder增加取消原因参数
	106	+ public BaseOutput<Integer> cancelOrder(long orderId,String reason);
	107	+
	108	+2014-06-18
	109	+1、提交订单接口和获取订单详细接口返回信息增加vendorId(店铺ID)
	110	+2、去掉删除订单接口
	111	+3、SDK包采用JDK1.7编译打包
	112	+2014-06-17
	113	+1、拆分购物车返回实体对象 com.diligrp.orders.client.domain.output.CartItem 增加商品类目id int cid;
	114	+2、采购中心、销售中心查看订单详情时：
	115	+ 获取订单流程节点信息调整分别从
	116	+ getOrderDescriptionForSale(long orderId);
	117	+ getOrderDescriptionForPurchase(long orderId);
	118	+ 中获取
	119	+2014-06-13
	120	+1、删除OrderService方法
	121	+ public BaseOutput<Integer> updateOrderStatus(long sellerId, long orderId, int status);
	122	+2、RefundService方法
	123	+ public PageOutput<List<RefundInfo>> getRefundList(long buyerId, int page,int pageSize);
	124	+3、提交地利服务支持一个提交申请绑定多个订单号
	125	+ SumbitValServiceInput.orderId
	126	+
	127	+2014-06-12
	128	+1、RefundService增加列表获取接口
	129	+ public PageOutput<List<RefundInfo>> getRefundList(RefundQuery refundQuery);
	130	+2、采购和销售服务返回增加description属性
	131	+3、恢复延期提货接口
	132	+
	133	+2014-06-11
	134	+1、统一服务相关地方采用服务编码serviceCode
	135	+2、退款申请接口返回退款ID
	136	+ 影响RefundService相关接口
	137	+ public BaseOutput<Long> sumbitApplyRefund(SumbitRefundInput sumbitRefundInput);
	138	+3、补全订单提交返回订单信息
	139	+ 影响OrderService服务相关接口
	140	+4、服务相关接口增加返回状态名称
	141	+5、采购服务接口字段名错误调整(conactPhone调整为contactPhone,conactUser调整为contactUser)
	142	+
	143	+2014-06-10
	144	+1、地利服务，代购服务，代销服务，联营联销服务按新需求调整，所有服务申请接口参看ApplyInfoService
	145	+2、拆分购物车返回商品项目（com.diligrp.orders.client.domain.output.CartItem）里面增加字段
	146	+int skuStatus /** 预览-2，删除-1，待审核1，审核失败2，在售商品3,仓库中商品4 */ (3在售其余状态均为下架)
	147	+
	148	+2014-06-09
	149	+订单返回商品项（com.diligrp.orders.client.domain.output.OrderItem）里面增加字段
	150	+int skuStatus /** 预览-2，删除-1，待审核1，审核失败2，在售商品3,仓库中商品4 */ (3在售其余状态均为下架)
	151	+
	152	+2014-06-05
	153	+1、调整金额相关属性为long类型
	154	+2、增加审批退款申请接口
	155	+3、买卖对接订单功能实现可用
	156	+
	157	+2014-06-03
	158	+1、OrderService增加commentedSku接口(更新订单商品项SKU评论状态为已评论)
	159	+2、订单列表和详细返回信息增加isCommented属性标识是否已经评论过商品
	160	+2014-06-03
	161	+1、提交订单接口输入参数预约提货时间调整为
	162	+ /*按卖家填入预约提货时间(起始,终止时间)/
	163	+ public Map<Long,ReservationTime> reservationTime;
	164	+
	165	+2014-05-30
	166	+1、订单接口增加paymentIn，stockingIn，StockingCompleted，cancelOrder，confirmDelivery操作接口，详细查看API
	167	+2、查看订单详细接口getOrderDetail拆分为：getOrderDetailForSale，getOrderDetailForPurchase
	168	+3、退款接口：退款列表中orderInfo属性从OrderInfo为OrderDetailInfo
	169	+4、com.diligrp.orders.client.domain.output。OrderDetailInfo ：增加属性：订单取消时间（cancelTime）、订单申请退款时间（refundTime）、订单成交时间（ConifmTime）、订单退款总金额（refundTotalPrice）、订单退款确认时间（refundConfirmTime）
	170	+5、退款接口增加取消退款申请cancelApplyRefund
	171	+6、代购\代销\增值服务增加取消服务接口
	172	+7、代购\代销服务输入输出参数中分类ID只传入传出选择的最后一级分类ID
	173	+
	174	+2014-05-28
	175	+1、com.diligrp.orders.client.domain.output。OrderInfo 增加支付时间，订单支付成功时，页面能取到支付时间
	176	+2、调整OrderService获取订单列表方法
	177	+ PageOutput<List<OrderDetailInfo>> getOrderList：增加买家姓名、卖家姓名、订单状态名称、支付状态名称、服务状态名称
	178	+3、public <BaseOutput<List<CartInfo>> SplitCartService 中com.diligrp.orders.client.domain.output.CartItem 增加：sellerName 卖家姓名 totalPrice 小计、preparationTime
	179	+最长备货期、List<ItemAddress> itmeAddressList 商品可选交购地
	180	+
	181	+2014-05-22
	182	+1、 com.diligrp.orders.client.domain.output目前下所有类增加get,set方法，解决前端VM获取不到值问题
	183	+2、调整OrderService方法
	184	+ public PageOutput<List<Ordernfo>> getOrderList(GetOrderListInput getOrderListInput);
	185	+ 为
	186	+ public PageOutput<List<OrderDetailInfo>> getOrderList(GetOrderListInput getOrderListInput);
	187	+ 解决列表显示订单项图片问题
	188	+
	189	+3、订单列表查询增加条件：买方姓名，卖方姓名，商品名称，订单编号
	190	+4、增加通用基础数据查询服务：CommonDataService
	191	+5、去掉供应单接口服务
...	...

orders-client/src/main/abc.js 0 → 100644

View file @06cb985

	1	+++ a/orders-client/src/main/abc.js
	1	+var ss = {
	2	+ "cartItemList " : [{
	3	+ "sku" : "",
	4	+ "amount" : "",
	5	+ "price" : "",
	6	+ "addrId" : "1111",
	7	+ " addToCartTime" : ""
	8	+ }, {
	9	+ "sku" : "",
	10	+ "amount" : "",
	11	+ "price" : "",
	12	+ "addrId" : "222",
	13	+ "addToCartTime" : ""
	14	+ }]
	15	+};
...	...

orders-client/src/main/java/com/diligrp/orders/client/OrderClient.java 0 → 100644

View file @06cb985

	1	+++ a/orders-client/src/main/java/com/diligrp/orders/client/OrderClient.java
	1	+package com.diligrp.orders.client;
	2	+
	3	+import com.diligrp.orders.client.service.*;
	4	+import com.diligrp.orders.client.service.impl.*;
	5	+import com.diligrp.orders.client.utils.Constants;
	6	+
	7	+/**
	8	+ * 订单API接口
	9	+ */
	10	+public class OrderClient {
	11	+ private OrderService orderService;
	12	+ private RefundService refundService;
	13	+ private ClaimsOrderService claimsOrderService;
	14	+ private CommonDataService commonDataService;
	15	+ private StatisticsService statisticsService;
	16	+
	17	+ public OrderClient(){
	18	+ this("");
	19	+ }
	20	+ /**
	21	+ * 获取一订单SDK实例
	22	+ * @param token 会员token
	23	+ */
	24	+ public OrderClient(String token){
	25	+ this(token, Constants.ORDER_BASE_URL);
	26	+ }
	27	+ /**
	28	+ * 获取一订单SDK实例
	29	+ * @param token 会员token
	30	+ * @param baseUrl 订单中心http服务URL
	31	+ */
	32	+ public OrderClient(String token,String baseUrl){
	33	+ Constants.ORDER_BASE_URL=baseUrl;
	34	+ this.orderService = new OrderServiceImpl(token);
	35	+ this.refundService = new RefundServiceImpl(token);
	36	+ this.commonDataService = new CommonDataServiceImpl(token);
	37	+ this.statisticsService = new StatisticsServiceImpl(token);
	38	+ this.claimsOrderService = new ClaimsOrderServiceImpl(token);
	39	+ }
	40	+ /**
	41	+ * 获取订单服务实例
	42	+ * @return OrderService
	43	+ */
	44	+ public OrderService getOrderService(){
	45	+ return orderService;
	46	+ }
	47	+ /**
	48	+ * 获取退款服务实例
	49	+ * @return refundService
	50	+ */
	51	+ public RefundService getRefundService(){
	52	+ return refundService;
	53	+ }
	54	+ /**
	55	+ * 获取通用基础数据实例(如，订单状态列表等)
	56	+ * @return ApplyInfoService
	57	+ */
	58	+ public CommonDataService getCommonDataService(){
	59	+ return commonDataService;
	60	+ }
	61	+
	62	+ /**
	63	+ * 获取统计服务实例
	64	+ * @return refundService
	65	+ */
	66	+ public StatisticsService getStatisticsService() {
	67	+ return statisticsService;
	68	+ }
	69	+
	70	+ public ClaimsOrderService getClaimsOrderService() {
	71	+ return claimsOrderService;
	72	+ }
	73	+}
...	...

orders-client/src/main/java/com/diligrp/orders/client/domain/input/AddOrderSrvceInput.java 0 → 100644

View file @06cb985

	1	+++ a/orders-client/src/main/java/com/diligrp/orders/client/domain/input/AddOrderSrvceInput.java
	1	+package com.diligrp.orders.client.domain.input;
	2	+
	3	+import org.hibernate.validator.constraints.NotBlank;
	4	+import org.hibernate.validator.constraints.NotEmpty;
	5	+
	6	+import java.util.HashSet;
	7	+import java.util.Set;
	8	+
	9	+public class AddOrderSrvceInput extends GetOrderInfoInput {
	10	+ /** 订单sku */
	11	+ @NotBlank(message="sku不能为空")
	12	+ private String sku;
	13	+ /** sku需要绑定服务CODE */
	14	+ @NotEmpty
	15	+ private Set<String> srvceCode = new HashSet<>();
	16	+
	17	+ public String getSku() {
	18	+ return sku;
	19	+ }
	20	+
	21	+
	22	+ public void setSku(String sku) {
	23	+ this.sku = sku;
	24	+ }
	25	+
	26	+
	27	+ public Set<String> getSrvceCode() {
	28	+ return srvceCode;
	29	+ }
	30	+
	31	+
	32	+ public void setSrvceCode(Set<String> srvceCode) {
	33	+ this.srvceCode = srvceCode;
	34	+ }
	35	+}
...	...

orders-client/src/main/java/com/diligrp/orders/client/domain/input/AuditClaimsInput.java 0 → 100644

View file @06cb985

	1	+++ a/orders-client/src/main/java/com/diligrp/orders/client/domain/input/AuditClaimsInput.java
	1	+package com.diligrp.orders.client.domain.input;
	2	+
	3	+import com.diligrp.orders.publics.enums.ClaimsDemand;
	4	+import org.hibernate.validator.constraints.NotBlank;
	5	+
	6	+import javax.validation.constraints.NotNull;
	7	+
	8	+/**
	9	+ * <B>Description</B> <br />
	10	+ * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />
	11	+ * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
	12	+ * <B>Company</B> 地利集团
	13	+ *
	14	+ * @author WuJianjun
	15	+ * @createTime 16/9/18 12:32
	16	+ */
	17	+public class AuditClaimsInput extends BasicClaimsInput {
	18	+ @NotNull(message = "审批者不能为空")
	19	+ private Long auditUserId;
	20	+ @NotBlank(message = "审批者名称不能为空")
	21	+ private String auditUserName;
	22	+ private ClaimsDemand auditResult;
	23	+ private String auditComment;
	24	+ private Long auditPrice;
	25	+ private String auditImgUrls;
	26	+
	27	+ public Long getAuditUserId() {
	28	+ return auditUserId;
	29	+ }
	30	+
	31	+ public void setAuditUserId(Long auditUserId) {
	32	+ this.auditUserId = auditUserId;
	33	+ }
	34	+
	35	+ public String getAuditUserName() {
	36	+ return auditUserName;
	37	+ }
	38	+
	39	+ public void setAuditUserName(String auditUserName) {
	40	+ this.auditUserName = auditUserName;
	41	+ }
	42	+
	43	+ public String getAuditComment() {
	44	+ return auditComment;
	45	+ }
	46	+
	47	+ public void setAuditComment(String auditComment) {
	48	+ this.auditComment = auditComment;
	49	+ }
	50	+
	51	+ public Long getAuditPrice() {
	52	+ return auditPrice;
	53	+ }
	54	+
	55	+ public void setAuditPrice(Long auditPrice) {
	56	+ this.auditPrice = auditPrice;
	57	+ }
	58	+
	59	+ public ClaimsDemand getAuditResult() {
	60	+ return auditResult;
	61	+ }
	62	+
	63	+ public void setAuditResult(ClaimsDemand auditResult) {
	64	+ this.auditResult = auditResult;
	65	+ }
	66	+
	67	+ public String getAuditImgUrls() {
	68	+ return auditImgUrls;
	69	+ }
	70	+
	71	+ public void setAuditImgUrls(String auditImgUrls) {
	72	+ this.auditImgUrls = auditImgUrls;
	73	+ }
	74	+}
...	...

orders-client/src/main/java/com/diligrp/orders/client/domain/input/AuditCreditOrderInput.java 0 → 100644

View file @06cb985

	1	+++ a/orders-client/src/main/java/com/diligrp/orders/client/domain/input/AuditCreditOrderInput.java
	1	+package com.diligrp.orders.client.domain.input;
	2	+
	3	+import javax.validation.constraints.NotNull;
	4	+
	5	+public class AuditCreditOrderInput extends GetOrderInfoInput {
	6	+ /*审批操作：true审批通过，false审批不通过/
	7	+ @NotNull(message = "审批操作pass不能为空")
	8	+ private Boolean pass;
	9	+
	10	+ public Boolean getPass() {
	11	+ return pass;
	12	+ }
	13	+
	14	+ public void setPass(Boolean pass) {
	15	+ this.pass = pass;
	16	+ }
	17	+}
...	...

orders-client/src/main/java/com/diligrp/orders/client/domain/input/AuditRefundInput.java 0 → 100644

View file @06cb985

	1	+++ a/orders-client/src/main/java/com/diligrp/orders/client/domain/input/AuditRefundInput.java
	1	+package com.diligrp.orders.client.domain.input;
	2	+
	3	+import javax.validation.constraints.NotNull;
	4	+
	5	+public class AuditRefundInput extends GetRefundInfoInput {
	6	+ /*审批操作：true审批通过，false审批不通过/
	7	+ @NotNull(message = "审批操作pass不能为空")
	8	+ private Boolean pass;
	9	+
	10	+ /*审批意见审批通过时不需要审批意见，审批拒绝时需要意见，为空判断由后台业务确定/
	11	+ //@NotBlank(message = "审批意见auditMsg不能为空")
	12	+ private String auditMsg;
	13	+ /*收款方确认退款认证token/
	14	+ //@NotBlank(message = "收款方确认退款认证token不能为空")
	15	+ private String token;
	16	+
	17	+ public Boolean getPass() {
	18	+ return pass;
	19	+ }
	20	+
	21	+ public void setPass(Boolean pass) {
	22	+ this.pass = pass;
	23	+ }
	24	+
	25	+ public String getAuditMsg() {
	26	+ return auditMsg;
	27	+ }
	28	+
	29	+ public void setAuditMsg(String auditMsg) {
	30	+ this.auditMsg = auditMsg;
	31	+ }
	32	+
	33	+
	34	+ public String getToken() {
	35	+ return token;
	36	+ }
	37	+
	38	+
	39	+ public void setToken(String token) {
	40	+ this.token = token;
	41	+ }
	42	+}
...	...

orders-client/src/main/java/com/diligrp/orders/client/domain/input/BasicClaimsInput.java 0 → 100644

View file @06cb985

	1	+++ a/orders-client/src/main/java/com/diligrp/orders/client/domain/input/BasicClaimsInput.java
	1	+package com.diligrp.orders.client.domain.input;
	2	+
	3	+import com.diligrp.orders.client.domain.input.base.BaseListInput;
	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 16/9/18 10:25
	13	+ */
	14	+public class BasicClaimsInput extends BaseListInput {
	15	+ /** 理赔单ID */
	16	+ private Long applyOrderId;
	17	+
	18	+ public BasicClaimsInput() {}
	19	+
	20	+ public BasicClaimsInput(Long applyOrderId, Long opUserId) {
	21	+ super();
	22	+ setOpUserId(opUserId);
	23	+ this.applyOrderId = applyOrderId;
	24	+ }
	25	+
	26	+ public Long getApplyOrderId() {
	27	+ return applyOrderId;
	28	+ }
	29	+
	30	+ public void setApplyOrderId(Long applyOrderId) {
	31	+ this.applyOrderId = applyOrderId;
	32	+ }
	33	+
	34	+}
...	...

orders-client/src/main/java/com/diligrp/orders/client/domain/input/CancelOrderInput.java 0 → 100644

View file @06cb985

	1	+++ a/orders-client/src/main/java/com/diligrp/orders/client/domain/input/CancelOrderInput.java
	1	+package com.diligrp.orders.client.domain.input;
	2	+
	3	+import org.hibernate.validator.constraints.NotBlank;
	4	+
	5	+public class CancelOrderInput extends GetOrderInfoInput {
	6	+ @NotBlank(message="订单取消原因reason不能为空")
	7	+ private String reason;
	8	+
	9	+ public String getReason() {
	10	+ return reason;
	11	+ }
	12	+
	13	+ public void setReason(String reason) {
	14	+ this.reason = reason;
	15	+ }
	16	+}
...	...

orders-client/src/main/java/com/diligrp/orders/client/domain/input/CommentedSkuInput.java 0 → 100644

View file @06cb985

	1	+++ a/orders-client/src/main/java/com/diligrp/orders/client/domain/input/CommentedSkuInput.java
	1	+package com.diligrp.orders.client.domain.input;
	2	+
	3	+
	4	+public class CommentedSkuInput extends GetOrderInfoInput {
	5	+
	6	+ /** 订单商品项ID */
	7	+ private Long orderItemId;
	8	+
	9	+ /** 订单商品项sku ,此字段已废弃，但仍可用。建议使用orderItemId*/
	10	+ @Deprecated
	11	+ private String sku;
	12	+
	13	+ public CommentedSkuInput(){
	14	+ super();
	15	+ }
	16	+
	17	+ public CommentedSkuInput(Long orderId,Long orderItemId,Long opUserId) {
	18	+ setOpUserId(opUserId);
	19	+ setOrderId(orderId);
	20	+ this.orderItemId = orderItemId;
	21	+ }
	22	+
	23	+ /**
	24	+ * 新版已废弃此方法，但仍可用
	25	+ * @param orderId
	26	+ * @param sku
	27	+ * @param opUserId
	28	+ */
	29	+ @Deprecated
	30	+ public CommentedSkuInput(Long orderId,String sku,Long opUserId) {
	31	+ setOpUserId(opUserId);
	32	+ setOrderId(orderId);
	33	+ this.sku = sku;
	34	+ }
	35	+ public Long getOrderItemId() {
	36	+ return orderItemId;
	37	+ }
	38	+ public void setOrderItemId(Long orderItemId) {
	39	+ this.orderItemId = orderItemId;
	40	+ }
	41	+
	42	+ public String getSku() {
	43	+ return sku;
	44	+ }
	45	+
	46	+ public void setSku(String sku) {
	47	+ this.sku = sku;
	48	+ }
	49	+}
...	...

orders-client/src/main/java/com/diligrp/orders/client/domain/input/CompleteStockUpInput.java 0 → 100644

View file @06cb985

	1	+++ a/orders-client/src/main/java/com/diligrp/orders/client/domain/input/CompleteStockUpInput.java
	1	+
	2	+package com.diligrp.orders.client.domain.input;
	3	+
	4	+import java.util.List;
	5	+
	6	+/**
	7	+ * 完成备货
	8	+ * @createTime 2016年1月13日
	9	+ * @author zhangshirui
	10	+ */
	11	+
	12	+public class CompleteStockUpInput extends GetOrderInfoInput {
	13	+
	14	+ /** 发货物流信息*/
	15	+ private List<ShipInfoInput> shipInfoList;
	16	+
	17	+ public List<ShipInfoInput> getShipInfoList() {
	18	+ return shipInfoList;
	19	+ }
	20	+
	21	+ public void setShipInfoList(List<ShipInfoInput> shipInfoList) {
	22	+ this.shipInfoList = shipInfoList;
	23	+ }
	24	+}
	25	+
...	...

orders-client/src/main/java/com/diligrp/orders/client/domain/input/ConfirmDeliveryInput.java 0 → 100644

View file @06cb985

	1	+++ a/orders-client/src/main/java/com/diligrp/orders/client/domain/input/ConfirmDeliveryInput.java
	1	+package com.diligrp.orders.client.domain.input;
	2	+
	3	+import org.hibernate.validator.constraints.NotBlank;
	4	+
	5	+/**
	6	+ * <B>Description</B> 确认收货(提货)输入 <br />
	7	+ * <B>Copyright</B> Copyright (c) 2015 www.diligrp.com All rights reserved. <br />
	8	+ * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
	9	+ * <B>Company</B> 地利集团
	10	+ */
	11	+public class ConfirmDeliveryInput extends GetOrderInfoInput {
	12	+ /*确认收货打款的认证token/
	13	+ @NotBlank(message="确认收货打款的认证token 不能为空")
	14	+ private String payToken;
	15	+
	16	+
	17	+ public String getPayToken() {
	18	+ return payToken;
	19	+ }
	20	+
	21	+
	22	+ public void setPayToken(String payToken) {
	23	+ this.payToken = payToken;
	24	+ }
	25	+
	26	+
	27	+}
...	...

orders-client/src/main/java/com/diligrp/orders/client/domain/input/ConfirmOrderOutInput.java 0 → 100644

View file @06cb985

	1	+++ a/orders-client/src/main/java/com/diligrp/orders/client/domain/input/ConfirmOrderOutInput.java
	1	+
	2	+package com.diligrp.orders.client.domain.input;
	3	+
	4	+import com.diligrp.orders.client.domain.input.base.BaseInput;
	5	+
	6	+/**
	7	+ * 确认订单出厂
	8	+ * @createTime 2015年7月9日
	9	+ * @author zhangshirui
	10	+ */
	11	+
	12	+public class ConfirmOrderOutInput extends BaseInput {
	13	+
	14	+ / 出厂id /
	15	+ private Long id;
	16	+ / 操作人姓名 /
	17	+ private String opUserName;
	18	+
	19	+ public String getOpUserName() {
	20	+ return opUserName;
	21	+ }
	22	+ public void setOpUserName(String opUserName) {
	23	+ this.opUserName = opUserName;
	24	+ }
	25	+ public Long getId() {
	26	+ return id;
	27	+ }
	28	+ public void setId(Long id) {
	29	+ this.id = id;
	30	+ }
	31	+}
	32	+
...	...

orders-client/src/main/java/com/diligrp/orders/client/domain/input/ConfirmReceivedMoneyInput.java 0 → 100644

View file @06cb985

	1	+++ a/orders-client/src/main/java/com/diligrp/orders/client/domain/input/ConfirmReceivedMoneyInput.java
	1	+package com.diligrp.orders.client.domain.input;
	2	+
	3	+
	4	+/**
	5	+ * <B>Description</B> 第三方订单确认收款输入 <br />
	6	+ * <B>Copyright</B> Copyright (c) 2015 www.diligrp.com All rights reserved. <br />
	7	+ * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
	8	+ * <B>Company</B> 地利集团
	9	+ */
	10	+public class ConfirmReceivedMoneyInput extends GetOrderInfoInput {
	11	+}
...	...

orders-client/src/main/java/com/diligrp/orders/client/domain/input/ConfirmSpotReceiptedInput.java 0 → 100644

View file @06cb985

	1	+++ a/orders-client/src/main/java/com/diligrp/orders/client/domain/input/ConfirmSpotReceiptedInput.java
	1	+package com.diligrp.orders.client.domain.input;
	2	+
	3	+/**
	4	+ * <B>Description</B> 第三方订单现场交易确认收款输入 <br />
	5	+ * <B>Copyright</B> Copyright (c) 2015 www.diligrp.com All rights reserved. <br />
	6	+ * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
	7	+ * <B>Company</B> 地利集团
	8	+ */
	9	+public class ConfirmSpotReceiptedInput extends GetOrderInfoInput {
	10	+
	11	+}
...	...

orders-client/src/main/java/com/diligrp/orders/client/domain/input/GetClaimsListInput.java 0 → 100644

View file @06cb985

	1	+++ a/orders-client/src/main/java/com/diligrp/orders/client/domain/input/GetClaimsListInput.java
	1	+package com.diligrp.orders.client.domain.input;
	2	+
	3	+import com.diligrp.orders.publics.enums.ClaimsOrderStatus;
	4	+
	5	+import java.util.Date;
	6	+
	7	+/**
	8	+ * <B>Description</B> <br />
	9	+ * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />
	10	+ * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
	11	+ * <B>Company</B> 地利集团
	12	+ *
	13	+ * @author WuJianjun
	14	+ * @createTime 16/9/18 10:25
	15	+ */
	16	+public class GetClaimsListInput extends BasicClaimsInput {
	17	+ private Long orderId;
	18	+ /** 理赔状态：10待审核，20审核通过，30审核不通过，40取消;可选 */
	19	+ private ClaimsOrderStatus status;
	20	+ /** 申请开始时间;可选*/
	21	+ private Date applyTimeStart;
	22	+ /** 申请结束时间;可选*/
	23	+ private Date applyTimeEnd;
	24	+
	25	+ public Long getOrderId() {
	26	+ return orderId;
	27	+ }
	28	+
	29	+ public void setOrderId(Long orderId) {
	30	+ this.orderId = orderId;
	31	+ }
	32	+
	33	+ public ClaimsOrderStatus getStatus() {
	34	+ return status;
	35	+ }
	36	+
	37	+ public void setStatus(ClaimsOrderStatus status) {
	38	+ this.status = status;
	39	+ }
	40	+
	41	+ public Date getApplyTimeStart() {
	42	+ return applyTimeStart;
	43	+ }
	44	+
	45	+ public void setApplyTimeStart(Date applyTimeStart) {
	46	+ this.applyTimeStart = applyTimeStart;
	47	+ }
	48	+
	49	+ public Date getApplyTimeEnd() {
	50	+ return applyTimeEnd;
	51	+ }
	52	+
	53	+ public void setApplyTimeEnd(Date applyTimeEnd) {
	54	+ this.applyTimeEnd = applyTimeEnd;
	55	+ }
	56	+}
...	...

orders-client/src/main/java/com/diligrp/orders/client/domain/input/GetDelayPaymentInfoInput.java 0 → 100644

View file @06cb985

	1	+++ a/orders-client/src/main/java/com/diligrp/orders/client/domain/input/GetDelayPaymentInfoInput.java
	1	+package com.diligrp.orders.client.domain.input;
	2	+
	3	+
	4	+public class GetDelayPaymentInfoInput extends GetOrderInfoInput {
	5	+
	6	+ /** 操作人角色： 10买家，20卖家 */
	7	+ /*@NotNull(message = "操作人角色opUserRole不能为空,可选值：10买家，20卖家")
	8	+ private Long opUserRole;
	9	+
	10	+ public Long getOpUserRole() {
	11	+ return opUserRole;
	12	+ }
	13	+
	14	+ public void setOpUserRole(Long opUserRole) {
	15	+ this.opUserRole = opUserRole;
	16	+ }*/
	17	+
	18	+}
...	...

orders-client/src/main/java/com/diligrp/orders/client/domain/input/GetOrderInfoInput.java 0 → 100644

View file @06cb985

	1	+++ a/orders-client/src/main/java/com/diligrp/orders/client/domain/input/GetOrderInfoInput.java
	1	+package com.diligrp.orders.client.domain.input;
	2	+
	3	+import com.diligrp.orders.client.domain.input.base.BaseInput;
	4	+
	5	+import javax.validation.constraints.Min;
	6	+import javax.validation.constraints.NotNull;
	7	+
	8	+public class GetOrderInfoInput extends BaseInput {
	9	+
	10	+ @NotNull(message = "订单编号orderId不能为空")
	11	+ @Min(value = 1)
	12	+ private Long orderId;
	13	+
	14	+ public GetOrderInfoInput() {
	15	+ }
	16	+
	17	+ public GetOrderInfoInput(Long orderId, Long opUserId) {
	18	+ super();
	19	+ setOpUserId(opUserId);
	20	+ this.orderId = orderId;
	21	+ }
	22	+
	23	+ public Long getOrderId() {
	24	+ return orderId;
	25	+ }
	26	+
	27	+ public void setOrderId(Long orderId) {
	28	+ this.orderId = orderId;
	29	+ }
	30	+}
...	...

orders-client/src/main/java/com/diligrp/orders/client/domain/input/GetOrderListInput.java 0 → 100644

View file @06cb985

	1	+++ a/orders-client/src/main/java/com/diligrp/orders/client/domain/input/GetOrderListInput.java
	1	+package com.diligrp.orders.client.domain.input;
	2	+
	3	+import com.diligrp.orders.client.domain.input.base.BaseOrderListInput;
	4	+import lombok.Getter;
	5	+import lombok.NoArgsConstructor;
	6	+import lombok.Setter;
	7	+
	8	+import java.util.List;
	9	+
	10	+/**
	11	+ * 订单基础查询，订单列表获取输入
	12	+ */
	13	+@NoArgsConstructor
	14	+@Getter
	15	+@Setter
	16	+public class GetOrderListInput extends BaseOrderListInput {
	17	+
	18	+ /** 查询条件：商品名称 */
	19	+ private String productName;
	20	+ /** 查询条件：订单编号。需使用Long数据类型，如果使用long型，orderId的值会被设置为默认值0当orderId没有被设置值时 */
	21	+ private List<Long> orderIdList;
	22	+ /** 配送方式：10：上门自提，20：送货上门 30:现场交易 40:物流配送*/
	23	+ private List<Integer> deliveryTypeList;
	24	+ /模糊搜索：目前支持订单编号和商品名称/
	25	+ private String oneSearchContent;
	26	+ /*订单是否已评论：0未评论，1已评论/
	27	+ //不加默认值，因前端不传值时，不能同时查询出已评论和未评论的订单
	28	+ private Integer isCommented;
	29	+
	30	+
	31	+ public String getProductName() {
	32	+ return productName;
	33	+ }
	34	+
	35	+ public void setProductName(String productName) {
	36	+ this.productName = productName;
	37	+ }
	38	+
	39	+ public List<Long> getOrderIdList() {
	40	+ return orderIdList;
	41	+ }
	42	+
	43	+ public void setOrderIdList(List<Long> orderIdList) {
	44	+ this.orderIdList = orderIdList;
	45	+ }
	46	+
	47	+ public List<Integer> getDeliveryTypeList() {
	48	+ return deliveryTypeList;
	49	+ }
	50	+
	51	+ public void setDeliveryTypeList(List<Integer> deliveryTypeList) {
	52	+ this.deliveryTypeList = deliveryTypeList;
	53	+ }
	54	+
	55	+ public String getOneSearchContent() {
	56	+ return oneSearchContent;
	57	+ }
	58	+
	59	+ public void setOneSearchContent(String oneSearchContent) {
	60	+ this.oneSearchContent = oneSearchContent;
	61	+ }
	62	+
	63	+ public Integer getIsCommented() {
	64	+ return isCommented;
	65	+ }
	66	+
	67	+ public void setIsCommented(Integer isCommented) {
	68	+ this.isCommented = isCommented;
	69	+ }
	70	+}
0	71	\ No newline at end of file
...	...

orders-client/src/main/java/com/diligrp/orders/client/domain/input/GetOrderOutListInput.java 0 → 100644

View file @06cb985

	1	+++ a/orders-client/src/main/java/com/diligrp/orders/client/domain/input/GetOrderOutListInput.java
	1	+
	2	+package com.diligrp.orders.client.domain.input;
	3	+
	4	+import com.diligrp.orders.client.domain.input.base.BaseInput;
	5	+
	6	+import javax.validation.constraints.Min;
	7	+import javax.validation.constraints.NotNull;
	8	+import java.util.Date;
	9	+
	10	+/**
	11	+ * 查询出现订单列表
	12	+ * @createTime 2015年7月7日
	13	+ * @author zhangshirui
	14	+ */
	15	+
	16	+public class GetOrderOutListInput extends BaseInput {
	17	+
	18	+ /** 查询条件：买家ID */
	19	+ @Min(value=1,message="买家ID(buyerId)不正确")
	20	+ private Long buyerId;
	21	+ /** 查询条件：订单提交时间(开始) */
	22	+ private Date submitBeginTime;
	23	+ /** 查询条件：订单提交时间(结束) */
	24	+ private Date submitEndTime;
	25	+ /** 是否出厂：1-已出厂，2-未出厂*/
	26	+ private Integer isOuted = 2;
	27	+ /** 页码,从1开始 */
	28	+ @NotNull(message="页码page不能为空") @Min(value=1,message="页码page值不能小于1")
	29	+ private int page = 1;
	30	+ /** 页大小，默认20 */
	31	+ @NotNull(message="页大小pageSize不能为空") @Min(value=1,message="页大小pageSize值不能小于1")
	32	+ private int pageSize = 20;
	33	+
	34	+ public Long getBuyerId() {
	35	+ return buyerId;
	36	+ }
	37	+ public void setBuyerId(Long buyerId) {
	38	+ this.buyerId = buyerId;
	39	+ }
	40	+ public Date getSubmitBeginTime() {
	41	+ return submitBeginTime;
	42	+ }
	43	+ public void setSubmitBeginTime(Date submitBeginTime) {
	44	+ this.submitBeginTime = submitBeginTime;
	45	+ }
	46	+ public Date getSubmitEndTime() {
	47	+ return submitEndTime;
	48	+ }
	49	+ public void setSubmitEndTime(Date submitEndTime) {
	50	+ this.submitEndTime = submitEndTime;
	51	+ }
	52	+ public Integer getIsOuted() {
	53	+ return isOuted;
	54	+ }
	55	+ public void setIsOuted(Integer isOuted) {
	56	+ this.isOuted = isOuted;
	57	+ }
	58	+ public int getPage() {
	59	+ return page;
	60	+ }
	61	+ public void setPage(int page) {
	62	+ this.page = page;
	63	+ }
	64	+ public int getPageSize() {
	65	+ return pageSize;
	66	+ }
	67	+ public void setPageSize(int pageSize) {
	68	+ this.pageSize = pageSize;
	69	+ }
	70	+}
	71	+
...	...

orders-client/src/main/java/com/diligrp/orders/client/domain/input/GetOrderTradeNoInput.java 0 → 100644

View file @06cb985

	1	+++ a/orders-client/src/main/java/com/diligrp/orders/client/domain/input/GetOrderTradeNoInput.java
	1	+package com.diligrp.orders.client.domain.input;
	2	+
	3	+import com.diligrp.orders.client.domain.input.base.BaseInput;
	4	+
	5	+import javax.validation.constraints.NotNull;
	6	+
	7	+public class GetOrderTradeNoInput extends BaseInput {
	8	+
	9	+ @NotNull(message = "订单编号orderId不能为空")
	10	+ private Long[] orderId;
	11	+
	12	+ public GetOrderTradeNoInput() {
	13	+ }
	14	+
	15	+ public GetOrderTradeNoInput(Long opUserId, Long... orderId) {
	16	+ super();
	17	+ setOpUserId(opUserId);
	18	+ this.orderId = orderId;
	19	+ }
	20	+
	21	+ public Long[] getOrderId() {
	22	+ return orderId;
	23	+ }
	24	+
	25	+ public void setOrderId(Long[] orderId) {
	26	+ this.orderId = orderId;
	27	+ }
	28	+}
...	...

orders-client/src/main/java/com/diligrp/orders/client/domain/input/GetOrdersByLogisticsInput.java 0 → 100644

View file @06cb985

	1	+++ a/orders-client/src/main/java/com/diligrp/orders/client/domain/input/GetOrdersByLogisticsInput.java
	1	+
	2	+package com.diligrp.orders.client.domain.input;
	3	+
	4	+import javax.validation.constraints.NotNull;
	5	+import java.util.List;
	6	+
	7	+/**
	8	+ * 根据物流订单查询订单信息
	9	+ * @createTime 2015年12月16日
	10	+ * @author zhangshirui
	11	+ */
	12	+
	13	+public class GetOrdersByLogisticsInput {
	14	+
	15	+ / 物流id/
	16	+ @NotNull(message="物流id不能为空")
	17	+ private String logisticsId;
	18	+ /** 订单类型*/
	19	+ @NotNull(message="订单类型不能为空")
	20	+ private List<Integer> orderTypes;
	21	+
	22	+ public String getLogisticsId() {
	23	+ return logisticsId;
	24	+ }
	25	+ public void setLogisticsId(String logisticsId) {
	26	+ this.logisticsId = logisticsId;
	27	+ }
	28	+ public List<Integer> getOrderTypes() {
	29	+ return orderTypes;
	30	+ }
	31	+ public void setOrderTypes(List<Integer> orderTypes) {
	32	+ this.orderTypes = orderTypes;
	33	+ }
	34	+
	35	+}
	36	+
...	...

orders-client/src/main/java/com/diligrp/orders/client/domain/input/GetProductBuyNumInput.java 0 → 100644

View file @06cb985

	1	+++ a/orders-client/src/main/java/com/diligrp/orders/client/domain/input/GetProductBuyNumInput.java
	1	+package com.diligrp.orders.client.domain.input;
	2	+
	3	+import com.diligrp.orders.client.domain.input.base.BaseInput;
	4	+
	5	+import javax.validation.constraints.Min;
	6	+import javax.validation.constraints.NotNull;
	7	+
	8	+
	9	+/**
	10	+ * <B>Description</B> 查询用户购买商品数量 <br />
	11	+ * <B>Copyright</B> Copyright (c) 2015 www.diligrp.com All rights reserved. <br />
	12	+ * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
	13	+ * <B>Company</B> 地利集团
	14	+ * @createTime 2015年10月13日下午8:40:36
	15	+ * @author zhangshirui
	16	+ */
	17	+public class GetProductBuyNumInput extends BaseInput {
	18	+
	19	+ /** 商品ID */
	20	+ @NotNull(message="商品ID(productId)不能为空") @Min(value=1,message="商品ID(productId)不正确")
	21	+ private Long productId;
	22	+
	23	+ public Long getProductId() {
	24	+ return productId;
	25	+ }
	26	+
	27	+ public void setProductId(Long productId) {
	28	+ this.productId = productId;
	29	+ }
	30	+}
...	...

orders-client/src/main/java/com/diligrp/orders/client/domain/input/GetRefundInfoInput.java 0 → 100644

View file @06cb985

	1	+++ a/orders-client/src/main/java/com/diligrp/orders/client/domain/input/GetRefundInfoInput.java
	1	+package com.diligrp.orders.client.domain.input;
	2	+
	3	+import com.diligrp.orders.client.domain.input.base.BaseInput;
	4	+
	5	+import javax.validation.constraints.Min;
	6	+import javax.validation.constraints.NotNull;
	7	+
	8	+public class GetRefundInfoInput extends BaseInput {
	9	+
	10	+ @NotNull(message = "退款单编号reOrderId不能为空")
	11	+ @Min(value = 1,message = "退款单编号reOrderId值不正确")
	12	+ private Long reOrderId;
	13	+ /** 30-商品订单(第三方)，40-代购订单*/
	14	+
	15	+ public GetRefundInfoInput() {
	16	+ }
	17	+
	18	+ public GetRefundInfoInput(Long reOrderId, Long opUserId) {
	19	+ super();
	20	+ setOpUserId(opUserId);
	21	+ this.reOrderId = reOrderId;
	22	+ }
	23	+
	24	+
	25	+ public Long getReOrderId() {
	26	+ return reOrderId;
	27	+ }
	28	+
	29	+
	30	+ public void setReOrderId(Long reOrderId) {
	31	+ this.reOrderId = reOrderId;
	32	+ }
	33	+}
...	...

orders-client/src/main/java/com/diligrp/orders/client/domain/input/GetRefundListInput.java 0 → 100644

View file @06cb985

	1	+++ a/orders-client/src/main/java/com/diligrp/orders/client/domain/input/GetRefundListInput.java
	1	+package com.diligrp.orders.client.domain.input;
	2	+
	3	+import com.diligrp.orders.client.domain.input.base.BaseListInput;
	4	+
	5	+import java.util.Date;
	6	+
	7	+/**
	8	+ * 退款查询输入
	9	+ */
	10	+public class GetRefundListInput extends BaseListInput {
	11	+
	12	+ /** 退单ID;可选 */
	13	+ private Long reOrderId;
	14	+ /** 关联订单ID;可选 */
	15	+ private Long orderId;
	16	+ /** 退款状态：10待审核，20审核通过，30审核不通过，40取消;可选 */
	17	+ private Integer reStatus;
	18	+ /*退款申请开始时间;可选/
	19	+ public Date applyTimeStart;
	20	+ /*退款申请结束时间;可选/
	21	+ public Date applyTimeEnd;
	22	+ /** 30-商品订单(第三方)，40-代购订单*/
	23	+ private Integer orderType;
	24	+ /** 店铺id*/
	25	+ private Long shopId;
	26	+
	27	+ public Long getReOrderId() {
	28	+ return reOrderId;
	29	+ }
	30	+
	31	+ public void setReOrderId(Long reOrderId) {
	32	+ this.reOrderId = reOrderId;
	33	+ }
	34	+
	35	+
	36	+ public Long getOrderId() {
	37	+ return orderId;
	38	+ }
	39	+
	40	+
	41	+ public void setOrderId(Long orderId) {
	42	+ this.orderId = orderId;
	43	+ }
	44	+
	45	+ public Date getApplyTimeStart() {
	46	+ return applyTimeStart;
	47	+ }
	48	+
	49	+
	50	+ public void setApplyTimeStart(Date applyTimeStart) {
	51	+ this.applyTimeStart = applyTimeStart;
	52	+ }
	53	+
	54	+
	55	+ public Date getApplyTimeEnd() {
	56	+ return applyTimeEnd;
	57	+ }
	58	+
	59	+
	60	+ public void setApplyTimeEnd(Date applyTimeEnd) {
	61	+ this.applyTimeEnd = applyTimeEnd;
	62	+ }
	63	+
	64	+ public Integer getReStatus() {
	65	+ return reStatus;
	66	+ }
	67	+
	68	+ public void setReStatus(Integer reStatus) {
	69	+ this.reStatus = reStatus;
	70	+ }
	71	+
	72	+ public Integer getOrderType() {
	73	+ return orderType;
	74	+ }
	75	+
	76	+ public void setOrderType(Integer orderType) {
	77	+ this.orderType = orderType;
	78	+ }
	79	+
	80	+ public Long getShopId() {
	81	+ return shopId;
	82	+ }
	83	+
	84	+ public void setShopId(Long shopId) {
	85	+ this.shopId = shopId;
	86	+ }
	87	+
	88	+}
...	...

orders-client/src/main/java/com/diligrp/orders/client/domain/input/ModifyOrderInfoInput.java 0 → 100644

View file @06cb985

	1	+++ a/orders-client/src/main/java/com/diligrp/orders/client/domain/input/ModifyOrderInfoInput.java
	1	+package com.diligrp.orders.client.domain.input;
	2	+
	3	+import com.diligrp.orders.client.domain.input.base.BaseInput;
	4	+
	5	+import javax.validation.constraints.Min;
	6	+import javax.validation.constraints.NotNull;
	7	+
	8	+public class ModifyOrderInfoInput extends BaseInput {
	9	+
	10	+ @NotNull(message = "订单编号(orderId)不能为空") @Min(value = 1)
	11	+ private Long orderId;
	12	+// /*优惠金额(负数表示优惠，正数表示涨价)，单位：分/
	13	+// @NotNull(message = "优惠金额(pricePrivilege)(负数表示涨价，正数表示优惠)不能为空")
	14	+// private Long pricePrivilege;
	15	+ /*修改后的商品总金额，单位：分/
	16	+ @NotNull(message = "新商品总金额(newTotalPriceOfProducts)不能为空")
	17	+ private Long newPriceTotalOfProducts;
	18	+ /*修改后的运费，单位：分/
	19	+ @NotNull(message = "新运费(newPricePostage)不能为空,无运费请填写0") @Min(value = 0)
	20	+ private Long newPricePostage;
	21	+
	22	+ public ModifyOrderInfoInput() {
	23	+ }
	24	+
	25	+ public ModifyOrderInfoInput(Long orderId, Long opUserId) {
	26	+ super();
	27	+ setOpUserId(opUserId);
	28	+ this.orderId = orderId;
	29	+ }
	30	+
	31	+ public Long getOrderId() {
	32	+ return orderId;
	33	+ }
	34	+
	35	+ public void setOrderId(Long orderId) {
	36	+ this.orderId = orderId;
	37	+ }
	38	+
	39	+ public Long getNewPricePostage() {
	40	+ return newPricePostage;
	41	+ }
	42	+
	43	+
	44	+ public void setNewPricePostage(Long newPricePostage) {
	45	+ this.newPricePostage = newPricePostage;
	46	+ }
	47	+
	48	+
	49	+ public Long getNewPriceTotalOfProducts() {
	50	+ return newPriceTotalOfProducts;
	51	+ }
	52	+
	53	+
	54	+ public void setNewPriceTotalOfProducts(Long newPriceTotalOfProducts) {
	55	+ this.newPriceTotalOfProducts = newPriceTotalOfProducts;
	56	+ }
	57	+
	58	+// public Long getPricePrivilege() {
	59	+// return pricePrivilege;
	60	+// }
	61	+//
	62	+// public void setPricePrivilege(Long pricePrivilege) {
	63	+// this.pricePrivilege = pricePrivilege;
	64	+// }
	65	+}
...	...

orders-client/src/main/java/com/diligrp/orders/client/domain/input/ModifyOrderLogisticsIdInput.java 0 → 100644

View file @06cb985

	1	+++ a/orders-client/src/main/java/com/diligrp/orders/client/domain/input/ModifyOrderLogisticsIdInput.java
	1	+package com.diligrp.orders.client.domain.input;
	2	+
	3	+import com.diligrp.orders.client.domain.input.base.BaseInput;
	4	+
	5	+import javax.validation.constraints.Min;
	6	+import javax.validation.constraints.NotNull;
	7	+
	8	+public class ModifyOrderLogisticsIdInput extends BaseInput {
	9	+
	10	+ @NotNull(message = "订单编号不能为空") @Min(value = 1)
	11	+ private Long orderId;
	12	+
	13	+ /*修改后的物流ID/
	14	+ @NotNull(message = "物流ID不能为空")
	15	+ private String logisticsId;
	16	+
	17	+ public ModifyOrderLogisticsIdInput() {
	18	+ }
	19	+
	20	+ public ModifyOrderLogisticsIdInput(Long orderId, Long opUserId) {
	21	+ super();
	22	+ setOpUserId(opUserId);
	23	+ this.orderId = orderId;
	24	+ }
	25	+
	26	+ public Long getOrderId() {
	27	+ return orderId;
	28	+ }
	29	+
	30	+ public void setOrderId(Long orderId) {
	31	+ this.orderId = orderId;
	32	+ }
	33	+
	34	+ public String getLogisticsId() {
	35	+ return logisticsId;
	36	+ }
	37	+
	38	+ public void setLogisticsId(String logisticsId) {
	39	+ this.logisticsId = logisticsId;
	40	+ }
	41	+}
...	...

orders-client/src/main/java/com/diligrp/orders/client/domain/input/ModifyOrderLogisticsRemarksInput.java 0 → 100644

View file @06cb985

	1	+++ a/orders-client/src/main/java/com/diligrp/orders/client/domain/input/ModifyOrderLogisticsRemarksInput.java
	1	+package com.diligrp.orders.client.domain.input;
	2	+
	3	+import com.diligrp.orders.client.domain.input.base.BaseInput;
	4	+
	5	+import javax.validation.constraints.Min;
	6	+import javax.validation.constraints.NotNull;
	7	+
	8	+public class ModifyOrderLogisticsRemarksInput extends BaseInput {
	9	+
	10	+ @NotNull(message = "订单编号不能为空") @Min(value = 1)
	11	+ private Long orderId;
	12	+
	13	+ /*修改后的物流及验收备注/
	14	+ @NotNull(message = "物流及验收备注不能为空")
	15	+ private String newLogisticsRemarks;
	16	+
	17	+ public ModifyOrderLogisticsRemarksInput() {
	18	+ }
	19	+
	20	+ public ModifyOrderLogisticsRemarksInput(Long orderId, Long opUserId) {
	21	+ super();
	22	+ setOpUserId(opUserId);
	23	+ this.orderId = orderId;
	24	+ }
	25	+
	26	+ public Long getOrderId() {
	27	+ return orderId;
	28	+ }
	29	+
	30	+ public void setOrderId(Long orderId) {
	31	+ this.orderId = orderId;
	32	+ }
	33	+
	34	+ public String getNewLogisticsRemarks() {
	35	+ return newLogisticsRemarks;
	36	+ }
	37	+
	38	+ public void setNewLogisticsRemarks(String newLogisticsRemarks) {
	39	+ this.newLogisticsRemarks = newLogisticsRemarks;
	40	+ }
	41	+}
...	...

orders-client/src/main/java/com/diligrp/orders/client/domain/input/ModifyOrderRemitsRemarksInput.java 0 → 100644

View file @06cb985

	1	+++ a/orders-client/src/main/java/com/diligrp/orders/client/domain/input/ModifyOrderRemitsRemarksInput.java
	1	+package com.diligrp.orders.client.domain.input;
	2	+
	3	+import com.diligrp.orders.client.domain.input.base.BaseInput;
	4	+import lombok.Getter;
	5	+import lombok.NoArgsConstructor;
	6	+import lombok.Setter;
	7	+
	8	+import javax.validation.constraints.Min;
	9	+import javax.validation.constraints.NotNull;
	10	+
	11	+@Getter
	12	+@Setter
	13	+@NoArgsConstructor
	14	+public class ModifyOrderRemitsRemarksInput extends BaseInput {
	15	+
	16	+ /** 订单ID */
	17	+ @NotNull(message = "订单编号不能为空") @Min(value = 1)
	18	+ private Long orderId;
	19	+ /*收款金额(单位：分)/
	20	+ @NotNull(message = "收款金额不能为空") @Min(value = 1)
	21	+ private Long receiptAmount;
	22	+ /*汇款人姓名/
	23	+ @NotNull(message = "汇款人姓名不能为空")
	24	+ private String remitPersonName;
	25	+ /*汇款人账号或地址/
	26	+ @NotNull(message = "汇款人账号或地址")
	27	+ private String remitPersonInfo;
	28	+ /*汇款凭证url/
	29	+ private String remitUrl;
	30	+
	31	+ public Long getOrderId() {
	32	+ return orderId;
	33	+ }
	34	+
	35	+ public void setOrderId(Long orderId) {
	36	+ this.orderId = orderId;
	37	+ }
	38	+
	39	+ public Long getReceiptAmount() {
	40	+ return receiptAmount;
	41	+ }
	42	+
	43	+ public void setReceiptAmount(Long receiptAmount) {
	44	+ this.receiptAmount = receiptAmount;
	45	+ }
	46	+
	47	+ public String getRemitPersonName() {
	48	+ return remitPersonName;
	49	+ }
	50	+
	51	+ public void setRemitPersonName(String remitPersonName) {
	52	+ this.remitPersonName = remitPersonName;
	53	+ }
	54	+
	55	+ public String getRemitPersonInfo() {
	56	+ return remitPersonInfo;
	57	+ }
	58	+
	59	+ public void setRemitPersonInfo(String remitPersonInfo) {
	60	+ this.remitPersonInfo = remitPersonInfo;
	61	+ }
	62	+
	63	+ public String getRemitUrl() {
	64	+ return remitUrl;
	65	+ }
	66	+
	67	+ public void setRemitUrl(String remitUrl) {
	68	+ this.remitUrl = remitUrl;
	69	+ }
	70	+}
...	...

orders-client/src/main/java/com/diligrp/orders/client/domain/input/OrderItemSubmitInput.java 0 → 100644

View file @06cb985

	1	+++ a/orders-client/src/main/java/com/diligrp/orders/client/domain/input/OrderItemSubmitInput.java
	1	+package com.diligrp.orders.client.domain.input;
	2	+
	3	+import lombok.Data;
	4	+import org.hibernate.validator.constraints.NotBlank;
	5	+
	6	+import javax.validation.constraints.Min;
	7	+import javax.validation.constraints.NotNull;
	8	+
	9	+/**
	10	+ * 订单项
	11	+ */
	12	+@Data
	13	+public class OrderItemSubmitInput {
	14	+ /** 商品sku */
	15	+ @NotBlank(message = "商品sku不能为空")
	16	+ private String sku;
	17	+ /** 购买数量 */
	18	+ @NotNull(message = "商品购买数量amount不能为空")
	19	+ @Min(value = 1, message = "商品购买数量amount必须大于等于1")
	20	+ private Integer amount;
	21	+ /** 订单原始价格，整型,单位：分 */
	22	+ @NotNull(message = "商品原始价格price不能为空")
	23	+ @Min(value = 0, message = "商品原始价格price必须大于等于0分")
	24	+ private Long originalPrice;
	25	+
	26	+}
...	...

orders-client/src/main/java/com/diligrp/orders/client/domain/input/OrderReceiverInput.java 0 → 100644

View file @06cb985

	1	+++ a/orders-client/src/main/java/com/diligrp/orders/client/domain/input/OrderReceiverInput.java
	1	+package com.diligrp.orders.client.domain.input;
	2	+
	3	+import lombok.Data;
	4	+import org.hibernate.validator.constraints.NotBlank;
	5	+
	6	+/**
	7	+ * Created by yuehongbo on 2016/8/18.
	8	+ */
	9	+@Data
	10	+public class OrderReceiverInput {
	11	+
	12	+ /收货人姓名/
	13	+ @NotBlank(message = "收货人姓名（receiverName）不能为空")
	14	+ private String receiverName;
	15	+ /收货人电话/
	16	+ @NotBlank(message = "收货人电话（receiverPhone）不能为空")
	17	+ private String receiverPhone;
	18	+ /收货人证件号/
	19	+ private String receiverIdcard;
	20	+ /收货人地址/
	21	+ @NotBlank(message = "收货人电话（receiverPhone）不能为空")
	22	+ private String receiverAddress;
	23	+ /实际收货人的姓名/
	24	+ private String realReceiverName;
	25	+ /实际收货人的电话/
	26	+ private String realReceiverPhone;
	27	+ /实际收货人证件号/
	28	+ private String realReceiverIdcard;
	29	+ /实际收货人地址/
	30	+ private String realReceiverAddress;
	31	+ public String getReceiverName() {
	32	+ return receiverName;
	33	+ }
	34	+ public void setReceiverName(String receiverName) {
	35	+ this.receiverName = receiverName;
	36	+ }
	37	+ public String getReceiverPhone() {
	38	+ return receiverPhone;
	39	+ }
	40	+ public void setReceiverPhone(String receiverPhone) {
	41	+ this.receiverPhone = receiverPhone;
	42	+ }
	43	+ public String getReceiverIdcard() {
	44	+ return receiverIdcard;
	45	+ }
	46	+ public void setReceiverIdcard(String receiverIdcard) {
	47	+ this.receiverIdcard = receiverIdcard;
	48	+ }
	49	+ public String getReceiverAddress() {
	50	+ return receiverAddress;
	51	+ }
	52	+ public void setReceiverAddress(String receiverAddress) {
	53	+ this.receiverAddress = receiverAddress;
	54	+ }
	55	+ public String getRealReceiverName() {
	56	+ return realReceiverName;
	57	+ }
	58	+ public void setRealReceiverName(String realReceiverName) {
	59	+ this.realReceiverName = realReceiverName;
	60	+ }
	61	+ public String getRealReceiverPhone() {
	62	+ return realReceiverPhone;
	63	+ }
	64	+ public void setRealReceiverPhone(String realReceiverPhone) {
	65	+ this.realReceiverPhone = realReceiverPhone;
	66	+ }
	67	+ public String getRealReceiverIdcard() {
	68	+ return realReceiverIdcard;
	69	+ }
	70	+ public void setRealReceiverIdcard(String realReceiverIdcard) {
	71	+ this.realReceiverIdcard = realReceiverIdcard;
	72	+ }
	73	+ public String getRealReceiverAddress() {
	74	+ return realReceiverAddress;
	75	+ }
	76	+ public void setRealReceiverAddress(String realReceiverAddress) {
	77	+ this.realReceiverAddress = realReceiverAddress;
	78	+ }
	79	+
	80	+}
...	...

orders-client/src/main/java/com/diligrp/orders/client/domain/input/OrderShopInfo.java 0 → 100644

View file @06cb985

	1	+++ a/orders-client/src/main/java/com/diligrp/orders/client/domain/input/OrderShopInfo.java
	1	+
	2	+package com.diligrp.orders.client.domain.input;
	3	+
	4	+import java.util.Date;
	5	+import java.util.LinkedList;
	6	+import java.util.List;
	7	+
	8	+import javax.validation.Valid;
	9	+import javax.validation.constraints.Min;
	10	+import javax.validation.constraints.NotNull;
	11	+
	12	+import com.diligrp.orders.publics.enums.OrderDeliveryType;
	13	+
	14	+import lombok.Data;
	15	+
	16	+/**
	17	+ * 订单店铺信息
	18	+ *
	19	+ * @createTime 2015年12月8日
	20	+ * @author zhangshirui
	21	+ */
	22	+@Data
	23	+public class OrderShopInfo {
	24	+ /** 店铺ID */
	25	+ @NotNull(message = "店铺ID(shopId)不能为空")
	26	+ @Min(value = 1, message = "店铺ID((shopId))值不正确")
	27	+ private Long shopId;
	28	+
	29	+ // =========配送/发货/提货信息==========
	30	+ /** 配送方式(10 自提，20 送货上门) */
	31	+ @NotNull(message = "配送方式deliveryType不能为空")
	32	+ private OrderDeliveryType deliveryType;
	33	+
	34	+ /** 预约提货时间 */
	35	+ private Date reservationTime;
	36	+ /** 买家备注 */
	37	+ private String buyerMemo;
	38	+ /** 订单商品信息 */
	39	+ @Valid
	40	+ private List<OrderItemSubmitInput> orderItemList = new LinkedList<OrderItemSubmitInput>();
	41	+ @Valid
	42	+ @Min(value = 0, message = "订单总价必须大于0分")
	43	+ private Long totalPrice;
	44	+
	45	+}
...	...

orders-client/src/main/java/com/diligrp/orders/client/domain/input/ShipInfoInput.java 0 → 100644

View file @06cb985

	1	+++ a/orders-client/src/main/java/com/diligrp/orders/client/domain/input/ShipInfoInput.java
	1	+package com.diligrp.orders.client.domain.input;
	2	+
	3	+/**
	4	+ * <B>Description</B>发货物流信息 <br />
	5	+ * <B>Copyright</B> Copyright (c) 2015 www.diligrp.com All rights reserved. <br />
	6	+ * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
	7	+ * <B>Company</B> 地利集团
	8	+ */
	9	+public class ShipInfoInput {
	10	+
	11	+ /** 司机姓名 */
	12	+ private String driverName;
	13	+
	14	+ /** 司机联系电话*/
	15	+ private String phone;
	16	+
	17	+ /** 车牌号码*/
	18	+ private String plateNumber;
	19	+ /*备注/
	20	+ private String memo;
	21	+
	22	+ public ShipInfoInput(){
	23	+ }
	24	+
	25	+ public ShipInfoInput(String driverName,String phone,String plateNumber){
	26	+ this.driverName=driverName;
	27	+ this.phone=phone;
	28	+ this.plateNumber=plateNumber;
	29	+ }
	30	+
	31	+ public String getDriverName() {
	32	+ return driverName;
	33	+ }
	34	+
	35	+ public void setDriverName(String driverName) {
	36	+ this.driverName = driverName;
	37	+ }
	38	+
	39	+ public String getPhone() {
	40	+ return phone;
	41	+ }
	42	+
	43	+ public void setPhone(String phone) {
	44	+ this.phone = phone;
	45	+ }
	46	+
	47	+ public String getPlateNumber() {
	48	+ return plateNumber;
	49	+ }
	50	+
	51	+ public void setPlateNumber(String plateNumber) {
	52	+ this.plateNumber = plateNumber;
	53	+ }
	54	+
	55	+ public String getMemo() {
	56	+ return memo;
	57	+ }
	58	+
	59	+ public void setMemo(String memo) {
	60	+ this.memo = memo;
	61	+ }
	62	+}
...	...

orders-client/src/main/java/com/diligrp/orders/client/domain/input/StatisticsOrderAmountInput.java 0 → 100644

View file @06cb985

	1	+++ a/orders-client/src/main/java/com/diligrp/orders/client/domain/input/StatisticsOrderAmountInput.java
	1	+package com.diligrp.orders.client.domain.input;
	2	+
	3	+import com.diligrp.orders.client.domain.input.base.BaseInput;
	4	+import com.diligrp.orders.publics.enums.OrderType;
	5	+import lombok.Data;
	6	+import lombok.NoArgsConstructor;
	7	+
	8	+import java.util.ArrayList;
	9	+import java.util.HashSet;
	10	+import java.util.List;
	11	+import java.util.Set;
	12	+
	13	+/**
	14	+ * <B>Description</B> 订单量统计输入 <br />
	15	+ * <B>Copyright</B> Copyright (c) 2015 www.diligrp.com All rights reserved. <br />
	16	+ * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
	17	+ * <B>Company</B> 地利集团
	18	+ */
	19	+@NoArgsConstructor
	20	+@Data
	21	+public class StatisticsOrderAmountInput extends BaseInput {
	22	+
	23	+ /*查询条件：支付方式。10：线上付款 20：线下付款 30：提货付款 40：赊账付款/
	24	+ private List<Integer> payTypeList=new ArrayList<Integer>();
	25	+
	26	+ /**
	27	+ * 查询条件：订单状态-多状态查询：订单状态(10待付款，15待审核(赊账订单有效)，20待备货(暂未使用)，30备货中，40待提货，45待收货，50已提货,60已失效,70已取消,80申请退款中，90已退款，100提货超时)
	28	+ */
	29	+ //@Pattern(regexp="[10\|20\|30\|40\|50\|60\|70\|80\|90\|100]")
	30	+ private Set<Integer> orderState = new HashSet<Integer>();
	31	+
	32	+ /**
	33	+ * 查询条件：订单商品是否已全部评价。 1：已评价 0：未评价
	34	+ */
	35	+ private Integer isCommented;
	36	+
	37	+ /** 订单类型:*/
	38	+ private OrderType orderType;
	39	+
	40	+ /** 店铺id*/
	41	+ private Long shopId;
	42	+
	43	+ public List<Integer> getPayTypeList() {
	44	+ return payTypeList;
	45	+ }
	46	+
	47	+ public void setPayTypeList(List<Integer> payTypeList) {
	48	+ this.payTypeList = payTypeList;
	49	+ }
	50	+
	51	+ public Set<Integer> getOrderState() {
	52	+ return orderState;
	53	+ }
	54	+
	55	+ public void setOrderState(Set<Integer> orderState) {
	56	+ this.orderState = orderState;
	57	+ }
	58	+
	59	+ public Integer getIsCommented() {
	60	+ return isCommented;
	61	+ }
	62	+
	63	+ public void setIsCommented(Integer isCommented) {
	64	+ this.isCommented = isCommented;
	65	+ }
	66	+
	67	+ public OrderType getOrderType() {
	68	+ return orderType;
	69	+ }
	70	+
	71	+ public void setOrderType(OrderType orderType) {
	72	+ this.orderType = orderType;
	73	+ }
	74	+
	75	+ public Long getShopId() {
	76	+ return shopId;
	77	+ }
	78	+
	79	+ public void setShopId(Long shopId) {
	80	+ this.shopId = shopId;
	81	+ }
	82	+}
...	...

orders-client/src/main/java/com/diligrp/orders/client/domain/input/SubmitClaimsAppealInput.java 0 → 100644

View file @06cb985

	1	+++ a/orders-client/src/main/java/com/diligrp/orders/client/domain/input/SubmitClaimsAppealInput.java
	1	+package com.diligrp.orders.client.domain.input;
	2	+
	3	+import com.diligrp.orders.client.domain.input.base.BaseInput;
	4	+
	5	+import javax.validation.constraints.Min;
	6	+import javax.validation.constraints.NotNull;
	7	+
	8	+/**
	9	+ * <B>Description</B> <br />
	10	+ * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />
	11	+ * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
	12	+ * <B>Company</B> 地利集团
	13	+ *
	14	+ * @author WuJianjun
	15	+ * @createTime 16/9/18 10:26
	16	+ */
	17	+public class SubmitClaimsAppealInput extends BaseInput {
	18	+ @NotNull(message = "理赔单编号applyOrderId不能为空")
	19	+ @Min(value = 1)
	20	+ private Long applyOrderId;
	21	+ private String appealComment;
	22	+
	23	+ public Long getApplyOrderId() {
	24	+ return applyOrderId;
	25	+ }
	26	+
	27	+ public void setApplyOrderId(Long applyOrderId) {
	28	+ this.applyOrderId = applyOrderId;
	29	+ }
	30	+
	31	+ public String getAppealComment() {
	32	+ return appealComment;
	33	+ }
	34	+
	35	+ public void setAppealComment(String appealComment) {
	36	+ this.appealComment = appealComment;
	37	+ }
	38	+}
...	...

orders-client/src/main/java/com/diligrp/orders/client/domain/input/SubmitClaimsInput.java 0 → 100644

View file @06cb985

	1	+++ a/orders-client/src/main/java/com/diligrp/orders/client/domain/input/SubmitClaimsInput.java
	1	+package com.diligrp.orders.client.domain.input;
	2	+
	3	+import com.diligrp.orders.client.domain.input.base.BaseInput;
	4	+import com.diligrp.orders.publics.enums.ClaimsDemand;
	5	+import org.hibernate.validator.constraints.NotBlank;
	6	+
	7	+import javax.validation.constraints.Min;
	8	+import javax.validation.constraints.NotNull;
	9	+
	10	+/**
	11	+ * <B>Description</B> <br />
	12	+ * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />
	13	+ * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
	14	+ * <B>Company</B> 地利集团
	15	+ *
	16	+ * @author WuJianjun
	17	+ * @createTime 16/9/18 10:25
	18	+ */
	19	+public class SubmitClaimsInput extends BaseInput {
	20	+ @NotNull(message = "订单编号orderId不能为空")
	21	+ @Min(value = 1)
	22	+ private Long orderId;
	23	+ private Long applyPrice;
	24	+ // 理赔原因
	25	+ @NotBlank(message="理赔原因resaon不能为空")
	26	+ private String applyReason;
	27	+ // 理赔备注
	28	+ private String applyMemo;
	29	+ // 理赔要求
	30	+ private ClaimsDemand applyDemand;
	31	+ @NotBlank(message="理赔凭证不能为空")
	32	+ private String applyImgUrls;
	33	+
	34	+ public Long getOrderId() {
	35	+ return orderId;
	36	+ }
	37	+
	38	+ public void setOrderId(Long orderId) {
	39	+ this.orderId = orderId;
	40	+ }
	41	+
	42	+ public Long getApplyPrice() {
	43	+ return applyPrice;
	44	+ }
	45	+
	46	+ public void setApplyPrice(Long applyPrice) {
	47	+ this.applyPrice = applyPrice;
	48	+ }
	49	+
	50	+ public String getApplyReason() {
	51	+ return applyReason;
	52	+ }
	53	+
	54	+ public void setApplyReason(String applyReason) {
	55	+ this.applyReason = applyReason;
	56	+ }
	57	+
	58	+ public String getApplyMemo() {
	59	+ return applyMemo;
	60	+ }
	61	+
	62	+ public void setApplyMemo(String applyMemo) {
	63	+ this.applyMemo = applyMemo;
	64	+ }
	65	+
	66	+ public ClaimsDemand getApplyDemand() {
	67	+ return applyDemand;
	68	+ }
	69	+
	70	+ public void setApplyDemand(ClaimsDemand applyDemand) {
	71	+ this.applyDemand = applyDemand;
	72	+ }
	73	+
	74	+ public String getApplyImgUrls() {
	75	+ return applyImgUrls;
	76	+ }
	77	+
	78	+ public void setApplyImgUrls(String applyImgUrls) {
	79	+ this.applyImgUrls = applyImgUrls;
	80	+ }
	81	+}
...	...

orders-client/src/main/java/com/diligrp/orders/client/domain/input/SubmitDelayPaymentInput.java 0 → 100644

View file @06cb985

	1	+++ a/orders-client/src/main/java/com/diligrp/orders/client/domain/input/SubmitDelayPaymentInput.java
	1	+package com.diligrp.orders.client.domain.input;
	2	+
	3	+
	4	+public class SubmitDelayPaymentInput extends GetOrderInfoInput {
	5	+ /*延迟日期/
	6	+ //@NotNull(message="延迟天数delayDay不能为空") @Min(value=1,message="延迟天数delayDay必须大于0")
	7	+ private Integer delayDay;
	8	+
	9	+ /** 操作人角色： 10买家，20卖家 */
	10	+// @NotNull(message="操作人角色opUserRole不能为空,可选值：10买家，20卖家")
	11	+// private Long opUserRole;
	12	+
	13	+
	14	+// public Long getOpUserRole() {
	15	+// return opUserRole;
	16	+// }
	17	+//
	18	+//
	19	+// public void setOpUserRole(Long opUserRole) {
	20	+// this.opUserRole = opUserRole;
	21	+// }
	22	+
	23	+
	24	+
	25	+ public Integer getDelayDay() {
	26	+ return delayDay;
	27	+ }
	28	+
	29	+
	30	+
	31	+ public void setDelayDay(Integer delayDay) {
	32	+ this.delayDay = delayDay;
	33	+ }
	34	+}
	35	+
...	...

orders-client/src/main/java/com/diligrp/orders/client/domain/input/SubmitOrderInput.java 0 → 100644

View file @06cb985

	1	+++ a/orders-client/src/main/java/com/diligrp/orders/client/domain/input/SubmitOrderInput.java
	1	+package com.diligrp.orders.client.domain.input;
	2	+
	3	+import javax.validation.Valid;
	4	+import javax.validation.constraints.Min;
	5	+import javax.validation.constraints.NotNull;
	6	+
	7	+import org.hibernate.validator.constraints.NotEmpty;
	8	+
	9	+import com.diligrp.orders.client.domain.input.base.BaseInput;
	10	+import com.diligrp.orders.publics.enums.OrderDeliveryType;
	11	+import com.diligrp.orders.publics.enums.PayType;
	12	+
	13	+import lombok.Getter;
	14	+import lombok.NoArgsConstructor;
	15	+import lombok.Setter;
	16	+
	17	+/**
	18	+ * 订单提交输入对象
	19	+ */
	20	+@NoArgsConstructor
	21	+@Getter
	22	+@Setter
	23	+public class SubmitOrderInput extends BaseInput {
	24	+ /** 买家ID */
	25	+ @NotNull(message = "买家ID(buyerId)不能为空")
	26	+ @Min(value = 1, message = "买家ID(buyerId)值不正确")
	27	+ private Long buyerId;
	28	+
	29	+ /** 支付方式:10线上付款、20线下付款 */
	30	+ @NotNull(message = "支付方式payType不能为空")
	31	+ private PayType payType;
	32	+
	33	+ /** 订单店铺信息 */
	34	+ @Valid
	35	+ @NotEmpty
	36	+ private OrderShopInfo orderShopInput;
	37	+
	38	+ /** 订单的收货人信息 */
	39	+ @Valid
	40	+ @NotNull(message = "收货人信息不能为空")
	41	+ private OrderReceiverInput orderReceiverInput;
	42	+
	43	+}
...	...

orders-client/src/main/java/com/diligrp/orders/client/domain/input/SumbitRefundAppealInput.java 0 → 100644

View file @06cb985

	1	+++ a/orders-client/src/main/java/com/diligrp/orders/client/domain/input/SumbitRefundAppealInput.java
	1	+package com.diligrp.orders.client.domain.input;
	2	+
	3	+import org.hibernate.validator.constraints.NotBlank;
	4	+
	5	+import java.util.ArrayList;
	6	+import java.util.List;
	7	+
	8	+/**
	9	+ * 退款申请提交输入
	10	+ */
	11	+public class SumbitRefundAppealInput extends GetRefundInfoInput {
	12	+ /** 退款申诉内容 */
	13	+ //@NotBlank(message = "退款申诉内容resaon不能为空")
	14	+ private String appealResaon;
	15	+ /** 申诉凭证 -图片url */
	16	+ private List<String> appealImgUrls = new ArrayList<>();
	17	+
	18	+ public String getAppealResaon() {
	19	+ return appealResaon;
	20	+ }
	21	+
	22	+ public void setAppealResaon(String appealResaon) {
	23	+ this.appealResaon = appealResaon;
	24	+ }
	25	+
	26	+ public List<String> getAppealImgUrls() {
	27	+ return appealImgUrls;
	28	+ }
	29	+
	30	+ public void setAppealImgUrls(List<String> appealImgUrls) {
	31	+ this.appealImgUrls = appealImgUrls;
	32	+ }
	33	+}
...	...

orders-client/src/main/java/com/diligrp/orders/client/domain/input/SumbitRefundInput.java 0 → 100644

View file @06cb985

	1	+++ a/orders-client/src/main/java/com/diligrp/orders/client/domain/input/SumbitRefundInput.java
	1	+package com.diligrp.orders.client.domain.input;
	2	+
	3	+import org.hibernate.validator.constraints.NotBlank;
	4	+
	5	+import javax.validation.constraints.Min;
	6	+
	7	+/**
	8	+ * 退款申请提交输入
	9	+ */
	10	+public class SumbitRefundInput extends GetOrderInfoInput {
	11	+ /** 退款理由 */
	12	+ @NotBlank(message="退款理由resaon不能为空")
	13	+ private String resaon;
	14	+ /** 退款金额，单位：分 */
	15	+ @Min(value=1,message="退款金额reApplyPrice不能小于0分")
	16	+ private long reApplyPrice;
	17	+ /** 备注 */
	18	+ private String applyMemo;
	19	+ /** 30-商品订单(第三方)，40-代购订单*/
	20	+ private Integer orderType;
	21	+
	22	+ public String getResaon() {
	23	+ return resaon;
	24	+ }
	25	+
	26	+ public void setResaon(String resaon) {
	27	+ this.resaon = resaon;
	28	+ }
	29	+
	30	+ public long getReApplyPrice() {
	31	+ return reApplyPrice;
	32	+ }
	33	+
	34	+ public void setReApplyPrice(long reApplyPrice) {
	35	+ this.reApplyPrice = reApplyPrice;
	36	+ }
	37	+
	38	+ public String getApplyMemo() {
	39	+ return applyMemo;
	40	+ }
	41	+
	42	+ public void setApplyMemo(String applyMemo) {
	43	+ this.applyMemo = applyMemo;
	44	+ }
	45	+
	46	+ public Integer getOrderType() {
	47	+ return orderType;
	48	+ }
	49	+
	50	+ public void setOrderType(Integer orderType) {
	51	+ this.orderType = orderType;
	52	+ }
	53	+}
...	...

orders-client/src/main/java/com/diligrp/orders/client/domain/input/base/BaseInput.java 0 → 100644

View file @06cb985

	1	+++ a/orders-client/src/main/java/com/diligrp/orders/client/domain/input/base/BaseInput.java
	1	+package com.diligrp.orders.client.domain.input.base;
	2	+
	3	+import javax.validation.constraints.Min;
	4	+import javax.validation.constraints.NotNull;
	5	+
	6	+
	7	+public class BaseInput {
	8	+ /** 操作人ID */
	9	+ @NotNull(message="操作人ID(opUserId)不能为空") @Min(value=1,message="操作人ID(opUserId)不正确")
	10	+ private Long opUserId;
	11	+
	12	+ /** 操作人角色： 10买家，20卖家 */
	13	+ @NotNull(message="操作人角色(opUserRole)不能为空")
	14	+ private Long opUserRole;
	15	+
	16	+ public Long getOpUserId() {
	17	+ return opUserId;
	18	+ }
	19	+
	20	+
	21	+ public void setOpUserId(Long opUserId) {
	22	+ this.opUserId = opUserId;
	23	+ }
	24	+
	25	+
	26	+
	27	+ public Long getOpUserRole() {
	28	+ return opUserRole;
	29	+ }
	30	+
	31	+
	32	+
	33	+ public void setOpUserRole(Long opUserRole) {
	34	+ this.opUserRole = opUserRole;
	35	+ }
	36	+}
...	...

orders-client/src/main/java/com/diligrp/orders/client/domain/input/base/BaseListInput.java 0 → 100644

View file @06cb985

	1	+++ a/orders-client/src/main/java/com/diligrp/orders/client/domain/input/base/BaseListInput.java
	1	+
	2	+package com.diligrp.orders.client.domain.input.base;
	3	+
	4	+import lombok.Getter;
	5	+import lombok.NoArgsConstructor;
	6	+import lombok.Setter;
	7	+
	8	+import javax.validation.constraints.Min;
	9	+import javax.validation.constraints.NotNull;
	10	+
	11	+/**
	12	+ * 列表搜索基类
	13	+ * @createTime 2015年12月16日
	14	+ * @author zhangshirui
	15	+ */
	16	+@NoArgsConstructor
	17	+@Getter
	18	+@Setter
	19	+public class BaseListInput extends BaseInput{
	20	+
	21	+ /** 买家ID */
	22	+ @Min(value=1,message="买家ID(buyerId)不正确")
	23	+ private Long buyerId;
	24	+ /** 卖家ID */
	25	+ @Min(value=1,message="卖家ID(buyerId)不正确")
	26	+ private Long sellerId;
	27	+ /** 查询条件：卖家姓名 */
	28	+ private String sellerName;
	29	+ /** 查询条件：买家姓名 */
	30	+ private String buyerName;
	31	+ /** 页码,从1开始 */
	32	+ @NotNull(message="页码page不能为空") @Min(value=1,message="页码page值不能小于1")
	33	+ private int page = 1;
	34	+ /** 页大小，默认20 */
	35	+ @NotNull(message="页大小pageSize不能为空") @Min(value=1,message="页大小pageSize值不能小于1")
	36	+ private int pageSize = 20;
	37	+
	38	+ public Long getBuyerId() {
	39	+ return buyerId;
	40	+ }
	41	+
	42	+ public void setBuyerId(Long buyerId) {
	43	+ this.buyerId = buyerId;
	44	+ }
	45	+
	46	+ public Long getSellerId() {
	47	+ return sellerId;
	48	+ }
	49	+
	50	+ public void setSellerId(Long sellerId) {
	51	+ this.sellerId = sellerId;
	52	+ }
	53	+
	54	+ public String getSellerName() {
	55	+ return sellerName;
	56	+ }
	57	+
	58	+ public void setSellerName(String sellerName) {
	59	+ this.sellerName = sellerName;
	60	+ }
	61	+
	62	+ public String getBuyerName() {
	63	+ return buyerName;
	64	+ }
	65	+
	66	+ public void setBuyerName(String buyerName) {
	67	+ this.buyerName = buyerName;
	68	+ }
	69	+
	70	+ public int getPage() {
	71	+ return page;
	72	+ }
	73	+
	74	+ public void setPage(int page) {
	75	+ this.page = page;
	76	+ }
	77	+
	78	+ public int getPageSize() {
	79	+ return pageSize;
	80	+ }
	81	+
	82	+ public void setPageSize(int pageSize) {
	83	+ this.pageSize = pageSize;
	84	+ }
	85	+}
	86	+
...	...

orders-client/src/main/java/com/diligrp/orders/client/domain/input/base/BaseOrderListInput.java 0 → 100644

View file @06cb985

	1	+++ a/orders-client/src/main/java/com/diligrp/orders/client/domain/input/base/BaseOrderListInput.java
	1	+
	2	+package com.diligrp.orders.client.domain.input.base;
	3	+
	4	+import com.diligrp.orders.publics.enums.OrderType;
	5	+import lombok.Getter;
	6	+import lombok.NoArgsConstructor;
	7	+import lombok.Setter;
	8	+
	9	+import java.util.Date;
	10	+import java.util.List;
	11	+import java.util.Set;
	12	+
	13	+/**
	14	+ * 订单列表基类
	15	+ * @createTime 2015年12月16日
	16	+ * @author zhangshirui
	17	+ */
	18	+@NoArgsConstructor
	19	+@Getter
	20	+@Setter
	21	+public class BaseOrderListInput extends BaseListInput {
	22	+
	23	+ /** 买家手机号码(这个号码是买家注册时的号码)*/
	24	+ private String buyerMobilePhone;
	25	+ /*查询条件：支付方式。10：线上付款 20：线下付款 30：提货付款 40：赊账付款/
	26	+ private List<Integer> payTypeList;
	27	+ /** 查询条件：订单状态 */
	28	+ private Set<Integer> orderState;
	29	+ /** 查询条件：订单提交时间(开始) */
	30	+ private Date submitBeginTime;
	31	+ /** 查询条件：订单提交时间(结束) */
	32	+ private Date submitEndTime;
	33	+ /** 店铺id*/
	34	+ private Long shopId;
	35	+ /** 查询条件：订单类型 */
	36	+ private OrderType orderType;
	37	+
	38	+ public String getBuyerMobilePhone() {
	39	+ return buyerMobilePhone;
	40	+ }
	41	+
	42	+ public void setBuyerMobilePhone(String buyerMobilePhone) {
	43	+ this.buyerMobilePhone = buyerMobilePhone;
	44	+ }
	45	+
	46	+ public List<Integer> getPayTypeList() {
	47	+ return payTypeList;
	48	+ }
	49	+
	50	+ public void setPayTypeList(List<Integer> payTypeList) {
	51	+ this.payTypeList = payTypeList;
	52	+ }
	53	+
	54	+ public Set<Integer> getOrderState() {
	55	+ return orderState;
	56	+ }
	57	+
	58	+ public void setOrderState(Set<Integer> orderState) {
	59	+ this.orderState = orderState;
	60	+ }
	61	+
	62	+ public Date getSubmitBeginTime() {
	63	+ return submitBeginTime;
	64	+ }
	65	+
	66	+ public void setSubmitBeginTime(Date submitBeginTime) {
	67	+ this.submitBeginTime = submitBeginTime;
	68	+ }
	69	+
	70	+ public Date getSubmitEndTime() {
	71	+ return submitEndTime;
	72	+ }
	73	+
	74	+ public void setSubmitEndTime(Date submitEndTime) {
	75	+ this.submitEndTime = submitEndTime;
	76	+ }
	77	+
	78	+ public Long getShopId() {
	79	+ return shopId;
	80	+ }
	81	+
	82	+ public void setShopId(Long shopId) {
	83	+ this.shopId = shopId;
	84	+ }
	85	+
	86	+ public OrderType getOrderType() {
	87	+ return orderType;
	88	+ }
	89	+
	90	+ public void setOrderType(OrderType orderType) {
	91	+ this.orderType = orderType;
	92	+ }
	93	+}
	94	+
...	...

orders-client/src/main/java/com/diligrp/orders/client/domain/output/BaseOutput.java 0 → 100644

View file @06cb985

	1	+++ a/orders-client/src/main/java/com/diligrp/orders/client/domain/output/BaseOutput.java
	1	+/*
	2	+ * Copyright (c) 2014 www.diligrp.com All rights reserved.
	3	+ * 本软件源代码版权归----所有,未经许可不得任意复制与传播.
	4	+ */
	5	+package com.diligrp.orders.client.domain.output;
	6	+
	7	+import com.diligrp.orders.client.utils.ResultCode;
	8	+
	9	+/**
	10	+ * 基础输出对象
	11	+ *
	12	+ * @author dev-center
	13	+ * @since 2014-05-10
	14	+ */
	15	+public class BaseOutput<T> {
	16	+
	17	+ /**
	18	+ * 业务状态码 <br/>
	19	+ * 200代表成功，其它表示失败，具体失败原因请查看ResultCode属性
	20	+ */
	21	+ private String code;//
	22	+ /**
	23	+ * 业务状态说明 <br/>
	24	+ * 200时返回OK，code!=200时表示具体失败原因
	25	+ */
	26	+ private String result;
	27	+ /**
	28	+ * 返回业务数据 <br/>
	29	+ * 根据接口泛型指定
	30	+ */
	31	+ private T data;// 数据
	32	+
	33	+ /**
	34	+ * 非业务数据，api调用业务状态码不为200时的错误数据，具体数据是否有值，查看ResultCode,根据状态码确定
	35	+ */
	36	+ private String errorData;
	37	+
	38	+ public BaseOutput() {
	39	+ }
	40	+
	41	+ public BaseOutput(String code, String result) {
	42	+ this.code = code;
	43	+ this.result = result;
	44	+ }
	45	+
	46	+ public String getCode() {
	47	+ return code;
	48	+ }
	49	+
	50	+ public void setCode(String code) {
	51	+ this.code = code;
	52	+ }
	53	+
	54	+ public String getResult() {
	55	+ return result;
	56	+ }
	57	+
	58	+ public void setResult(String result) {
	59	+ this.result = result;
	60	+ }
	61	+
	62	+ public T getData() {
	63	+ return (T) data;
	64	+ }
	65	+
	66	+ public void setData(T data) {
	67	+ this.data = data;
	68	+ }
	69	+
	70	+ public static <T> BaseOutput<T> create(String code, String result) {
	71	+ return new BaseOutput<T>(code, result);
	72	+ }
	73	+
	74	+ public static <T> BaseOutput<T> success() {
	75	+ return success("OK");
	76	+ }
	77	+
	78	+ public static <T> BaseOutput<T> success(String msg) {
	79	+ return create(ResultCode.OK, msg);
	80	+ }
	81	+
	82	+ public static <T> BaseOutput<T> failure() {
	83	+ return failure("操作失败!");
	84	+ }
	85	+
	86	+ public static <T> BaseOutput<T> failure(String msg) {
	87	+ return create(ResultCode.APP_ERROR, msg);
	88	+ }
	89	+
	90	+
	91	+ public String getErrorData() {
	92	+ return errorData;
	93	+ }
	94	+
	95	+ public void setErrorData(String errorData) {
	96	+ this.errorData = errorData;
	97	+ }
	98	+}
...	...

orders-client/src/main/java/com/diligrp/orders/client/domain/output/ClaimsInfo.java 0 → 100644

View file @06cb985

	1	+++ a/orders-client/src/main/java/com/diligrp/orders/client/domain/output/ClaimsInfo.java
	1	+package com.diligrp.orders.client.domain.output;
	2	+
	3	+import com.diligrp.orders.publics.enums.ClaimsDemand;
	4	+import com.diligrp.orders.publics.enums.ClaimsOrderStatus;
	5	+
	6	+import java.util.Date;
	7	+
	8	+/**
	9	+ * <B>Description</B> <br />
	10	+ * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />
	11	+ * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
	12	+ * <B>Company</B> 地利集团
	13	+ *
	14	+ * @author WuJianjun
	15	+ * @createTime 16/9/18 10:26
	16	+ */
	17	+public class ClaimsInfo {
	18	+ private Long id;
	19	+ /** 原始订单信息 */
	20	+ private OrderDetailInfo orderInfo;
	21	+ private ClaimsOrderStatus status;
	22	+
	23	+ // ---申请信息---
	24	+ private Long applyUserId;
	25	+ private String applyUserName;
	26	+ // 理赔金额: 分
	27	+ private Long applyPrice;
	28	+ // 理赔原因
	29	+ private String applyReason;
	30	+ // 理赔说明
	31	+ private String applyMemo;
	32	+ // 理赔要求
	33	+ private ClaimsDemand applyDemand;
	34	+ private String applyImgUrls;
	35	+ private Date createTime;
	36	+
	37	+ // ---审核信息---
	38	+ private Long auditUserId;
	39	+ private String auditUserName;
	40	+ private String auditComment;
	41	+ private Long auditPrice;
	42	+ private ClaimsDemand auditResult;
	43	+ private Date auditTime;
	44	+ private String auditImgUrls;
	45	+ //是否可发起理赔申诉，1否，2是
	46	+ private Integer appealEnable;
	47	+ //理赔申诉相关===========
	48	+ //申诉补充说明
	49	+ private String appealComment;
	50	+ //申诉提交时间
	51	+ private Date appealApplyTime;
	52	+ //平台处理结果给买家申诉金额
	53	+ private Long appealResultPriceBuyer;
	54	+ //平台处理结果给卖家申诉金额
	55	+ private Long appealResultPriceSeller;
	56	+ // 平台处理结果
	57	+ private String appealResult;
	58	+ // 平台结果处理理由
	59	+ private String appealResultReason;
	60	+ //申述处理时间
	61	+ private Date appealResultTime;
	62	+ //申诉处理人id
	63	+ private Long appealResultUserId;
	64	+ //申诉处理人账号名
	65	+ private String appealResultUserName;
	66	+ private String appealResultImgUrls;
	67	+ //平台处理结果复核说明
	68	+ private String appealAuditComment;
	69	+ //平台处理结果复核处理时间
	70	+ private Date appealAuditTime;
	71	+ //平台处理结果复核处理人id
	72	+ private Long appealAuditUserId;
	73	+ //平台处理结果复核处理人账号名
	74	+ private String appealAuditUserName;
	75	+
	76	+ public String getAppealComment() {
	77	+ return appealComment;
	78	+ }
	79	+
	80	+ public void setAppealComment(String appealComment) {
	81	+ this.appealComment = appealComment;
	82	+ }
	83	+
	84	+ public Date getAppealApplyTime() {
	85	+ return appealApplyTime;
	86	+ }
	87	+
	88	+ public void setAppealApplyTime(Date appealApplyTime) {
	89	+ this.appealApplyTime = appealApplyTime;
	90	+ }
	91	+
	92	+ public Long getAppealResultPriceBuyer() {
	93	+ return appealResultPriceBuyer;
	94	+ }
	95	+
	96	+ public void setAppealResultPriceBuyer(Long appealResultPriceBuyer) {
	97	+ this.appealResultPriceBuyer = appealResultPriceBuyer;
	98	+ }
	99	+
	100	+ public Long getAppealResultPriceSeller() {
	101	+ return appealResultPriceSeller;
	102	+ }
	103	+
	104	+ public void setAppealResultPriceSeller(Long appealResultPriceSeller) {
	105	+ this.appealResultPriceSeller = appealResultPriceSeller;
	106	+ }
	107	+
	108	+ public String getAppealResult() {
	109	+ return appealResult;
	110	+ }
	111	+
	112	+ public void setAppealResult(String appealResult) {
	113	+ this.appealResult = appealResult;
	114	+ }
	115	+
	116	+ public String getAppealResultReason() {
	117	+ return appealResultReason;
	118	+ }
	119	+
	120	+ public void setAppealResultReason(String appealResultReason) {
	121	+ this.appealResultReason = appealResultReason;
	122	+ }
	123	+
	124	+ public Date getAppealResultTime() {
	125	+ return appealResultTime;
	126	+ }
	127	+
	128	+ public void setAppealResultTime(Date appealResultTime) {
	129	+ this.appealResultTime = appealResultTime;
	130	+ }
	131	+
	132	+ public Long getAppealResultUserId() {
	133	+ return appealResultUserId;
	134	+ }
	135	+
	136	+ public void setAppealResultUserId(Long appealResultUserId) {
	137	+ this.appealResultUserId = appealResultUserId;
	138	+ }
	139	+
	140	+ public String getAppealResultUserName() {
	141	+ return appealResultUserName;
	142	+ }
	143	+
	144	+ public void setAppealResultUserName(String appealResultUserName) {
	145	+ this.appealResultUserName = appealResultUserName;
	146	+ }
	147	+
	148	+ public String getAppealResultImgUrls() {
	149	+ return appealResultImgUrls;
	150	+ }
	151	+
	152	+ public void setAppealResultImgUrls(String appealResultImgUrls) {
	153	+ this.appealResultImgUrls = appealResultImgUrls;
	154	+ }
	155	+
	156	+ public String getAppealAuditComment() {
	157	+ return appealAuditComment;
	158	+ }
	159	+
	160	+ public void setAppealAuditComment(String appealAuditComment) {
	161	+ this.appealAuditComment = appealAuditComment;
	162	+ }
	163	+
	164	+ public Date getAppealAuditTime() {
	165	+ return appealAuditTime;
	166	+ }
	167	+
	168	+ public void setAppealAuditTime(Date appealAuditTime) {
	169	+ this.appealAuditTime = appealAuditTime;
	170	+ }
	171	+
	172	+ public Long getAppealAuditUserId() {
	173	+ return appealAuditUserId;
	174	+ }
	175	+
	176	+ public void setAppealAuditUserId(Long appealAuditUserId) {
	177	+ this.appealAuditUserId = appealAuditUserId;
	178	+ }
	179	+
	180	+ public String getAppealAuditUserName() {
	181	+ return appealAuditUserName;
	182	+ }
	183	+
	184	+ public void setAppealAuditUserName(String appealAuditUserName) {
	185	+ this.appealAuditUserName = appealAuditUserName;
	186	+ }
	187	+
	188	+ public Integer getAppealEnable() {
	189	+ return appealEnable;
	190	+ }
	191	+
	192	+ public void setAppealEnable(Integer appealEnable) {
	193	+ this.appealEnable = appealEnable;
	194	+ }
	195	+
	196	+ public Long getId() {
	197	+ return id;
	198	+ }
	199	+
	200	+ public void setId(Long id) {
	201	+ this.id = id;
	202	+ }
	203	+
	204	+ public OrderDetailInfo getOrderInfo() {
	205	+ return orderInfo;
	206	+ }
	207	+
	208	+ public void setOrderInfo(OrderDetailInfo orderInfo) {
	209	+ this.orderInfo = orderInfo;
	210	+ }
	211	+
	212	+ public ClaimsOrderStatus getStatus() {
	213	+ return status;
	214	+ }
	215	+
	216	+ public void setStatus(ClaimsOrderStatus status) {
	217	+ this.status = status;
	218	+ }
	219	+
	220	+ public Long getApplyUserId() {
	221	+ return applyUserId;
	222	+ }
	223	+
	224	+ public void setApplyUserId(Long applyUserId) {
	225	+ this.applyUserId = applyUserId;
	226	+ }
	227	+
	228	+ public String getApplyUserName() {
	229	+ return applyUserName;
	230	+ }
	231	+
	232	+ public void setApplyUserName(String applyUserName) {
	233	+ this.applyUserName = applyUserName;
	234	+ }
	235	+
	236	+ public Long getApplyPrice() {
	237	+ return applyPrice;
	238	+ }
	239	+
	240	+ public void setApplyPrice(Long applyPrice) {
	241	+ this.applyPrice = applyPrice;
	242	+ }
	243	+
	244	+ public String getApplyReason() {
	245	+ return applyReason;
	246	+ }
	247	+
	248	+ public void setApplyReason(String applyReason) {
	249	+ this.applyReason = applyReason;
	250	+ }
	251	+
	252	+ public String getApplyMemo() {
	253	+ return applyMemo;
	254	+ }
	255	+
	256	+ public void setApplyMemo(String applyMemo) {
	257	+ this.applyMemo = applyMemo;
	258	+ }
	259	+
	260	+ public ClaimsDemand getApplyDemand() {
	261	+ return applyDemand;
	262	+ }
	263	+
	264	+ public void setApplyDemand(ClaimsDemand applyDemand) {
	265	+ this.applyDemand = applyDemand;
	266	+ }
	267	+
	268	+ public String getApplyImgUrls() {
	269	+ return applyImgUrls;
	270	+ }
	271	+
	272	+ public void setApplyImgUrls(String applyImgUrls) {
	273	+ this.applyImgUrls = applyImgUrls;
	274	+ }
	275	+
	276	+ public Date getCreateTime() {
	277	+ return createTime;
	278	+ }
	279	+
	280	+ public void setCreateTime(Date createTime) {
	281	+ this.createTime = createTime;
	282	+ }
	283	+
	284	+ public Long getAuditUserId() {
	285	+ return auditUserId;
	286	+ }
	287	+
	288	+ public void setAuditUserId(Long auditUserId) {
	289	+ this.auditUserId = auditUserId;
	290	+ }
	291	+
	292	+ public String getAuditUserName() {
	293	+ return auditUserName;
	294	+ }
	295	+
	296	+ public void setAuditUserName(String auditUserName) {
	297	+ this.auditUserName = auditUserName;
	298	+ }
	299	+
	300	+ public String getAuditComment() {
	301	+ return auditComment;
	302	+ }
	303	+
	304	+ public void setAuditComment(String auditComment) {
	305	+ this.auditComment = auditComment;
	306	+ }
	307	+
	308	+ public Long getAuditPrice() {
	309	+ return auditPrice;
	310	+ }
	311	+
	312	+ public void setAuditPrice(Long auditPrice) {
	313	+ this.auditPrice = auditPrice;
	314	+ }
	315	+
	316	+ public ClaimsDemand getAuditResult() {
	317	+ return auditResult;
	318	+ }
	319	+
	320	+ public void setAuditResult(ClaimsDemand auditResult) {
	321	+ this.auditResult = auditResult;
	322	+ }
	323	+
	324	+ public Date getAuditTime() {
	325	+ return auditTime;
	326	+ }
	327	+
	328	+ public void setAuditTime(Date auditTime) {
	329	+ this.auditTime = auditTime;
	330	+ }
	331	+
	332	+ public String getAuditImgUrls() {
	333	+ return auditImgUrls;
	334	+ }
	335	+
	336	+ public void setAuditImgUrls(String auditImgUrls) {
	337	+ this.auditImgUrls = auditImgUrls;
	338	+ }
	339	+}
...	...

orders-client/src/main/java/com/diligrp/orders/client/domain/output/DelayPaymentInfo.java 0 → 100644

View file @06cb985

	1	+++ a/orders-client/src/main/java/com/diligrp/orders/client/domain/output/DelayPaymentInfo.java
	1	+package com.diligrp.orders.client.domain.output;
	2	+
	3	+import java.util.Date;
	4	+
	5	+/**
	6	+ *
	7	+ * 订单延期结算信息
	8	+ */
	9	+public class DelayPaymentInfo {
	10	+
	11	+ /** 订单ID */
	12	+ private Long orderId;
	13	+ /** 总可用延期次数 */
	14	+ private Integer delayTotalNum = 0;
	15	+ /** 已使用延期次数 */
	16	+ private Integer delayedNum = 0;
	17	+ /** 当前订单最后有效期(到此时间系统将自动结算订单) */
	18	+ private Date currDelayLastTime;
	19	+ /** 当前服务器时间 */
	20	+ private Date serverTime = new Date();
	21	+
	22	+ public Long getOrderId() {
	23	+ return orderId;
	24	+ }
	25	+
	26	+ public void setOrderId(Long orderId) {
	27	+ this.orderId = orderId;
	28	+ }
	29	+
	30	+
	31	+ public Integer getDelayTotalNum() {
	32	+ return delayTotalNum;
	33	+ }
	34	+
	35	+
	36	+ public void setDelayTotalNum(Integer delayTotalNum) {
	37	+ this.delayTotalNum = delayTotalNum;
	38	+ }
	39	+
	40	+
	41	+ public Integer getDelayedNum() {
	42	+ return delayedNum;
	43	+ }
	44	+
	45	+
	46	+ public void setDelayedNum(Integer delayedNum) {
	47	+ this.delayedNum = delayedNum;
	48	+ }
	49	+
	50	+
	51	+ public Date getCurrDelayLastTime() {
	52	+ return currDelayLastTime;
	53	+ }
	54	+
	55	+
	56	+ public void setCurrDelayLastTime(Date currDelayLastTime) {
	57	+ this.currDelayLastTime = currDelayLastTime;
	58	+ }
	59	+
	60	+
	61	+ public Date getServerTime() {
	62	+ return serverTime;
	63	+ }
	64	+
	65	+
	66	+ public void setServerTime(Date serverTime) {
	67	+ this.serverTime = serverTime;
	68	+ }
	69	+}
...	...

orders-client/src/main/java/com/diligrp/orders/client/domain/output/LogisticsRelatedOrders.java 0 → 100644

View file @06cb985

	1	+++ a/orders-client/src/main/java/com/diligrp/orders/client/domain/output/LogisticsRelatedOrders.java
	1	+
	2	+package com.diligrp.orders.client.domain.output;
	3	+
	4	+
	5	+import java.util.List;
	6	+
	7	+/**
	8	+ * 物流关联订单
	9	+ * @createTime 2015年12月23日
	10	+ * @author zhangshirui
	11	+ */
	12	+
	13	+public class LogisticsRelatedOrders {
	14	+
	15	+ /** 商品订单列表*/
	16	+ private List<OrderDetailInfo> orderList;
	17	+
	18	+ public List<OrderDetailInfo> getOrderList() {
	19	+ return orderList;
	20	+ }
	21	+ public void setOrderList(List<OrderDetailInfo> orderList) {
	22	+ this.orderList = orderList;
	23	+ }
	24	+}
	25	+
...	...

orders-client/src/main/java/com/diligrp/orders/client/domain/output/OrderBrokerageInfo.java 0 → 100644

View file @06cb985

	1	+++ a/orders-client/src/main/java/com/diligrp/orders/client/domain/output/OrderBrokerageInfo.java
	1	+package com.diligrp.orders.client.domain.output;
	2	+
	3	+import lombok.Data;
	4	+import lombok.NoArgsConstructor;
	5	+
	6	+/**
	7	+ * <B>订单的佣金</B>
	8	+ * <B>Copyright</B>
	9	+ * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
	10	+ * <B>地利集团</B>
	11	+ *
	12	+ * @author yuehongbo
	13	+ * @createTime 2016/9/21 17:48
	14	+ */
	15	+@NoArgsConstructor
	16	+@Data
	17	+public class OrderBrokerageInfo {
	18	+ /**
	19	+ * 佣金比例格式为：百分之N
	20	+ */
	21	+ private String rate;
	22	+ /**
	23	+ * 佣金
	24	+ */
	25	+ private Long brokerage;
	26	+
	27	+ public String getRate() {
	28	+ return rate;
	29	+ }
	30	+
	31	+ public void setRate(String rate) {
	32	+ this.rate = rate;
	33	+ }
	34	+
	35	+ public Long getBrokerage() {
	36	+ return brokerage;
	37	+ }
	38	+
	39	+ public void setBrokerage(Long brokerage) {
	40	+ this.brokerage = brokerage;
	41	+ }
	42	+}
...	...

orders-client/src/main/java/com/diligrp/orders/client/domain/output/OrderDescriptionInfo.java 0 → 100644

View file @06cb985

	1	+++ a/orders-client/src/main/java/com/diligrp/orders/client/domain/output/OrderDescriptionInfo.java
	1	+package com.diligrp.orders.client.domain.output;
	2	+
	3	+import java.util.Date;
	4	+import java.util.LinkedList;
	5	+import java.util.List;
	6	+
	7	+/**
	8	+ * 订单详情信息
	9	+ */
	10	+public class OrderDescriptionInfo {
	11	+
	12	+ /** 订单流程节点创建时间信息 */
	13	+ private List<Date> orderProcess = new LinkedList<Date>();
	14	+ /** 订单描述信息 */
	15	+ private String orderDes = "";
	16	+
	17	+ public String getOrderDes() {
	18	+ return orderDes;
	19	+ }
	20	+
	21	+ public void setOrderDes(String orderDes) {
	22	+ this.orderDes = orderDes;
	23	+ }
	24	+
	25	+ public List<Date> getOrderProcess() {
	26	+ return orderProcess;
	27	+ }
	28	+
	29	+ public void setOrderProcess(List<Date> orderProcess) {
	30	+ this.orderProcess = orderProcess;
	31	+ }
	32	+
	33	+}
...	...

orders-client/src/main/java/com/diligrp/orders/client/domain/output/OrderDetailInfo.java 0 → 100644

View file @06cb985

	1	+++ a/orders-client/src/main/java/com/diligrp/orders/client/domain/output/OrderDetailInfo.java
	1	+package com.diligrp.orders.client.domain.output;
	2	+
	3	+import lombok.Getter;
	4	+import lombok.NoArgsConstructor;
	5	+import lombok.Setter;
	6	+
	7	+import java.util.ArrayList;
	8	+import java.util.LinkedList;
	9	+import java.util.List;
	10	+
	11	+/**
	12	+ * 订单详情信息
	13	+ */
	14	+@NoArgsConstructor
	15	+@Getter
	16	+@Setter
	17	+public class OrderDetailInfo extends OrderInfo {
	18	+
	19	+ /** 订单商品项 */
	20	+ private List<OrderItemInfo> orderItemList = new LinkedList<>();
	21	+ /** 是否已评论,1是,0否 */
	22	+ private int isCommented;
	23	+ /*发货信息/
	24	+ private List<ShipInfo> shipInfoList=new ArrayList<ShipInfo>();
	25	+ /** 订单的收货人 */
	26	+ private OrderReceiverInfo orderReceiverInfo;
	27	+ /*订单的汇款信息/
	28	+ private OrderRemitRecord remitRecord;
	29	+ /** 订单的佣金信息 */
	30	+ private OrderBrokerageInfo orderBrokerage;
	31	+
	32	+ public List<OrderItemInfo> getOrderItemList() {
	33	+ return orderItemList;
	34	+ }
	35	+
	36	+ public void setOrderItemList(List<OrderItemInfo> orderItemList) {
	37	+ this.orderItemList = orderItemList;
	38	+ }
	39	+
	40	+ public int getIsCommented() {
	41	+ return isCommented;
	42	+ }
	43	+
	44	+ public void setIsCommented(int isCommented) {
	45	+ this.isCommented = isCommented;
	46	+ }
	47	+
	48	+ public List<ShipInfo> getShipInfoList() {
	49	+ return shipInfoList;
	50	+ }
	51	+
	52	+ public void setShipInfoList(List<ShipInfo> shipInfoList) {
	53	+ this.shipInfoList = shipInfoList;
	54	+ }
	55	+
	56	+ public OrderReceiverInfo getOrderReceiverInfo() {
	57	+ return orderReceiverInfo;
	58	+ }
	59	+
	60	+ public void setOrderReceiverInfo(OrderReceiverInfo orderReceiverInfo) {
	61	+ this.orderReceiverInfo = orderReceiverInfo;
	62	+ }
	63	+
	64	+ public OrderRemitRecord getRemitRecord() {
	65	+ return remitRecord;
	66	+ }
	67	+
	68	+ public void setRemitRecord(OrderRemitRecord remitRecord) {
	69	+ this.remitRecord = remitRecord;
	70	+ }
	71	+
	72	+ public OrderBrokerageInfo getOrderBrokerage() {
	73	+ return orderBrokerage;
	74	+ }
	75	+
	76	+ public void setOrderBrokerage(OrderBrokerageInfo orderBrokerage) {
	77	+ this.orderBrokerage = orderBrokerage;
	78	+ }
	79	+}
...	...

orders-client/src/main/java/com/diligrp/orders/client/domain/output/OrderInfo.java 0 → 100644

View file @06cb985

	1	+++ a/orders-client/src/main/java/com/diligrp/orders/client/domain/output/OrderInfo.java
	1	+package com.diligrp.orders.client.domain.output;
	2	+
	3	+import lombok.Data;
	4	+
	5	+import java.util.Date;
	6	+
	7	+/**
	8	+ * 订单信息
	9	+ */
	10	+@Data
	11	+public class OrderInfo {
	12	+ /** 店铺ID */
	13	+ private Long shopId;
	14	+ /** 店铺名称 */
	15	+ private String shopName;
	16	+ /** 订单ID */
	17	+ private Long orderId;
	18	+ /** 订单交易号(线上付款时有效) */
	19	+ private String tradeNo;
	20	+ /** 买家ID */
	21	+ private Long buyerId;
	22	+ /** 买家姓名 */
	23	+ private String buyerName;
	24	+ /** 卖家ID */
	25	+ private Long sellerId;
	26	+ /** 卖家姓名 */
	27	+ private String sellerName;
	28	+ /** 市场ID */
	29	+ private Long marketId;
	30	+ /** 市场名称 */
	31	+ private String marketName;
	32	+ /** 订单状态:(10待付款，15待审核(赊账付款有效)，20待备货(不再使用)，30备货中，40待提货，45待收货，50交易完成,60已过期,70已取消,80申请退款中，90已退款，100提货超时) */
	33	+ private Integer orderStatus;
	34	+ /** 订单状态名称 */
	35	+ private String orderStatusName;
	36	+ /** 订单支付状态:(10未付款，20已付款) */
	37	+ private Integer payStatus;
	38	+ /** 订单支付状态名称 */
	39	+ private String payStatusName;
	40	+ /** 10自营/代销订单,30第三方订单 */
	41	+ private Integer orderType;
	42	+
	43	+ /** 配送方式：10：上门自提，20送货上门 */
	44	+ private Integer deliveryType;
	45	+ /** 配送方式名称 */
	46	+ private String deliveryTypeName;
	47	+ /** 发货地址 */
	48	+ private String shipingAddress;
	49	+ /** 物流及验收备注 */
	50	+ private String logisticsRemarks;
	51	+
	52	+ /** 买家提交备注信息 */
	53	+ private String buyerMemo;
	54	+ // 支付信息start-----------
	55	+ /** 付款方式 :(线上付款10，线下付款20，提货付款30，40赊账付款) */
	56	+ private Integer payType;
	57	+ /** 付款方式名称 */
	58	+ private String payTypeName;
	59	+
	60	+ /** 订单总金额(最新商品总金额 + 最新运费),单位：分 */
	61	+ private Long orderTotalPrice;
	62	+ /** 订单应支付金额(最新商品总金额 + 最新运费 - 优惠金额 - 抵消余额),单位：分 */
	63	+ private Long orderRealPrice;
	64	+ /** 优惠金额单位：分*/
	65	+ private Long privilegePrice;
	66	+ /** 抵消余额单位：分*/
	67	+ private Long offsetPrice;
	68	+ /** 已付金额单位：分*/
	69	+ private Long paidPrice;
	70	+ /** 未付金额单位：分 */
	71	+ private Long unpaidPrice;
	72	+ /** 退款金额单位：分 */
	73	+ private Long refundPrice;
	74	+ /** 最新运费单位：分当前运费 */
	75	+ private Long postagePrice;
	76	+ /** 原始运费单位：分订单第一次提交时提交的运费*/
	77	+ private Long postagePriceOriginal;
	78	+ /** 最新商品总金额,单位：分当前商品总金额*/
	79	+ private Long productsTotalPrice;
	80	+ /** 原始商品总金额单位：分订单第一次提交时提交的商品金额*/
	81	+ private Long productsTotalPriceOriginal;
	82	+
	83	+ // 支付信息end-----------
	84	+ //时间信息start-------------
	85	+ /** 订单提交时间 */
	86	+ private Date createTime;
	87	+ /** 确认收货时间 */
	88	+ private Date receiveTime;
	89	+ /** 订单支付时间 */
	90	+ private Date payTime;
	91	+ /** 预约提货时间(开始) */
	92	+ private Date reservationSTime;
	93	+ /** 订单开始备货时间(备货中) */
	94	+ private Date stockingInTime;
	95	+ /** 订单备货完成时间 */
	96	+ private Date stockingCompleteTime;
	97	+ /** 订单确认提货时间(完成交易) */
	98	+ private Date buyerConfirmTime;
	99	+ /** 预约提货时间(结束) */
	100	+ private Date reservationFTime;
	101	+ /** 买卖对接订单-最晚提货时间(备货完成状态时有效) */
	102	+ private Date latestDeliveryTime;
	103	+ /** 订单当前状态最晚有效时间(计划流出时间)。如：待付款时为最晚支付时间;待提货时为最晚提货时间；申请退款中时为最晚审核退款申请时间 */
	104	+ private Date orderStatusLastValidTime;
	105	+ /*订单当前状态流入时间/
	106	+ private Date orderStatusInTime;
	107	+ //时间信息end-------------
	108	+
	109	+ // 发票信息start-----------
	110	+ /** 发票类型:10不开票、20增值税、30普通发票 */
	111	+ private Integer invoiceType;
	112	+ /** 发票类型名称 */
	113	+ private String invoiceTypeName;
	114	+ /** 发票抬头 */
	115	+ private String invoiceTitle;
	116	+ /** 发票内容 */
	117	+ private String invoiceContent;
	118	+ /** 自营订单-线下付款-15位校验码 */
	119	+ private String identifyNo;
	120	+ /** 关联退款单ID,退款申请中时有值 */
	121	+ private Long reOrderId;
	122	+ /** 收提货验证码,备货或发货后生成*/
	123	+ private String deliveryVerCode;
	124	+ /** 订单来源值:PC:10,iOS:20,Android:30,Wap:40*/
	125	+ private Integer comeFrom;
	126	+ /** 订单来源名字*/
	127	+ private String comeFromName;
	128	+ /** 是否允许申请退款 */
	129	+ private boolean refundFlag;
	130	+ /** 订单商品重量*/
	131	+ private Long goodsWeight;
	132	+ /*交易担保，交割保：10，不需要担保：20，其他：30/
	133	+ private Integer warrantType;
	134	+
	135	+ /** 理赔申请中的ID*/
	136	+ private Long claimsApplyId;
	137	+ /** 是否允许理赔*/
	138	+ private boolean claimsFlag;
	139	+
	140	+ public Long getShopId() {
	141	+ return shopId;
	142	+ }
	143	+
	144	+ public void setShopId(Long shopId) {
	145	+ this.shopId = shopId;
	146	+ }
	147	+
	148	+ public String getShopName() {
	149	+ return shopName;
	150	+ }
	151	+
	152	+ public void setShopName(String shopName) {
	153	+ this.shopName = shopName;
	154	+ }
	155	+
	156	+ public Long getOrderId() {
	157	+ return orderId;
	158	+ }
	159	+
	160	+ public void setOrderId(Long orderId) {
	161	+ this.orderId = orderId;
	162	+ }
	163	+
	164	+ public String getTradeNo() {
	165	+ return tradeNo;
	166	+ }
	167	+
	168	+ public void setTradeNo(String tradeNo) {
	169	+ this.tradeNo = tradeNo;
	170	+ }
	171	+
	172	+ public Long getBuyerId() {
	173	+ return buyerId;
	174	+ }
	175	+
	176	+ public void setBuyerId(Long buyerId) {
	177	+ this.buyerId = buyerId;
	178	+ }
	179	+
	180	+ public String getBuyerName() {
	181	+ return buyerName;
	182	+ }
	183	+
	184	+ public void setBuyerName(String buyerName) {
	185	+ this.buyerName = buyerName;
	186	+ }
	187	+
	188	+ public Long getSellerId() {
	189	+ return sellerId;
	190	+ }
	191	+
	192	+ public void setSellerId(Long sellerId) {
	193	+ this.sellerId = sellerId;
	194	+ }
	195	+
	196	+ public String getSellerName() {
	197	+ return sellerName;
	198	+ }
	199	+
	200	+ public void setSellerName(String sellerName) {
	201	+ this.sellerName = sellerName;
	202	+ }
	203	+
	204	+ public Long getMarketId() {
	205	+ return marketId;
	206	+ }
	207	+
	208	+ public void setMarketId(Long marketId) {
	209	+ this.marketId = marketId;
	210	+ }
	211	+
	212	+ public String getMarketName() {
	213	+ return marketName;
	214	+ }
	215	+
	216	+ public void setMarketName(String marketName) {
	217	+ this.marketName = marketName;
	218	+ }
	219	+
	220	+ public Integer getOrderStatus() {
	221	+ return orderStatus;
	222	+ }
	223	+
	224	+ public void setOrderStatus(Integer orderStatus) {
	225	+ this.orderStatus = orderStatus;
	226	+ }
	227	+
	228	+ public String getOrderStatusName() {
	229	+ return orderStatusName;
	230	+ }
	231	+
	232	+ public void setOrderStatusName(String orderStatusName) {
	233	+ this.orderStatusName = orderStatusName;
	234	+ }
	235	+
	236	+ public Integer getPayStatus() {
	237	+ return payStatus;
	238	+ }
	239	+
	240	+ public void setPayStatus(Integer payStatus) {
	241	+ this.payStatus = payStatus;
	242	+ }
	243	+
	244	+ public String getPayStatusName() {
	245	+ return payStatusName;
	246	+ }
	247	+
	248	+ public void setPayStatusName(String payStatusName) {
	249	+ this.payStatusName = payStatusName;
	250	+ }
	251	+
	252	+ public Integer getOrderType() {
	253	+ return orderType;
	254	+ }
	255	+
	256	+ public void setOrderType(Integer orderType) {
	257	+ this.orderType = orderType;
	258	+ }
	259	+
	260	+ public Integer getDeliveryType() {
	261	+ return deliveryType;
	262	+ }
	263	+
	264	+ public void setDeliveryType(Integer deliveryType) {
	265	+ this.deliveryType = deliveryType;
	266	+ }
	267	+
	268	+ public String getDeliveryTypeName() {
	269	+ return deliveryTypeName;
	270	+ }
	271	+
	272	+ public void setDeliveryTypeName(String deliveryTypeName) {
	273	+ this.deliveryTypeName = deliveryTypeName;
	274	+ }
	275	+
	276	+ public String getShipingAddress() {
	277	+ return shipingAddress;
	278	+ }
	279	+
	280	+ public void setShipingAddress(String shipingAddress) {
	281	+ this.shipingAddress = shipingAddress;
	282	+ }
	283	+
	284	+ public String getLogisticsRemarks() {
	285	+ return logisticsRemarks;
	286	+ }
	287	+
	288	+ public void setLogisticsRemarks(String logisticsRemarks) {
	289	+ this.logisticsRemarks = logisticsRemarks;
	290	+ }
	291	+
	292	+ public String getBuyerMemo() {
	293	+ return buyerMemo;
	294	+ }
	295	+
	296	+ public void setBuyerMemo(String buyerMemo) {
	297	+ this.buyerMemo = buyerMemo;
	298	+ }
	299	+
	300	+ public Integer getPayType() {
	301	+ return payType;
	302	+ }
	303	+
	304	+ public void setPayType(Integer payType) {
	305	+ this.payType = payType;
	306	+ }
	307	+
	308	+ public String getPayTypeName() {
	309	+ return payTypeName;
	310	+ }
	311	+
	312	+ public void setPayTypeName(String payTypeName) {
	313	+ this.payTypeName = payTypeName;
	314	+ }
	315	+
	316	+ public Long getOrderTotalPrice() {
	317	+ return orderTotalPrice;
	318	+ }
	319	+
	320	+ public void setOrderTotalPrice(Long orderTotalPrice) {
	321	+ this.orderTotalPrice = orderTotalPrice;
	322	+ }
	323	+
	324	+ public Long getOrderRealPrice() {
	325	+ return orderRealPrice;
	326	+ }
	327	+
	328	+ public void setOrderRealPrice(Long orderRealPrice) {
	329	+ this.orderRealPrice = orderRealPrice;
	330	+ }
	331	+
	332	+ public Long getPrivilegePrice() {
	333	+ return privilegePrice;
	334	+ }
	335	+
	336	+ public void setPrivilegePrice(Long privilegePrice) {
	337	+ this.privilegePrice = privilegePrice;
	338	+ }
	339	+
	340	+ public Long getOffsetPrice() {
	341	+ return offsetPrice;
	342	+ }
	343	+
	344	+ public void setOffsetPrice(Long offsetPrice) {
	345	+ this.offsetPrice = offsetPrice;
	346	+ }
	347	+
	348	+ public Long getPaidPrice() {
	349	+ return paidPrice;
	350	+ }
	351	+
	352	+ public void setPaidPrice(Long paidPrice) {
	353	+ this.paidPrice = paidPrice;
	354	+ }
	355	+
	356	+ public Long getUnpaidPrice() {
	357	+ return unpaidPrice;
	358	+ }
	359	+
	360	+ public void setUnpaidPrice(Long unpaidPrice) {
	361	+ this.unpaidPrice = unpaidPrice;
	362	+ }
	363	+
	364	+ public Long getRefundPrice() {
	365	+ return refundPrice;
	366	+ }
	367	+
	368	+ public void setRefundPrice(Long refundPrice) {
	369	+ this.refundPrice = refundPrice;
	370	+ }
	371	+
	372	+ public Long getPostagePrice() {
	373	+ return postagePrice;
	374	+ }
	375	+
	376	+ public void setPostagePrice(Long postagePrice) {
	377	+ this.postagePrice = postagePrice;
	378	+ }
	379	+
	380	+ public Long getPostagePriceOriginal() {
	381	+ return postagePriceOriginal;
	382	+ }
	383	+
	384	+ public void setPostagePriceOriginal(Long postagePriceOriginal) {
	385	+ this.postagePriceOriginal = postagePriceOriginal;
	386	+ }
	387	+
	388	+ public Long getProductsTotalPrice() {
	389	+ return productsTotalPrice;
	390	+ }
	391	+
	392	+ public void setProductsTotalPrice(Long productsTotalPrice) {
	393	+ this.productsTotalPrice = productsTotalPrice;
	394	+ }
	395	+
	396	+ public Long getProductsTotalPriceOriginal() {
	397	+ return productsTotalPriceOriginal;
	398	+ }
	399	+
	400	+ public void setProductsTotalPriceOriginal(Long productsTotalPriceOriginal) {
	401	+ this.productsTotalPriceOriginal = productsTotalPriceOriginal;
	402	+ }
	403	+
	404	+ public Date getCreateTime() {
	405	+ return createTime;
	406	+ }
	407	+
	408	+ public void setCreateTime(Date createTime) {
	409	+ this.createTime = createTime;
	410	+ }
	411	+
	412	+ public Date getReceiveTime() {
	413	+ return receiveTime;
	414	+ }
	415	+
	416	+ public void setReceiveTime(Date receiveTime) {
	417	+ this.receiveTime = receiveTime;
	418	+ }
	419	+
	420	+ public Date getPayTime() {
	421	+ return payTime;
	422	+ }
	423	+
	424	+ public void setPayTime(Date payTime) {
	425	+ this.payTime = payTime;
	426	+ }
	427	+
	428	+ public Date getReservationSTime() {
	429	+ return reservationSTime;
	430	+ }
	431	+
	432	+ public void setReservationSTime(Date reservationSTime) {
	433	+ this.reservationSTime = reservationSTime;
	434	+ }
	435	+
	436	+ public Date getStockingInTime() {
	437	+ return stockingInTime;
	438	+ }
	439	+
	440	+ public void setStockingInTime(Date stockingInTime) {
	441	+ this.stockingInTime = stockingInTime;
	442	+ }
	443	+
	444	+ public Date getStockingCompleteTime() {
	445	+ return stockingCompleteTime;
	446	+ }
	447	+
	448	+ public void setStockingCompleteTime(Date stockingCompleteTime) {
	449	+ this.stockingCompleteTime = stockingCompleteTime;
	450	+ }
	451	+
	452	+ public Date getBuyerConfirmTime() {
	453	+ return buyerConfirmTime;
	454	+ }
	455	+
	456	+ public void setBuyerConfirmTime(Date buyerConfirmTime) {
	457	+ this.buyerConfirmTime = buyerConfirmTime;
	458	+ }
	459	+
	460	+ public Date getReservationFTime() {
	461	+ return reservationFTime;
	462	+ }
	463	+
	464	+ public void setReservationFTime(Date reservationFTime) {
	465	+ this.reservationFTime = reservationFTime;
	466	+ }
	467	+
	468	+ public Date getLatestDeliveryTime() {
	469	+ return latestDeliveryTime;
	470	+ }
	471	+
	472	+ public void setLatestDeliveryTime(Date latestDeliveryTime) {
	473	+ this.latestDeliveryTime = latestDeliveryTime;
	474	+ }
	475	+
	476	+ public Date getOrderStatusLastValidTime() {
	477	+ return orderStatusLastValidTime;
	478	+ }
	479	+
	480	+ public void setOrderStatusLastValidTime(Date orderStatusLastValidTime) {
	481	+ this.orderStatusLastValidTime = orderStatusLastValidTime;
	482	+ }
	483	+
	484	+ public Date getOrderStatusInTime() {
	485	+ return orderStatusInTime;
	486	+ }
	487	+
	488	+ public void setOrderStatusInTime(Date orderStatusInTime) {
	489	+ this.orderStatusInTime = orderStatusInTime;
	490	+ }
	491	+
	492	+ public Integer getInvoiceType() {
	493	+ return invoiceType;
	494	+ }
	495	+
	496	+ public void setInvoiceType(Integer invoiceType) {
	497	+ this.invoiceType = invoiceType;
	498	+ }
	499	+
	500	+ public String getInvoiceTypeName() {
	501	+ return invoiceTypeName;
	502	+ }
	503	+
	504	+ public void setInvoiceTypeName(String invoiceTypeName) {
	505	+ this.invoiceTypeName = invoiceTypeName;
	506	+ }
	507	+
	508	+ public String getInvoiceTitle() {
	509	+ return invoiceTitle;
	510	+ }
	511	+
	512	+ public void setInvoiceTitle(String invoiceTitle) {
	513	+ this.invoiceTitle = invoiceTitle;
	514	+ }
	515	+
	516	+ public String getInvoiceContent() {
	517	+ return invoiceContent;
	518	+ }
	519	+
	520	+ public void setInvoiceContent(String invoiceContent) {
	521	+ this.invoiceContent = invoiceContent;
	522	+ }
	523	+
	524	+ public String getIdentifyNo() {
	525	+ return identifyNo;
	526	+ }
	527	+
	528	+ public void setIdentifyNo(String identifyNo) {
	529	+ this.identifyNo = identifyNo;
	530	+ }
	531	+
	532	+ public Long getReOrderId() {
	533	+ return reOrderId;
	534	+ }
	535	+
	536	+ public void setReOrderId(Long reOrderId) {
	537	+ this.reOrderId = reOrderId;
	538	+ }
	539	+
	540	+ public String getDeliveryVerCode() {
	541	+ return deliveryVerCode;
	542	+ }
	543	+
	544	+ public void setDeliveryVerCode(String deliveryVerCode) {
	545	+ this.deliveryVerCode = deliveryVerCode;
	546	+ }
	547	+
	548	+ public Integer getComeFrom() {
	549	+ return comeFrom;
	550	+ }
	551	+
	552	+ public void setComeFrom(Integer comeFrom) {
	553	+ this.comeFrom = comeFrom;
	554	+ }
	555	+
	556	+ public String getComeFromName() {
	557	+ return comeFromName;
	558	+ }
	559	+
	560	+ public void setComeFromName(String comeFromName) {
	561	+ this.comeFromName = comeFromName;
	562	+ }
	563	+
	564	+ public boolean isRefundFlag() {
	565	+ return refundFlag;
	566	+ }
	567	+
	568	+ public void setRefundFlag(boolean refundFlag) {
	569	+ this.refundFlag = refundFlag;
	570	+ }
	571	+
	572	+ public Long getGoodsWeight() {
	573	+ return goodsWeight;
	574	+ }
	575	+
	576	+ public void setGoodsWeight(Long goodsWeight) {
	577	+ this.goodsWeight = goodsWeight;
	578	+ }
	579	+
	580	+ public Integer getWarrantType() {
	581	+ return warrantType;
	582	+ }
	583	+
	584	+ public void setWarrantType(Integer warrantType) {
	585	+ this.warrantType = warrantType;
	586	+ }
	587	+
	588	+ public Long getClaimsApplyId() {
	589	+ return claimsApplyId;
	590	+ }
	591	+
	592	+ public void setClaimsApplyId(Long claimsApplyId) {
	593	+ this.claimsApplyId = claimsApplyId;
	594	+ }
	595	+
	596	+ public boolean isClaimsFlag() {
	597	+ return claimsFlag;
	598	+ }
	599	+
	600	+ public void setClaimsFlag(boolean claimsFlag) {
	601	+ this.claimsFlag = claimsFlag;
	602	+ }
	603	+}
...	...

orders-client/src/main/java/com/diligrp/orders/client/domain/output/OrderItemInfo.java 0 → 100644

View file @06cb985

	1	+++ a/orders-client/src/main/java/com/diligrp/orders/client/domain/output/OrderItemInfo.java
	1	+package com.diligrp.orders.client.domain.output;
	2	+
	3	+import lombok.Data;
	4	+
	5	+import java.util.Map;
	6	+
	7	+
	8	+/**
	9	+ * 订单项输出信息
	10	+ */
	11	+@Data
	12	+public class OrderItemInfo {
	13	+ /** 商品sku */
	14	+ private String sku;
	15	+ /** 商品ID */
	16	+ private Long pid;
	17	+ /** 商品标题 */
	18	+ private String title;
	19	+ /** sku原始价格,单位：分 */
	20	+ private Long originalPrice;
	21	+ /** sku商品成交价格,单位：分 */
	22	+ private Long price;
	23	+ /** 购买数量 */
	24	+ private Integer amount;
	25	+ /** 当前库存数量 */
	26	+ private Integer stock;
	27	+ /** 市场ID */
	28	+ private Long marketId;
	29	+ /** 市场名称 */
	30	+ private String marketName;
	31	+ /** 卖方ID */
	32	+ private Long sellerId;
	33	+ /** 店铺ID */
	34	+ private Long shopId;
	35	+ /** 卖方姓名 */
	36	+ private String sellerName;
	37	+ /** 商品首图 */
	38	+ private String picture;
	39	+ /** 商品sku属性项列表 */
	40	+ private Map<String, String> attrs;
	41	+ /** 商品类型:10自营商品，20代销商品，30第三方卖家商品 */
	42	+ private Integer skuType;
	43	+ /** 预览-2，删除-1，待审核1，审核失败2，在售商品3,仓库中商品4 */
	44	+ private Integer skuStatus;
	45	+ /** 商品计价单位 */
	46	+ private String priceUnit;
	47	+ /** 商品项总价:min(amount,stock) * currPrice ,单位：分 */
	48	+ private Long totalPrice;
	49	+ /** 是否已评论,1是,0否 */
	50	+ private Integer isCommented;
	51	+ /** 订单ID */
	52	+ private Long orderId;
	53	+
	54	+ public String getSku() {
	55	+ return sku;
	56	+ }
	57	+
	58	+ public void setSku(String sku) {
	59	+ this.sku = sku;
	60	+ }
	61	+
	62	+ public Long getPid() {
	63	+ return pid;
	64	+ }
	65	+
	66	+ public void setPid(Long pid) {
	67	+ this.pid = pid;
	68	+ }
	69	+
	70	+ public String getTitle() {
	71	+ return title;
	72	+ }
	73	+
	74	+ public void setTitle(String title) {
	75	+ this.title = title;
	76	+ }
	77	+
	78	+ public Long getOriginalPrice() {
	79	+ return originalPrice;
	80	+ }
	81	+
	82	+ public void setOriginalPrice(Long originalPrice) {
	83	+ this.originalPrice = originalPrice;
	84	+ }
	85	+
	86	+ public Long getPrice() {
	87	+ return price;
	88	+ }
	89	+
	90	+ public void setPrice(Long price) {
	91	+ this.price = price;
	92	+ }
	93	+
	94	+ public Integer getAmount() {
	95	+ return amount;
	96	+ }
	97	+
	98	+ public void setAmount(Integer amount) {
	99	+ this.amount = amount;
	100	+ }
	101	+
	102	+ public Integer getStock() {
	103	+ return stock;
	104	+ }
	105	+
	106	+ public void setStock(Integer stock) {
	107	+ this.stock = stock;
	108	+ }
	109	+
	110	+ public Long getMarketId() {
	111	+ return marketId;
	112	+ }
	113	+
	114	+ public void setMarketId(Long marketId) {
	115	+ this.marketId = marketId;
	116	+ }
	117	+
	118	+ public String getMarketName() {
	119	+ return marketName;
	120	+ }
	121	+
	122	+ public void setMarketName(String marketName) {
	123	+ this.marketName = marketName;
	124	+ }
	125	+
	126	+ public Long getSellerId() {
	127	+ return sellerId;
	128	+ }
	129	+
	130	+ public void setSellerId(Long sellerId) {
	131	+ this.sellerId = sellerId;
	132	+ }
	133	+
	134	+ public Long getShopId() {
	135	+ return shopId;
	136	+ }
	137	+
	138	+ public void setShopId(Long shopId) {
	139	+ this.shopId = shopId;
	140	+ }
	141	+
	142	+ public String getSellerName() {
	143	+ return sellerName;
	144	+ }
	145	+
	146	+ public void setSellerName(String sellerName) {
	147	+ this.sellerName = sellerName;
	148	+ }
	149	+
	150	+ public String getPicture() {
	151	+ return picture;
	152	+ }
	153	+
	154	+ public void setPicture(String picture) {
	155	+ this.picture = picture;
	156	+ }
	157	+
	158	+ public Map<String, String> getAttrs() {
	159	+ return attrs;
	160	+ }
	161	+
	162	+ public void setAttrs(Map<String, String> attrs) {
	163	+ this.attrs = attrs;
	164	+ }
	165	+
	166	+ public Integer getSkuType() {
	167	+ return skuType;
	168	+ }
	169	+
	170	+ public void setSkuType(Integer skuType) {
	171	+ this.skuType = skuType;
	172	+ }
	173	+
	174	+ public Integer getSkuStatus() {
	175	+ return skuStatus;
	176	+ }
	177	+
	178	+ public void setSkuStatus(Integer skuStatus) {
	179	+ this.skuStatus = skuStatus;
	180	+ }
	181	+
	182	+ public String getPriceUnit() {
	183	+ return priceUnit;
	184	+ }
	185	+
	186	+ public void setPriceUnit(String priceUnit) {
	187	+ this.priceUnit = priceUnit;
	188	+ }
	189	+
	190	+ public Long getTotalPrice() {
	191	+ return totalPrice;
	192	+ }
	193	+
	194	+ public void setTotalPrice(Long totalPrice) {
	195	+ this.totalPrice = totalPrice;
	196	+ }
	197	+
	198	+ public Integer getIsCommented() {
	199	+ return isCommented;
	200	+ }
	201	+
	202	+ public void setIsCommented(Integer isCommented) {
	203	+ this.isCommented = isCommented;
	204	+ }
	205	+
	206	+ public Long getOrderId() {
	207	+ return orderId;
	208	+ }
	209	+
	210	+ public void setOrderId(Long orderId) {
	211	+ this.orderId = orderId;
	212	+ }
	213	+}
...	...

orders-client/src/main/java/com/diligrp/orders/client/domain/output/OrderOutInfo.java 0 → 100644

View file @06cb985

	1	+++ a/orders-client/src/main/java/com/diligrp/orders/client/domain/output/OrderOutInfo.java
	1	+
	2	+package com.diligrp.orders.client.domain.output;
	3	+
	4	+import java.util.Date;
	5	+import java.util.List;
	6	+
	7	+/**
	8	+ * 出厂订单信息
	9	+ * @createTime 2015年7月8日
	10	+ * @author zhangshirui
	11	+ */
	12	+
	13	+public class OrderOutInfo {
	14	+
	15	+ /** 出厂订单id */
	16	+ public Long id;
	17	+ /*买家id/
	18	+ private Long buyerId;
	19	+ /*订单id/
	20	+ private Long orderId;
	21	+ /*卖家id/
	22	+ private Long sellerId;
	23	+ /*卖家姓名/
	24	+ private String sellerName;
	25	+ /*店铺id/
	26	+ private Long shopId;
	27	+ /** 店铺名字*/
	28	+ private String shopName;
	29	+ /订单创建时间/
	30	+ private Date createTime;
	31	+ /*订单总价(实付金额)/
	32	+ private Long realTotalPrice;
	33	+ /*订单出厂时间/
	34	+ private Date outTime;
	35	+ /*出厂人姓名/
	36	+ private String outUserName;
	37	+ /** 付款方式 :(线上付款10，线下付款20，提货付款30，40赊账付款) */
	38	+ private Integer payType;
	39	+ /** 付款方式名称 */
	40	+ private String payTypeName;
	41	+ /** 订单商品项 */
	42	+ private List<OrderItemInfo> orderItemList;
	43	+
	44	+ public Long getBuyerId() {
	45	+ return buyerId;
	46	+ }
	47	+ public void setBuyerId(Long buyerId) {
	48	+ this.buyerId = buyerId;
	49	+ }
	50	+ public Long getOrderId() {
	51	+ return orderId;
	52	+ }
	53	+ public void setOrderId(Long orderId) {
	54	+ this.orderId = orderId;
	55	+ }
	56	+ public Long getSellerId() {
	57	+ return sellerId;
	58	+ }
	59	+ public void setSellerId(Long sellerId) {
	60	+ this.sellerId = sellerId;
	61	+ }
	62	+ public String getSellerName() {
	63	+ return sellerName;
	64	+ }
	65	+ public void setSellerName(String sellerName) {
	66	+ this.sellerName = sellerName;
	67	+ }
	68	+ public Long getShopId() {
	69	+ return shopId;
	70	+ }
	71	+ public void setShopId(Long shopId) {
	72	+ this.shopId = shopId;
	73	+ }
	74	+ public String getShopName() {
	75	+ return shopName;
	76	+ }
	77	+ public void setShopName(String shopName) {
	78	+ this.shopName = shopName;
	79	+ }
	80	+ public List<OrderItemInfo> getOrderItemList() {
	81	+ return orderItemList;
	82	+ }
	83	+ public void setOrderItemList(List<OrderItemInfo> orderItemList) {
	84	+ this.orderItemList = orderItemList;
	85	+ }
	86	+ public Long getId() {
	87	+ return id;
	88	+ }
	89	+ public void setId(Long id) {
	90	+ this.id = id;
	91	+ }
	92	+ public Date getCreateTime() {
	93	+ return createTime;
	94	+ }
	95	+ public void setCreateTime(Date createTime) {
	96	+ this.createTime = createTime;
	97	+ }
	98	+ public Long getRealTotalPrice() {
	99	+ return realTotalPrice;
	100	+ }
	101	+ public void setRealTotalPrice(Long realTotalPrice) {
	102	+ this.realTotalPrice = realTotalPrice;
	103	+ }
	104	+ public Date getOutTime() {
	105	+ return outTime;
	106	+ }
	107	+ public void setOutTime(Date outTime) {
	108	+ this.outTime = outTime;
	109	+ }
	110	+ public String getOutUserName() {
	111	+ return outUserName;
	112	+ }
	113	+ public void setOutUserName(String outUserName) {
	114	+ this.outUserName = outUserName;
	115	+ }
	116	+ public Integer getPayType() {
	117	+ return payType;
	118	+ }
	119	+ public void setPayType(Integer payType) {
	120	+ this.payType = payType;
	121	+ }
	122	+ public String getPayTypeName() {
	123	+ return payTypeName;
	124	+ }
	125	+ public void setPayTypeName(String payTypeName) {
	126	+ this.payTypeName = payTypeName;
	127	+ }
	128	+}
	129	+
...	...

orders-client/src/main/java/com/diligrp/orders/client/domain/output/OrderReceiverInfo.java 0 → 100644

View file @06cb985

	1	+++ a/orders-client/src/main/java/com/diligrp/orders/client/domain/output/OrderReceiverInfo.java
	1	+package com.diligrp.orders.client.domain.output;
	2	+
	3	+import lombok.Data;
	4	+
	5	+/**
	6	+ * 订单的收货人信息
	7	+ * Created by yuehongbo on 2016/8/5.
	8	+ */
	9	+@Data
	10	+public class OrderReceiverInfo {
	11	+
	12	+ /收货人姓名/
	13	+ private String receiverName;
	14	+ /收货人电话/
	15	+ private String receiverPhone;
	16	+ /收货人证件号/
	17	+ private String receiverIdcard;
	18	+ /收货人地址/
	19	+ private String receiverAddress;
	20	+ /实际收货人的姓名/
	21	+ private String realReceiverName;
	22	+ /实际收货人的电话/
	23	+ private String realReceiverPhone;
	24	+ /实际收货人证件号/
	25	+ private String realReceiverIdcard;
	26	+ /实际收货人地址/
	27	+ private String realReceiverAddress;
	28	+}
...	...

orders-client/src/main/java/com/diligrp/orders/client/domain/output/OrderRemitRecord.java 0 → 100644

View file @06cb985

	1	+++ a/orders-client/src/main/java/com/diligrp/orders/client/domain/output/OrderRemitRecord.java
	1	+package com.diligrp.orders.client.domain.output;
	2	+
	3	+import com.diligrp.orders.publics.enums.RemitAuditStatus;
	4	+import lombok.Data;
	5	+import lombok.Getter;
	6	+import lombok.NoArgsConstructor;
	7	+import lombok.Setter;
	8	+
	9	+import java.util.Date;
	10	+
	11	+/**
	12	+ * 订单的汇款信息
	13	+ * Created by yuehongbo on 2016/8/8.
	14	+ */
	15	+@Getter
	16	+@Setter
	17	+@NoArgsConstructor
	18	+public class OrderRemitRecord {
	19	+ //收款时间
	20	+ private Date receiptDate;
	21	+ //收款金额 (单位：分)
	22	+ private Long receiptAmount;
	23	+ //汇款人姓名
	24	+ private String remitPersonName;
	25	+ //汇款人账号或地址
	26	+ private String remitPersonInfo;
	27	+ //汇款凭证URL
	28	+ private String remitUrl;
	29	+ //汇款单的审核状态
	30	+ private RemitAuditStatus auditStatus;
	31	+
	32	+}
...	...

orders-client/src/main/java/com/diligrp/orders/client/domain/output/OrderTraceInfo.java 0 → 100644

View file @06cb985

	1	+++ a/orders-client/src/main/java/com/diligrp/orders/client/domain/output/OrderTraceInfo.java
	1	+/*
	2	+ * Copyright (c) 2014 www.diligrp.com All rights reserved.
	3	+ * 本软件源代码版权归----所有,未经许可不得任意复制与传播.
	4	+ */
	5	+package com.diligrp.orders.client.domain.output;
	6	+
	7	+import java.util.Date;
	8	+
	9	+/**
	10	+ * orderTraceInfo
	11	+ *
	12	+ * @author dev-center
	13	+ * @since 2014-05-19
	14	+ */
	15	+public class OrderTraceInfo {
	16	+ private Long orderId;
	17	+ private String traceInfo;
	18	+ private Long userId;
	19	+ private String userName;
	20	+ private Date createTime;
	21	+ private Integer traceType;
	22	+ private Integer orderStatus;
	23	+ private Integer payStatus;
	24	+ /**
	25	+ * 跟踪信息可见性
	26	+ */
	27	+ private Integer visibleLevel;
	28	+
	29	+ private String visibleLevelName;
	30	+
	31	+ public OrderTraceInfo() {
	32	+ // 默认无参构造方法
	33	+ }
	34	+
	35	+ public String getVisibleLevelName() {
	36	+ return visibleLevelName;
	37	+ }
	38	+
	39	+ public void setVisibleLevelName(String visibleLevelName) {
	40	+ this.visibleLevelName = visibleLevelName;
	41	+ }
	42	+
	43	+ /**
	44	+ * 获取 orderId
	45	+ *
	46	+ * @return
	47	+ */
	48	+ public Long getOrderId() {
	49	+ return orderId;
	50	+ }
	51	+
	52	+ /**
	53	+ * 设置 orderId
	54	+ *
	55	+ * @param orderId
	56	+ */
	57	+ public void setOrderId(Long orderId) {
	58	+ this.orderId = orderId;
	59	+ }
	60	+
	61	+ /**
	62	+ * 获取 traceInfo
	63	+ *
	64	+ * @return
	65	+ */
	66	+ public String getTraceInfo() {
	67	+ return traceInfo;
	68	+ }
	69	+
	70	+ /**
	71	+ * 设置 traceInfo
	72	+ *
	73	+ * @param traceInfo
	74	+ */
	75	+ public void setTraceInfo(String traceInfo) {
	76	+ this.traceInfo = traceInfo;
	77	+ }
	78	+
	79	+ /**
	80	+ * 获取 userId
	81	+ *
	82	+ * @return
	83	+ */
	84	+ public Long getUserId() {
	85	+ return userId;
	86	+ }
	87	+
	88	+ /**
	89	+ * 设置 userId
	90	+ *
	91	+ * @param userId
	92	+ */
	93	+ public void setUserId(Long userId) {
	94	+ this.userId = userId;
	95	+ }
	96	+
	97	+ /**
	98	+ * 获取 userName
	99	+ *
	100	+ * @return
	101	+ */
	102	+ public String getUserName() {
	103	+ return userName;
	104	+ }
	105	+
	106	+ /**
	107	+ * 设置 userName
	108	+ *
	109	+ * @param userName
	110	+ */
	111	+ public void setUserName(String userName) {
	112	+ this.userName = userName;
	113	+ }
	114	+
	115	+ /**
	116	+ * 获取 createTime
	117	+ *
	118	+ * @return
	119	+ */
	120	+ public Date getCreateTime() {
	121	+ return createTime;
	122	+ }
	123	+
	124	+ /**
	125	+ * 设置 createTime
	126	+ *
	127	+ * @param createTime
	128	+ */
	129	+ public void setCreateTime(Date createTime) {
	130	+ this.createTime = createTime;
	131	+ }
	132	+
	133	+ /**
	134	+ * 获取 traceType
	135	+ *
	136	+ * @return
	137	+ */
	138	+ public Integer getTraceType() {
	139	+ return traceType;
	140	+ }
	141	+
	142	+ /**
	143	+ * 设置 traceType
	144	+ *
	145	+ * @param traceType
	146	+ */
	147	+ public void setTraceType(Integer traceType) {
	148	+ this.traceType = traceType;
	149	+ }
	150	+
	151	+ public Integer getOrderStatus() {
	152	+ return orderStatus;
	153	+ }
	154	+
	155	+ public void setOrderStatus(Integer orderStatus) {
	156	+ this.orderStatus = orderStatus;
	157	+ }
	158	+
	159	+ public Integer getPayStatus() {
	160	+ return payStatus;
	161	+ }
	162	+
	163	+ public void setPayStatus(Integer payStatus) {
	164	+ this.payStatus = payStatus;
	165	+ }
	166	+
	167	+ public Integer getVisibleLevel() {
	168	+ return visibleLevel;
	169	+ }
	170	+
	171	+ public void setVisibleLevel(Integer visibleLevel) {
	172	+ this.visibleLevel = visibleLevel;
	173	+ }
	174	+
	175	+ @Override
	176	+ public String toString() {
	177	+ return "OrderTraceInfo [orderId=" + orderId + ", traceInfo=" + traceInfo + ", userId=" + userId + ", userName="
	178	+ + userName + ", createTime=" + createTime + ", traceType=" + traceType + ", orderStatus=" + orderStatus
	179	+ + ", payStatus=" + payStatus + ", visibleLevel=" + visibleLevel + ", visibleLevelName="
	180	+ + visibleLevelName + "]";
	181	+ }
	182	+
	183	+
	184	+
	185	+}
0	186	\ No newline at end of file
...	...

orders-client/src/main/java/com/diligrp/orders/client/domain/output/PageOutput.java 0 → 100644

View file @06cb985

	1	+++ a/orders-client/src/main/java/com/diligrp/orders/client/domain/output/PageOutput.java
	1	+/*
	2	+ * Copyright (c) 2014 www.diligrp.com All rights reserved.
	3	+ * 本软件源代码版权归----所有,未经许可不得任意复制与传播.
	4	+ */
	5	+package com.diligrp.orders.client.domain.output;
	6	+
	7	+import com.diligrp.orders.client.utils.ResultCode;
	8	+
	9	+/**
	10	+ * 分页输出对象
	11	+ * @author dev-center
	12	+ * @since 2014-05-10
	13	+ */
	14	+public class PageOutput<T> extends BaseOutput<T> {
	15	+
	16	+ /**
	17	+ * 页码，获取第page页数据
	18	+ */
	19	+ private int page;
	20	+ /**
	21	+ * 页大小，每页记录数
	22	+ */
	23	+ private int pageSize;
	24	+ /**
	25	+ * 总记录数
	26	+ */
	27	+ private int total;
	28	+
	29	+ @Override
	30	+ public T getData() {
	31	+ return super.getData();
	32	+ }
	33	+
	34	+ @Override
	35	+ public void setData(T data) {
	36	+ super.setData(data);
	37	+ }
	38	+
	39	+ /**
	40	+ * 页码，获取第page页数据
	41	+ */
	42	+ public int getPage() {
	43	+ return page;
	44	+ }
	45	+
	46	+ public void setPage(int page) {
	47	+ this.page = page;
	48	+ }
	49	+
	50	+ /**
	51	+ * 页大小，每页记录数
	52	+ */
	53	+ public int getPageSize() {
	54	+ return pageSize;
	55	+ }
	56	+
	57	+ public void setPageSize(int pageSize) {
	58	+ this.pageSize = pageSize;
	59	+ }
	60	+
	61	+ /**
	62	+ * 总记录数
	63	+ */
	64	+ public int getTotal() {
	65	+ return total;
	66	+ }
	67	+
	68	+ public void setTotal(int total) {
	69	+ this.total = total;
	70	+ }
	71	+
	72	+ // -----------------------------------------------------------------------------------
	73	+ public PageOutput() {
	74	+ }
	75	+
	76	+ public PageOutput(String code, String result) {
	77	+ super(code, result);
	78	+ }
	79	+
	80	+ public static <T> PageOutput<T> create(String code, String result) {
	81	+ return new PageOutput<T>(code, result);
	82	+ }
	83	+
	84	+ public static <T> PageOutput<T> success() {
	85	+ return success("OK");
	86	+ }
	87	+
	88	+ public static <T> PageOutput<T> success(String msg) {
	89	+ return create(ResultCode.OK, msg);
	90	+ }
	91	+
	92	+ public static <T> PageOutput<T> failure() {
	93	+ return failure("操作失败!");
	94	+ }
	95	+
	96	+ public static <T> PageOutput<T> failure(String msg) {
	97	+ return create(ResultCode.APP_ERROR, msg);
	98	+ }
	99	+
	100	+ @Override
	101	+ public String getCode() {
	102	+ return super.getCode();
	103	+ }
	104	+
	105	+ @Override
	106	+ public void setCode(String code) {
	107	+ super.setCode(code);
	108	+ }
	109	+
	110	+ @Override
	111	+ public String getResult() {
	112	+ return super.getResult();
	113	+ }
	114	+
	115	+ @Override
	116	+ public void setResult(String result) {
	117	+ super.setResult(result);
	118	+ }
	119	+}
...	...

orders-client/src/main/java/com/diligrp/orders/client/domain/output/RefundInfo.java 0 → 100644

View file @06cb985

	1	+++ a/orders-client/src/main/java/com/diligrp/orders/client/domain/output/RefundInfo.java
	1	+package com.diligrp.orders.client.domain.output;
	2	+
	3	+import com.diligrp.orders.publics.enums.AuditResult;
	4	+import com.diligrp.orders.publics.enums.ReOrderStatus;
	5	+
	6	+import java.util.ArrayList;
	7	+import java.util.Date;
	8	+import java.util.List;
	9	+
	10	+/**
	11	+ * 订单信息
	12	+ */
	13	+public class RefundInfo {
	14	+
	15	+ /** 退单ID */
	16	+ private long reOrderId;
	17	+ /** 退单状态：10卖家待审核，20卖家审核通过，30卖家审核不通过，40申请退款取消，50平台申诉处理中，60退款申诉成功，70退款申诉失败，80退款申诉取消 */
	18	+ private ReOrderStatus reOrderStatus;
	19	+ /** 退单状态：10卖家待审核，20卖家审核通过，30卖家审核不通过，40申请退款取消，50平台申诉处理中，60退款申诉成功，70退款申诉失败，80退款申诉取消 */
	20	+ private String reOrderStatusName;
	21	+ /** 申请退款金额,单位：分 */
	22	+ private long reApplyPrice;
	23	+ /** 申请退款提交时间 */
	24	+ private Date createTime;
	25	+ /** 申请退款说明 */
	26	+ private String applyMemo;
	27	+ /** 申请退款原因 */
	28	+ private String applyReason;
	29	+ /** 退款审核意见 */
	30	+ private String auditComment;
	31	+
	32	+ /** 原始订单信息 */
	33	+ private OrderDetailInfo orderInfo;
	34	+
	35	+ //退款申诉相关属性=======================
	36	+ /** 是否可发起退款申诉，0否，1是 */
	37	+ private Integer appealEnable;
	38	+ /** 退款申诉内容 */
	39	+ private String appealResaon;
	40	+ /** 退款申诉凭证 -图片url */
	41	+ private List<String> appealImgUrls = new ArrayList<>();
	42	+ /** 退款申诉审核意见 */
	43	+ private String auditAppealComment;
	44	+ /** 退款申诉金额 */
	45	+ private Long appealPrice;
	46	+ /** 退款申诉实际退款金额 */
	47	+ private Long appealRealPrice;
	48	+ /** 30-商品订单(第三方)，40-代购订单*/
	49	+ private Integer reOrderType;
	50	+ private AuditResult auditResult;
	51	+
	52	+ public long getReOrderId() {
	53	+ return reOrderId;
	54	+ }
	55	+
	56	+ public void setReOrderId(long reOrderId) {
	57	+ this.reOrderId = reOrderId;
	58	+ }
	59	+
	60	+ public ReOrderStatus getReOrderStatus() {
	61	+ return reOrderStatus;
	62	+ }
	63	+
	64	+ public void setReOrderStatus(ReOrderStatus reOrderStatus) {
	65	+ this.reOrderStatus = reOrderStatus;
	66	+ }
	67	+
	68	+ public long getReApplyPrice() {
	69	+ return reApplyPrice;
	70	+ }
	71	+
	72	+ public void setReApplyPrice(long reApplyPrice) {
	73	+ this.reApplyPrice = reApplyPrice;
	74	+ }
	75	+
	76	+ public Date getCreateTime() {
	77	+ return createTime;
	78	+ }
	79	+
	80	+ public void setCreateTime(Date createTime) {
	81	+ this.createTime = createTime;
	82	+ }
	83	+
	84	+ public String getReOrderStatusName() {
	85	+ return reOrderStatusName;
	86	+ }
	87	+
	88	+ public void setReOrderStatusName(String reOrderStatusName) {
	89	+ this.reOrderStatusName = reOrderStatusName;
	90	+ }
	91	+
	92	+ public String getApplyMemo() {
	93	+ return applyMemo;
	94	+ }
	95	+
	96	+ public void setApplyMemo(String applyMemo) {
	97	+ this.applyMemo = applyMemo;
	98	+ }
	99	+
	100	+ public String getApplyReason() {
	101	+ return applyReason;
	102	+ }
	103	+
	104	+ public void setApplyReason(String applyReason) {
	105	+ this.applyReason = applyReason;
	106	+ }
	107	+
	108	+ public OrderDetailInfo getOrderInfo() {
	109	+ return orderInfo;
	110	+ }
	111	+
	112	+ public void setOrderInfo(OrderDetailInfo orderInfo) {
	113	+ this.orderInfo = orderInfo;
	114	+ }
	115	+
	116	+ public String getAuditComment() {
	117	+ return auditComment;
	118	+ }
	119	+
	120	+ public void setAuditComment(String auditComment) {
	121	+ this.auditComment = auditComment;
	122	+ }
	123	+
	124	+ public Integer getAppealEnable() {
	125	+ return appealEnable;
	126	+ }
	127	+
	128	+ public void setAppealEnable(Integer appealEnable) {
	129	+ this.appealEnable = appealEnable;
	130	+ }
	131	+
	132	+ public String getAppealResaon() {
	133	+ return appealResaon;
	134	+ }
	135	+
	136	+ public void setAppealResaon(String appealResaon) {
	137	+ this.appealResaon = appealResaon;
	138	+ }
	139	+
	140	+ public List<String> getAppealImgUrls() {
	141	+ return appealImgUrls;
	142	+ }
	143	+
	144	+ public void setAppealImgUrls(List<String> appealImgUrls) {
	145	+ this.appealImgUrls = appealImgUrls;
	146	+ }
	147	+
	148	+ public String getAuditAppealComment() {
	149	+ return auditAppealComment;
	150	+ }
	151	+
	152	+ public void setAuditAppealComment(String auditAppealComment) {
	153	+ this.auditAppealComment = auditAppealComment;
	154	+ }
	155	+
	156	+ public Long getAppealPrice() {
	157	+ return appealPrice;
	158	+ }
	159	+
	160	+ public void setAppealPrice(Long appealPrice) {
	161	+ this.appealPrice = appealPrice;
	162	+ }
	163	+
	164	+ public Long getAppealRealPrice() {
	165	+ return appealRealPrice;
	166	+ }
	167	+
	168	+ public void setAppealRealPrice(Long appealRealPrice) {
	169	+ this.appealRealPrice = appealRealPrice;
	170	+ }
	171	+
	172	+
	173	+ public Integer getReOrderType() {
	174	+ return reOrderType;
	175	+ }
	176	+
	177	+ public void setReOrderType(Integer reOrderType) {
	178	+ this.reOrderType = reOrderType;
	179	+ }
	180	+
	181	+
	182	+ public void setAuditResult(AuditResult auditResult) {
	183	+ this.auditResult = auditResult;
	184	+ }
	185	+
	186	+ public AuditResult getAuditResult() {
	187	+ return auditResult;
	188	+ }
	189	+}
...	...

orders-client/src/main/java/com/diligrp/orders/client/domain/output/ShipInfo.java 0 → 100644

View file @06cb985

	1	+++ a/orders-client/src/main/java/com/diligrp/orders/client/domain/output/ShipInfo.java
	1	+package com.diligrp.orders.client.domain.output;
	2	+
	3	+/**
	4	+ *
	5	+ * 发货物流信息
	6	+ */
	7	+public class ShipInfo {
	8	+
	9	+ /** 司机姓名 */
	10	+ private String driverName;
	11	+
	12	+ /** 司机联系电话*/
	13	+ private String phone;
	14	+
	15	+ /** 车牌号码*/
	16	+ private String plateNumber;
	17	+ /*备注/
	18	+ private String memo;
	19	+
	20	+ public ShipInfo(){
	21	+ }
	22	+
	23	+ public ShipInfo(String driverName,String phone,String plateNumber){
	24	+ this.driverName=driverName;
	25	+ this.phone=phone;
	26	+ this.plateNumber=plateNumber;
	27	+ }
	28	+
	29	+ public String getDriverName() {
	30	+ return driverName;
	31	+ }
	32	+
	33	+ public void setDriverName(String driverName) {
	34	+ this.driverName = driverName;
	35	+ }
	36	+
	37	+ public String getPhone() {
	38	+ return phone;
	39	+ }
	40	+
	41	+ public void setPhone(String phone) {
	42	+ this.phone = phone;
	43	+ }
	44	+
	45	+ public String getPlateNumber() {
	46	+ return plateNumber;
	47	+ }
	48	+
	49	+ public void setPlateNumber(String plateNumber) {
	50	+ this.plateNumber = plateNumber;
	51	+ }
	52	+
	53	+ public String getMemo() {
	54	+ return memo;
	55	+ }
	56	+
	57	+ public void setMemo(String memo) {
	58	+ this.memo = memo;
	59	+ }
	60	+}
...	...

orders-client/src/main/java/com/diligrp/orders/client/domain/output/StatisticsOrderAmount.java 0 → 100644

View file @06cb985

	1	+++ a/orders-client/src/main/java/com/diligrp/orders/client/domain/output/StatisticsOrderAmount.java
	1	+package com.diligrp.orders.client.domain.output;
	2	+
	3	+public class StatisticsOrderAmount {
	4	+
	5	+ /** 订单状态ID */
	6	+ private Integer orderStatus;
	7	+ /** 订单状态名称 */
	8	+ private String orderStatusName;
	9	+ /** 订单状态统计量 */
	10	+ private Long amount;
	11	+
	12	+ public Integer getOrderStatus() {
	13	+ return orderStatus;
	14	+ }
	15	+
	16	+ public void setOrderStatus(Integer orderStatus) {
	17	+ this.orderStatus = orderStatus;
	18	+ }
	19	+
	20	+ public String getOrderStatusName() {
	21	+ return orderStatusName;
	22	+ }
	23	+
	24	+ public void setOrderStatusName(String orderStatusName) {
	25	+ this.orderStatusName = orderStatusName;
	26	+ }
	27	+
	28	+ public Long getAmount() {
	29	+ return amount;
	30	+ }
	31	+
	32	+ public void setAmount(Long amount) {
	33	+ this.amount = amount;
	34	+ }
	35	+
	36	+ @Override
	37	+ public String toString() {
	38	+ return "StatisticsOrderAmount [orderStatus=" + orderStatus
	39	+ + ", orderStatusName=" + orderStatusName + ", amount=" + amount
	40	+ + "]";
	41	+ }
	42	+}
...	...

orders-client/src/main/java/com/diligrp/orders/client/service/BaseService.java 0 → 100644

View file @06cb985

	1	+++ a/orders-client/src/main/java/com/diligrp/orders/client/service/BaseService.java
	1	+package com.diligrp.orders.client.service;
	2	+
	3	+
	4	+
	5	+public interface BaseService {
	6	+ /**
	7	+ * 设置会员token
	8	+ * @param token
	9	+ */
	10	+ public void setToken(String token);
	11	+}
...	...

orders-client/src/main/java/com/diligrp/orders/client/service/ClaimsOrderService.java 0 → 100644

View file @06cb985

	1	+++ a/orders-client/src/main/java/com/diligrp/orders/client/service/ClaimsOrderService.java
	1	+package com.diligrp.orders.client.service;
	2	+
	3	+import com.diligrp.orders.client.domain.input.AuditClaimsInput;
	4	+import com.diligrp.orders.client.domain.input.GetClaimsListInput;
	5	+import com.diligrp.orders.client.domain.input.SubmitClaimsAppealInput;
	6	+import com.diligrp.orders.client.domain.input.SubmitClaimsInput;
	7	+import com.diligrp.orders.client.domain.output.BaseOutput;
	8	+import com.diligrp.orders.client.domain.output.ClaimsInfo;
	9	+import com.diligrp.orders.client.domain.output.PageOutput;
	10	+import com.diligrp.orders.publics.enums.OpUserRole;
	11	+
	12	+import java.util.List;
	13	+
	14	+/**
	15	+ * 理赔相关API接口.
	16	+ */
	17	+public interface ClaimsOrderService extends BaseService {
	18	+
	19	+ /**
	20	+ * 理赔申请.
	21	+ *
	22	+ * @param input the input
	23	+ * @return BaseOutput<Integer> ,成功时返回退单ID号，失败时返回0
	24	+ */
	25	+ BaseOutput<Long> submitClaimsApply(SubmitClaimsInput input);
	26	+
	27	+ /**
	28	+ * 询理赔申请列表(采购&销售中心通用).
	29	+ *
	30	+ * @param input the input
	31	+ * @return PageOutput<List<ClaimsInfo>>
	32	+ */
	33	+ PageOutput<List<ClaimsInfo>> getClaimsList(GetClaimsListInput input);
	34	+
	35	+ /**
	36	+ * 理赔申请详情查看.
	37	+ *
	38	+ * @param orderId 理赔申请ID
	39	+ * @param opUserId 操作人ID
	40	+ * @param opUserRole 操作人角色 10L:买家 20L:卖家
	41	+ * @return BaseOutput<ClaimsInfo>
	42	+ */
	43	+ BaseOutput<ClaimsInfo> getClaimsDetail(Long orderId, Long opUserId, OpUserRole opUserRole);
	44	+
	45	+ /**
	46	+ * 取消理赔申请.
	47	+ *
	48	+ * @param orderId the re order id
	49	+ * @param opUserId 操作人ID
	50	+ * @param opUserRole 操作人角色 10L:买家 20L:卖家
	51	+ * @return BaseOutput<Integer>
	52	+ */
	53	+ BaseOutput<Integer> cancelClaimsApply(Long orderId, Long opUserId, OpUserRole opUserRole);
	54	+
	55	+ /**
	56	+ * 审批理赔申请.
	57	+ *
	58	+ * @param input 审批信息
	59	+ * @return BaseOutput<Integer>
	60	+ */
	61	+ BaseOutput<Integer> auditClaimsApply(AuditClaimsInput input);
	62	+
	63	+ /**
	64	+ * 查询待审核理赔金额.
	65	+ *
	66	+ * @param orderId the order id
	67	+ * @param opUserId 操作人ID
	68	+ * @param opUserRole 操作人角色 10L:买家 20L:卖家
	69	+ * @return BaseOutput<Long>
	70	+ */
	71	+ BaseOutput<Long> getApplyClaimsMoney(Long orderId, Long opUserId, OpUserRole opUserRole);
	72	+
	73	+ /**
	74	+ * 提交理赔申诉.
	75	+ *
	76	+ * @param input
	77	+ * @return 返回理赔申诉单ID
	78	+ */
	79	+ BaseOutput<Long> submitClaimsAppeal(SubmitClaimsAppealInput input);
	80	+
	81	+ /**
	82	+ * 取消理赔申诉.
	83	+ *
	84	+ * @param orderId the re order id
	85	+ * @param opUserId 操作人ID
	86	+ * @param opUserRole 操作人角色 10L:买家 20L:卖家
	87	+ * @return BaseOutput<Integer>
	88	+ */
	89	+ BaseOutput<Integer> cancelClaimsAppeal(Long orderId, Long opUserId, OpUserRole opUserRole);
	90	+}
...	...

orders-client/src/main/java/com/diligrp/orders/client/service/CommonDataService.java 0 → 100644

View file @06cb985

	1	+++ a/orders-client/src/main/java/com/diligrp/orders/client/service/CommonDataService.java
	1	+package com.diligrp.orders.client.service;
	2	+
	3	+import com.diligrp.orders.client.domain.input.GetOrdersByLogisticsInput;
	4	+import com.diligrp.orders.client.domain.output.BaseOutput;
	5	+import com.diligrp.orders.client.domain.output.LogisticsRelatedOrders;
	6	+
	7	+import java.util.LinkedHashMap;
	8	+
	9	+/**
	10	+ * 订单状态相关API接口
	11	+ */
	12	+public interface CommonDataService extends BaseService {
	13	+ /**
	14	+ * 获取订单状态列表
	15	+ * @param type 10默认订单状态列表，20赊帐付款订单状态列表
	16	+ * @return
	17	+ */
	18	+ public BaseOutput<LinkedHashMap<Integer,String>> getWebOrderStatusList(Integer type);
	19	+
	20	+ /**
	21	+ * 根据物流订单id查询代购订单和订单
	22	+ * @param input
	23	+ * @return
	24	+ */
	25	+ public BaseOutput<LogisticsRelatedOrders> getOrdersByLogistics(GetOrdersByLogisticsInput input);
	26	+}
...	...

b2c / order · Commits

GitLab

初始化项目

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

GitLab

初始化项目

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

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