初始化工程-接口定义

weiliwhereareyou@163.com
1 parent 376680f5
Showing 84 changed files with 2014 additions and 1705 deletions
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/base/BaseListReq.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/Attribute.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/AttributeValue.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/Category.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/ConsigneeInfo.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/GetShopDeliveryTimeResp.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/GoodsSuper.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/Order.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/OrderItem.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/OrderProduct.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/SKUInfo.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/detail/BindToShopReq.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/fund/FundTradeReq.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/fund/FundTradeResp.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/fund/GetFundsReq.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/fund/GetFundsResp.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/fund/GetfundTradeRecordReq.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/fund/GetfundTradeRecordResp.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/order/CancelOrderReq.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/order/CancelOrderResp.java
@@ -2,6 +2,7 @@
 package com.diligrp.mobsite.getway.domain.base;
 import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
+import io.swagger.annotations.ApiModelProperty;
 /**
  * 列表请求基类
@@ -20,6 +21,7 @@ public class BaseListReq extends BaseReq {
 	/**
 	 * 页码
 	 */
+	@ApiModelProperty(value = "页码",required = true)
 	private Integer pageNum;
 	public Integer getPageNum() {
 package com.diligrp.mobsite.getway.domain.protocol;
+import io.swagger.annotations.ApiModelProperty;
+
 import java.util.List;
 /**
@@ -15,17 +17,23 @@ public class Attribute {
     /**
      * 商品属性Id
      */
+    @ApiModelProperty(value = "商品属性id")
     private Long id;
     /**
      * 商品属性名称
      */
+    @ApiModelProperty(value = "商品属性名称")
     private String name;
     /**
      * 属性取值
      */
+    @ApiModelProperty(value = "商品属性值")
     private List<AttributeValue> values;
+
+
+
     /**
      * get value of Attribute.id
      * @return the id
 package com.diligrp.mobsite.getway.domain.protocol;
+import io.swagger.annotations.ApiModelProperty;
+
 /**
  * <B>Description</B> 属性值 <br />
  * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />
@@ -24,10 +26,12 @@ public class AttributeValue {
     /**
      * 属性值ID
      */
+    @ApiModelProperty(value = "属性值id")
     private Long id;
     /**
      * 属性值名称
      */
+    @ApiModelProperty(value = "属性值名称")
     private String name;
     /**
@@ -33,11 +33,9 @@ public class Category {
      */
 	@ApiModelProperty(value = "分类图标")
     private String imgUrl;
-    /**
-     * 关联分类id
-     */
-	@ApiModelProperty(value = "关联分类id")
-    private Long relateId;
+
+	@ApiModelProperty(value = "父分类id")
+    private Long parentId;
     /**
      * 分类级别
      */
@@ -70,12 +68,13 @@ public class Category {
         this.imgUrl = imgUrl;
     }
-	public Long getRelateId() {
-		return relateId;
+
+	public Long getParentId() {
+		return parentId;
 	}
-	public void setRelateId(Long relateId) {
-		this.relateId = relateId;
+	public void setParentId(Long parentId) {
+		this.parentId = parentId;
 	}
 	public String getLevel() {
@@ -32,17 +32,17 @@ public class ConsigneeInfo implements Serializable {
     /**
      * id
      */
-    @ApiModelProperty(value = "id")
+    @ApiModelProperty(value = "收货人id")
     private Long id;
     /**
      * 用户姓名名字
      */
-    @ApiModelProperty(value = "联系人姓名")
+    @ApiModelProperty(value = "收货人姓名")
     private String name;
     /**
      * 电话
      */
-    @ApiModelProperty(value = "联系人电话")
+    @ApiModelProperty(value = "收货人电话")
     private String mobile;
     /**
@@ -51,10 +51,16 @@ public class ConsigneeInfo implements Serializable {
     @ApiModelProperty(value = "是否为默认提货人:1-是，2-否")
     private Integer isDefault;
+
     /**
      * 城市地址
      */
-    @ApiModelProperty(value = "城市地址")
+    @ApiModelProperty(value = "城市id")
+    private Integer cityId;
+    /**
+     * 城市地址
+     */
+    @ApiModelProperty(value = "城市描述")
     private String cityAddress;
     /**
      * 街道地址
@@ -63,11 +69,13 @@ public class ConsigneeInfo implements Serializable {
     private String streetAddress;
+    public Integer getCityId() {
+        return cityId;
+    }
-
-
-
-
+    public void setCityId(Integer cityId) {
+        this.cityId = cityId;
+    }
     public Long getId() {
         return id;
 package com.diligrp.mobsite.getway.domain.protocol;
 import com.diligrp.mobsite.getway.domain.base.BaseListResp;
+import com.diligrp.mobsite.getway.domain.protocol.shop.DeliveryTimeInfo;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.List;
 /**
  * Created by xxxzzz on 2016/12/21.
@@ -9,7 +13,17 @@ public class GetShopDeliveryTimeResp extends BaseListResp {
+    @ApiModelProperty(value = "时间段",required = true)
+    private List<DeliveryTimeInfo> deliveryTimeInfos;
+
+
+    public List<DeliveryTimeInfo> getDeliveryTimeInfos() {
+        return deliveryTimeInfos;
+    }
+    public void setDeliveryTimeInfos(List<DeliveryTimeInfo> deliveryTimeInfos) {
+        this.deliveryTimeInfos = deliveryTimeInfos;
+    }
 }
@@ -15,69 +15,74 @@ import java.util.List;
  * @author zhangshirui
  */
 public class GoodsSuper implements Serializable{
-    
-    
-    /**
-     * 商品ID
-     */
-    @ApiModelProperty(value = "商品id")
-    private Long id;
-    /**
-     * 商品标题
-     */
-    @ApiModelProperty(value = "商品标题")
-    private String title;
-    /**
-     * 商品默认图片
-     */
-    @ApiModelProperty(value = "商品默认图片")
+
+
+    @ApiModelProperty(value = "商品id" )
+    private Long pid;
+    @ApiModelProperty(value = "商品状态：-1删除,3在售,4下架" )
+    private Long state;
+    @ApiModelProperty(value = "商品名称",required = true)
+    private String name;
+    @ApiModelProperty(value = "商品单位",required = true)
+    private String unit;
+    @ApiModelProperty(value = "分类id",required = true)
+    private Integer cid;
+    @ApiModelProperty(value = "分类名称")
+    private String cname;
+    @ApiModelProperty(value = "商品类型：0普通商品,1促销商品",required = true)
+    private int productType;
+    @ApiModelProperty(value = "默认图片",required = true)
     private String defaultPic;
-    /**
-     * 商品图片
-     */
-    @ApiModelProperty(value = "商品图片")
+    @ApiModelProperty(value = "商品图片",required = true)
     private List<String> pictures;
-    /**
-     * 单位
-     */
-    @ApiModelProperty(value = "商品单位")
-    private String unit;
+    @ApiModelProperty(value = "商品描述",required = true)
+    private String desc;
+    @ApiModelProperty(value = "skus",required = true)
+    private List<SKUInfo> skus;
+    @ApiModelProperty(value = "销售属性",required = true)
+    private List<Attribute> saleAtt;
+    @ApiModelProperty(value = "是否首页推荐：0是,1否",required = true)
+    private Integer indexTop;
+
+    public Long getState() {
+        return state;
+    }
+
+    public void setState(Long state) {
+        this.state = state;
+    }
-    /**
-     * 规格
-     */
-    @ApiModelProperty(value = "规格")
-    private String standard;
+    public String getName() {
+        return name;
+    }
-    /**
-     * 状态  -2=预览 -1=删除 1=待审核（新建）2=审核失败 3=在售 4=仓库中 5=待上架 6=过期下架 7=手动下架
-     */
-    @ApiModelProperty(value = "商品状态：-2=预览 -1=删除 1=待审核（新建）2=审核失败 3=在售 4=仓库中 5=待上架 6=过期下架 7=手动下架")
-    private Integer state;
-    
+    public void setName(String name) {
+        this.name = name;
+    }
-    /**
-     * 价格
-     */
-    @ApiModelProperty(value = "商品价格")
-    private Long price = 0L;
+    public Integer getCid() {
+        return cid;
+    }
+    public void setCid(Integer cid) {
+        this.cid = cid;
+    }
-    public Long getId() {
-        return id;
+    public String getCname() {
+        return cname;
     }
-    public void setId(Long id) {
-        this.id = id;
+    public void setCname(String cname) {
+        this.cname = cname;
     }
-    public String getTitle() {
-        return title;
+    public int getProductType() {
+        return productType;
     }
-    public void setTitle(String title) {
-        this.title = title;
+    public void setProductType(int productType) {
+        this.productType = productType;
     }
     public String getDefaultPic() {
@@ -96,27 +101,51 @@ public class GoodsSuper implements Serializable{
         this.pictures = pictures;
     }
-    public String getUnit() {
-        return unit;
+    public String getDesc() {
+        return desc;
     }
-    public void setUnit(String unit) {
-        this.unit = unit;
+    public void setDesc(String desc) {
+        this.desc = desc;
     }
-    public Integer getState() {
-        return state;
+    public List<SKUInfo> getSkus() {
+        return skus;
     }
-    public void setState(Integer state) {
-        this.state = state;
+    public void setSkus(List<SKUInfo> skus) {
+        this.skus = skus;
+    }
+
+    public List<Attribute> getSaleAtt() {
+        return saleAtt;
+    }
+
+    public void setSaleAtt(List<Attribute> saleAtt) {
+        this.saleAtt = saleAtt;
+    }
+
+    public Long getPid() {
+        return pid;
+    }
+
+    public void setPid(Long pid) {
+        this.pid = pid;
+    }
+
+    public Integer getIndexTop() {
+        return indexTop;
     }
-    public Long getPrice() {
-        return price;
+    public void setIndexTop(Integer indexTop) {
+        this.indexTop = indexTop;
     }
-    public void setPrice(Long price) {
-        this.price = price;
+    public String getUnit() {
+        return unit;
+    }
+
+    public void setUnit(String unit) {
+        this.unit = unit;
     }
 }
 package com.diligrp.mobsite.getway.domain.protocol;
-import com.diligrp.mobsite.getway.domain.protocol.order.model.MarketInfo;
-import com.diligrp.mobsite.getway.domain.protocol.order.model.OrderSumInfo;
 import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
@@ -16,7 +14,7 @@ import java.util.List;
  * @createTime 2014年9月1日 下午3:17:28
  * @author zhangshirui
  */
-public class Order extends OrderSumInfo implements Serializable{
+public class Order  implements Serializable{
 	/**
 	 * 是否已评论,1是,0否
@@ -29,6 +27,12 @@ public class Order extends OrderSumInfo implements Serializable{
 	/**
+	 * id,订单编号
+	 */
+	@ApiModelProperty(value = "订单id")
+	private Long orderId;
+
+	/**
 	 * 订单状态:(10待接单，15已接单待付款，20待自提，25待送货，30接单已过期,35支付超时,40已拒绝,45已取消，50已完成)
 	 */
 	@ApiModelProperty(value = "订单状态:(10待接单，15已接单待付款，20待自提，25待送货，30接单已过期,35支付超时,40已拒绝,45已取消，50已完成) ")
@@ -65,15 +69,17 @@ public class Order extends OrderSumInfo implements Serializable{
 	 */
 	@ApiModelProperty(value = "运费")
 	private Long postage;
-	/**
-	 * 提交订单时间
-	 */
-	private Long submitTime;
+
 	/**
 	 * 订单提交日期
 	 */
 	@ApiModelProperty(value = "订单提交时间")
-	private String submitDate;
+	private String submitTime;
+
+
+	@ApiModelProperty(value = "送达时间")
+	private String arriveTime;
+
 	/**
 	 * 订单详情页最上面
 	 */
@@ -84,144 +90,232 @@ public class Order extends OrderSumInfo implements Serializable{
 	 */
 	@ApiModelProperty(value = "是否评论")
 	private Integer isCommented;
-	/**
-	 * 卖家id
-	 */
-	private Long sellerId;
+
 	/**
 	 * 卖家姓名
 	 */
+	@ApiModelProperty(value = "卖家姓名")
 	private String sellerName;
 	/**
 	 * 卖家电话
 	 */
+	@ApiModelProperty(value = "卖家电话")
 	private String sellerMobile;
 	/**
-	 * 店铺id
-	 */
-	private Long shopId;
-	/**
 	 * 店铺名称
 	 */
+	@ApiModelProperty(value = "店铺名")
 	private String shopName;
-	/**
-	 * 店铺联系电话
-	 */
-	private String contactMobile;
+
 	/**
 	 * 订单商品列表
 	 */
+	@ApiModelProperty(value = "商品列表")
 	private List<OrderProduct> orderProducts;
 	/**
 	 * 提货留言
 	 */
+	@ApiModelProperty(value = "提货备注留言")
 	private String pickUserMsg;
-	/**
-	 * 提货人信息
-	 */
-	private ConsigneeInfo consigneeInfo;
+
 	/**
 	 * 提货时间
-	 * TODO 后期需要删除
+	 *
 	 */
-	@Deprecated
+	@ApiModelProperty(value = "提货时间")
 	private String pickDate;
-	/**
-	 * 最晚提货时间
-	 */
-	private Long pickupEndTime;
+
 	/**
 	 * 提货地点
 	 */
+	@ApiModelProperty(value = "提货地点")
 	private String pickAddress;
-	/**
-	 * 市场信息
-	 */
-	private MarketInfo marketInfo;
-	/**
-	 * 交易识别码
-	 */
-	private String tradeCode;
-	/**
-	 * 提货验证码
-	 */
-	private String deliveryVerCode;
-	/**
-	 * 申请退款id
-	 */
-	private Long refundId;
-	/**
-	 * 配送方式：10：上门自提，20送货上门
-	 */
-	private Integer deliveryType;
+
+
 	/**
 	 * 提货方式名称
 	 */
+	@ApiModelProperty(value = "配送方式")
 	private String deliveryName;
-	/**
-	 * 剩余提货时间
-	 */
-	private Float remainPickTime;
-	/**
-	 * 已经延期次数
-	 */
-	private Integer delayedPickupNum;
-	
-	/**
-	 * 物流及验收备注
-	 */
-	private String logisticsRemarks;
-	/**
-	 * 店铺所在地省id
-	 */
-	private Long shopLocationProvinceId;
-	/**
-	 * 店铺所在地省name
-	 */
-	private String shopLocationProvinceName;
 	/**
-	 * 店铺所在地市id
-	 */
-	private Long shopLocationCityId;
-	/**
-	 * 店铺所在地市name
+	 * 店铺地址
 	 */
-	private String shopLocationCityName;
+	@ApiModelProperty(value = "店铺地址")
+	private String shopAddr;
-	/**
-	 * 店铺所在地区id
-	 */
-	private Long shopLocationRegionId;
-	/**
-	 * 店铺所在地区name
-	 */
-	private String shopLocationRegionName;
-	/**
-	 * 店铺发货地址
-	 */
-	private String shopSendAddress;
+	public Long getOrderId() {
+		return orderId;
+	}
+	public void setOrderId(Long orderId) {
+		this.orderId = orderId;
+	}
+	public Integer getOrderState() {
+		return orderState;
+	}
-	/**
-	 * 物流信息
-	 */
-	//  private LogisticsInfo logisticsInfo;
+	public void setOrderState(Integer orderState) {
+		this.orderState = orderState;
+	}
+	public String getStateName() {
+		return stateName;
+	}
-	/** 是否允许申请退款:1可以 0不可以 */
-	private Integer refundFlag;
+	public void setStateName(String stateName) {
+		this.stateName = stateName;
+	}
-	/**
-	 * 退款单id，退款申请中时有值
-	 */
-	private Long reOrderId;
+	public Integer getPayType() {
+		return payType;
+	}
+
+	public void setPayType(Integer payType) {
+		this.payType = payType;
+	}
+
+	public Long getTotalAmount() {
+		return totalAmount;
+	}
+
+	public void setTotalAmount(Long totalAmount) {
+		this.totalAmount = totalAmount;
+	}
+
+	public Long getRealPayAmount() {
+		return realPayAmount;
+	}
+
+	public void setRealPayAmount(Long realPayAmount) {
+		this.realPayAmount = realPayAmount;
+	}
+
+	public Long getDiscountAmount() {
+		return discountAmount;
+	}
+
+	public void setDiscountAmount(Long discountAmount) {
+		this.discountAmount = discountAmount;
+	}
+
+	public Long getPostage() {
+		return postage;
+	}
+
+	public void setPostage(Long postage) {
+		this.postage = postage;
+	}
+
+	public String getSubmitTime() {
+		return submitTime;
+	}
+
+	public void setSubmitTime(String submitTime) {
+		this.submitTime = submitTime;
+	}
+
+	public String getArriveTime() {
+		return arriveTime;
+	}
+
+	public void setArriveTime(String arriveTime) {
+		this.arriveTime = arriveTime;
+	}
+
+	public String getOrderDesc() {
+		return orderDesc;
+	}
+
+	public void setOrderDesc(String orderDesc) {
+		this.orderDesc = orderDesc;
+	}
+
+	public Integer getIsCommented() {
+		return isCommented;
+	}
+
+	public void setIsCommented(Integer isCommented) {
+		this.isCommented = isCommented;
+	}
+
+	public String getSellerName() {
+		return sellerName;
+	}
+
+	public void setSellerName(String sellerName) {
+		this.sellerName = sellerName;
+	}
+
+	public String getSellerMobile() {
+		return sellerMobile;
+	}
+
+	public void setSellerMobile(String sellerMobile) {
+		this.sellerMobile = sellerMobile;
+	}
+
+	public String getShopName() {
+		return shopName;
+	}
+
+	public void setShopName(String shopName) {
+		this.shopName = shopName;
+	}
+
+	public List<OrderProduct> getOrderProducts() {
+		return orderProducts;
+	}
+
+	public void setOrderProducts(List<OrderProduct> orderProducts) {
+		this.orderProducts = orderProducts;
+	}
+
+	public String getPickUserMsg() {
+		return pickUserMsg;
+	}
+
+	public void setPickUserMsg(String pickUserMsg) {
+		this.pickUserMsg = pickUserMsg;
+	}
+
+
+
+	public String getPickDate() {
+		return pickDate;
+	}
+
+	public void setPickDate(String pickDate) {
+		this.pickDate = pickDate;
+	}
+
+	public String getPickAddress() {
+		return pickAddress;
+	}
+
+	public void setPickAddress(String pickAddress) {
+		this.pickAddress = pickAddress;
+	}
+
+	public String getDeliveryName() {
+		return deliveryName;
+	}
+
+	public void setDeliveryName(String deliveryName) {
+		this.deliveryName = deliveryName;
+	}
+	public String getShopAddr() {
+		return shopAddr;
+	}
+	public void setShopAddr(String shopAddr) {
+		this.shopAddr = shopAddr;
+	}
 }
 package com.diligrp.mobsite.getway.domain.protocol;
+import io.swagger.annotations.ApiModelProperty;
 /**
  * <B>Description</B> 订单具体项<br />
@@ -12,39 +13,35 @@ package com.diligrp.mobsite.getway.domain.protocol;
  */
 public class OrderItem {
-    /**
-     * 进货单id
-     */
-    private Long cartId;
+    ///**
+    // * 进货单id
+    // */
+    //@ApiModelProperty(value = "购物车id")
+    //private Long cartId;
     /**
      * 购买数量
      */
+    @ApiModelProperty(value = "购买数量",required = true)
     private Integer amount;
     /**
      * 价格-单位：分
      */
+    @ApiModelProperty(value = "价格-单位:分",required = true)
     private Long price;
-    /**
-     * 最新价格
-     */
-    private Long newPrice;
+
     /**
      * 商品sku
      */
+    @ApiModelProperty(value = "sku",required = true)
     private String sku;
 	/**
 	 * 商品id
 	 * */
+    @ApiModelProperty(value = "商品id",required = true)
 	private Long productId;
-	/**
-	 * 是否为特价商品
-	 * */
-	private Integer hasSpecial;
-
-
     public Integer getAmount() {
         return amount;
     }
@@ -52,46 +49,28 @@ public class OrderItem {
     public void setAmount(Integer amount) {
         this.amount = amount;
     }
-    public Long getPrice() {
-        return price;
+
+    public Long getProductId() {
+        return productId;
     }
-    public void setPrice(Long price) {
-        this.price = price;
+
+    public void setProductId(Long productId) {
+        this.productId = productId;
     }
+
     public String getSku() {
         return sku;
     }
+
     public void setSku(String sku) {
         this.sku = sku;
     }
-    public Long getCartId() {
-        return cartId;
-    }
-    public void setCartId(Long cartId) {
-        this.cartId = cartId;
-    }
-
-	public Long getNewPrice() {
-		return newPrice;
-	}
-
-	public void setNewPrice(Long newPrice) {
-		this.newPrice = newPrice;
-	}
-
-	public Long getProductId() {
-		return productId;
-	}
-	public void setProductId(Long productId) {
-		this.productId = productId;
-	}
-
-	public Integer getHasSpecial() {
-		return hasSpecial;
-	}
+    public Long getPrice() {
+        return price;
+    }
-	public void setHasSpecial(Integer hasSpecial) {
-		this.hasSpecial = hasSpecial;
-	}
+    public void setPrice(Long price) {
+        this.price = price;
+    }
 }
 package com.diligrp.mobsite.getway.domain.protocol;
-import java.util.Map;
+import io.swagger.annotations.ApiModelProperty;
 /**
@@ -16,83 +16,32 @@ public class OrderProduct extends GoodsSuper {
 	/**
 	 * 购买数量
 	 */
+	@ApiModelProperty(value = "购买数量")
 	private Integer buyNum;
-	/**
-     * 商品属性map
-     */
-    private Map<String,String> attributeMap;
-    
+//	/**
+//     * 商品属性map
+//     */
+//    private Map<String,String> attributeMap;
+//
+
+//
 //    /**
-//     * 商品服务列表
+//     * 商品sku
 //     */
-//    private List<Service> serviceList;
-    
-    /**
-     * 商品sku
-     */
-    private String sku;
+//    private String sku;
+//
+//	/**
+//	 *商品当前价格
+//	 * */
+//	private Long currentPrice;
-	/**
-	 *商品当前价格
-	 * */
-	private Long currentPrice;
-	/**
-	 * @return the buyNum
-	 */
 	public Integer getBuyNum() {
 		return buyNum;
 	}
-	/**
-	 * @param buyNum the buyNum to set
-	 */
 	public void setBuyNum(Integer buyNum) {
 		this.buyNum = buyNum;
 	}
-
-	/**
-	 * @return the attributeMap
-	 */
-	public Map<String, String> getAttributeMap() {
-		return attributeMap;
-	}
-
-	/**
-	 * @param attributeMap the attributeMap to set
-	 */
-	public void setAttributeMap(Map<String, String> attributeMap) {
-		this.attributeMap = attributeMap;
-	}
-
-    /**
-     * get value of OrderProduct.sku
-     * @return the sku
-     * @createTime 2014年10月22日 下午2:55:49
-     * @author zhangshirui
-     */
-    public String getSku() {
-        return sku;
-    }
-
-    
-    /**
-     * set value of OrderProduct.sku
-     * @param sku the sku to set
-     * @createTime 2014年10月22日 下午2:55:49
-     * @author zhangshirui
-     */
-    public void setSku(String sku) {
-        this.sku = sku;
-    }
-
-
-	public Long getCurrentPrice() {
-		return currentPrice;
-	}
-
-	public void setCurrentPrice(Long currentPrice) {
-		this.currentPrice = currentPrice;
-	}
 }
 package com.diligrp.mobsite.getway.domain.protocol;
-import java.util.List;
+import io.swagger.annotations.ApiModelProperty;
 /**
  * <B>Description</B> 商品SKU信息 <br />
@@ -12,151 +12,59 @@ import java.util.List;
  * @createTime 2014/8/25 17:06
  */
 public class SKUInfo {
-    /**
-     * 最少起批量
-     */
-    private Integer minWholesale;
-    /**
-     * 库存
-     */
-    private Integer stockNum;
-    /**
-     * 属性组成的列表
-     */
-    private List<Long> sku;
-    /**
-     * 加密的sku
-     */
-    private String encodeSku;
-    /**
-     * 未加密的sku,规则：pid:attrId...
-     * 1000003313:1270:1275
-     */
+    @ApiModelProperty(value = "sku",required = true)
+    private String sku;
+
+    @ApiModelProperty(value = "价格",required = true)
+    private int price;
+
+    @ApiModelProperty(value = "商品id")
+    private long pid;
+
     private String decodeSku;
-    /**
-     * 价格
-     */
-    private Long price;
-    
-    /**
-     * SKU版本
-     */
+
     private Integer version;
-    /**
-     * sku状态
-     */
+    @ApiModelProperty(value = "商品状态：1删除,3在售,4下架")
     private Integer status;
-    /**
-     * SKU版本，添加进货单时需要回传
-     *
-     * @return
-     */
-    public Integer getVersion() {
-        return version;
-    }
-    /**
-     * 设置SKU版本
-     *
-     * @param version
-     */
-    public void setVersion(Integer version) {
-        this.version = version;
-    }
-    /**
-     * 剩余库存量
-     *
-     * @return
-     */
-    public Integer getStockNum() {
-        return stockNum;
+    public int getPrice() {
+        return price;
     }
-    /**
-     * 剩余库存量
-     *
-     * @param stockNum
-     */
-    public void setStockNum(Integer stockNum) {
-        this.stockNum = stockNum;
+    public void setPrice(int price) {
+        this.price = price;
     }
-    /**
-     * 由销售属性值ID组成的sku串
-     *
-     * @return
-     */
-    public List<Long> getSku() {
-        return sku;
+    public long getPid() {
+        return pid;
     }
-    /**
-     * 由销售属性值ID组成的sku串
-     *
-     * @param sku
-     */
-    public void setSku(List<Long> sku) {
-        this.sku = sku;
+    public void setPid(long pid) {
+        this.pid = pid;
     }
-    /**
-     * 价格
-     *
-     * @return
-     */
-    public Long getPrice() {
-        return price;
+    public String getDecodeSku() {
+        return decodeSku;
     }
-    /**
-     * 价格
-     *
-     * @param price
-     */
-    public void setPrice(Long price) {
-        this.price = price;
+    public void setDecodeSku(String decodeSku) {
+        this.decodeSku = decodeSku;
     }
-    
-    /**
-     * 最少起批量
-     * minWholesale
-     */
-    public Integer getMinWholesale() {
-        return minWholesale;
+    public Integer getVersion() {
+        return version;
     }
-    
-    /**
-     * 最少起批量
-     * minWholesale
-     */
-    public void setMinWholesale(Integer minWholesale) {
-        this.minWholesale = minWholesale;
+    public void setVersion(Integer version) {
+        this.version = version;
     }
-	public String getEncodeSku() {
-		return encodeSku;
-	}
-
-	public void setEncodeSku(String encodeSku) {
-		this.encodeSku = encodeSku;
-	}
-
-	public String getDecodeSku() {
-		return decodeSku;
-	}
-
-	public void setDecodeSku(String decodeSku) {
-		this.decodeSku = decodeSku;
-	}
-
-	public Integer getStatus() {
-		return status;
-	}
+    public Integer getStatus() {
+        return status;
+    }
-	public void setStatus(Integer status) {
-		this.status = status;
-	}
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
 }
@@ -17,7 +17,7 @@ public class BindToShopReq extends BaseReq {
     /**
      * 店铺code
      */
-    @ApiModelProperty(value = "店铺code",required = true)
+    @ApiModelProperty(value = "店铺分享码",required = true)
     private Integer shopAuthCode;
+package com.diligrp.mobsite.getway.domain.protocol.fund;
+
+import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * Created by xxxzzz on 2017/1/3.
+ */
+public class FundTradeReq extends BaseReq {
+
+
+
+    @ApiModelProperty(value = "交易类型（1：充值 2：冻结4：消费）" ,required = true)
+    private Long tradeType;
+
+
+
+    @ApiModelProperty(value = "交易金额",required = true)
+    private Long tradePrice;
+
+
+    public Long getTradeType() {
+        return tradeType;
+    }
+
+    public void setTradeType(Long tradeType) {
+        this.tradeType = tradeType;
+    }
+
+    public Long getTradePrice() {
+        return tradePrice;
+    }
+
+    public void setTradePrice(Long tradePrice) {
+        this.tradePrice = tradePrice;
+    }
+}
+package com.diligrp.mobsite.getway.domain.protocol.fund;
+
+import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
+
+/**
+ * Created by xxxzzz on 2017/1/3.
+ */
+public class FundTradeResp extends BaseResp {
+}
+package com.diligrp.mobsite.getway.domain.protocol.fund;
+
+import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
+
+/**
+ * Created by xxxzzz on 2017/1/3.
+ */
+public class GetFundsReq extends BaseReq {
+}
+package com.diligrp.mobsite.getway.domain.protocol.fund;
+
+import com.diligrp.mobsite.getway.domain.base.BaseListResp;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * Created by xxxzzz on 2017/1/3.
+ */
+public class GetFundsResp extends BaseListResp {
+
+
+    @ApiModelProperty(value = "储值总金额")
+    private Long storedTotalPrice;
+
+    @ApiModelProperty(value = "可用余额")
+    private Long residueTotalPrice;
+
+    @ApiModelProperty(value = "冻结总金额")
+    private Long freezeTotalPrice;
+
+    @ApiModelProperty(value = "用户名称")
+    private String userName ;
+
+    @ApiModelProperty(value = "用户头像")
+    private String headImg ;
+
+    public String getHeadImg() {
+        return headImg;
+    }
+
+    public void setHeadImg(String headImg) {
+        this.headImg = headImg;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public Long getStoredTotalPrice() {
+        return storedTotalPrice;
+    }
+
+    public void setStoredTotalPrice(Long storedTotalPrice) {
+        this.storedTotalPrice = storedTotalPrice;
+    }
+
+    public Long getResidueTotalPrice() {
+        return residueTotalPrice;
+    }
+
+    public void setResidueTotalPrice(Long residueTotalPrice) {
+        this.residueTotalPrice = residueTotalPrice;
+    }
+
+    public Long getFreezeTotalPrice() {
+        return freezeTotalPrice;
+    }
+
+    public void setFreezeTotalPrice(Long freezeTotalPrice) {
+        this.freezeTotalPrice = freezeTotalPrice;
+    }
+
+
+}
+package com.diligrp.mobsite.getway.domain.protocol.fund;
+
+import com.diligrp.mobsite.getway.domain.base.BaseListReq;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * Created by xxxzzz on 2017/1/3.
+ */
+public class GetfundTradeRecordReq extends BaseListReq {
+
+
+    @ApiModelProperty(value = "查询类型（1：充值 2：冻结4：消费）" ,required = true)
+    private Long tradeType;
+
+    public Long getTradeType() {
+        return tradeType;
+    }
+
+    public void setTradeType(Long tradeType) {
+        this.tradeType = tradeType;
+    }
+}
+package com.diligrp.mobsite.getway.domain.protocol.fund;
+
+import com.diligrp.mobsite.getway.domain.base.BaseListResp;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * Created by xxxzzz on 2017/1/3.
+ */
+public class GetfundTradeRecordResp extends BaseListResp {
+
+
+    @ApiModelProperty(value = "储值金额/订单金额" ,required = true)
+    private Long tradePrice ;
+
+
+    @ApiModelProperty(value = "储值时间/消费时间")
+    private String tradeTime;
+
+    //@ApiModelProperty(value = "储值余额/消费时间")
+    //private Long residueTotalPrice;
+
+
+    public Long getTradePrice() {
+        return tradePrice;
+    }
+
+    public void setTradePrice(Long tradePrice) {
+        this.tradePrice = tradePrice;
+    }
+
+    public String getTradeTime() {
+        return tradeTime;
+    }
+
+    public void setTradeTime(String tradeTime) {
+        this.tradeTime = tradeTime;
+    }
+}
-package com.diligrp.mobsite.getway.domain.protocol.out;
+package com.diligrp.mobsite.getway.domain.protocol.fund;
 import com.diligrp.mobsite.getway.domain.protocol.saler.order.GuardBaseQueryReq;
-package com.diligrp.mobsite.getway.domain.protocol.out;
+package com.diligrp.mobsite.getway.domain.protocol.fund;
 import com.diligrp.mobsite.getway.domain.protocol.saler.order.GuardOperateCommonReq;
-package com.diligrp.mobsite.getway.domain.protocol.out;
+package com.diligrp.mobsite.getway.domain.protocol.fund;
 import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
 package com.diligrp.mobsite.getway.domain.protocol.order;
 import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
+import io.swagger.annotations.ApiModelProperty;
 /**
@@ -17,12 +18,14 @@ public class CancelOrderReq extends BaseReq {
     /**
      * 订单id
      */
+    @ApiModelProperty(value = "订单id",required = true)
     private Long orderId;
-    /**
-     * 取消原因
-     */
-    private String reason;
+    ///**
+    // * 取消原因
+    // */
+    //@ApiModelProperty(value = "取消原因",required = true)
+    //private String reason;
     /**
@@ -47,41 +50,4 @@ public class CancelOrderReq extends BaseReq {
     }
-    /* (non-Javadoc)
-     * @see java.lang.Object#toString()
-     */
-    @Override
-    public String toString() {
-        StringBuilder builder = new StringBuilder();
-        builder.append("CancelOrderReq [orderId=");
-        builder.append(orderId);
-        builder.append(", reason=");
-        builder.append(reason);
-        builder.append("]");
-        return builder.toString();
-    }
-
-
-    
-    /**
-     * get value of CancelOrderReq.reason
-     * @return the reason
-     * @createTime 2014年9月3日 下午5:19:33
-     * @author zhangshirui
-     */
-    public String getReason() {
-        return reason;
-    }
-
-
-    
-    /**
-     * set value of CancelOrderReq.reason
-     * @param reason the reason to set
-     * @createTime 2014年9月3日 下午5:19:33
-     * @author zhangshirui
-     */
-    public void setReason(String reason) {
-        this.reason = reason;
-    }
 }
@@ -14,6 +14,6 @@ import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
 @SuppressWarnings("serial")
 public class CancelOrderResp extends BaseResp {
-    public static final int CANCEL_RESULT_FAILED = 520;
+
 }
 package com.diligrp.mobsite.getway.domain.protocol.order;
 import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
+import io.swagger.annotations.ApiModelProperty;
 /**
@@ -17,12 +18,10 @@ public class ConfirmPickUpReq extends BaseReq {
     /**
      * 订单id
      */
+    @ApiModelProperty(value = "订单id",required = true)
     private Long orderId;
-    /**
-     * 支付密码
-     */
-    private String payToken;
+
 	/**
@@ -46,27 +45,6 @@ public class ConfirmPickUpReq extends BaseReq {
         this.orderId = orderId;
     }
-    
-    public String getPayToken() {
-		return payToken;
-	}
-
-
-	public void setPayToken(String payToken) {
-		this.payToken = payToken;
-	}
-	
-    /* (non-Javadoc)
-     * @see java.lang.Object#toString()
-     */
-    @Override
-    public String toString() {
-        StringBuilder builder = new StringBuilder();
-        builder.append("PickUpOrderReq [orderId=");
-        builder.append(orderId);
-        builder.append("]");
-        return builder.toString();
-    }
 }
 package com.diligrp.mobsite.getway.domain.protocol.order;
 import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
-import com.diligrp.mobsite.getway.domain.protocol.Order;
-import com.diligrp.mobsite.getway.domain.protocol.order.model.OrderDetail;
 /**
@@ -19,14 +17,14 @@ public class ConfirmPickUpResp extends BaseResp {
     /**
      * 订单
      */
-    private OrderDetail order;
-
-	public OrderDetail getOrder() {
-		return order;
-	}
-
-	public void setOrder(OrderDetail order) {
-		this.order = order;
-	}
+    //private OrderDetail order;
+    //
+	//public OrderDetail getOrder() {
+	//	return order;
+	//}
+    //
+	//public void setOrder(OrderDetail order) {
+	//	this.order = order;
+	//}
 }
+package com.diligrp.mobsite.getway.domain.protocol.order;
+
+import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.List;
+
+
+/**
+ * <B>Description</B> 取消订单请求 <br />
+ * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />
+ * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
+ * <B>Company</B> 地利集团
+ * @createTime 2014年9月1日 下午2:42:17
+ * @author zhangshirui
+ */
+@SuppressWarnings("serial")
+public class DelOrderReq extends BaseReq {
+    
+    /**
+     * 订单id
+     */
+    @ApiModelProperty(value = "订单id",required = true)
+    private List<Long> orderIds;
+
+
+    public List<Long> getOrderIds() {
+        return orderIds;
+    }
+
+    public void setOrderIds(List<Long> orderIds) {
+        this.orderIds = orderIds;
+    }
+}
+package com.diligrp.mobsite.getway.domain.protocol.order;
+
+import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
+
+
+/**
+ * <B>Description</B> 取消订单响应 <br />
+ * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />
+ * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
+ * <B>Company</B> 地利集团
+ * @createTime 2014年9月1日 下午2:43:08
+ * @author zhangshirui
+ */
+@SuppressWarnings("serial")
+public class DelOrderResp extends BaseResp {
+
+
+    
+}
 package com.diligrp.mobsite.getway.domain.protocol.order;
 import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
+import io.swagger.annotations.ApiModelProperty;
 /**
@@ -17,6 +18,7 @@ public class GetOrderReq extends BaseReq {
     /**
      * 订单id
      */
+    @ApiModelProperty(value = "订单id",required = true)
     private Long orderId;
 package com.diligrp.mobsite.getway.domain.protocol.order;
 import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
-import com.diligrp.mobsite.getway.domain.protocol.Order;
 import com.diligrp.mobsite.getway.domain.protocol.order.model.OrderDetail;
@@ -19,9 +18,9 @@ public class GetOrderResp extends BaseResp {
     /**
      * 订单详情
      */
-    private Order order;
+    private OrderDetail order;
-	public Order getOrder() {
+	public OrderDetail getOrder() {
 		return order;
 	}
+package com.diligrp.mobsite.getway.domain.protocol.order;
+
+import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * Created by xxxzzz on 2016/9/7.
+ */
+public class PaymentReq extends BaseReq{
+
+    /**
+     * 订单id
+     */
+    @ApiModelProperty(value = "订单id",required = true)
+    private Long orderId;
+    @ApiModelProperty(value = "支付方式:10线上付款,20线下付款",required = true)
+    private Integer payType;
+
+
+    public Long getOrderId() {
+        return orderId;
+    }
+
+    public void setOrderId(Long orderId) {
+        this.orderId = orderId;
+    }
+
+    public Integer getPayType() {
+        return payType;
+    }
+
+    public void setPayType(Integer payType) {
+        this.payType = payType;
+    }
+}
@@ -5,5 +5,5 @@ import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
 /**
  * Created by xxxzzz on 2016/9/7.
  */
-public class PayofflineResp extends BaseResp{
+public class PaymentResp extends BaseResp{
 }
-package com.diligrp.mobsite.getway.domain.protocol.order;
-
-import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
-
-import javax.validation.constraints.NotNull;
-
-/**
- * Created by xxxzzz on 2016/9/7.
- */
-public class PayofflineReq extends BaseReq{
-
-    /**
-     * 订单id
-     */
-    private Long orderId;
-
-    /**
-     * 汇款人姓名
-     */
-    private String remitPersonName;
-
-    /**
-     * 收款金额
-     */
-    private Long receiptAmount;
-
-    /**
-     * 汇款人账号或地址
-     */
-    private String remitPersonInfo;
-
-    /**
-     * 汇款凭证url
-     */
-    @NotNull(message = "汇款凭证不能为空")
-    private String  remitUrl;
-
-    public Long getOrderId() {
-        return orderId;
-    }
-
-    public void setOrderId(Long orderId) {
-        this.orderId = orderId;
-    }
-
-    public String getRemitPersonName() {
-        return remitPersonName;
-    }
-
-    public void setRemitPersonName(String remitPersonName) {
-        this.remitPersonName = remitPersonName;
-    }
-
-    public Long getReceiptAmount() {
-        return receiptAmount;
-    }
-
-    public void setReceiptAmount(Long receiptAmount) {
-        this.receiptAmount = receiptAmount;
-    }
-
-    public String getRemitPersonInfo() {
-        return remitPersonInfo;
-    }
-
-    public void setRemitPersonInfo(String remitPersonInfo) {
-        this.remitPersonInfo = remitPersonInfo;
-    }
-
-    public String getRemitUrl() {
-        return remitUrl;
-    }
-
-    public void setRemitUrl(String remitUrl) {
-        this.remitUrl = remitUrl;
-    }
-}
@@ -3,6 +3,7 @@ package com.diligrp.mobsite.getway.domain.protocol.order;
 import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
 import com.diligrp.mobsite.getway.domain.protocol.ConsigneeInfo;
 import com.diligrp.mobsite.getway.domain.protocol.order.model.OrderShopInfo;
+import io.swagger.annotations.ApiModelProperty;
 import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
@@ -23,105 +24,121 @@ public class SubmitOrderReq extends BaseReq {
      * 提货人信息
      */
     @Valid @NotNull(message = "联系人不能为空")
+    @ApiModelProperty(value = "收货人信息",required = true)
 	private ConsigneeInfo consigneeInfo;
-    ///**
-    // * 提货人信息
-    // */
-    //private DeliveryConsigneeInfo deliveryConsigneeInfo;
 	/**
-     * 支付方式:10线上付款,20线下付款,30提货付款
+     * 支付方式:10线上付款,20线下付款
      */
     @NotNull(message = "支付方式不能为空")
+    @ApiModelProperty(value = "支付方式:10线上付款,20线下付款",required = true)
     private Integer payType;
     /**
      * 送货方式:10:自提,20:送货上门
      */
     @NotNull(message = "送货方式不能为空")
+    @ApiModelProperty(value = "送货方式:10自提、20送货上门",required = true)
     private Integer deliveryType;
+
+    @ApiModelProperty(value = "送达时间" )
+    private String arriveTime;
+
+    @ApiModelProperty(value = "提货时间" )
+    private String reservationTime;
+
+    @ApiModelProperty(value = "市场id" )
+    private Long marketId;
+
     /**
-     * 是否市场内交割:1:市场内交割,2:市场外交割
+     * 买家留言
      */
-    @NotNull(message = "交割方式不能为空")
-    private Integer marketDeliveryType;
-
+    @ApiModelProperty(value = "买家留言")
+    private String remark;
     /**
-     * 物流及验收备注
+     * 邮费
      */
-    private String logisticsRemarks;
+    @ApiModelProperty(value = "邮费")
+    private Long postage = 0L;
+
     /**
      * 店铺商品信息
      */
     @Valid @NotNull(message = "商品不能为空")
+    @ApiModelProperty(value = "商品列表")
     private List<OrderShopInfo> orderShopInfos;
-
-	///**
-	// * 物流订单信息
-	// */
-	//private SaveLogisticsOrderReq logisticsOrderReq;
-
-
-    //public DeliveryConsigneeInfo getDeliveryConsigneeInfo() {
-    //    return deliveryConsigneeInfo;
-    //}
-    //
-    //public void setDeliveryConsigneeInfo(DeliveryConsigneeInfo deliveryConsigneeInfo) {
-    //    this.deliveryConsigneeInfo = deliveryConsigneeInfo;
-    //}
-
-    public Integer getMarketDeliveryType() {
-        return marketDeliveryType;
-    }
-
-    public void setMarketDeliveryType(Integer marketDeliveryType) {
-        this.marketDeliveryType = marketDeliveryType;
-    }
-
     public ConsigneeInfo getConsigneeInfo() {
         return consigneeInfo;
     }
-    
+
     public void setConsigneeInfo(ConsigneeInfo consigneeInfo) {
         this.consigneeInfo = consigneeInfo;
     }
-    
+
     public Integer getPayType() {
         return payType;
     }
-    
+
     public void setPayType(Integer payType) {
         this.payType = payType;
     }
-    
+
     public Integer getDeliveryType() {
         return deliveryType;
     }
-    
+
     public void setDeliveryType(Integer deliveryType) {
         this.deliveryType = deliveryType;
     }
-    
-    public List<OrderShopInfo> getOrderShopInfos() {
-        return orderShopInfos;
+
+    public String getArriveTime() {
+        return arriveTime;
     }
-    
-    public void setOrderShopInfos(List<OrderShopInfo> orderShopInfos) {
-        this.orderShopInfos = orderShopInfos;
+    public void setArriveTime(String arriveTime) {
+        this.arriveTime = arriveTime;
     }
-	public String getLogisticsRemarks() {
-		return logisticsRemarks;
-	}
+    public String getReservationTime() {
+        return reservationTime;
+    }
-	public void setLogisticsRemarks(String logisticsRemarks) {
-		this.logisticsRemarks = logisticsRemarks;
-	}
+    public void setReservationTime(String reservationTime) {
+        this.reservationTime = reservationTime;
+    }
+
+    public Long getMarketId() {
+        return marketId;
+    }
+    public void setMarketId(Long marketId) {
+        this.marketId = marketId;
+    }
+    public String getRemark() {
+        return remark;
+    }
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public Long getPostage() {
+        return postage;
+    }
+
+    public void setPostage(Long postage) {
+        this.postage = postage;
+    }
+
+    public List<OrderShopInfo> getOrderShopInfos() {
+        return orderShopInfos;
+    }
+
+    public void setOrderShopInfos(List<OrderShopInfo> orderShopInfos) {
+        this.orderShopInfos = orderShopInfos;
+    }
 }
 package com.diligrp.mobsite.getway.domain.protocol.order;
 import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
-import com.diligrp.mobsite.getway.domain.protocol.common.LogResp;
 import com.diligrp.mobsite.getway.domain.protocol.order.model.OrderSumInfo;
+import io.swagger.annotations.ApiModelProperty;
 import java.util.List;
@@ -21,39 +21,23 @@ public class SubmitOrderResp extends BaseResp {
     /**
      * 订单号
      */
+    @ApiModelProperty(value = "订单信息")
     private List<OrderSumInfo> orderInfos;
-    ///**
-	 //* 物流订单返回结果
-	 //* */
-    //private SaveLogisticsOrderResp logisticsOrderResp;
-	/**
-	 * 物流订单提交成功与否
-	 * */
-  //  private Boolean logisticsOrderSuccess = false;
-
     /**
      * 提交成功描述
      */
+    @ApiModelProperty(value = "提交结果描述")
     private String description;
     /**
      * 总金额
      */
+    @ApiModelProperty(value = "总金额")
     private Long totalPrice;
-	/**
-	 * 记录日志对象
-	 */
-	private LogResp logResp;
-	//public Boolean getLogisticsOrderSuccess() {
-	//	return logisticsOrderSuccess;
-	//}
-	//public void setLogisticsOrderSuccess(Boolean logisticsOrderSuccess) {
-	//	this.logisticsOrderSuccess = logisticsOrderSuccess;
-	//}
 	public List<OrderSumInfo> getOrderInfos() {
         return orderInfos;
@@ -88,11 +72,4 @@ public class SubmitOrderResp extends BaseResp {
-	public LogResp getLogResp() {
-		return logResp;
-	}
-
-	public void setLogResp(LogResp logResp) {
-		this.logResp = logResp;
-	}
 }
 package com.diligrp.mobsite.getway.domain.protocol.order.model;
+import com.diligrp.mobsite.getway.domain.protocol.ConsigneeInfo;
 import com.diligrp.mobsite.getway.domain.protocol.Order;
+import io.swagger.annotations.ApiModelProperty;
 /**
  * <B>订单详情</B> <br />
@@ -11,10 +13,21 @@ import com.diligrp.mobsite.getway.domain.protocol.Order;
  * @author zhangshirui
  */
 public class OrderDetail extends Order{
-	
+    /**
+     * 提货人信息
+     */
+    @ApiModelProperty(value = "收货人信息")
+    private ConsigneeInfo consigneeInfo;
+    public ConsigneeInfo getConsigneeInfo() {
+        return consigneeInfo;
+    }
+
+    public void setConsigneeInfo(ConsigneeInfo consigneeInfo) {
+        this.consigneeInfo = consigneeInfo;
+    }
 }
 package com.diligrp.mobsite.getway.domain.protocol.order.model;
-import java.util.List;
-
 import com.diligrp.mobsite.getway.domain.protocol.OrderItem;
-import com.diligrp.mobsite.getway.domain.protocol.shop.model.ShopInfo;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.util.List;
 /**
  * <B>Description</B> 进货单商品 <br />
@@ -14,80 +15,21 @@ import com.diligrp.mobsite.getway.domain.protocol.shop.model.ShopInfo;
  * @author zhangshirui
  * @createTime 2014/9/25 11:15
  */
-public class OrderShopInfo extends ShopInfo{
-	
-	/**
-	 * 提货时间类型
-	 * 0-6
-	 */
-	public static final int PICKUP_TIME_1 =1;
-	/**
-	 * 6-12
-	 */
-	public static final int PICKUP_TIME_2 =2;
-	/**
-	 * 12-18
-	 */
-	public static final int PICKUP_TIME_3 =3;
-	/**
-	 * 18-24
-	 */
-	public static final int PICKUP_TIME_4 =4;
-	
-	
-	/**
-	 * 提货日期格式：03-05
-	 */
-	private String pickupDate;
-	/**
-	 * 提货时间类型 1:0-6,2:6-12,3:12-18,4:18-24
-	 */
-	private Integer pickupTimeType;
-	/**
-     * 邮费
-     */
-    private Long postage = 0L;
-    /**
-     * 买家备注
-     */
-    private String remark;
+public class OrderShopInfo  implements Serializable{
+
     /**
      * 商品项信息
      */
+
+    @ApiModelProperty(value = "商品项列表")
     private List<OrderItem> orderItems;
-	
-	public List<OrderItem> getOrderItems() {
-		return orderItems;
-	}
-	public void setOrderItems(List<OrderItem> orderItems) {
-		this.orderItems = orderItems;
-	}
-	public String getPickupDate() {
-		return pickupDate;
-	}
-	public void setPickupDate(String pickupDate) {
-		this.pickupDate = pickupDate;
-	}
-	public Integer getPickupTimeType() {
-		return pickupTimeType;
-	}
-	public void setPickupTimeType(Integer pickupTimeType) {
-		this.pickupTimeType = pickupTimeType;
-	}
-    
-    public Long getPostage() {
-        return postage;
-    }
-    
-    public void setPostage(Long postage) {
-        this.postage = postage;
-    }
-    
-    public String getRemark() {
-        return remark;
+
+
+    public List<OrderItem> getOrderItems() {
+        return orderItems;
     }
-    
-    public void setRemark(String remark) {
-        this.remark = remark;
+
+    public void setOrderItems(List<OrderItem> orderItems) {
+        this.orderItems = orderItems;
     }
 }
 package com.diligrp.mobsite.getway.domain.protocol.order.model;
+import io.swagger.annotations.ApiModelProperty;
+
 import java.io.Serializable;
 /**
@@ -16,39 +18,8 @@ public class OrderSumInfo implements Serializable{
     /**
      * id,订单编号
      */
+    @ApiModelProperty(value = "订单号")
     private Long orderId;
-    /**
-     * 支付编码
-     */
-    private String payNo;
-    /**
-     * 应付金额
-     */
-    private Long realPayAmount;
-    /**
-     * 市场运费
-     */
-    private Long marketPostage;
-    /**
-     * 市场运费支付编码
-     */
-    private String marketTradeNo;
-
-    public Long getMarketPostage() {
-        return marketPostage;
-    }
-
-    public void setMarketPostage(Long marketPostage) {
-        this.marketPostage = marketPostage;
-    }
-
-    public String getMarketTradeNo() {
-        return marketTradeNo;
-    }
-
-    public void setMarketTradeNo(String marketTradeNo) {
-        this.marketTradeNo = marketTradeNo;
-    }
     public Long getOrderId() {
         return orderId;
@@ -57,20 +28,4 @@ public class OrderSumInfo implements Serializable{
     public void setOrderId(Long orderId) {
         this.orderId = orderId;
     }
-
-    public String getPayNo() {
-        return payNo;
-    }
-
-    public void setPayNo(String payNo) {
-        this.payNo = payNo;
-    }
-
-    public Long getRealPayAmount() {
-        return realPayAmount;
-    }
-
-    public void setRealPayAmount(Long realPayAmount) {
-        this.realPayAmount = realPayAmount;
-    }
 }
+package com.diligrp.mobsite.getway.domain.protocol.product;
+
+import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
+import com.diligrp.mobsite.getway.domain.protocol.GoodsSuper;
+
+/**
+ * Created by xxxzzz on 2016/12/28.
+ */
+public class AddGoodsReq  extends BaseReq {
+
+
+    private GoodsSuper goods;
+
+    public GoodsSuper getGoods() {
+        return goods;
+    }
+
+    public void setGoods(GoodsSuper goods) {
+        this.goods = goods;
+    }
+}
+package com.diligrp.mobsite.getway.domain.protocol.product;
+
+import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
+
+/**
+ * Created by xxxzzz on 2016/12/28.
+ */
+public class AddGoodsResp extends BaseResp {
+
+
+}
+package com.diligrp.mobsite.getway.domain.protocol.product;
+
+import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
+import com.diligrp.mobsite.getway.domain.protocol.Category;
+
+/**
+ * Created by xxxzzz on 2016/12/28.
+ */
+public class AddProductCategoryReq extends BaseReq {
+
+
+
+    private Category category;
+
+    public Category getCategory() {
+        return category;
+    }
+
+    public void setCategory(Category category) {
+        this.category = category;
+    }
+}
+package com.diligrp.mobsite.getway.domain.protocol.product;
+
+import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
+
+/**
+ * Created by xxxzzz on 2016/12/28.
+ */
+public class AddProductCategoryResp extends BaseResp {
+
+
+}
+package com.diligrp.mobsite.getway.domain.protocol.product;
+
+import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
+
+/**
+ * Created by xxxzzz on 2016/12/29.
+ */
+public class GetGoodsReq extends BaseReq {
+}
+package com.diligrp.mobsite.getway.domain.protocol.product;
+
+import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
+import com.diligrp.mobsite.getway.domain.protocol.GoodsSuper;
+
+/**
+ * Created by xxxzzz on 2016/12/29.
+ */
+public class GetGoodsResp extends BaseResp {
+
+    private GoodsSuper goods;
+
+    public GoodsSuper getGoods() {
+        return goods;
+    }
+
+    public void setGoods(GoodsSuper goods) {
+        this.goods = goods;
+    }
+}
+package com.diligrp.mobsite.getway.domain.protocol.product;
+
+import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.List;
+
+/**
+ * Created by xxxzzz on 2016/12/29.
+ */
+public class HandleGoodsReq extends BaseReq {
+
+
+    @ApiModelProperty(value = "商品id",required = true)
+    private List<Long> ids;
+
+    @ApiModelProperty("操作：1上架 2 下架 3设置促销 4设置首页推荐 5删除")
+    private Integer operate;
+
+
+    public List<Long> getIds() {
+        return ids;
+    }
+
+    public void setIds(List<Long> ids) {
+        this.ids = ids;
+    }
+
+    public Integer getOperate() {
+        return operate;
+    }
+
+    public void setOperate(Integer operate) {
+        this.operate = operate;
+    }
+}
+package com.diligrp.mobsite.getway.domain.protocol.product;
+
+import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
+
+/**
+ * Created by xxxzzz on 2016/12/29.
+ */
+public class HandleGoodsResp extends BaseResp {
+}
+package com.diligrp.mobsite.getway.domain.protocol.product;
+
+import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * Created by xxxzzz on 2016/12/28.
+ */
+public class SearchProductCategoryReq extends BaseReq {
+
+    @ApiModelProperty(value = "搜索关键字")
+    private String keyword;
+
+
+    public String getKeyword() {
+        return keyword;
+    }
+
+    public void setKeyword(String keyword) {
+        this.keyword = keyword;
+    }
+}
+package com.diligrp.mobsite.getway.domain.protocol.product;
+
+import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
+import com.diligrp.mobsite.getway.domain.protocol.Category;
+
+import java.util.List;
+
+/**
+ * Created by xxxzzz on 2016/12/28.
+ */
+public class SearchProductCategoryResp extends BaseResp {
+
+
+   private  List<Category>  categories;
+
+
+    public List<Category> getCategories() {
+        return categories;
+    }
+
+    public void setCategories(List<Category> categories) {
+        this.categories = categories;
+    }
+}
+package com.diligrp.mobsite.getway.domain.protocol.product;
+
+import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
+import com.diligrp.mobsite.getway.domain.protocol.GoodsSuper;
+
+/**
+ * Created by xxxzzz on 2016/12/28.
+ */
+public class UpdateGoodsReq extends BaseReq {
+
+
+    private GoodsSuper goods;
+
+    public GoodsSuper getGoods() {
+        return goods;
+    }
+
+    public void setGoods(GoodsSuper goods) {
+        this.goods = goods;
+    }
+}
+package com.diligrp.mobsite.getway.domain.protocol.product;
+
+import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
+
+/**
+ * Created by xxxzzz on 2016/12/28.
+ */
+public class UpdateGoodsResp extends BaseResp {
+
+
+}
+package com.diligrp.mobsite.getway.domain.protocol.product;
+
+import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
+import com.diligrp.mobsite.getway.domain.protocol.Category;
+
+/**
+ * Created by xxxzzz on 2016/12/28.
+ */
+public class UpdateProductCategoryReq extends BaseReq {
+
+
+
+    private Category category;
+
+    public Category getCategory() {
+        return category;
+    }
+
+    public void setCategory(Category category) {
+        this.category = category;
+    }
+}
+package com.diligrp.mobsite.getway.domain.protocol.product;
+
+import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
+
+/**
+ * Created by xxxzzz on 2016/12/28.
+ */
+public class UpdateProductCategoryResp extends BaseResp {
+
+
+}
 package com.diligrp.mobsite.getway.domain.protocol.saler.order;
 import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
+import io.swagger.annotations.ApiModelProperty;
 public class ConfirmReceiptMoneyReq extends BaseReq {
     /**
      *订单id
      * */
+	@ApiModelProperty(value = "订单id",required = true)
     private Long orderId;
 	public Long getOrderId() {
 package com.diligrp.mobsite.getway.domain.protocol.saler.order;
 import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
+import io.swagger.annotations.ApiModelProperty;
 public class GetOrderDetailReq extends BaseReq {
     /**
      *订单id
      * */
+    @ApiModelProperty(value = "订单id",required = true)
     private Long orderId;
     public Long getOrderId() {
 package com.diligrp.mobsite.getway.domain.protocol.saler.order;
-import java.util.List;
-
 import com.diligrp.mobsite.getway.domain.base.BaseListReq;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.List;
 public class GetOrderListReq extends BaseListReq {
-	/**
-	 * 订单状态:(-1全部，10待付款，20待备货，30备货中，40待提货，50已提货,60已过期,70已取消,80已申请退款，90已退款，100
-	 * 提货超时)
-	 * */
-	private List<Integer> orderStatus;
 	/**
-	 * 支付方式 10-在线支付,20-线下支付,30-提货付款,40-赊账付款
-	 * */
-	private List<Integer> payTypeList;
-	/**
-	 * 买家姓名
-	 * */
-	private String buyerName;
-	/**
-	 * 买家电话
-	 * */
-	private String buyerMobilePhone;
+	 * 订单状态
+	 */
+	@ApiModelProperty(value = "订单状态:(10待接单，15已接单待付款，20待自提，25待送货，30接单已过期,35支付超时,40已拒绝,45已取消，50已完成) ")
+	private Integer orderState;
 	/**
-	 * 搜索参数
+	 * 支付类型
 	 */
-	private String searchKey;
+	@ApiModelProperty(value = "支付方式：10-在线支付,20-线下支付")
+	private List<Integer> payType;
-	public List<Integer> getOrderStatus() {
-		return orderStatus;
+	public Integer getOrderState() {
+		return orderState;
 	}
-	public void setOrderStatus(List<Integer> orderStatus) {
-		this.orderStatus = orderStatus;
+	public void setOrderState(Integer orderState) {
+		this.orderState = orderState;
 	}
-	public List<Integer> getPayTypeList() {
-		return payTypeList;
+	public List<Integer> getPayType() {
+		return payType;
 	}
-	public void setPayTypeList(List<Integer> payTypeList) {
-		this.payTypeList = payTypeList;
+	public void setPayType(List<Integer> payType) {
+		this.payType = payType;
 	}
-
-	public String getBuyerName() {
-		return buyerName;
-	}
-
-	public void setBuyerName(String buyerName) {
-		this.buyerName = buyerName;
-	}
-
-	public String getBuyerMobilePhone() {
-		return buyerMobilePhone;
-	}
-
-	public void setBuyerMobilePhone(String buyerMobilePhone) {
-		this.buyerMobilePhone = buyerMobilePhone;
-	}
-
-	public String getSearchKey() {
-		return searchKey;
-	}
-
-	public void setSearchKey(String searchKey) {
-		this.searchKey = searchKey;
-	}
-
 }
 package com.diligrp.mobsite.getway.domain.protocol.saler.order;
 import com.diligrp.mobsite.getway.domain.base.BaseListResp;
-import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
-import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
-import com.diligrp.mobsite.getway.domain.protocol.saler.order.model.SellerOrder;
+import com.diligrp.mobsite.getway.domain.protocol.Order;
 import java.util.List;
@@ -12,13 +10,13 @@ public class GetOrderListResp extends BaseListResp {
     /**
      *order list
      * */
-    private List<SellerOrder> orders;
+    private List<Order> orders;
-    public List<SellerOrder> getOrders() {
+    public List<Order> getOrders() {
         return orders;
     }
-    public void setOrders(List<SellerOrder> orders) {
+    public void setOrders(List<Order> orders) {
         this.orders = orders;
     }
 }
 package com.diligrp.mobsite.getway.domain.protocol.saler.order;
 import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
+import io.swagger.annotations.ApiModelProperty;
 public class RefuseQuoteReq extends BaseReq {
     /**
      *订单id
      * */
+	@ApiModelProperty(value = "订单id",required = true)
     private Long orderId;
     /**
      * 拒绝原因
      */
-    private String  refuseReason;
+	@ApiModelProperty(value = "拒绝原因",required = true)
+	private String  refuseReason;
 	public Long getOrderId() {
 		return orderId;
+package com.diligrp.mobsite.getway.domain.protocol.saler.order;
+
+import com.diligrp.mobsite.getway.domain.base.BaseListReq;
+import io.swagger.annotations.ApiModelProperty;
+
+public class SearchOrderListReq extends BaseListReq {
+
+
+	/**
+	 * 订单状态
+	 */
+	@ApiModelProperty(value = "搜索关键字：订单号等 ")
+	private Integer keyword;
+
+
+	public Integer getKeyword() {
+		return keyword;
+	}
+
+	public void setKeyword(Integer keyword) {
+		this.keyword = keyword;
+	}
+}
+package com.diligrp.mobsite.getway.domain.protocol.saler.order;
+
+import com.diligrp.mobsite.getway.domain.base.BaseListResp;
+import com.diligrp.mobsite.getway.domain.protocol.Order;
+
+import java.util.List;
+
+public class SearchOrderListResp extends BaseListResp {
+
+    /**
+     *order list
+     * */
+    private List<Order> orders;
+
+    public List<Order> getOrders() {
+        return orders;
+    }
+
+    public void setOrders(List<Order> orders) {
+        this.orders = orders;
+    }
+}
@@ -5,56 +5,26 @@ import java.io.Serializable;
 /**
  * Created by david on 2015/4/23.
  */
-public class BuyerInfo implements Serializable {
+public class SellerInfo implements Serializable {
     /**
      * 买家id
      * */
-    private Long buyerId;
+    private Long sellerId;
     /**
      * 买家名称
      * */
-    private String buyerName;
+    private String sellerName;
     /**
      * 买家真实姓名
      * */
-    private String buyerRealName;
+    private String sellerRealName;
     /**
      * 买家电话
      * */
-    private String buyerPhone;
+    private String sellerPhone;
-    public String getBuyerRealName() {
-        return buyerRealName;
-    }
-    public void setBuyerRealName(String buyerRealName) {
-        this.buyerRealName = buyerRealName;
-    }
-
-    public Long getBuyerId() {
-        return buyerId;
-    }
-
-    public void setBuyerId(Long buyerId) {
-        this.buyerId = buyerId;
-    }
-
-    public String getBuyerName() {
-        return buyerName;
-    }
-
-    public void setBuyerName(String buyerName) {
-        this.buyerName = buyerName;
-    }
-
-    public String getBuyerPhone() {
-        return buyerPhone;
-    }
-
-    public void setBuyerPhone(String buyerPhone) {
-        this.buyerPhone = buyerPhone;
-    }
 }
 package com.diligrp.mobsite.getway.domain.protocol.saler.order.model;
 import com.diligrp.mobsite.getway.domain.protocol.ConsigneeInfo;
-import com.diligrp.mobsite.getway.domain.protocol.OrderProduct;
-import com.diligrp.mobsite.getway.domain.protocol.order.model.*;
-
-import java.util.List;
+import com.diligrp.mobsite.getway.domain.protocol.Order;
+import io.swagger.annotations.ApiModelProperty;
 /**
  * Created by david on 2015/4/16.
  */
-public class SellerOrder extends OrderSumInfo {
-	/**
-	 * 订单状态:(10待付款，20待备货，30备货中，40待提货，50已提货,60已过期,70已取消,80已申请退款，90已退款，100提货超时)
-	 */
-	private Integer orderState;
+public class SellerOrder extends Order {
-	/**
-	 * 订单状态名称
-	 */
-	private String stateName;
 	/**
-	 * 支付方式
-	 */
-	private Integer payType;
-	/**
-	 * 总金额
-	 */
-	private Long totalAmount;
-	/**
-	 * 应付金额
-	 */
-	private Long realPayAmount;
-	/**
-	 * 商品总金额
-	 */
-	private Long productsTotalPrice;
-	/**
-	 * 邮费
-	 */
-	private Long postage;
-	/**
-	 * 提交日期
-	 */
-	private String submitDate;
-	/**
-	 * 订单详情页最上面
-	 */
-	private String orderDescription;
-	/**
-	 * 卖家id
-	 */
-	private Long sellerId;
-	/**
-	 * 店铺id
-	 */
-	private Long shopId;
-	/**
-	 * 店铺名称
-	 */
-	private String shopName;
-	/**
-	 * 店铺联系电话
-	 */
-	private String contactMobile;
-	/**
-	 * 订单商品列表
-	 */
-	private List<OrderProduct> orderProducts;
-	/**
-	 * 提货留言
-	 */
-	private String pickUserMsg;
-	/**
 	 * 提货人信息
 	 */
+	@ApiModelProperty(value = "收货人信息")
 	private ConsigneeInfo consigneeInfo;
-	/**
-	 * 买家信息
-	 */
-	private BuyerInfo buyerInfo;
-
-	/**
-	 * 取货验证码
-	 */
-	private String pickUpVerifyCode;
-
-	/**
-	 * 提货时间
-	 */
-	private String pickDate;
-	/**
-	 * 提货地点
-	 */
-	private String pickAddress;
-	/**
-	 * 市场信息
-	 */
-	private MarketInfo marketInfo;
-	/**
-	 * 交易识别码
-	 */
-	private String tradeCode;
-	/**
-	 * 申请退款id
-	 */
-	private Long refundId;
-
-	/**
-	 * 提货方式id
-	 */
-	private Integer deliveryType;
-	/**
-	 * 提货方式名称
-	 */
-	private String deliveryName;
-	/**
-	 * 剩余提货时间
-	 */
-	private Integer remainPickTime;
-
-	/**
-	 * 提货开始时间
-	 */
-	private String reservationStime;
-
-	/**
-	 * 提货结束时间
-	 */
-	private String reservationFtime;
-
-	/**
-	 * 退款单号
-	 */
-	private Long reOrderId;
-
-	/**
-	 * 退款金额
-	 */
-	private Long refundPrice;
-
-	/**
-	 * 物流备注
-	 */
-	private String logisticsRemarks;
-	
-	/**
-	 * 订单日志
-	 */
-	private List<OrderLog> orderLogs;
-
-	/**
-	 * 物流信息
-	 */
-	private LogisticsInfo logisticsInfo;
-
-	/**
-	 * 代购信息
-	 */
-	private PurchaseInfo purchaseInfo;
-	
-	public String getPickUpVerifyCode() {
-		return pickUpVerifyCode;
-	}
-
-	public void setPickUpVerifyCode(String pickUpVerifyCode) {
-		this.pickUpVerifyCode = pickUpVerifyCode;
-	}
-
-	public BuyerInfo getBuyerInfo() {
-		return buyerInfo;
-	}
-
-	public void setBuyerInfo(BuyerInfo buyerInfo) {
-		this.buyerInfo = buyerInfo;
-	}
-
-	public Integer getOrderState() {
-		return orderState;
-	}
-
-	public void setOrderState(Integer orderState) {
-		this.orderState = orderState;
-	}
-
-	public String getStateName() {
-		return stateName;
-	}
-
-	public void setStateName(String stateName) {
-		this.stateName = stateName;
-	}
-
-	public Integer getPayType() {
-		return payType;
-	}
-
-	public void setPayType(Integer payType) {
-		this.payType = payType;
-	}
-
-	public Long getTotalAmount() {
-		return totalAmount;
-	}
-
-	public void setTotalAmount(Long totalAmount) {
-		this.totalAmount = totalAmount;
-	}
-
-	public Long getRealPayAmount() {
-		return realPayAmount;
-	}
-
-	public void setRealPayAmount(Long realPayAmount) {
-		this.realPayAmount = realPayAmount;
-	}
-
-	public Long getProductsTotalPrice() {
-		return productsTotalPrice;
-	}
-
-	public void setProductsTotalPrice(Long productsTotalPrice) {
-		this.productsTotalPrice = productsTotalPrice;
-	}
-
-	public Long getPostage() {
-		return postage;
-	}
-
-	public void setPostage(Long postage) {
-		this.postage = postage;
-	}
-
-	public String getSubmitDate() {
-		return submitDate;
-	}
-
-	public void setSubmitDate(String submitDate) {
-		this.submitDate = submitDate;
-	}
-
-	public String getOrderDescription() {
-		return orderDescription;
-	}
-
-	public void setOrderDescription(String orderDescription) {
-		this.orderDescription = orderDescription;
-	}
-
-	public Long getSellerId() {
-		return sellerId;
-	}
-
-	public void setSellerId(Long sellerId) {
-		this.sellerId = sellerId;
-	}
-
-	public Long getShopId() {
-		return shopId;
-	}
-
-	public void setShopId(Long shopId) {
-		this.shopId = shopId;
-	}
-
-	public String getShopName() {
-		return shopName;
-	}
-
-	public void setShopName(String shopName) {
-		this.shopName = shopName;
-	}
-
-	public String getContactMobile() {
-		return contactMobile;
-	}
-
-	public void setContactMobile(String contactMobile) {
-		this.contactMobile = contactMobile;
-	}
-
-	public List<OrderProduct> getOrderProducts() {
-		return orderProducts;
-	}
-
-	public void setOrderProducts(List<OrderProduct> orderProducts) {
-		this.orderProducts = orderProducts;
-	}
-
-	public String getPickUserMsg() {
-		return pickUserMsg;
-	}
-
-	public void setPickUserMsg(String pickUserMsg) {
-		this.pickUserMsg = pickUserMsg;
-	}
 	public ConsigneeInfo getConsigneeInfo() {
 		return consigneeInfo;
@@ -303,132 +23,4 @@ public class SellerOrder extends OrderSumInfo {
 	public void setConsigneeInfo(ConsigneeInfo consigneeInfo) {
 		this.consigneeInfo = consigneeInfo;
 	}
-
-	public String getPickDate() {
-		return pickDate;
-	}
-
-	public void setPickDate(String pickDate) {
-		this.pickDate = pickDate;
-	}
-
-	public String getPickAddress() {
-		return pickAddress;
-	}
-
-	public void setPickAddress(String pickAddress) {
-		this.pickAddress = pickAddress;
-	}
-
-	public MarketInfo getMarketInfo() {
-		return marketInfo;
-	}
-
-	public void setMarketInfo(MarketInfo marketInfo) {
-		this.marketInfo = marketInfo;
-	}
-
-	public String getTradeCode() {
-		return tradeCode;
-	}
-
-	public void setTradeCode(String tradeCode) {
-		this.tradeCode = tradeCode;
-	}
-
-	public Long getRefundId() {
-		return refundId;
-	}
-
-	public void setRefundId(Long refundId) {
-		this.refundId = refundId;
-	}
-
-	public Integer getDeliveryType() {
-		return deliveryType;
-	}
-
-	public void setDeliveryType(Integer deliveryType) {
-		this.deliveryType = deliveryType;
-	}
-
-	public String getDeliveryName() {
-		return deliveryName;
-	}
-
-	public void setDeliveryName(String deliveryName) {
-		this.deliveryName = deliveryName;
-	}
-
-	public Integer getRemainPickTime() {
-		return remainPickTime;
-	}
-
-	public void setRemainPickTime(Integer remainPickTime) {
-		this.remainPickTime = remainPickTime;
-	}
-
-	public String getReservationStime() {
-		return reservationStime;
-	}
-
-	public void setReservationStime(String reservationStime) {
-		this.reservationStime = reservationStime;
-	}
-
-	public String getReservationFtime() {
-		return reservationFtime;
-	}
-
-	public void setReservationFtime(String reservationFtime) {
-		this.reservationFtime = reservationFtime;
-	}
-
-	public Long getReOrderId() {
-		return reOrderId;
-	}
-
-	public void setReOrderId(Long reOrderId) {
-		this.reOrderId = reOrderId;
-	}
-
-	public Long getRefundPrice() {
-		return refundPrice;
-	}
-
-	public void setRefundPrice(Long refundPrice) {
-		this.refundPrice = refundPrice;
-	}
-
-	public String getLogisticsRemarks() {
-		return logisticsRemarks;
-	}
-
-	public void setLogisticsRemarks(String logisticsRemarks) {
-		this.logisticsRemarks = logisticsRemarks;
-	}
-
-	public List<OrderLog> getOrderLogs() {
-		return orderLogs;
-	}
-
-	public void setOrderLogs(List<OrderLog> orderLogs) {
-		this.orderLogs = orderLogs;
-	}
-
-	public LogisticsInfo getLogisticsInfo() {
-		return logisticsInfo;
-	}
-
-	public void setLogisticsInfo(LogisticsInfo logisticsInfo) {
-		this.logisticsInfo = logisticsInfo;
-	}
-
-	public PurchaseInfo getPurchaseInfo() {
-		return purchaseInfo;
-	}
-
-	public void setPurchaseInfo(PurchaseInfo purchaseInfo) {
-		this.purchaseInfo = purchaseInfo;
-	}
 }
 package com.diligrp.mobsite.getway.domain.protocol.saler.order;
 import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
+import io.swagger.annotations.ApiModelProperty;
-public class ModifyOrderPriceReq extends BaseReq {
+public class takeOrderReq extends BaseReq {
     /***
      * 订单id
      * */
+    @ApiModelProperty(value = "订单id",required = true)
     private Long orderId;
     /***
      * 新的订单金额
      */
+    @ApiModelProperty(value = "修改后的订单金额",required = true)
     private Long pricePrivilege;
-    /**
-     * 新运费(newPricePostage)不能为空,无运费请填写0
-     * */
-    private Long newPricePostage;
     public Long getOrderId() {
         return orderId;
@@ -33,12 +32,4 @@ public class ModifyOrderPriceReq extends BaseReq {
     public void setPricePrivilege(Long pricePrivilege) {
         this.pricePrivilege = pricePrivilege;
     }
-
-    public Long getNewPricePostage() {
-        return newPricePostage;
-    }
-
-    public void setNewPricePostage(Long newPricePostage) {
-        this.newPricePostage = newPricePostage;
-    }
 }
+package com.diligrp.mobsite.getway.domain.protocol.shop;
+
+import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.List;
+
+/**
+ * Created by xxxzzz on 2016/12/28.
+ */
+public class AddShopDeliveryTimeReq extends BaseReq {
+
+    @ApiModelProperty(value = "时间段",required = true)
+    private List<DeliveryTimeInfo>  deliveryTimeInfos;
+
+
+    public List<DeliveryTimeInfo> getDeliveryTimeInfos() {
+        return deliveryTimeInfos;
+    }
+
+    public void setDeliveryTimeInfos(List<DeliveryTimeInfo> deliveryTimeInfos) {
+        this.deliveryTimeInfos = deliveryTimeInfos;
+    }
+}
+package com.diligrp.mobsite.getway.domain.protocol.shop;
+
+import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
+
+/**
+ * Created by xxxzzz on 2016/12/28.
+ */
+public class AddShopDeliveryTimeResp extends BaseResp {
+}
+package com.diligrp.mobsite.getway.domain.protocol.shop;
+
+import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
+import com.diligrp.mobsite.getway.domain.protocol.Category;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.List;
+
+/**
+ * <B>Description</B> 路线管理-获取线路信息   <br />
+ * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />
+ * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
+ * <B>Company</B> 地利集团
+ * @author wujiaqiang
+ */
+public class CreateOrUpdateShopReq extends BaseReq {
+
+
+
+	@ApiModelProperty(value = "城市code")
+	private Long cityCode;
+
+	@ApiModelProperty(value = "城市名称")
+	private String cityName;
+
+	@ApiModelProperty(value = "店铺名称")
+	private String shopName;
+
+	@ApiModelProperty(value = "店铺logo")
+	private String shopLogo;
+
+	@ApiModelProperty(value = "主营类目")
+	private List<Category> catagorys;
+
+
+
+	@ApiModelProperty(value = "店铺地址")
+	private String shopAddr;
+
+	@ApiModelProperty(value = "客户电话")
+	private String phone;
+
+
+	@ApiModelProperty(value = "商品排列方式（1：两列式 2：列表式）")
+	private Integer productDisplayWay;
+
+	@ApiModelProperty(value = "配送费")
+	private Long postage;
+
+	@ApiModelProperty(value = "订单免配送费金额")
+	private Long freeShippingPrice;
+
+	@ApiModelProperty(value = "店铺公告")
+	private String shopNotices;
+
+	@ApiModelProperty(value = "送货时间段")
+	private List<String> deliveryTime;
+
+
+
+	public Long getCityCode() {
+		return cityCode;
+	}
+
+	public void setCityCode(Long cityCode) {
+		this.cityCode = cityCode;
+	}
+
+	public String getCityName() {
+		return cityName;
+	}
+
+	public void setCityName(String cityName) {
+		this.cityName = cityName;
+	}
+
+	public String getShopName() {
+		return shopName;
+	}
+
+	public void setShopName(String shopName) {
+		this.shopName = shopName;
+	}
+
+	public String getShopLogo() {
+		return shopLogo;
+	}
+
+	public void setShopLogo(String shopLogo) {
+		this.shopLogo = shopLogo;
+	}
+
+
+	public List<Category> getCatagorys() {
+		return catagorys;
+	}
+
+	public void setCatagorys(List<Category> catagorys) {
+		this.catagorys = catagorys;
+	}
+
+	public Integer getProductDisplayWay() {
+		return productDisplayWay;
+	}
+
+	public void setProductDisplayWay(Integer productDisplayWay) {
+		this.productDisplayWay = productDisplayWay;
+	}
+
+	public Long getPostage() {
+		return postage;
+	}
+
+	public void setPostage(Long postage) {
+		this.postage = postage;
+	}
+
+	public Long getFreeShippingPrice() {
+		return freeShippingPrice;
+	}
+
+	public void setFreeShippingPrice(Long freeShippingPrice) {
+		this.freeShippingPrice = freeShippingPrice;
+	}
+
+	public String getShopNotices() {
+		return shopNotices;
+	}
+
+	public void setShopNotices(String shopNotices) {
+		this.shopNotices = shopNotices;
+	}
+
+	public List<String> getDeliveryTime() {
+		return deliveryTime;
+	}
+
+	public void setDeliveryTime(List<String> deliveryTime) {
+		this.deliveryTime = deliveryTime;
+	}
+
+	public String getShopAddr() {
+		return shopAddr;
+	}
+
+	public void setShopAddr(String shopAddr) {
+		this.shopAddr = shopAddr;
+	}
+
+	public String getPhone() {
+		return phone;
+	}
+
+	public void setPhone(String phone) {
+		this.phone = phone;
+	}
+}
+package com.diligrp.mobsite.getway.domain.protocol.shop;
+
+import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * <B>Description</B> 路线管理-获取线路信息   <br />
+ * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />
+ * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
+ * <B>Company</B> 地利集团
+ * @author wujiaqiang
+ */
+public class CreateOrUpdateShopResp extends BaseResp {
+
+
+    /**
+     * 店铺code
+     */
+    @ApiModelProperty(value = "店铺分享码" )
+    private Integer shopAuthCode;
+
+    public Integer getShopAuthCode() {
+        return shopAuthCode;
+    }
+
+    public void setShopAuthCode(Integer shopAuthCode) {
+        this.shopAuthCode = shopAuthCode;
+    }
+}
+package com.diligrp.mobsite.getway.domain.protocol.shop;
+
+import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
+
+/**
+ * Created by xxxzzz on 2016/12/28.
+ */
+public class DelShopDeliveryTimeReq extends BaseReq {
+
+
+    private Long[] ids;
+
+    public Long[] getIds() {
+        return ids;
+    }
+
+    public void setIds(Long[] ids) {
+        this.ids = ids;
+    }
+}
+package com.diligrp.mobsite.getway.domain.protocol.shop;
+
+import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
+
+/**
+ * Created by xxxzzz on 2016/12/28.
+ */
+public class DelShopDeliveryTimeResp extends BaseResp {
+}
+package com.diligrp.mobsite.getway.domain.protocol.shop;
+
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+
+/**
+ * Created by xxxzzz on 2016/12/28.
+ */
+public class DeliveryTimeInfo implements Serializable {
+
+    @ApiModelProperty(value = "时间段id",required = true)
+    private Long id;
+
+    @ApiModelProperty(value = "开始时间",required = true)
+    private String beginTime;
+
+    @ApiModelProperty(value = "结束时间",required = true)
+    private String endTime;
+
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getBeginTime() {
+        return beginTime;
+    }
+
+    public void setBeginTime(String beginTime) {
+        this.beginTime = beginTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
+}
+package com.diligrp.mobsite.getway.domain.protocol.shop;
+
+import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
+import com.diligrp.mobsite.getway.domain.protocol.Category;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.List;
+
+/**
+ * Created by xxxzzz on 2016/12/27.
+ */
+public class GetShopInfoResp extends BaseResp {
+
+    @ApiModelProperty(value = "城市code")
+    private Long cityCode;
+
+    @ApiModelProperty(value = "城市名称")
+    private String cityName;
+
+    @ApiModelProperty(value = "店铺名称")
+    private String shopName;
+
+    @ApiModelProperty(value = "店铺logo")
+    private String shopLogo;
+
+    @ApiModelProperty(value = "主营类目")
+    private List<Category> catagorys;
+
+
+
+    @ApiModelProperty(value = "店铺地址")
+    private String shopAddr;
+
+    @ApiModelProperty(value = "客户电话")
+    private String phone;
+
+
+    @ApiModelProperty(value = "商品排列方式（1：两列式 2：列表式）")
+    private Integer productDisplayWay;
+
+    @ApiModelProperty(value = "配送费")
+    private Long postage;
+
+    @ApiModelProperty(value = "订单免配送费金额")
+    private Long freeShippingPrice;
+
+    @ApiModelProperty(value = "店铺公告")
+    private String shopNotices;
+
+    @ApiModelProperty(value = "送货时间段")
+    private List<String> deliveryTime;
+
+
+
+    public Long getCityCode() {
+        return cityCode;
+    }
+
+    public void setCityCode(Long cityCode) {
+        this.cityCode = cityCode;
+    }
+
+    public String getCityName() {
+        return cityName;
+    }
+
+    public void setCityName(String cityName) {
+        this.cityName = cityName;
+    }
+
+    public String getShopName() {
+        return shopName;
+    }
+
+    public void setShopName(String shopName) {
+        this.shopName = shopName;
+    }
+
+    public String getShopLogo() {
+        return shopLogo;
+    }
+
+    public void setShopLogo(String shopLogo) {
+        this.shopLogo = shopLogo;
+    }
+
+
+    public List<Category> getCatagorys() {
+        return catagorys;
+    }
+
+    public void setCatagorys(List<Category> catagorys) {
+        this.catagorys = catagorys;
+    }
+
+    public Integer getProductDisplayWay() {
+        return productDisplayWay;
+    }
+
+    public void setProductDisplayWay(Integer productDisplayWay) {
+        this.productDisplayWay = productDisplayWay;
+    }
+
+    public Long getPostage() {
+        return postage;
+    }
+
+    public void setPostage(Long postage) {
+        this.postage = postage;
+    }
+
+    public Long getFreeShippingPrice() {
+        return freeShippingPrice;
+    }
+
+    public void setFreeShippingPrice(Long freeShippingPrice) {
+        this.freeShippingPrice = freeShippingPrice;
+    }
+
+    public String getShopNotices() {
+        return shopNotices;
+    }
+
+    public void setShopNotices(String shopNotices) {
+        this.shopNotices = shopNotices;
+    }
+
+    public List<String> getDeliveryTime() {
+        return deliveryTime;
+    }
+
+    public void setDeliveryTime(List<String> deliveryTime) {
+        this.deliveryTime = deliveryTime;
+    }
+
+    public String getShopAddr() {
+        return shopAddr;
+    }
+
+    public void setShopAddr(String shopAddr) {
+        this.shopAddr = shopAddr;
+    }
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+}
+package com.diligrp.mobsite.getway.domain.protocol.shop;
+
+import com.diligrp.mobsite.getway.domain.base.BaseListResp;
+
+/**
+ * Created by xxxzzz on 2016/12/27.
+ */
+public class GetShowStyleResp extends BaseListResp {
+}
+package com.diligrp.mobsite.getway.domain.protocol.user;
+
+import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
+
+/**
+ * Created by xxxzzz on 2016/12/27.
+ */
+public class GetDepositCardAmountReq extends BaseReq {
+
+
+
+
+
+
+}
+package com.diligrp.mobsite.getway.domain.protocol.user;
+
+import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * Created by xxxzzz on 2016/12/27.
+ */
+public class GetDepositCardAmountResp extends BaseResp {
+
+    @ApiModelProperty(value = "储值卡余额")
+    private Long depositCardAmount;
+
+
+    public Long getDepositCardAmount() {
+        return depositCardAmount;
+    }
+
+    public void setDepositCardAmount(Long depositCardAmount) {
+        this.depositCardAmount = depositCardAmount;
+    }
+}
@@ -12,5 +12,5 @@ import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
  * @createTime 2014/9/1 11:47
  */
 @SuppressWarnings("serial")
-public class GetUserIntroductionReq extends BaseReq {
+public class GetUserInfoReq extends BaseReq {
 }
+package com.diligrp.mobsite.getway.domain.protocol.user;
+
+import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
+import com.diligrp.mobsite.getway.domain.protocol.user.model.BuyerInfo;
+
+/**
+ * <B>Description</B> 用户简介响应对象 <br />
+ * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />
+ * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
+ * <B>Company</B> 地利集团
+ *
+ * @author wujianjun
+ * @createTime 2014/9/1 11:48
+ */
+@SuppressWarnings("serial")
+public class GetUserInfoResp extends BaseResp {
+
+   private BuyerInfo buyerInfo;
+
+
+    public BuyerInfo getBuyerInfo() {
+        return buyerInfo;
+    }
+
+    public void setBuyerInfo(BuyerInfo buyerInfo) {
+        this.buyerInfo = buyerInfo;
+    }
+}
-package com.diligrp.mobsite.getway.domain.protocol.user;
-
-import com.diligrp.mobsite.getway.domain.common.Constant;
-import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
-import com.diligrp.mobsite.getway.domain.protocol.shop.model.ShopInfo;
-
-/**
- * <B>Description</B> 用户简介响应对象 <br />
- * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />
- * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
- * <B>Company</B> 地利集团
- *
- * @author wujianjun
- * @createTime 2014/9/1 11:48
- */
-@SuppressWarnings("serial")
-public class GetUserIntroductionResp extends BaseResp {
-
-    /**
-     * 男
-     */
-    public static final Integer SEX_MALE = 1;
-    /**
-     * 女
-     */
-    public static final Integer SEX_FEMALE = 2;
-    /**
-     * 未知
-     */
-    public static final Integer SEX_UNKNOW = 3;
-
-    /**
-     * 个人用户
-     */
-    public static final Integer USERTYPE_PERSON = 1;
-    /**
-     * 企业用户
-     */
-    public static final Integer USERTYPE_COMPANY = 2;
-
-    /**
-     * 用户真实姓名
-     */
-    private String realName;
-    /**
-     * 用户名，昵称
-     */
-    private String userName;
-    /**
-     * 用户手机号码
-     */
-    private String mobilePhone;
-    /**
-     * 认证标识
-     * 认证标识：未认证:100,认证中:101,已认证:102,认证失败:103
-     */
-    private Integer authResult = Constant.USER_AUTH_RESULT_NOTAUTH;
-    /**
-     * 认证消息
-     */
-    private String authMessage;
-    /**
-     * 性别
-     */
-    private Integer sex;
-    /**
-     * 用户类型 :1-个人用户,2-企业用户
-     */
-    private Integer userType;
-    /**
-     * 账户状态： 1:正常状态，2:锁定，3：未激活
-     */
-    private Integer accountState;
-    /**
-     * 个人头像
-     */
-    private String headImg;
-    /**
-     * 店铺信息
-     */
-    private ShopInfo shopInfo;
-
-    public String getRealName() {
-        return realName;
-    }
-
-    public void setRealName(String realName) {
-        this.realName = realName;
-    }
-
-    public String getMobilePhone() {
-        return mobilePhone;
-    }
-
-    public void setMobilePhone(String mobilePhone) {
-        this.mobilePhone = mobilePhone;
-    }
-
-    public Integer getSex() {
-        return sex;
-    }
-
-    public void setSex(Integer sex) {
-        this.sex = sex;
-    }
-
-    public Integer getUserType() {
-        return userType;
-    }
-
-    public void setUserType(Integer userType) {
-        this.userType = userType;
-    }
-
-    public String getAuthMessage() {
-        return authMessage;
-    }
-
-    public void setAuthMessage(String authMessage) {
-        this.authMessage = authMessage;
-    }
-
-    
-    public String getUserName() {
-        return userName;
-    }
-
-    
-    public void setUserName(String userName) {
-        this.userName = userName;
-    }
-
-    
-    public Integer getAuthResult() {
-        return authResult;
-    }
-
-    
-    public void setAuthResult(Integer authResult) {
-        this.authResult = authResult;
-    }
-
-	public Integer getAccountState() {
-		return accountState;
-	}
-
-	public void setAccountState(Integer accountState) {
-		this.accountState = accountState;
-	}
-
-	public ShopInfo getShopInfo() {
-		return shopInfo;
-	}
-
-	public void setShopInfo(ShopInfo shopInfo) {
-		this.shopInfo = shopInfo;
-	}
-
-    
-    public String getHeadImg() {
-        return headImg;
-    }
-
-    
-    public void setHeadImg(String headImg) {
-        this.headImg = headImg;
-    }
-}
+package com.diligrp.mobsite.getway.domain.protocol.user;
+
+import com.diligrp.mobsite.getway.domain.base.BaseListReq;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * <B>Description</B> 用户简介 <br />
+ * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />
+ * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
+ * <B>Company</B> 地利集团
+ *
+ * @author wujianjun
+ * @createTime 2014/9/1 11:47
+ */
+@SuppressWarnings("serial")
+public class SearchUserInfoReq extends BaseListReq {
+
+
+    @ApiModelProperty(value = "搜索关键字：昵称或手机号")
+    private String keyword;
+
+
+    public String getKeyword() {
+        return keyword;
+    }
+
+    public void setKeyword(String keyword) {
+        this.keyword = keyword;
+    }
+}
+package com.diligrp.mobsite.getway.domain.protocol.user;
+
+import com.diligrp.mobsite.getway.domain.base.BaseListResp;
+import com.diligrp.mobsite.getway.domain.protocol.user.model.BuyerInfo;
+
+import java.util.List;
+
+/**
+ * <B>Description</B> 用户简介 <br />
+ * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />
+ * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
+ * <B>Company</B> 地利集团
+ *
+ * @author wujianjun
+ * @createTime 2014/9/1 11:47
+ */
+@SuppressWarnings("serial")
+public class SearchUserInfoResp extends BaseListResp {
+
+    private List<BuyerInfo> users;
+
+    public List<BuyerInfo> getUsers() {
+        return users;
+    }
+
+    public void setUsers(List<BuyerInfo> users) {
+        this.users = users;
+    }
+}
+package com.diligrp.mobsite.getway.domain.protocol.user;
+
+import com.diligrp.mobsite.getway.domain.base.BaseListReq;
+
+/**
+ * Created by xxxzzz on 2016/12/1.
+ */
+public class TradeRecordReq extends BaseListReq {
+
+}
+package com.diligrp.mobsite.getway.domain.protocol.user;
+
+import com.diligrp.mobsite.getway.domain.base.BaseListResp;
+import com.diligrp.mobsite.getway.domain.protocol.user.model.TradeRecord;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.List;
+
+/**
+ * Created by xxxzzz on 2016/12/1.
+ */
+public class TradeRecordResp extends BaseListResp {
+
+
+
+
+    /**
+     * 交易记录
+     */
+    @ApiModelProperty(value = "交易记录")
+    private List<TradeRecord> records;
+
+
+    public List<TradeRecord> getRecords() {
+        return records;
+    }
+
+    public void setRecords(List<TradeRecord> records) {
+        this.records = records;
+    }
+
+
+}
 package com.diligrp.mobsite.getway.domain.protocol.user;
 import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
+import io.swagger.annotations.ApiModelProperty;
 /**
@@ -16,131 +17,93 @@ public class UpdateUserInfoReq extends BaseReq {
     /**
      * 新的密码
      */
+    @ApiModelProperty(value = "新密码")
     private String password;
     /**
-     * 旧密码
+     * 再次输入密码
      */
-    @Deprecated // 下个版本删除
+    @ApiModelProperty(value = "再次输入新密码")
     private String oldPassword;
     /**
-     * 用户账号
+     * 性别
      */
-    private String accountName;
+    @ApiModelProperty(value = "性别：1男,2女")
+    private Integer gender;
     /**
-     * 真实姓名
+     * 昵称
      */
-    private String realName;
+    @ApiModelProperty(value = "昵称")
+    private String nickname;
+    /**
+     * 生日
+     */
+    @ApiModelProperty(value = "生日")
+    private String birth;
     /**
      * 电话号码
      */
+    @ApiModelProperty(value = "电话号码")
     private String mobile;
     /**
      * 用户头像
      */
+    @ApiModelProperty(value = "头像")
     private String headImg;
-    
-    
-	public String getMobile() {
-		return mobile;
-	}
-
-	public void setMobile(String mobile) {
-		this.mobile = mobile;
-	}
-
-	/**
-     * get value of UpdatePasswordReq.password
-     * @return the password
-     * @createTime Aug 12, 2014 8:08:33 PM
-     * @author wujianjun
-     */
+
+
     public String getPassword() {
         return password;
     }
-    
-    /**
-     * set value of UpdatePasswordReq.password
-     * @param password the password to set
-     * @createTime Aug 12, 2014 8:08:33 PM
-     * @author wujianjun
-     */
+
     public void setPassword(String password) {
         this.password = password;
     }
-    
-    /**
-     * get value of UpdatePasswordReq.accountName
-     * @return the accountName
-     * @createTime 2014年8月28日 下午3:05:28
-     * @author zhangshirui
-     */
-    public String getAccountName() {
-        return accountName;
-    }
-
-    
-    /**
-     * set value of UpdatePasswordReq.accountName
-     * @param accountName the accountName to set
-     * @createTime 2014年8月28日 下午3:05:28
-     * @author zhangshirui
-     */
-    public void setAccountName(String accountName) {
-        this.accountName = accountName;
-    }
-
-    
-    /**
-     * get value of UpdateUserInfoReq.oldPassword
-     * @return the oldPassword
-     * @createTime 2015年1月21日 下午7:35:20
-     * @author zhangshirui
-     */
     public String getOldPassword() {
         return oldPassword;
     }
-    
-    /**
-     * set value of UpdateUserInfoReq.oldPassword
-     * @param oldPassword the oldPassword to set
-     * @createTime 2015年1月21日 下午7:35:20
-     * @author zhangshirui
-     */
     public void setOldPassword(String oldPassword) {
         this.oldPassword = oldPassword;
     }
-    
-    /**
-     * get value of UpdateUserInfoReq.realName
-     * @return the realName
-     * @createTime 2015年1月21日 下午7:48:12
-     * @author zhangshirui
-     */
-    public String getRealName() {
-        return realName;
+    public Integer getGender() {
+        return gender;
     }
-    
-    /**
-     * set value of UpdateUserInfoReq.realName
-     * @param realName the realName to set
-     * @createTime 2015年1月21日 下午7:48:12
-     * @author zhangshirui
-     */
-    public void setRealName(String realName) {
-        this.realName = realName;
+    public void setGender(Integer gender) {
+        this.gender = gender;
     }
-	public String getHeadImg() {
-		return headImg;
-	}
+    public String getNickname() {
+        return nickname;
+    }
+
+    public void setNickname(String nickname) {
+        this.nickname = nickname;
+    }
+
+    public String getBirth() {
+        return birth;
+    }
-	public void setHeadImg(String headImg) {
-		this.headImg = headImg;
-	}
-    
-    
+    public void setBirth(String birth) {
+        this.birth = birth;
+    }
+
+    public String getMobile() {
+        return mobile;
+    }
+
+    public void setMobile(String mobile) {
+        this.mobile = mobile;
+    }
+
+    public String getHeadImg() {
+        return headImg;
+    }
+
+    public void setHeadImg(String headImg) {
+        this.headImg = headImg;
+    }
 }
@@ -28,7 +28,7 @@ public class UpdateUserInfoResp extends BaseResp {
     /**
      * 更新结果
      */
-    @Deprecated
+
     private Integer resultFlag = RESULT_FLAG_SUCCESS;
+package com.diligrp.mobsite.getway.domain.protocol.user.model;
+
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+
+/**
+ * Created by xxxzzz on 2017/1/3.
+ */
+public class BuyerInfo implements Serializable{
+
+    /**
+     * 男
+     */
+    public static final Integer SEX_MALE = 1;
+    /**
+     * 女
+     */
+    public static final Integer SEX_FEMALE = 2;
+    /**
+     * 未知
+     */
+    public static final Integer SEX_UNKNOW = 3;
+
+
+    /**
+     * 用户真实姓名
+     */
+    //@ApiModelProperty(value = "真实姓名")
+    //private String realName;
+    /**
+     * 用户名，昵称
+     */
+    @ApiModelProperty(value = "昵称")
+    private String nickName;
+    /**
+     * 用户手机号码
+     */
+    @ApiModelProperty(value = "手机号码")
+    private String mobilePhone;
+
+    /**
+     * 性别
+     */
+    @ApiModelProperty(value = "性别：1-男 2-女 ")
+    private Integer sex;
+
+    ///**
+    // * 账户状态： 1:正常状态，2:锁定，3：未激活
+    // */
+    //private Integer accountState;
+    /**
+     * 个人头像
+     */
+    @ApiModelProperty(value = "头像")
+    private String headImg;
+
+
+    public String getNickName() {
+        return nickName;
+    }
+
+    public void setNickName(String nickName) {
+        this.nickName = nickName;
+    }
+
+    public String getMobilePhone() {
+        return mobilePhone;
+    }
+
+    public void setMobilePhone(String mobilePhone) {
+        this.mobilePhone = mobilePhone;
+    }
+
+    public Integer getSex() {
+        return sex;
+    }
+
+    public void setSex(Integer sex) {
+        this.sex = sex;
+    }
+
+    public String getHeadImg() {
+        return headImg;
+    }
+
+    public void setHeadImg(String headImg) {
+        this.headImg = headImg;
+    }
+}
+package com.diligrp.mobsite.getway.domain.protocol.user.model;
+
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+
+/**
+ * Created by xxxzzz on 2016/12/1.
+ */
+public class TradeRecord implements Serializable{
+
+
+    /**
+     * 商品名称
+     * */
+    @ApiModelProperty(value = "商品名称")
+    private String title;
+
+    /**
+     * 交易时间
+     * */
+    @ApiModelProperty(value = "交易时间")
+    private String tradeTime;
+
+    /**
+     * 交易金额
+     * */
+    @ApiModelProperty(value = "交易金额")
+    private Long tradeAmount;
+
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getTradeTime() {
+        return tradeTime;
+    }
+
+    public void setTradeTime(String tradeTime) {
+        this.tradeTime = tradeTime;
+    }
+
+
+    public Long getTradeAmount() {
+        return tradeAmount;
+    }
+
+    public void setTradeAmount(Long tradeAmount) {
+        this.tradeAmount = tradeAmount;
+    }
+}
@@ -10,12 +10,9 @@
 package com.diligrp.mobsite.getway.rpc.buyer;
 import com.diligrp.mobsite.getway.domain.protocol.GoodsSuper;
-import com.diligrp.mobsite.getway.domain.protocol.order.AppraiseGoodsReq;
-import com.diligrp.titan.sdk.domain.*;
-import com.diligrp.titan.sdk.input.PpsSearchInput;
-import com.diligrp.titan.sdk.output.BaseOutput;
-import com.diligrp.titan.sdk.output.PageOutput;
-import com.diligrp.website.util.domain.Result;
+import com.diligrp.titan.sdk.domain.Attribute;
+import com.diligrp.titan.sdk.domain.Category;
+import com.diligrp.titan.sdk.domain.Product;
 import java.util.HashMap;
 import java.util.List;
@@ -27,93 +24,68 @@ import java.util.Map;
  * @date 2014年8月14日 上午11:20:17  
  */
 public interface GoodsRPC {
-	
+
 	/**
-	 * 
-	 * @Title: getGoodsById 
-	 * @Description: 根据id获取商品详情
-	 * @param  id 商品id
-	 * @param  defindResult 自定义返回结果集 不填默认只返回分类基础信息
-     *                      “attribute”-返回基础信息加上商品描述·销售·可搜索属性相关信息
-     *                      “auth”-返回基础信息加上商品认证 信息
-     *                      “video”-返回基础信息加上商品视频信息
-     *                      “subCates”-返回基础信息加上商品子分类信息
-     *                      “cate”-返回基础信息加上商品主分类详细信息
-	 * @param @return    
-	 * @return Goods  
+	 * @param id           商品id
+	 * @param defindResult 自定义返回结果集 不填默认只返回分类基础信息
+	 *                     “attribute”-返回基础信息加上商品描述·销售·可搜索属性相关信息
+	 *                     “auth”-返回基础信息加上商品认证 信息
+	 *                     “video”-返回基础信息加上商品视频信息
+	 *                     “subCates”-返回基础信息加上商品子分类信息
+	 *                     “cate”-返回基础信息加上商品主分类详细信息
+	 * @param @return
+	 * @return Goods
 	 * @throws
+	 * @Title: getGoodsById
+	 * @Description: 根据id获取商品详情
 	 */
 	public Product getGoodsById(Long id, String[] defindResult);
 	/**
-	 * 
-	 * @Title: getConditionByCid 
-     * @Description: 根据类别id获取，筛选条件
 	 * @param categoryId
 	 * @return
+	 * @Title: getConditionByCid
+	 * @Description: 根据类别id获取，筛选条件
 	 * @createTime 2014年8月19日 下午2:55:50
 	 * @author zhangshirui
 	 */
-	public HashMap<String,List<Attribute>> getConditionByCid(Integer categoryId);
-	
-	/**
-	 * 
-	 * @Title: getComments 
-     * @Description: 根据商品id获取评价
-	 * @param id
-	 * @return
-	 * @createTime 2014年8月19日 下午5:11:10
-	 * @author zhangshirui
-	 */
-	public Result getComments(Long id, Integer page, Integer pageSize);
+	public HashMap<String, List<Attribute>> getConditionByCid(Integer categoryId);
 	/**
 	 * 更具商品id获取商品
+	 *
 	 * @param productId
 	 * @param defindResult
 	 * @return
 	 * @createTime 2014年9月3日 下午4:58:39
 	 * @author zhangshirui
 	 */
-    List<Product> getProductByIds(List<Long> productId, String[] defindResult);
+	List<Product> getProductByIds(List<Long> productId, String[] defindResult);
-    /**
-     * 添加商品评论
-     * @param req
-     * @createTime 2014年9月3日 下午4:58:25
-     * @author zhangshirui
-     */
-    void addComment(AppraiseGoodsReq req);
-    /**
-     * 
-     * @param skus
-     * @return
-     * @createTime 2014年9月15日 下午4:04:46
-     * @author zhangshirui
-     */
-    List<StockInfo> getStockInfo(List<String> skus);
-
-    /**
-     * 根据sku查询skuInfoMap详细信息
-     * @param skuList
-     * @return
-     * @createTime 2014年11月6日 上午11:43:20
-     * @author zhangshirui
-     */
-    Map<String, Product> getSkuInfoMap(List<String> skuList);
+	/**
+	 * 根据sku查询skuInfoMap详细信息
+	 *
+	 * @param skuList
+	 * @return
+	 * @createTime 2014年11月6日 上午11:43:20
+	 * @author zhangshirui
+	 */
+	Map<String, Product> getSkuInfoMap(List<String> skuList);
-    /**
-     * 获取商品描述信息
-     * @param productId
-     * @return
-     * @createTime 2015年6月8日 下午6:50:31
-     * @author zhangshirui
-     */
+	/**
+	 * 获取商品描述信息
+	 *
+	 * @param productId
+	 * @return
+	 * @createTime 2015年6月8日 下午6:50:31
+	 * @author zhangshirui
+	 */
 	String getProductDesc(Long productId);
 	/**
 	 * 根据商品id查询商品信息
+	 *
 	 * @param productIds
 	 * @return
 	 * @createTime 2015年6月12日 下午3:14:08
@@ -123,6 +95,7 @@ public interface GoodsRPC {
 	/**
 	 * 根据分类id查询分类信息
+	 *
 	 * @param cid
 	 * @return
 	 * @createTime 2015年6月23日 下午5:56:34
@@ -132,6 +105,7 @@ public interface GoodsRPC {
 	/**
 	 * 查询类目面包屑，返回结果进行正序排序
+	 *
 	 * @param cid
 	 * @return
 	 * @createTime 2015年6月23日 下午5:56:34
@@ -139,84 +113,5 @@ public interface GoodsRPC {
 	 */
 	List<Category> listCrumbs(Long cid);
-	/**
-	 * 根据ID查询供应信息
-	 * @param ids
-	 * @param 
-	 * @return
-	 */
-	BaseOutput<List<Supply>> getSupplyInfoByIds(List<Long> ids);
-
-	/**
-	 * 根据ID查询预售信息
-	 * @param ids
-	 * @param 
-	 * @return
-	 */
-	BaseOutput<List<Presale>> getPresaleInfoByIds(List<Long> ids);
-	/**
-	 * 根据ID查询求购信息
-	 * @param ids
-	 * @param 
-	 * @return
-	 */
-	BaseOutput<List<Purchase>> getPurchaseInfoByIds(List<Long> ids);
-
-	/**
-	 * 查询预售信息
-	 * @param input
-	 * @param page
-	 * @return
-	 */
-	PageOutput<List<Presale>> getPresaleInfo(PpsSearchInput input, Integer page);
-
-	/**
-	 * 查询求购信息
-	 * @param input
-	 * @param page
-	 * @return
-	 */
-	PageOutput<List<Purchase>> getPurchaseInfo(PpsSearchInput input, Integer page);
-
-	/**
-	 * 查询供应信息
-	 * @param input
-	 * @param page
-	 * @return
-	 */
-	PageOutput<List<Supply>> getSupplyInfo(PpsSearchInput input, Integer page);
-
-	/**
-     * 删除求购信息
-     * @param ids
-     * @return
-     */
-	BaseOutput<List<Long>> deletePurchaseInfo(List<Long> ids);
-
-	/**
-     * 删除预售信息
-     * @param ids
-     * @return
-     */
-	BaseOutput<List<Long>> deletePresaleInfo(List<Long> ids);
-
-	/**
-     * 删除供应信息
-     * @param ids
-     * @return
-     */
-	BaseOutput<List<Long>> deleteSupplyInfo(List<Long> ids);
-
-	/**
-	 * this method is 查询用户的评论列表，支持分页，默认查询第1页
-	 * @param buyerUserId
-	 * @param sellerUserId
-	 * @param grade  1:好评，2:中评，3:差评
-	 * @param dateScope  1：最近一周，2：最近一个月，3：最近6个月，4：6个月以前，5：全部
-	 * @param page
-	 * @return
-	 */
-	Result listUserComments(Long buyerUserId, Long sellerUserId, Integer grade,
-							Integer dateScope, Integer page);
 }