增加swagger配置，暂无法运行

Jiang
1 parent 1d49e3c8
Showing 63 changed files with 1892 additions and 1381 deletions
.project
b2c-orders-client/.project
b2c-orders-client/pom.xml
b2c-orders-client/src/main/java/com/b2c/orders/client/domain/dto/request/BuyerCancelRequestDto.java
b2c-orders-client/src/main/java/com/b2c/orders/client/domain/dto/request/BuyerConfirmRequestDto.java
b2c-orders-client/src/main/java/com/b2c/orders/client/domain/dto/request/DtmsConfirmRequestDto.java
b2c-orders-client/src/main/java/com/b2c/orders/client/domain/dto/request/DtmsTimeoutRequestDto.java
b2c-orders-client/src/main/java/com/b2c/orders/client/domain/dto/request/OrderItemDto.java
b2c-orders-client/src/main/java/com/b2c/orders/client/domain/dto/request/OrderListRequestDto.java
b2c-orders-client/src/main/java/com/b2c/orders/client/domain/dto/request/PayOrderRequestDto.java
b2c-orders-client/src/main/java/com/b2c/orders/client/domain/dto/request/SellerConfirmRequestDto.java
b2c-orders-client/src/main/java/com/b2c/orders/client/domain/dto/request/SellerRefuseRequestDto.java
b2c-orders-client/src/main/java/com/b2c/orders/client/domain/dto/request/SubmitOrderRequestDto.java
b2c-orders-client/src/main/java/com/b2c/orders/client/domain/dto/request/TakeOrderRequestDto.java
b2c-orders-client/src/main/java/com/b2c/orders/client/domain/dto/response/OrderItemResponseDto.java
b2c-orders-client/src/main/java/com/b2c/orders/client/domain/dto/response/OrderListResponseDto.java
b2c-orders-client/src/main/java/com/b2c/orders/enums/PayType.java
b2c-orders-commons/.project
b2c-orders-commons/pom.xml
b2c-orders-dao/.gitignore
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>orders-parent</name>
+	<name>b2c-orders-parent</name>
 	<comment></comment>
 	<projects>
 	</projects>
@@ -16,12 +16,12 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<name>org.eclipse.wst.validation.validationbuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.wst.validation.validationbuilder</name>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
@@ -3,13 +3,59 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>com.b2c.orders</groupId>
-		<artifactId>orders-parent</artifactId>
+		<artifactId>b2c-orders-parent</artifactId>
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
-	<artifactId>orders-client</artifactId>
-	<version>1.1.0-SNAPSHOT</version>
+	<artifactId>b2c-orders-client</artifactId>
  
 	<dependencies>
+		<!--swagger -->
+		<dependency>
+			<groupId>io.springfox</groupId>
+			<artifactId>springfox-swagger2</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>org.springframework</groupId>
+					<artifactId>spring-web</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.springframework</groupId>
+					<artifactId>spring-beans</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.springframework</groupId>
+					<artifactId>spring-webmvc</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.springframework</groupId>
+					<artifactId>spring-beans</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.springframework</groupId>
+					<artifactId>spring-context</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.springframework</groupId>
+					<artifactId>spring-core</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.springframework</groupId>
+					<artifactId>spring-aop</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.aspectj</groupId>
+					<artifactId>aspectjweaver</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.slf4j</groupId>
+					<artifactId>slf4j-api</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>com.fasterxml.jackson.core</groupId>
+					<artifactId>jackson-annotations</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
 		<dependency>
 			<groupId>org.hibernate</groupId>
 			<artifactId>hibernate-validator</artifactId>
@@ -34,45 +80,22 @@
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-core</artifactId>
-		</dependency>
-
-		<!-- Just the annotations; use this dependency if you want to attach annotations 
-			to classes without connecting them to the code. -->
-		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-annotations</artifactId>
-		</dependency>
-
-		<!-- databinding; ObjectMapper, JsonNode and related classes are here -->
-		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-databind</artifactId>
-		</dependency>
-		<!-- smile (binary JSON). Other artifacts in this group do other formats. -->
-		<dependency>
-			<groupId>com.fasterxml.jackson.dataformat</groupId>
-			<artifactId>jackson-dataformat-smile</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.fasterxml.jackson.dataformat</groupId>
-			<artifactId>jackson-dataformat-xml</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.codehaus.woodstox</groupId>
-			<artifactId>woodstox-core-asl</artifactId>
-		</dependency>
-		<!-- JAX-RS provider -->
-		<dependency>
-			<groupId>com.fasterxml.jackson.jaxrs</groupId>
-			<artifactId>jackson-jaxrs-json-provider</artifactId>
-		</dependency>
-		<!-- Support for JAX-B annotations as additional configuration -->
-		<dependency>
-			<groupId>com.fasterxml.jackson.module</groupId>
-			<artifactId>jackson-module-jaxb-annotations</artifactId>
-		</dependency>
+		<!-- <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-core</artifactId> 
+			</dependency> Just the annotations; use this dependency if you want to attach 
+			annotations to classes without connecting them to the code. <dependency> 
+			<groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-annotations</artifactId> 
+			</dependency> databinding; ObjectMapper, JsonNode and related classes are 
+			here <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> 
+			</dependency> smile (binary JSON). Other artifacts in this group do other 
+			formats. <dependency> <groupId>com.fasterxml.jackson.dataformat</groupId> 
+			<artifactId>jackson-dataformat-smile</artifactId> </dependency> <dependency> 
+			<groupId>com.fasterxml.jackson.dataformat</groupId> <artifactId>jackson-dataformat-xml</artifactId> 
+			</dependency> <dependency> <groupId>org.codehaus.woodstox</groupId> <artifactId>woodstox-core-asl</artifactId> 
+			</dependency> JAX-RS provider <dependency> <groupId>com.fasterxml.jackson.jaxrs</groupId> 
+			<artifactId>jackson-jaxrs-json-provider</artifactId> </dependency> Support 
+			for JAX-B annotations as additional configuration <dependency> <groupId>com.fasterxml.jackson.module</groupId> 
+			<artifactId>jackson-module-jaxb-annotations</artifactId> </dependency> -->
+		<!-- <dependency> <groupId>io.springfox</groupId> <artifactId>springfox-swagger2</artifactId> 
+			</dependency> -->
 	</dependencies>
 </project>
 \ No newline at end of file
 package com.b2c.orders.client.domain.dto.request;
  
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiParam;
+
 public class BuyerCancelRequestDto extends BaseRequestDto {
  
 	/**
 	 * 
 	 */
 	private static final long serialVersionUID = -5338664730613120833L;
-	
+
+	@ApiParam(value = "订单id", required = true)
+	@NotNull(message = "订单id不能为空")
 	private Long orderId;
+	@ApiParam(value = "买家id", required = true)
+	@NotNull(message = "买家id不能为空")
 	private Long buyerId;
  
 	public Long getOrderId() {
 package com.b2c.orders.client.domain.dto.request;
  
+import javax.validation.constraints.NotNull;
+
 public class BuyerConfirmRequestDto extends BaseRequestDto {
  
 	/**
@@ -7,7 +9,11 @@ public class BuyerConfirmRequestDto extends BaseRequestDto {
 	 */
 	private static final long serialVersionUID = 5323840474125840652L;
  
+//	@ApiParam(value = "订单id", required = true)
+	@NotNull(message = "订单id不能为空")
 	private Long orderId;
+//	@ApiParam(value = "买家id", required = true)
+	@NotNull(message = "买家id不能为空")
 	private Long buyerId;
  
 	public Long getOrderId() {
 package com.b2c.orders.client.domain.dto.request;
  
+import javax.validation.constraints.NotNull;
+
 public class DtmsConfirmRequestDto extends BaseRequestDto {
  
 	/**
@@ -7,6 +9,8 @@ public class DtmsConfirmRequestDto extends BaseRequestDto {
 	 */
 	private static final long serialVersionUID = 7519820743736468349L;
  
+//	@ApiParam(value = "订单id", required = true)
+	@NotNull(message = "订单id不能为空")
 	private Long orderId;
  
 	public Long getOrderId() {
 package com.b2c.orders.client.domain.dto.request;
  
+import javax.validation.constraints.NotNull;
+
 public class DtmsTimeoutRequestDto extends BaseRequestDto {
  
 	/**
 	 * 
 	 */
 	private static final long serialVersionUID = 8454009010057359942L;
-	
+
+//	@ApiParam(value = "订单id", required = true)
+	@NotNull(message = "订单id不能为空")
 	private Long orderId;
  
 	public Long getOrderId() {
@@ -16,6 +20,5 @@ public class DtmsTimeoutRequestDto extends BaseRequestDto {
 	public void setOrderId(Long orderId) {
 		this.orderId = orderId;
 	}
-	
  
 }
@@ -2,6 +2,11 @@ package com.b2c.orders.client.domain.dto.request;
  
 import java.io.Serializable;
  
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
+
+import org.hibernate.validator.constraints.NotBlank;
+
 public class OrderItemDto implements Serializable {
  
 	/**
@@ -9,23 +14,50 @@ public class OrderItemDto implements Serializable {
 	 */
 	private static final long serialVersionUID = 2876508071333281636L;
  
-	private ProductDto product;
-	private Long buyerId;
+//	@ApiParam(value = "商品id", required = true)
+	private Long productId;
+//	@ApiParam(value = "商品sku", required = true)
+	@NotBlank(message = "商品sku不能为空")
+	private String sku;
+//	@ApiParam(value = "购买数量", required = true)
+	@NotNull(message = "商品购买数量amount不能为空")
+	@Min(value = 1, message = "商品购买数量amount必须大于等于1")
+	private Integer amount;
+//	@ApiParam(value = "商品价格，整型,单位：分 ", required = true)
+	@NotNull(message = "商品价格price不能为空")
+	@Min(value = 0, message = "商品价格price必须大于等于0分")
+	private Long price;
+
+	public Long getProductId() {
+		return productId;
+	}
+
+	public void setProductId(Long productId) {
+		this.productId = productId;
+	}
+
+	public String getSku() {
+		return sku;
+	}
+
+	public void setSku(String sku) {
+		this.sku = sku;
+	}
  
-	public ProductDto getProduct() {
-		return product;
+	public Integer getAmount() {
+		return amount;
 	}
  
-	public void setProduct(ProductDto product) {
-		this.product = product;
+	public void setAmount(Integer amount) {
+		this.amount = amount;
 	}
  
-	public Long getBuyerId() {
-		return buyerId;
+	public Long getPrice() {
+		return price;
 	}
  
-	public void setBuyerId(Long buyerId) {
-		this.buyerId = buyerId;
+	public void setPrice(Long price) {
+		this.price = price;
 	}
  
 }
+package com.b2c.orders.client.domain.dto.request;
+
+import java.util.Date;
+
+import com.b2c.orders.enums.OrderDeliveryType;
+import com.b2c.orders.enums.OrderStatus;
+import com.b2c.orders.enums.PayStatus;
+import com.b2c.orders.enums.PayType;
+
+public class OrderListRequestDto {
+
+	/**
+	 * 买家
+	 */
+	private Long buyerId;
+	/**
+	 * 卖家
+	 */
+	private Long sellerId;
+	/** 配送类型 */
+	private OrderDeliveryType deliveryType;
+	/** 订单状态 */
+	private OrderStatus orderStatus;
+	/** 支付状态 */
+	private PayStatus payStatus;
+	/** 买家备注说明 */
+	private String buyerMemo;
+	/** 支付时间 */
+	private Date payTime;
+	/**
+	 * 送货时间
+	 */
+	private Date deliveryTime;
+	/**
+	 * 提货时间
+	 */
+	private Date reservationTime;
+	/**
+	 * 买家确认收货时间
+	 */
+	private Date buyerConfirmTime;
+	/**
+	 * 订单提交时间
+	 */
+	private Date submitTime;
+	/** 支付类型 */
+	private PayType payType;
+	private Integer pageSize = 10;
+	private Integer page = 1;
+	private Integer start;
+	private Integer limit;
+
+	public Long getBuyerId() {
+		return buyerId;
+	}
+
+	public void setBuyerId(Long buyerId) {
+		this.buyerId = buyerId;
+	}
+
+	public Long getSellerId() {
+		return sellerId;
+	}
+
+	public void setSellerId(Long sellerId) {
+		this.sellerId = sellerId;
+	}
+
+	public OrderDeliveryType getDeliveryType() {
+		return deliveryType;
+	}
+
+	public void setDeliveryType(OrderDeliveryType deliveryType) {
+		this.deliveryType = deliveryType;
+	}
+
+	public OrderStatus getOrderStatus() {
+		return orderStatus;
+	}
+
+	public void setOrderStatus(OrderStatus orderStatus) {
+		this.orderStatus = orderStatus;
+	}
+
+	public PayStatus getPayStatus() {
+		return payStatus;
+	}
+
+	public void setPayStatus(PayStatus payStatus) {
+		this.payStatus = payStatus;
+	}
+
+	public String getBuyerMemo() {
+		return buyerMemo;
+	}
+
+	public void setBuyerMemo(String buyerMemo) {
+		this.buyerMemo = buyerMemo;
+	}
+
+	public Date getPayTime() {
+		return payTime;
+	}
+
+	public void setPayTime(Date payTime) {
+		this.payTime = payTime;
+	}
+
+	public Date getDeliveryTime() {
+		return deliveryTime;
+	}
+
+	public void setDeliveryTime(Date deliveryTime) {
+		this.deliveryTime = deliveryTime;
+	}
+
+	public Date getReservationTime() {
+		return reservationTime;
+	}
+
+	public void setReservationTime(Date reservationTime) {
+		this.reservationTime = reservationTime;
+	}
+
+	public Date getBuyerConfirmTime() {
+		return buyerConfirmTime;
+	}
+
+	public void setBuyerConfirmTime(Date buyerConfirmTime) {
+		this.buyerConfirmTime = buyerConfirmTime;
+	}
+
+	public Date getSubmitTime() {
+		return submitTime;
+	}
+
+	public void setSubmitTime(Date submitTime) {
+		this.submitTime = submitTime;
+	}
+
+	public PayType getPayType() {
+		return payType;
+	}
+
+	public void setPayType(PayType payType) {
+		this.payType = payType;
+	}
+
+	public Integer getPageSize() {
+		return pageSize;
+	}
+
+	public void setPageSize(Integer pageSize) {
+		this.pageSize = pageSize;
+	}
+
+	public Integer getPage() {
+		return page;
+	}
+
+	public void setPage(Integer page) {
+		this.page = page;
+	}
+
+	public Integer getStart() {
+		return start;
+	}
+
+	public void setStart(Integer start) {
+		this.start = start;
+	}
+
+	public Integer getLimit() {
+		return limit;
+	}
+
+	public void setLimit(Integer limit) {
+		this.limit = limit;
+	}
+
+}
 package com.b2c.orders.client.domain.dto.request;
  
+import javax.validation.constraints.NotNull;
+
 public class PayOrderRequestDto extends BaseRequestDto {
  
 	/**
@@ -7,7 +9,11 @@ public class PayOrderRequestDto extends BaseRequestDto {
 	 */
 	private static final long serialVersionUID = 7438455154625322536L;
  
+//	@ApiParam(value = "订单id", required = true)
+	@NotNull(message = "订单id不能为空")
 	private Long orderId;
+//	@ApiParam(value = "买家id", required = true)
+	@NotNull(message = "买家id不能为空")
 	private Long buyerId;
  
 	public Long getOrderId() {
 package com.b2c.orders.client.domain.dto.request;
  
+import javax.validation.constraints.NotNull;
+
 public class SellerConfirmRequestDto extends BaseRequestDto {
  
 	/**
@@ -7,7 +9,11 @@ public class SellerConfirmRequestDto extends BaseRequestDto {
 	 */
 	private static final long serialVersionUID = -6873506335794369709L;
  
+//	@ApiParam(value = "订单id", required = true)
+	@NotNull(message = "订单id不能为空")
 	private Long orderId;
+//	@ApiParam(value = "商家id", required = true)
+	@NotNull(message = "商家id不能为空")
 	private Long sellerId;
  
 	public Long getOrderId() {
 package com.b2c.orders.client.domain.dto.request;
  
+import javax.validation.constraints.NotNull;
+
 public class SellerRefuseRequestDto extends BaseRequestDto {
  
 	/**
 	 * 
 	 */
 	private static final long serialVersionUID = 1563792094069115492L;
-	
+
+//	@ApiParam(value = "订单id", required = true)
+	@NotNull(message = "订单id不能为空")
 	private Long orderId;
+//	@ApiParam(value = "商家id", required = true)
+	@NotNull(message = "商家id不能为空")
 	private Long sellerId;
  
 	public Long getOrderId() {
 package com.b2c.orders.client.domain.dto.request;
  
 import java.io.Serializable;
+import java.util.Date;
 import java.util.List;
  
 import com.b2c.orders.enums.OrderDeliveryType;
-import com.b2c.orders.enums.OrderStatus;
 import com.b2c.orders.enums.PayType;
  
 public class SubmitOrderRequestDto implements Serializable {
@@ -14,28 +14,26 @@ public class SubmitOrderRequestDto implements Serializable {
 	 */
 	private static final long serialVersionUID = 5060629945327592074L;
  
-	/** 买家ID与姓名 */
+//	@ApiParam(value = "买家id", required = true)
 	private Long buyerId;
-	private String buyerName;
-	/** 卖家ID与姓名 */
+//	@ApiParam(value = "卖家id", required = true)
 	private Long sellerId;
 	private String sellerName;
-	/** 配送类型 */
+//	@ApiParam(value = "配送类型", required = true)
 	private OrderDeliveryType deliveryType;
-	/** 订单状态 */
-	private OrderStatus orderStatus;
-	/** 买家备注说明 */
+//	@ApiParam(value = "买家备注说明", required = true)
 	private String buyerMemo;
-	/** 支付类型 */
+//	@ApiParam(value = "支付类型", required = true)
 	private PayType payType;
-	/** 最新商品总金额 */
+//	@ApiParam(value = "最新商品总金额", required = true)
 	private Long priceTotal;
-	/** 店铺ID */
+//	@ApiParam(value = "店铺ID", required = true)
 	private Long shopId;
-	private Long userId;
-	/**
-	 * 订单项
-	 */
+//	@ApiParam(value = "送货时间")
+	private Date deliveryTime;
+//	@ApiParam(value = "提货时间")
+	private Date reservationTime;
+//	@ApiParam(value = "订单项", required = true)
 	private List<OrderItemDto> orderItems;
  
 	public Long getBuyerId() {
@@ -46,14 +44,6 @@ public class SubmitOrderRequestDto implements Serializable {
 		this.buyerId = buyerId;
 	}
  
-	public String getBuyerName() {
-		return buyerName;
-	}
-
-	public void setBuyerName(String buyerName) {
-		this.buyerName = buyerName;
-	}
-
 	public Long getSellerId() {
 		return sellerId;
 	}
@@ -78,14 +68,6 @@ public class SubmitOrderRequestDto implements Serializable {
 		this.deliveryType = deliveryType;
 	}
  
-	public OrderStatus getOrderStatus() {
-		return orderStatus;
-	}
-
-	public void setOrderStatus(OrderStatus orderStatus) {
-		this.orderStatus = orderStatus;
-	}
-
 	public String getBuyerMemo() {
 		return buyerMemo;
 	}
@@ -118,14 +100,6 @@ public class SubmitOrderRequestDto implements Serializable {
 		this.shopId = shopId;
 	}
  
-	public Long getUserId() {
-		return userId;
-	}
-
-	public void setUserId(Long userId) {
-		this.userId = userId;
-	}
-
 	public List<OrderItemDto> getOrderItems() {
 		return orderItems;
 	}
@@ -134,4 +108,20 @@ public class SubmitOrderRequestDto implements Serializable {
 		this.orderItems = orderItems;
 	}
  
+	public Date getDeliveryTime() {
+		return deliveryTime;
+	}
+
+	public void setDeliveryTime(Date deliveryTime) {
+		this.deliveryTime = deliveryTime;
+	}
+
+	public Date getReservationTime() {
+		return reservationTime;
+	}
+
+	public void setReservationTime(Date reservationTime) {
+		this.reservationTime = reservationTime;
+	}
+
 }
@@ -9,13 +9,16 @@ public class TakeOrderRequestDto extends BaseRequestDto {
 	 */
 	private static final long serialVersionUID = -1409059930851556435L;
  
+//	@ApiParam(value = "订单id", required = true)
 	@NotNull(message = "订单id不能为空")
 	private Long orderId;
+//	@ApiParam(value = "商家id", required = true)
 	@NotNull(message = "商家id不能为空")
 	private Long sellerId;
 	/**
 	 * 订单总价
 	 */
+//	@ApiParam(value = "订单总价", required = true)
 	@NotNull(message = "订单总价不能为空")
 	private Long totalPrice;
  
+package com.b2c.orders.client.domain.dto.response;
+
+public class OrderItemResponseDto {
+
+	private Long orderId;
+	private Long productId;
+	private String sku;
+	private String skuTitle;
+	private String skuAttributes;
+	private Integer skuNum;
+	private Long skuPrice;
+	private String skuPicture;
+	private String priceUnit;
+
+	public Long getOrderId() {
+		return orderId;
+	}
+
+	public void setOrderId(Long orderId) {
+		this.orderId = orderId;
+	}
+
+	public Long getProductId() {
+		return productId;
+	}
+
+	public void setProductId(Long productId) {
+		this.productId = productId;
+	}
+
+	public String getSku() {
+		return sku;
+	}
+
+	public void setSku(String sku) {
+		this.sku = sku;
+	}
+
+	public String getSkuTitle() {
+		return skuTitle;
+	}
+
+	public void setSkuTitle(String skuTitle) {
+		this.skuTitle = skuTitle;
+	}
+
+	public String getSkuAttributes() {
+		return skuAttributes;
+	}
+
+	public void setSkuAttributes(String skuAttributes) {
+		this.skuAttributes = skuAttributes;
+	}
+
+	public Integer getSkuNum() {
+		return skuNum;
+	}
+
+	public void setSkuNum(Integer skuNum) {
+		this.skuNum = skuNum;
+	}
+
+	public Long getSkuPrice() {
+		return skuPrice;
+	}
+
+	public void setSkuPrice(Long skuPrice) {
+		this.skuPrice = skuPrice;
+	}
+
+	public String getSkuPicture() {
+		return skuPicture;
+	}
+
+	public void setSkuPicture(String skuPicture) {
+		this.skuPicture = skuPicture;
+	}
+
+	public String getPriceUnit() {
+		return priceUnit;
+	}
+
+	public void setPriceUnit(String priceUnit) {
+		this.priceUnit = priceUnit;
+	}
+}
+package com.b2c.orders.client.domain.dto.response;
+
+import java.util.Date;
+import java.util.List;
+
+import com.b2c.orders.enums.OrderDeliveryType;
+import com.b2c.orders.enums.OrderStatus;
+import com.b2c.orders.enums.PayStatus;
+import com.b2c.orders.enums.PayType;
+
+public class OrderListResponseDto {
+
+	/**
+	 * 店铺id
+	 */
+	private Long shopId;
+	/**
+	 * 商家id
+	 */
+	private Long sellerId;
+	/**
+	 * 用户id
+	 */
+	private Long buyerId;
+	/** 配送类型 */
+	private OrderDeliveryType deliveryType;
+	/** 订单状态 */
+	private OrderStatus orderStatus;
+	/** 支付状态 */
+	private PayStatus payStatus;
+	/** 买家备注说明 */
+	private String buyerMemo;
+	/** 支付时间 */
+	private Date payTime;
+	/**
+	 * 送货时间
+	 */
+	private Date deliveryTime;
+	/** 提货时间 */
+	private Date reservationTime;
+	/** 买家确认收货时间 */
+	private Date buyerConfirmTime;
+	/** 订单提交时间 */
+	private Date submitTime;
+	/** 支付类型 */
+	private PayType payType;
+	/** 总金额 */
+	private Long totalPrice;
+	/** 进入当前状态说明或原因，如取消原因，退款审批通过原因等 */
+	private String statusInReason;
+	/**
+	 * 订单项
+	 */
+	private List<OrderItemResponseDto> orderItems;
+
+	public Long getShopId() {
+		return shopId;
+	}
+
+	public void setShopId(Long shopId) {
+		this.shopId = shopId;
+	}
+
+	public Long getSellerId() {
+		return sellerId;
+	}
+
+	public void setSellerId(Long sellerId) {
+		this.sellerId = sellerId;
+	}
+
+	public Long getBuyerId() {
+		return buyerId;
+	}
+
+	public void setBuyerId(Long buyerId) {
+		this.buyerId = buyerId;
+	}
+
+	public OrderDeliveryType getDeliveryType() {
+		return deliveryType;
+	}
+
+	public void setDeliveryType(OrderDeliveryType deliveryType) {
+		this.deliveryType = deliveryType;
+	}
+
+	public OrderStatus getOrderStatus() {
+		return orderStatus;
+	}
+
+	public void setOrderStatus(OrderStatus orderStatus) {
+		this.orderStatus = orderStatus;
+	}
+
+	public PayStatus getPayStatus() {
+		return payStatus;
+	}
+
+	public void setPayStatus(PayStatus payStatus) {
+		this.payStatus = payStatus;
+	}
+
+	public String getBuyerMemo() {
+		return buyerMemo;
+	}
+
+	public void setBuyerMemo(String buyerMemo) {
+		this.buyerMemo = buyerMemo;
+	}
+
+	public Date getPayTime() {
+		return payTime;
+	}
+
+	public void setPayTime(Date payTime) {
+		this.payTime = payTime;
+	}
+
+	public Date getDeliveryTime() {
+		return deliveryTime;
+	}
+
+	public void setDeliveryTime(Date deliveryTime) {
+		this.deliveryTime = deliveryTime;
+	}
+
+	public Date getReservationTime() {
+		return reservationTime;
+	}
+
+	public void setReservationTime(Date reservationTime) {
+		this.reservationTime = reservationTime;
+	}
+
+	public Date getBuyerConfirmTime() {
+		return buyerConfirmTime;
+	}
+
+	public void setBuyerConfirmTime(Date buyerConfirmTime) {
+		this.buyerConfirmTime = buyerConfirmTime;
+	}
+
+	public Date getSubmitTime() {
+		return submitTime;
+	}
+
+	public void setSubmitTime(Date submitTime) {
+		this.submitTime = submitTime;
+	}
+
+	public PayType getPayType() {
+		return payType;
+	}
+
+	public void setPayType(PayType payType) {
+		this.payType = payType;
+	}
+
+	public Long getTotalPrice() {
+		return totalPrice;
+	}
+
+	public void setTotalPrice(Long totalPrice) {
+		this.totalPrice = totalPrice;
+	}
+
+	public String getStatusInReason() {
+		return statusInReason;
+	}
+
+	public void setStatusInReason(String statusInReason) {
+		this.statusInReason = statusInReason;
+	}
+
+	public List<OrderItemResponseDto> getOrderItems() {
+		return orderItems;
+	}
+
+	public void setOrderItems(List<OrderItemResponseDto> orderItems) {
+		this.orderItems = orderItems;
+	}
+}
@@ -2,7 +2,6 @@ package com.b2c.orders.enums;
  
 import java.util.Map;
  
-import com.fasterxml.jackson.annotation.JsonValue;
 import com.google.common.collect.Maps;
  
 /**
@@ -46,7 +45,6 @@ public enum PayType {
 		this.index = index;
 	}
  
-	@JsonValue
 	public String getValue() {
 		return value;
 	}
@@ -16,12 +16,12 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<name>org.eclipse.wst.validation.validationbuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.wst.validation.validationbuilder</name>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
@@ -3,10 +3,10 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>com.b2c.orders</groupId>
-		<artifactId>orders-parent</artifactId>
+		<artifactId>b2c-orders-parent</artifactId>
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
-	<artifactId>orders-commons</artifactId>
+	<artifactId>b2c-orders-commons</artifactId>
  
 	<dependencies>
 		<dependency>
-/target/
@@ -16,12 +16,12 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<name>org.eclipse.wst.validation.validationbuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.wst.validation.validationbuilder</name>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
@@ -3,20 +3,41 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>com.b2c.orders</groupId>
-		<artifactId>orders-parent</artifactId>
+		<artifactId>b2c-orders-parent</artifactId>
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
-	<artifactId>orders-dao</artifactId>
+	<artifactId>b2c-orders-dao</artifactId>
+
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>orders-domain</artifactId>
+			<artifactId>b2c-orders-domain</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
+			<groupId>com.b2c.website</groupId>
+			<artifactId>diligrp-website-util</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>velocity</groupId>
+					<artifactId>velocity-dep</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.apache.hbase</groupId>
+					<artifactId>hbase-client</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-jdbc</artifactId>
+		</dependency>
+		<dependency>
 			<groupId>org.mariadb.jdbc</groupId>
 			<artifactId>mariadb-java-client</artifactId>
 		</dependency>
+		<!-- <dependency> <groupId>mysql</groupId> <artifactId>mysql-connector-java</artifactId> 
+			</dependency> -->
 		<dependency>
 			<groupId>org.mybatis</groupId>
 			<artifactId>mybatis</artifactId>
@@ -29,23 +50,5 @@
 			<groupId>com.alibaba</groupId>
 			<artifactId>druid</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-jdbc</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.b2c.website</groupId>
-			<artifactId>diligrp-website-util</artifactId>
-			<exclusions>
-				<exclusion>
-					<groupId>velocity</groupId>
-					<artifactId>velocity-dep</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.apache.hbase</groupId>
-					<artifactId>hbase-client</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
 	</dependencies>
 </project>
 \ No newline at end of file
+/*
+ * Copyright (c) 2014 www.diligrp.com All rights reserved.
+ * 本软件源代码版权归----所有,未经许可不得任意复制与传播.
+ */
+package com.b2c.orders.dao;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * dao基类<实体,主键>
+ * @author dev-center
+ * @since 2014-05-15
+ * @param <T> 实体
+ * @param <KEY> 主键
+ */
+public interface BaseDao<T,KEY extends Serializable> {
+
+	/**
+	 * 添加对象
+	 * @param t
+	 * @return 影响条数
+	 */
+	@SuppressWarnings("unchecked")
+    int insertEntry(T...t);
+	
+//	/**
+//	 * 添加对象并设置ID到对象上(需开启事务)
+//	 * @param t
+//	 * @return 影响条数
+//	 */
+//	int insertEntryCreateId(T t);
+	
+	/**
+	 * 删除对象,主键
+	 * @param key
+	 * @return 影响条数
+	 */
+	@SuppressWarnings("unchecked")
+    int deleteByKey(KEY...key);
+	
+	/**
+	 * 删除对象,条件
+	 * @param condtion
+	 * @return 影响条数
+	 */
+	int deleteByKey(T condtion);
+	
+	/**
+	 * 更新对象,条件主键ID
+	 * @param t
+	 * @return 影响条数
+	 */
+	int updateByKey(T t);
+
+	/**
+	 * 查询对象,条件主键
+	 * @param key
+	 * @return
+	 */
+	T selectEntry(KEY key);
+	
+	/**
+	 * 查询对象,条件主键数组
+	 * @param key
+	 * @return
+	 */
+	@SuppressWarnings("unchecked")
+    List<T> selectEntryList(KEY...key);
+	
+	/**
+	 * 查询对象,只要不为NULL与空则为条件
+	 * @param t
+	 * @return
+	 */
+	List<T> selectEntryList(T t);
+
+	/**
+	 * 查询对象总数
+	 * @param t
+	 * @return
+	 */
+	Integer selectEntryListCount(T t);
+	
+	/**
+	 * 批量更新
+	 * @param t
+	 * @return
+	 */
+	int updateBatch(List<T> t);
+	
+	 /**
+     * 批量更新
+     * @param t
+     * @return
+     */
+    @SuppressWarnings("unchecked")
+    int updateBatch(T ... t);
+    
+
+    /**
+     * 批量插入
+     * @param t
+     * @return
+     */
+    int insertBatch(List<T> t);
+    
+     /**
+     * 批量插入
+     * @param t
+     * @return
+     */
+    @SuppressWarnings("unchecked")
+    int insertBatch(T ... t);
+}
+/*
+ * Copyright (c) 2014 www.diligrp.com All rights reserved.
+ * 本软件源代码版权归----所有,未经许可不得任意复制与传播.
+ */
+package com.b2c.orders.dao;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Resource;
+
+import org.apache.ibatis.session.SqlSession;
+import org.mybatis.spring.SqlSessionTemplate;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.b2c.orders.commons.exceptions.ApplicationException;
+
+/**
+ * 对mybatis的支持<br/>
+ * spring配置文件需定义sqlTemplate与batchSqlTemplate
+ * 
+ * @author dev-center
+ * @since 2014-05-15
+ */
+public abstract class MyBatisSupport {
+	protected static final Logger LOGGER = LoggerFactory.getLogger(MyBatisSupport.class);
+	@Resource
+	private SqlSessionTemplate sqlTemplate;
+	@Resource
+	private SqlSessionTemplate batchSqlTemplate;
+
+	/**
+	 * SqlSessionTemplate
+	 * 
+	 * @param batch
+	 *            是否批处理
+	 * @param readonly
+	 *            是否只读
+	 * @return
+	 */
+	protected SqlSessionTemplate getSqlTemplate(boolean batch, boolean readonly) {
+
+		if (readonly) {
+		}
+
+		if (batch) {
+			return batchSqlTemplate;
+		}
+		return sqlTemplate;
+	}
+
+	/**
+	 * 新增对象
+	 * 
+	 * @param statement
+	 * @param parameter
+	 * @return
+	 */
+	protected int insert(String statement, Object parameter) {
+		int res = 0;
+		try {
+			if (parameter != null) {
+				res = getSqlTemplate(false, false).insert(statement, parameter);
+			}
+		} catch (Exception ex) {
+			throw new RuntimeException(ex);
+		}
+		return res;
+	}
+
+	/**
+	 * 删除对象
+	 * 
+	 * @param statement
+	 * @param parameter
+	 * @return
+	 */
+	protected int delete(String statement, Object parameter) {
+		int res = 0;
+		try {
+			res = getSqlTemplate(false, false).delete(statement, parameter);
+		} catch (Exception ex) {
+			throw new RuntimeException(ex);
+		}
+		return res;
+	}
+
+	/**
+	 * 更新对象
+	 * 
+	 * @param statement
+	 * @param parameter
+	 * @return
+	 */
+	protected int update(String statement, Object parameter) {
+		int res = 0;
+		try {
+			if (parameter != null) {
+				res = getSqlTemplate(false, false).update(statement, parameter);
+			}
+		} catch (Exception ex) {
+			throw new RuntimeException(ex);
+		}
+		return res;
+	}
+
+	/**
+	 * 批量更新对象
+	 * 
+	 * @param statement
+	 * @param list
+	 * @return
+	 */
+	@SuppressWarnings("rawtypes")
+	protected int updateBatch(String statement, List parameterList) {
+		int res = 0;
+		SqlSession session = null;
+		try {
+			if (parameterList != null && parameterList.size() > 0) {
+				session = getSqlTemplate(true, false).getSqlSessionFactory().openSession();
+				for (int i = 0; i < parameterList.size(); i++) {
+					int row = session.update(statement, parameterList.get(i));
+					res += row;
+				}
+				session.flushStatements();
+				session.commit();
+			}
+		} catch (Exception ex) {
+			// 回滚由外层服务决定
+			throw new RuntimeException(ex);
+		} finally {
+			if (session != null) {
+				session.close();
+			}
+		}
+		return res;
+	}
+
+	/**
+	 * 批量更新对象
+	 * 
+	 * @param statement
+	 * @param list
+	 * @return
+	 */
+	protected int updateBatch(String statement, Object... parameterArray) {
+		int res = 0;
+		SqlSession session = null;
+		try {
+			if (parameterArray != null && parameterArray.length > 0) {
+				session = getSqlTemplate(true, false).getSqlSessionFactory().openSession();
+				for (int i = 0; i < parameterArray.length; i++) {
+					int row = session.update(statement, parameterArray[i]);
+					res += row;
+				}
+				session.flushStatements();
+				session.commit();
+			}
+		} catch (Exception ex) {
+			// 回滚由外层服务决定
+			throw new RuntimeException(ex);
+		} finally {
+			if (session != null) {
+				session.close();
+			}
+		}
+		return res;
+	}
+
+	/**
+	 * 
+	 * 批量插入对象
+	 * 
+	 * @param statement
+	 * @param parameterList
+	 * @return
+	 */
+	@SuppressWarnings("rawtypes")
+	protected int insertBatch(String statement, List parameterList) {
+		int res = 0;
+		SqlSession session = null;
+		try {
+			if (parameterList != null && parameterList.size() > 0) {
+				session = getSqlTemplate(true, false).getSqlSessionFactory().openSession();
+				for (int i = 0; i < parameterList.size(); i++) {
+					int row = session.insert(statement, parameterList.get(i));
+					res += row;
+				}
+				session.flushStatements();
+				session.commit();
+			}
+		} catch (Exception ex) {
+			// 回滚由外层服务决定
+			throw new RuntimeException(ex);
+		} finally {
+			if (session != null) {
+				session.close();
+			}
+		}
+		return res;
+	}
+
+	/**
+	 * 批量更新对象
+	 * 
+	 * @param statement
+	 * @param list
+	 * @return
+	 */
+	protected int insertBatch(String statement, Object... parameterArray) {
+		int res = 0;
+		SqlSession session = null;
+		try {
+			if (parameterArray != null && parameterArray.length > 0) {
+				session = getSqlTemplate(true, false).getSqlSessionFactory().openSession();
+				for (int i = 0; i < parameterArray.length; i++) {
+					int row = session.insert(statement, parameterArray[i]);
+					res += row;
+				}
+				session.flushStatements();
+				session.commit();
+			}
+		} catch (Exception ex) {
+			// 回滚由外层服务决定
+			throw new RuntimeException(ex);
+		} finally {
+			if (session != null) {
+				session.close();
+			}
+		}
+		return res;
+	}
+
+	/**
+	 * 查询一条记录
+	 * 
+	 * @param <T>
+	 * @param statement
+	 * @param parameter
+	 * @param clz
+	 * @return
+	 */
+	@SuppressWarnings("unchecked")
+	protected <T> T select(String statement, Object parameter) {
+		T obj = null;
+		try {
+			obj = (T) getSqlTemplate(false, true).selectOne(statement, parameter);
+		} catch (Exception ex) {
+			throw new RuntimeException(ex);
+		}
+		return obj;
+	}
+
+	/**
+	 * 查询列表
+	 * 
+	 * @param <T>
+	 * @param statement
+	 * @param parameter
+	 * @param clz
+	 * @return
+	 */
+	protected <T> List<T> selectList(String statement, Object parameter) {
+		List<T> list = null;
+		try {
+			list = getSqlTemplate(false, true).selectList(statement, parameter);
+		} catch (Exception ex) {
+			throw new RuntimeException(ex);
+		}
+		return list;
+	}
+
+	/**
+	 * 查询Map
+	 * 
+	 * @param <K>
+	 * @param <V>
+	 * @param statement
+	 * @param parameter
+	 * @param mapKey
+	 * @return
+	 */
+	protected <K, V> Map<K, V> selectMap(String statement, Object parameter, String mapKey) {
+		Map<K, V> map = null;
+		try {
+			map = getSqlTemplate(false, true).selectMap(statement, parameter, mapKey);
+		} catch (Exception ex) {
+			throw new RuntimeException(ex);
+		}
+		return map;
+	}
+}
@@ -7,7 +7,6 @@ package com.b2c.orders.dao;
 import java.util.concurrent.atomic.AtomicLong;
  
 import com.b2c.orders.domain.OrderMaxid;
-import com.diligrp.website.util.dao.IBaseDao;
  
 /**
  * OrderMaxidDao 接口
@@ -15,7 +14,7 @@ import com.diligrp.website.util.dao.IBaseDao;
  * @author dev-center
  * @since 2014-05-19
  */
-public interface OrderMaxidDao extends IBaseDao<OrderMaxid> {
+public interface OrderMaxidDao extends BaseDao<OrderMaxid, Long> {
 	// 自定义扩展
 	public OrderMaxid getOrderMaxIdByIdType(String idType);
  
+/*
+ * Copyright (c) 2014 www.diligrp.com All rights reserved.
+ * 本软件源代码版权归----所有,未经许可不得任意复制与传播.
+ */
+package com.b2c.orders.dao.impl;
+
+import java.io.Serializable;
+import java.util.List;
+
+import com.b2c.orders.dao.BaseDao;
+import com.b2c.orders.dao.MyBatisSupport;
+
+/**
+ * dao实现类
+ * @author dev-center
+ * @since 2014-05-15
+ * @param <T> 实体
+ * @param <KEY> 主键
+ */
+public abstract class BaseDaoImpl<T, KEY extends Serializable> extends MyBatisSupport implements BaseDao<T, KEY> {
+	private static final String DEFAULT_INSERT_KEY = "insertEntry";
+	//private static final String DEFAULT_INSERT_LAST_SEQUENCE_KEY = "lastSequence";
+	private static final String DEFAULT_DELETE_ARRAY_KEY = "deleteByArrayKey";
+	private static final String DEFAULT_DELETE_CONDTION = "deleteByCondtion";
+	private static final String DEFAULT_UPDATE_KEY = "updateByKey";
+	private static final String DEFAULT_SELECT_ARRAY_KEY = "selectEntryArray";
+	private static final String DEFAULT_SELECT_CONDTION = "selectEntryList";
+	private static final String DEFAULT_SELECT_CONDTION_COUNT = "selectEntryListCount";
+
+	/**
+	 * 获取命名空前前缀
+	 * @param statement
+	 * @return
+	 */
+	public abstract String getNameSpace(String statement);
+	
+	@SuppressWarnings("unchecked")
+    public int insertEntry(T...t){
+		int result = 0;
+		if (t == null || t.length <= 0) {return result;}
+		for (T o : t) {
+			if(o != null) {
+				result += this.insert(getNameSpace(DEFAULT_INSERT_KEY), o);
+			}
+		}
+		return result;
+	}
+	
+//	public int insertEntryCreateId(T t) {
+//		@SuppressWarnings("unchecked")
+//		int result = this.insertEntry(t);
+//		if (result > 0) {
+//			Integer id = (Integer)select(getNameSpace(DEFAULT_INSERT_LAST_SEQUENCE_KEY),null);
+//			if (id != null && id >0) {
+//				try {
+//					Class<?> clz = t.getClass();
+//					clz.getMethod("setId", Long.class).invoke(t, id.longValue());//最后一次插入编号
+//				} catch (Exception e) {
+//					throw new AppException("设置新增主键失败", e);
+//				}
+//			}
+//		}
+//		return result;
+//	}
+	
+	@SuppressWarnings("unchecked")
+    public int deleteByKey(KEY...key) {
+		return this.delete(getNameSpace(DEFAULT_DELETE_ARRAY_KEY), key);
+	}
+	
+	public int deleteByKey(T t) {
+		return this.delete(getNameSpace(DEFAULT_DELETE_CONDTION), t);
+	}
+	
+	public int updateByKey(T t) {
+		return this.update(getNameSpace(DEFAULT_UPDATE_KEY), t);
+	}
+	
+	public int updateBatch(List<T> t) {
+        return this.updateBatch(getNameSpace(DEFAULT_UPDATE_KEY),t);
+    }
+	
+	
+	@SuppressWarnings("unchecked")
+    public int updateBatch(T ... t) {
+        return this.updateBatch(getNameSpace(DEFAULT_UPDATE_KEY), t);
+    }
+	
+	public int insertBatch(List<T> t) {
+	    return this.insertBatch(getNameSpace(DEFAULT_INSERT_KEY),t);
+	}
+	
+	@SuppressWarnings("unchecked")
+    public int insertBatch(T ... t) {
+	    return this.insertBatch(getNameSpace(DEFAULT_INSERT_KEY),t);
+	}
+	
+	public T selectEntry(KEY key) {
+		@SuppressWarnings("unchecked")
+		List<T> list = this.selectEntryList(key);
+		if(list != null && list.size() > 0) {
+			return list.get(0);
+		}
+		return null;
+	}
+	
+	@SuppressWarnings("unchecked")
+    public List<T> selectEntryList(KEY...key) {
+		if (key == null || key.length <= 0) {return null;}
+		return this.selectList(getNameSpace(DEFAULT_SELECT_ARRAY_KEY), key);
+	}
+	
+	public List<T> selectEntryList(T t) {
+		return this.selectList(getNameSpace(DEFAULT_SELECT_CONDTION), t);
+	}
+	
+	public Integer selectEntryListCount(T t) {
+		return this.select(getNameSpace(DEFAULT_SELECT_CONDTION_COUNT), t);
+	}
+}
-package com.b2c.orders.dao;
+package com.b2c.orders.dao.impl;
  
 import org.springframework.stereotype.Repository;
  
+import com.b2c.orders.dao.OrderDao;
 import com.b2c.orders.domain.Order;
 import com.diligrp.website.util.dao.impl.BaseDaoImpl;
  
+package com.b2c.orders.dao.impl;
+
+import java.util.List;
+
+import org.springframework.stereotype.Repository;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.b2c.orders.dao.OrderMaxidDao;
+import com.b2c.orders.domain.OrderMaxid;
+
+@Repository
+public class OrderMaxIdDaoBean extends BaseDaoImpl<OrderMaxid, Long> implements OrderMaxidDao {
+
+	private final static String NAMESPACE = "com.b2c.orders.dao.OrderMaxidDao.";
+
+	// 返回本DAO命名空间,并添加statement
+	public String getNameSpace(String statement) {
+		return NAMESPACE + statement;
+	}
+
+	@Override
+	public OrderMaxid getOrderMaxIdByIdType(String idType) {
+		OrderMaxid orderMaxid = new OrderMaxid();
+		orderMaxid.setIdType(idType);
+		List<OrderMaxid> list = this.selectEntryList(orderMaxid);
+		if (list == null || list.isEmpty()) {
+			return null;
+		}
+		if (list.size() > 1) {
+			StringBuilder sb = new StringBuilder();
+			sb.append("重复的id生成类型");
+			sb.append(idType);
+			sb.append(",无法确定使用哪一个");
+			throw new RuntimeException(sb.toString());
+		}
+		return list.get(0);
+	}
+
+	@Transactional(propagation = Propagation.REQUIRES_NEW, rollbackFor = Exception.class)
+	public SequenceNo getSeqNoByNewTransactional(SequenceNo idSequence, String seqIdKey, Long startSeq) {
+		OrderMaxid orderMaxid = this.getOrderMaxIdByIdType(seqIdKey);
+		if (startSeq != null && startSeq > orderMaxid.getIdValue()) {// orderMaxid.getIdValue()
+			idSequence.setStartSeq(startSeq);
+		} else {
+			idSequence.setStartSeq(orderMaxid.getIdValue());
+		}
+		idSequence.setFinishSeq(idSequence.getStartSeq() + idSequence.getStep());
+		orderMaxid.setIdValue(idSequence.getFinishSeq());
+		Integer result = this.updateByKey(orderMaxid);
+		// 当更新失败后，返回空，外层进行重试
+		if (null == result || result < 1) {
+			return null;
+		}
+		return idSequence;
+	}
+}
@@ -10,9 +10,9 @@
     		http://www.springframework.org/schema/aop/spring-aop.xsd"
 	default-autowire="byName">
  
-	<context:component-scan base-package="com.diligrp.orders.dao" />
+	<context:component-scan base-package="com.b2c.orders.dao" />
  
-	<bean id="dataSource" class="com.alibaba.druid.pool.DruidDataSource"
+	<bean id="masterDataSource" class="com.alibaba.druid.pool.DruidDataSource"
 		init-method="init" destroy-method="close">
 		<property name="driverClassName" value="${jdbc.driverClass}" />
 		<property name="url" value="${jdbc.jdbcUrl}" />
@@ -52,17 +52,16 @@
 	<!-- 配置事务管理器 -->
 	<bean id="transactionManager"
 		class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
-		<property name="dataSource" ref="dataSource" />
+		<property name="dataSource" ref="masterDataSource" />
 	</bean>
  
 	<!-- 集成Mybatis -->
-	<bean id="sqlSessionFactory" class="org.mybatis.spring.SqlSessionFactoryBean">
-		<property name="configLocation" value="classpath:/mybatis/sqlmap-config.xml"></property>
-		<property name="dataSource" ref="dataSource" />
+	<bean id="sessionFactory" class="org.mybatis.spring.SqlSessionFactoryBean">
+		<property name="dataSource" ref="masterDataSource" />
+		<property name="configLocation" value="classpath:sqlmap-config.xml" />
 	</bean>
-
-	<bean id="sqlSessionTemplate" class="org.mybatis.spring.SqlSessionTemplate">
-		<constructor-arg index="0" ref="sqlSessionFactory" />
+	<bean id="sqlTemplate" class="org.mybatis.spring.SqlSessionTemplate">
+		<constructor-arg index="0" ref="sessionFactory" />
 	</bean>
-
+	
 </beans>
 \ No newline at end of file
@@ -11,37 +11,28 @@
 		<setting name="useColumnLabel" value="true" />
 		<!-- 数据库超过25000秒仍未响应则超时 -->
 		<setting name="defaultStatementTimeout" value="25000" />
-		<!-- <setting name="logImpl" value="STDOUT_LOGGING" /> -->
+		<setting name="logImpl" value="STDOUT_LOGGING" />
 	</settings>
  
 	<!-- 全局别名设置，在映射文件中只需写别名，而不必写出整个类路径 -->
 	<typeAliases>
-
-
+		<typeAlias type="com.b2c.orders.domain.OrderMaxid" alias="orderMaxid"/>
 	</typeAliases>
  
 	<typeHandlers>
-		<typeHandler
-			handler="com.diligrp.orders.dao.typehandler.OrderManStatusHandler"
-			javaType="com.diligrp.orders.common.enums.order.OrderManStatus" />
-		<typeHandler handler="com.diligrp.orders.dao.typehandler.OrderPayTypeHandler"
-			javaType="com.diligrp.orders.publics.enums.PayType" />
-		<typeHandler handler="com.diligrp.orders.dao.typehandler.ReOrderStatusHandler"
-			javaType="com.diligrp.orders.publics.enums.ReOrderStatus" />
-		<typeHandler
-			handler="com.diligrp.orders.dao.typehandler.OrderPayStatusHandler"
-			javaType="com.diligrp.orders.publics.enums.PayStatus" />
-		<typeHandler
-			handler="com.diligrp.orders.dao.typehandler.OrderDeliveryTypeHandler"
-			javaType="com.diligrp.orders.publics.enums.OrderDeliveryType" />
+		<!-- <typeHandler handler="com.b2c.dtms.dao.typehandler.OrderManStatusHandler"
+			javaType="com.b2c.dtms.common.enums.order.OrderManStatus" />
+		<typeHandler handler="com.b2c.dtms.dao.typehandler.OrderPayTypeHandler"
+			javaType="com.b2c.dtms.publics.enums.PayType" />
+		<typeHandler handler="com.b2c.dtms.dao.typehandler.OrderPayStatusHandler"
+			javaType="com.b2c.dtms.publics.enums.PayStatus" />
+		<typeHandler handler="com.b2c.dtms.dao.typehandler.OrderDeliveryTypeHandler"
+			javaType="com.b2c.dtms.publics.enums.OrderDeliveryType" /> -->
 	</typeHandlers>
  
 	<!-- 映射文件路径 -->
 	<mappers>
-		<mapper resource="sqlmap/OrderItem.xml" />
-		<mapper resource="sqlmap/Orders.xml" />
 		<mapper resource="sqlmap/OrderMaxid.xml" />
-		<mapper resource="sqlmap/OrdersJob.xml" />
 	</mappers>
  
  
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-	"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.diligrp.orders.dao.OrderItemDao">
-
-	<!-- order_item 所有查询列 -->
-	<sql id="QUERY_COLUMN_LIST">
-		<![CDATA[id,order_id AS orderId,product_id AS productId,buyer_id AS buyerId,seller_id AS sellerId,sale_type AS saleType,sku,sku_title AS skuTitle,sku_attributes AS skuAttributes,sku_num AS skuNum,sku_price AS skuPrice,sku_original_price AS skuOriginalPrice,create_time AS createTime,edit_time AS editTime,is_commented AS isCommented,version_num as versionNum,sku_picture as skuPicture,shop_id as shopId,price_unit as priceUnit]]>
-	</sql>
-
-	<!-- order_item 查询列来源表-->
-	<sql id="QUERY_FROM_TABLE"><![CDATA[FROM order_item]]></sql>
-	
-	<!-- 全部条件(更多功能可以通过queryData扩展实现)  -->
-	<sql id="QUERY_WHERE_CLAUSE">
-		<where>
-			<if test="id != null and id != ''"><![CDATA[AND id = #{id}]]></if>
-			<if test="orderId != null and orderId != ''"><![CDATA[AND order_id = #{orderId}]]></if>
-			<if test="productId != null and productId != ''"><![CDATA[AND product_id = #{productId}]]></if>
-			<if test="sellerId != null and sellerId != ''"><![CDATA[AND seller_id = #{sellerId}]]></if>
-			<if test="buyerId != null and buyerId != ''"><![CDATA[AND buyer_id = #{buyerId}]]></if>
-			<if test="saleType != null and saleType != ''"><![CDATA[AND sale_type = #{saleType}]]></if>
-			<if test="sku != null and sku != ''"><![CDATA[AND sku = #{sku}]]></if>
-			<if test="skuTitle != null and skuTitle != ''"><![CDATA[AND sku_title = #{skuTitle}]]></if>
-			<if test="skuAttributes != null and skuAttributes != ''"><![CDATA[AND sku_attributes = #{skuAttributes}]]></if>
-			<if test="skuNum != null and skuNum != ''"><![CDATA[AND sku_num = #{skuNum}]]></if>
-			<if test="skuPrice != null and skuPrice != ''"><![CDATA[AND sku_price = #{skuPrice}]]></if>
-			<if test="skuOriginalPrice != null and skuOriginalPrice != ''"><![CDATA[AND sku_original_price = #{skuOriginalPrice}]]></if>
-			<if test="createTime != null and createTime != ''"><![CDATA[AND create_time = #{createTime}]]></if>
-			<if test="editTime != null and editTime != ''"><![CDATA[AND edit_time = #{editTime}]]></if>
-			<if test="(isCommented != null and isCommented != '') or isCommented==0"><![CDATA[AND is_commented = #{isCommented}]]></if>
-			<if test="skuPicture != null and skuPicture != ''"><![CDATA[AND sku_picture = #{skuPicture}]]></if>
-			<if test="shopId != null and shopId != ''"><![CDATA[AND shop_id = #{shopId}]]></if>
-			<if test="priceUnit != null and priceUnit != ''"><![CDATA[AND price_unit = #{price_unit}]]></if>
-			<if test="queryData != null">
-			   <if test="queryData.orderIdSet!=null and queryData.orderIdSet.size()>0">
-		          AND order_id in
-	              <foreach collection="queryData.orderIdSet" index="index" item="orderId" open="(" separator="," close=")">
-	                #{orderId}
-	              </foreach>
-			   </if>
-		     </if>
-		</where>
-	</sql>
-	
-	<!-- 智能排序与分页 -->
-	<sql id="QUERY_ORDER_LIMIT_CONDTION">
-		<choose>
-		   <when test="orderField != null and orderField != ''">
-		        <choose>
-		            <when test="orderFieldType != null and orderFieldType != ''">
-		                <![CDATA[ORDER BY ${orderField} ${orderFieldType}]]>
-		            </when>
-		            <otherwise>
-		                <![CDATA[ORDER BY ${orderField} desc]]>
-		            </otherwise>
-		        </choose>
-		   </when>
-		   <otherwise>
-		        <![CDATA[ORDER BY id desc]]>
-		   </otherwise>
-		</choose>
-		<if test="startIndex != null and startIndex &gt;= 0 and pageSize != null and pageSize &gt; 0"><![CDATA[LIMIT #{startIndex},#{pageSize}]]></if>
-	</sql>
-
-	<!-- 更新列字段,只要不为NULL则更新,除开主键列 -->
-	<sql id="UPDATE_COLUMN_SET">
-		<set>
-			<if test="orderId != null"><![CDATA[order_id = #{orderId},]]></if>
-			<if test="productId != null"><![CDATA[product_id = #{productId},]]></if>
-			<if test="sellerId != null"><![CDATA[seller_id = #{sellerId},]]></if>
-			<if test="buyerId != null"><![CDATA[buyer_id = #{buyerId},]]></if>
-			<if test="saleType != null"><![CDATA[sale_type = #{saleType},]]></if>
-			<if test="sku != null"><![CDATA[sku = #{sku},]]></if>
-			<if test="skuTitle != null"><![CDATA[sku_title = #{skuTitle},]]></if>
-			<if test="skuAttributes != null"><![CDATA[sku_attributes = #{skuAttributes},]]></if>
-			<if test="skuNum != null"><![CDATA[sku_num = #{skuNum},]]></if>
-			<if test="skuPrice != null"><![CDATA[sku_price = #{skuPrice},]]></if>
-			<if test="skuOriginalPrice != null"><![CDATA[sku_original_price = #{skuOriginalPrice},]]></if>
-			<if test="isCommented != null"><![CDATA[is_commented = #{isCommented},]]></if>
-			<if test="versionNum != null"><![CDATA[version_num = #{versionNum}+1,]]></if>
-<!-- 			<if test="createTime != null"><![CDATA[create_time = #{createTime},]]></if> -->
-			<![CDATA[edit_time = now(),]]><if test="editTime != null"></if>
-			<if test="skuPicture != null"><![CDATA[sku_picture = #{skuPicture},]]></if>
-			<if test="shopId != null"><![CDATA[shop_id = #{shopId},]]></if>
-			<if test="priceUnit != null"><![CDATA[price_unit = #{price_unit},]]></if>
-		</set>
-	</sql>
-
-	<!-- 插入order_item记录 -->
-	<insert id="insertEntry" parameterType="orderItem" >
-		<![CDATA[
-			INSERT INTO order_item (id,order_id,product_id,buyer_id,seller_id,sale_type,sku,sku_title,sku_attributes,sku_num,sku_price,sku_original_price,create_time,edit_time,sku_picture,shop_id,price_unit)
-			VALUES (#{id},#{orderId},#{productId},#{buyerId},#{sellerId},#{saleType},#{sku},#{skuTitle},#{skuAttributes},#{skuNum},#{skuPrice},#{skuOriginalPrice},#{createTime},#{editTime},#{skuPicture},#{shopId},#{priceUnit})
-		]]>
-	</insert>
-	
-	<!-- 返回插入的编号,在事务开启状态下有效 -->
-	<select id="lastSequence" resultType="int"><![CDATA[SELECT LAST_INSERT_ID() AS id]]></select>
-
-	<!-- 删除记录,主键IN(array) -->
-	<delete id="deleteByArrayKey" parameterType="java.lang.reflect.Array" >
-		<![CDATA[DELETE FROM order_item WHERE id IN]]>
-		<foreach collection="array" item="id" open="(" separator="," close=")">
-			<![CDATA[#{id}]]>
-		</foreach>
-	</delete>
-
-	<!-- 删除,通过条件 -->
-	<update id="deleteByCondtion" parameterType="orderItem" >
-		<![CDATA[DELETE FROM order_item]]>
-		<include refid="QUERY_WHERE_CLAUSE"/>
-	</update>
-
-	<!-- 修改记录通过主键 -->
-	<update id="updateByKey" parameterType="orderItem" >
-		<![CDATA[UPDATE order_item]]>
-		<include refid="UPDATE_COLUMN_SET"/>
-		<![CDATA[WHERE id = #{id}]]>
-		<if test="versionNum!= null "><![CDATA[AND version_NUM = #{versionNum}]]></if>
-	</update>
-	<!-- 通过订单ID更新订单项为已评论 -->
-	<update id="updatSkuCommentedByOrderId" parameterType="long" >
-		<![CDATA[UPDATE order_item SET is_commented=1 WHERE order_id = #{orderId} AND is_commented<>1 ]]>
-	</update>
-	<!-- 查询,通过主键IN(array) -->
-	<select id="selectEntryArray" parameterType="java.lang.reflect.Array" resultType="orderItem">
-		<![CDATA[SELECT]]>
-		<include refid="QUERY_COLUMN_LIST"/>
-		<include refid="QUERY_FROM_TABLE"/>
-		<![CDATA[WHERE id IN]]>
-		<foreach collection="array" item="id" open="(" separator="," close=")">
-			<![CDATA[#{id}]]>
-		</foreach>
-	</select>
-
-	<!-- 查询,通过条件 -->
-	<select id="selectEntryList" parameterType="orderItem" resultType="orderItem">
-		<![CDATA[SELECT]]>
-		<include refid="QUERY_COLUMN_LIST"/>
-		<include refid="QUERY_FROM_TABLE"/>
-		<include refid="QUERY_WHERE_CLAUSE"/>
-		<include refid="QUERY_ORDER_LIMIT_CONDTION"/>
-	</select>
-	<!-- 总数查询,通过条件 -->
-	<select id="selectEntryListCount" parameterType="orderItem" resultType="int">
-		<![CDATA[SELECT COUNT(id) AS dataCount]]>
-		<include refid="QUERY_FROM_TABLE"/>
-		<include refid="QUERY_WHERE_CLAUSE"/>
-	</select>
-	
-	<!-- 其它SQL语句 -->
-	<select id="getSupplierItemSum" parameterType="map" resultType="Long">
-		select sum(s.assign_num) from supply_order s where ( s.assign_status=10 or s.assign_status=20) and s.order_item_id=#{orderItemId} and s.order_Id=#{orderId}
-	</select>
-	
-	<!-- 查询用户购买单个商品的数量 -->
-	<select id="getProductBuyNum" parameterType="orderItem" resultType="Integer">
-		SELECT COUNT(1) FROM order_item item 
-		JOIN orders o ON o.id=item.order_id 
-		WHERE o.buyer_id=#{buyerId} 
-		AND item.product_id=#{productId} 
-		AND o.order_status NOT IN(60,70)
-	</select>
-</mapper>
 \ No newline at end of file
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.diligrp.orders.dao.OrderMaxidDao">
+<mapper namespace="com.b2c.orders.dao.OrderMaxidDao">
  
 	<!-- order_maxid 所有查询列 -->
 	<sql id="QUERY_COLUMN_LIST">
-		<!-- [CDATA[id,id_type AS idType,id_value AS idValue,memo,version_num AS versionNum]]-->
+		<!-- [CDATA[id,id_type AS idType,id_value AS idValue,memo,version_num AS 
+			versionNum]] -->
 		<![CDATA[id,id_value AS idValue,version_num AS versionNum]]>
 	</sql>
  
-	<!-- order_maxid 查询列来源表-->
+	<!-- order_maxid 查询列来源表 -->
 	<sql id="QUERY_FROM_TABLE"><![CDATA[FROM order_maxid]]></sql>
-	
-	<!-- 全部条件(更多功能可以通过queryData扩展实现)  -->
+
+	<!-- 全部条件(更多功能可以通过queryData扩展实现) -->
 	<sql id="QUERY_WHERE_CLAUSE">
 		<where>
 			<if test="id != null and id != ''"><![CDATA[AND id = #{id}]]></if>
@@ -22,25 +23,26 @@
 			<if test="versionNum != null and versionNum != ''"><![CDATA[AND version_num = #{versionNum}]]></if>
 		</where>
 	</sql>
-	
+
 	<!-- 智能排序与分页 -->
 	<sql id="QUERY_ORDER_LIMIT_CONDTION">
 		<choose>
-		   <when test="orderField != null and orderField != ''">
-		        <choose>
-		            <when test="orderFieldType != null and orderFieldType != ''">
+			<when test="orderField != null and orderField != ''">
+				<choose>
+					<when test="orderFieldType != null and orderFieldType != ''">
 		                <![CDATA[ORDER BY ${orderField} ${orderFieldType}]]>
-		            </when>
-		            <otherwise>
+					</when>
+					<otherwise>
 		                <![CDATA[ORDER BY ${orderField} desc]]>
-		            </otherwise>
-		        </choose>
-		   </when>
-		   <otherwise>
+					</otherwise>
+				</choose>
+			</when>
+			<otherwise>
 		        <![CDATA[ORDER BY id desc]]>
-		   </otherwise>
+			</otherwise>
 		</choose>
-		<if test="startIndex != null and startIndex &gt;= 0 and pageSize != null and pageSize &gt; 0"><![CDATA[LIMIT #{startIndex},#{pageSize}]]></if>
+		<if
+			test="startIndex != null and startIndex &gt;= 0 and pageSize != null and pageSize &gt; 0"><![CDATA[LIMIT #{startIndex},#{pageSize}]]></if>
 	</sql>
  
 	<!-- 更新列字段,只要不为NULL则更新,除开主键列 -->
@@ -54,65 +56,70 @@
 	</sql>
  
 	<!-- 插入order_maxid记录 -->
-	<insert id="insertEntry" parameterType="orderMaxid" >
+	<insert id="insertEntry" parameterType="com.b2c.orders.domain.OrderMaxid">
 		<![CDATA[
 			INSERT INTO order_maxid (id,id_type,id_value,memo,version_num)
 			VALUES (#{id},#{idType},#{idValue},#{memo},#{versionNum})
 		]]>
 	</insert>
-	
+
 	<!-- 返回插入的编号,在事务开启状态下有效 -->
 	<select id="lastSequence" resultType="int"><![CDATA[SELECT LAST_INSERT_ID() AS id]]></select>
  
 	<!-- 删除记录,主键IN(array) -->
-	<delete id="deleteByArrayKey" parameterType="java.lang.reflect.Array" >
+	<delete id="deleteByArrayKey" parameterType="java.lang.reflect.Array">
 		<![CDATA[DELETE FROM order_maxid WHERE id IN]]>
-		<foreach collection="array" item="id" open="(" separator="," close=")">
+		<foreach collection="array" item="id" open="(" separator=","
+			close=")">
 			<![CDATA[#{id}]]>
 		</foreach>
 	</delete>
  
 	<!-- 删除,通过条件 -->
-	<update id="deleteByCondtion" parameterType="orderMaxid" >
+	<update id="deleteByCondtion" parameterType="com.b2c.orders.domain.OrderMaxid">
 		<![CDATA[DELETE FROM order_maxid]]>
-		<include refid="QUERY_WHERE_CLAUSE"/>
+		<include refid="QUERY_WHERE_CLAUSE" />
 	</update>
  
 	<!-- 修改记录通过主键 -->
-	<update id="updateByKey" parameterType="orderMaxid" >
+	<update id="updateByKey" parameterType="com.b2c.orders.domain.OrderMaxid">
 		<![CDATA[UPDATE order_maxid]]>
-		<include refid="UPDATE_COLUMN_SET"/>
+		<include refid="UPDATE_COLUMN_SET" />
 		<![CDATA[WHERE id = #{id} AND  version_num = #{versionNum}]]>
 	</update>
  
 	<!-- 查询,通过主键IN(array) -->
-	<select id="selectEntryArray" parameterType="java.lang.reflect.Array" resultType="orderMaxid">
+	<select id="selectEntryArray" parameterType="java.lang.reflect.Array"
+		resultType="com.b2c.orders.domain.OrderMaxid">
 		<![CDATA[SELECT]]>
-		<include refid="QUERY_COLUMN_LIST"/>
-		<include refid="QUERY_FROM_TABLE"/>
+		<include refid="QUERY_COLUMN_LIST" />
+		<include refid="QUERY_FROM_TABLE" />
 		<![CDATA[WHERE id IN]]>
-		<foreach collection="array" item="id" open="(" separator="," close=")">
+		<foreach collection="array" item="id" open="(" separator=","
+			close=")">
 			<![CDATA[#{id}]]>
 		</foreach>
 	</select>
  
 	<!-- 查询,通过条件 -->
-	<select id="selectEntryList" parameterType="orderMaxid" resultType="orderMaxid">
+	<select id="selectEntryList" parameterType="com.b2c.orders.domain.OrderMaxid"
+		resultType="com.b2c.orders.domain.OrderMaxid">
 		<![CDATA[SELECT]]>
-		<include refid="QUERY_COLUMN_LIST"/>
-		<include refid="QUERY_FROM_TABLE"/>
-		<include refid="QUERY_WHERE_CLAUSE"/>
-		<include refid="QUERY_ORDER_LIMIT_CONDTION"/>
+		<include refid="QUERY_COLUMN_LIST" />
+		<include refid="QUERY_FROM_TABLE" />
+		<include refid="QUERY_WHERE_CLAUSE" />
+		<include refid="QUERY_ORDER_LIMIT_CONDTION" />
 	</select>
  
 	<!-- 总数查询,通过条件 -->
-	<select id="selectEntryListCount" parameterType="orderMaxid" resultType="int">
+	<select id="selectEntryListCount" parameterType="com.b2c.orders.domain.OrderMaxid"
+		resultType="int">
 		<![CDATA[SELECT COUNT(id) AS dataCount]]>
-		<include refid="QUERY_FROM_TABLE"/>
-		<include refid="QUERY_WHERE_CLAUSE"/>
+		<include refid="QUERY_FROM_TABLE" />
+		<include refid="QUERY_WHERE_CLAUSE" />
 	</select>
-	
+
 	<!-- 其它SQL语句 -->
-	
-	
+
+
 </mapper>
 \ No newline at end of file
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-	"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.diligrp.orders.dao.OrderReceiverDao">
-
-	<!-- order_receiver 所有查询列 -->
-	<sql id="QUERY_COLUMN_LIST">
-		<![CDATA[id,order_id AS orderId,receiver_name AS receiverName,receiver_phone AS receiverPhone,
-				receiver_idcard AS receiverIdcard,receiver_address AS receiverAddress,
-				real_receiver_name AS realReceiverName,real_receiver_phone AS realReceiverPhone,
-				real_receiver_idcard AS realReceiverIdcard,real_receiver_address AS realReceiverAddress,
-				create_time AS createTime,edit_time AS editTime
-		]]>
-	</sql>
-
-	<!-- order_ship_info 查询列来源表-->
-	<sql id="QUERY_FROM_TABLE"><![CDATA[FROM order_receiver]]></sql>
-	
-	<!-- 全部条件(更多功能可以通过queryData扩展实现)  -->
-	<sql id="QUERY_WHERE_CLAUSE">
-		<where>
-			<if test="id != null and id != ''"><![CDATA[AND id = #{id}]]></if>
-			<if test="orderId != null and orderId != ''"><![CDATA[AND order_id = #{orderId}]]></if>
-			<if test="receiverName != null and receiverName != ''"><![CDATA[AND receiver_name = #{receiverName}]]></if>
-			<if test="receiverPhone != null and receiverPhone != ''"><![CDATA[AND receiver_phone = #{receiverPhone}]]></if>
-			<if test="queryData != null">
-				<if test="queryData.orderIdSet!=null and queryData.orderIdSet.size()>0">
-					AND order_id in
-					<foreach collection="queryData.orderIdSet" index="index" item="orderId" open="(" separator="," close=")">
-						#{orderId}
-					</foreach>
-				</if>
-			</if>
-		</where>
-	</sql>
-	
-	<!-- 智能排序与分页 -->
-	<sql id="QUERY_ORDER_LIMIT_CONDTION">
-		<if test="orderField != null and orderField != '' and orderFieldType != null and orderFieldType != ''"><![CDATA[ORDER BY ${orderField} ${orderFieldType}]]></if>
-		<if test="startIndex != null and startIndex &gt;= 0 and pageSize != null and pageSize &gt; 0"><![CDATA[LIMIT #{startIndex},#{pageSize}]]></if>
-	</sql>
-
-	<!-- 更新列字段,只要不为NULL则更新,除开主键列 -->
-	<sql id="UPDATE_COLUMN_SET">
-		<set>
-			<if test="orderId != null"><![CDATA[order_id = #{orderId},]]></if>
-			<if test="receiverName != null"><![CDATA[receiver_name = #{receiverName},]]></if>
-			<if test="receiverPhone != null"><![CDATA[receiver_phone = #{receiverPhone},]]></if>
-			<if test="receiverIdcard != null"><![CDATA[receiver_idcard = #{receiverIdcard},]]></if>
-			<if test="receiverAddress != null"><![CDATA[receiver_address = #{receiverAddress},]]></if>
-			<if test="realReceiverName != null"><![CDATA[real_receiver_name = #{realReceiverName},]]></if>
-			<if test="realReceiverPhone != null"><![CDATA[real_receiver_phone = #{realReceiverPhone},]]></if>
-			<if test="realReceiverIdcard != null"><![CDATA[real_receiver_idcard = #{realReceiverIdcard},]]></if>
-			<if test="realReceiverAddress != null"><![CDATA[real_receiver_address = #{realReceiverAddress},]]></if>
-			<choose>
-				<when test="editTime != null">
-					<![CDATA[edit_time = #{editTime},]]>
-				</when>
-				<otherwise>
-					<![CDATA[a.edit_time = NOW(),]]>
-				</otherwise>
-			</choose>
-		</set>
-	</sql>
-
-	<!-- 插入order_ship_info记录 -->
-	<insert id="insertEntry" parameterType="orderReceiver" >
-		<![CDATA[
-			INSERT INTO order_receiver (order_id,receiver_name,receiver_phone,receiver_idcard,receiver_address,real_receiver_name,real_receiver_phone,real_receiver_idcard,real_receiver_address,create_time,edit_time)
-			VALUES (#{orderId},#{receiverName},#{receiverPhone},#{receiverIdcard},#{receiverAddress},#{realReceiverName},#{realReceiverPhone},#{realReceiverIdcard},#{realReceiverAddress},#{createTime},#{editTime})
-		]]>
-	</insert>
-	
-	<!-- 返回插入的编号,在事务开启状态下有效 -->
-	<select id="lastSequence" resultType="int"><![CDATA[SELECT LAST_INSERT_ID() AS id]]></select>
-
-	<!-- 删除记录,主键IN(array) -->
-	<delete id="deleteByArrayKey" parameterType="java.lang.reflect.Array" >
-		<![CDATA[DELETE FROM order_receiver WHERE id IN]]>
-		<foreach collection="array" item="id" open="(" separator="," close=")">
-			<![CDATA[#{id}]]>
-		</foreach>
-	</delete>
-
-	<!-- 删除,通过条件 -->
-	<update id="deleteByCondtion" parameterType="orderReceiver" >
-		<![CDATA[DELETE FROM order_receiver ]]>
-		<include refid="QUERY_WHERE_CLAUSE"/>
-	</update>
-
-	<!-- 修改记录通过主键 -->
-	<update id="updateByKey" parameterType="orderReceiver" >
-		<![CDATA[UPDATE order_receiver ]]>
-		<include refid="UPDATE_COLUMN_SET"/>
-		<![CDATA[WHERE id = #{id}]]>
-	</update>
-
-	<!-- 查询,通过主键IN(array) -->
-	<select id="selectEntryArray" parameterType="java.lang.reflect.Array" resultType="orderReceiver">
-		<![CDATA[SELECT]]>
-		<include refid="QUERY_COLUMN_LIST"/>
-		<include refid="QUERY_FROM_TABLE"/>
-		<![CDATA[WHERE id IN]]>
-		<foreach collection="array" item="id" open="(" separator="," close=")">
-			<![CDATA[#{id}]]>
-		</foreach>
-	</select>
-
-	<!-- 查询,通过条件 -->
-	<select id="selectEntryList" parameterType="orderReceiver" resultType="orderReceiver">
-		<![CDATA[SELECT]]>
-		<include refid="QUERY_COLUMN_LIST"/>
-		<include refid="QUERY_FROM_TABLE"/>
-		<include refid="QUERY_WHERE_CLAUSE"/>
-		<include refid="QUERY_ORDER_LIMIT_CONDTION"/>
-	</select>
-
-	<!-- 总数查询,通过条件 -->
-	<select id="selectEntryListCount" parameterType="orderReceiver" resultType="int">
-		<![CDATA[SELECT COUNT(id) AS dataCount]]>
-		<include refid="QUERY_FROM_TABLE"/>
-		<include refid="QUERY_WHERE_CLAUSE"/>
-	</select>
-	
-	<!-- 其它SQL语句 -->
-	
-	
-</mapper>
 \ No newline at end of file
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-	"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.diligrp.orders.dao.OrdersDao">
-	<!-- orders 所有查询列 -->
-	<sql id="QUERY_COLUMN_LIST">
-		<![CDATA[a.id,
-				 a.parent_id AS parentId,
-		         a.buyer_id AS buyerId,
-		         a.buyer_name AS buyerName,
-		         a.seller_id AS sellerId,
-		         a.seller_name AS sellerName,
-		         a.market_name AS marketName,
-		         a.market_id AS marketId,
-		         a.delivery_type AS deliveryType,
-		         a.shiping_address AS shipingAddress,
-		         a.order_type AS orderType,
-		         a.order_status AS orderStatus,
-		         a.pay_status AS payStatus,
-		         a.buyer_memo AS buyerMemo,
-		         a.order_status_in_time AS orderStatusInTime,
-		         a.order_status_last_valid_time AS orderStatusLastValidTime,
-		         a.pay_time AS payTime,
-		         a.stocking_in_time AS stockingInTime,
-		         a.stocking_complete_time AS stockingCompleteTime,
-		         a.reservation_stime AS reservationStime,
-		         a.reservation_ftime AS reservationFtime,
-		         a.buyer_confirm_time AS buyerConfirmTime,
-		         a.create_time AS createTime,
-		         a.edit_time AS editTime,
-		         a.invoice_type AS invoiceType,
-		         a.invoice_title AS invoiceTitle,
-		         a.invoice_content AS invoiceContent,
-		         a.pay_type AS payType,
-		         a.price_total AS priceTotal,
-		         a.price_privilege AS pricePrivilege,
-		         a.price_offset AS priceOffset,
-		         a.price_paid AS pricePaid,
-		         a.price_refund AS priceRefund,
-		         a.price_postage AS pricePostage,
-		         a.version_num AS versionNum,
-		         a.is_delete AS isDelete,
-		         a.shop_id AS shopId,
-		         a.trade_no AS tradeNo,
-		         a.shop_name AS shopName,
-		         a.delivery_ver_code AS deliveryVerCode,
-		         a.status_in_reason AS statusInReason,
-		         a.is_commented AS isCommented,
-		         a.price_total_original AS priceTotalOriginal,
-		         a.price_postage_original AS pricePostageOriginal,
-		         a.come_from AS comeFrom,
-		         a.logistics_remarks as logisticsRemarks,
-		         a.buyer_city_id as buyerCityId,
-		         a.goods_weight goodsWeight,
-		         a.seller_source as sellerSource,
-		         a.print_flag AS printFlag,
-		         a.warrant_type as warrantType,
-		         a.market_delivery AS marketDelivery
-		         ]]>
-	</sql>
-
-	<!-- orders 查询列来源表-->
-	<sql id="QUERY_FROM_TABLE"><![CDATA[FROM orders a]]></sql>
-	
-	<!-- 全部条件(更多功能可以通过queryData扩展实现)  -->
-	<sql id="QUERY_WHERE_CLAUSE">
-		where 1=1 AND a.is_delete = 0
-		    <!--当id值为0时，此判断条件无法通过判断，不能生成a.id=0的查询条件，导致查询出错
-			<if test="id != null and id != ''"><![CDATA[AND a.id = #{id}]]></if>
-              -->
-            <choose>
-	            <when test="id != null and id != ''">
-	            	<![CDATA[AND a.id = #{id}]]>
-	            </when>
-	            <otherwise>
-	            	<if test="queryData != null and queryData != ''">
-                           <if test="queryData.orderIdList!=null and queryData.orderIdList.size()>0">
-                                  AND a.id in
-                                  <foreach collection="queryData.orderIdList" index="index" item="idList" open="(" separator="," close=")">
-                                    #{idList}
-                                  </foreach>
-                           </if>
-                     </if>
-	            </otherwise>
-            </choose>
-			<if test="buyerId != null and buyerId != ''"><![CDATA[AND a.buyer_id = #{buyerId}]]></if>
-			<if test="sellerId != null and sellerId != ''"><![CDATA[AND a.seller_id = #{sellerId}]]></if>
-			<if test="buyerName != null and buyerName != ''"><![CDATA[AND a.buyer_name = #{buyerName}]]></if>
-			<if test="sellerName != null and sellerName != ''"><![CDATA[AND a.seller_name = #{sellerName}]]></if>
-			<if test="marketName != null and marketName != ''"><![CDATA[AND a.market_name = #{marketName}]]></if>
-			<if test="sellerSource != null and sellerSource != ''"><![CDATA[AND a.seller_source = #{sellerSource}]]></if>
-			<if test="printFlag != null "><![CDATA[AND a.print_flag = #{printFlag}]]></if>
-			<choose>
-                  <when test="deliveryType != null and deliveryType != ''">
-                      <![CDATA[AND a.delivery_type = #{deliveryType}]]>
-                  </when>
-                  <otherwise>
-                      <if test="queryData != null and queryData != ''">
-                           <if test="queryData.deliveryTypeList!=null and queryData.deliveryTypeList.size()>0">
-                                  AND a.delivery_type in
-                                  <foreach collection="queryData.deliveryTypeList" index="index" item="deliveryType" open="(" separator="," close=")">
-                                    #{deliveryType}
-                                  </foreach>
-                           </if>
-                     </if>
-                  </otherwise>
-            </choose>
-			<if test="shipingAddress != null and shipingAddress != ''"><![CDATA[AND a.shiping_address like CONCAT('%',#{shipingAddress},'%')]]></if>
-			<if test="orderType != null and orderType != ''"><![CDATA[AND a.order_type = #{orderType}]]></if>
-			<if test="orderStatus != null and orderStatus != ''"><![CDATA[AND a.order_status = #{orderStatus}]]></if>
-			<if test="payStatus != null and payStatus != ''"><![CDATA[AND a.pay_status = #{payStatus}]]></if>
-			<if test="buyerMemo != null and buyerMemo != ''"><![CDATA[AND a.buyer_memo = #{buyerMemo}]]></if>
-			<if test="orderStatusInTime != null and orderStatusInTime != ''"><![CDATA[AND a.order_status_in_time = #{orderStatusInTime}]]></if>
-			<if test="orderStatusLastValidTime != null and orderStatusLastValidTime != ''"><![CDATA[AND a.order_status_last_valid_time = #{orderStatusLastValidTime}]]></if>
-			<if test="payTime != null and payTime != ''"><![CDATA[AND a.pay_time = #{payTime}]]></if>
-			<if test="stockingInTime != null and stockingInTime != ''"><![CDATA[AND a.stocking_in_time = #{stockingInTime}]]></if>
-			<if test="stockingCompleteTime != null and stockingCompleteTime != ''"><![CDATA[AND a.stocking_complete_time = #{stockingCompleteTime}]]></if>
-			<if test="reservationStime != null and reservationStime != '' and (reservationFtime == null or reservationFtime == '')">
-			   <![CDATA[AND a.reservation_stime >= #{reservationStime}]]>
-			</if>
-			<if test="reservationFtime != null and reservationFtime != '' and (reservationStime == null or reservationStime == '')">
-			    <![CDATA[AND a.reservation_ftime <= #{reservationFtime}]]>
-			</if>
-			<if test="reservationStime != null and reservationStime != '' and (reservationFtime != null and reservationFtime != '')">
-			   <![CDATA[
-			           AND (a.reservation_stime >= #{reservationStime} AND a.reservation_stime<=#{reservationFtime}
-			           OR a.reservation_ftime >= #{reservationStime} AND a.reservation_ftime<=#{reservationFtime}
-			           OR a.reservation_stime <=#{reservationStime} AND a.reservation_ftime>=#{reservationFtime})
-			   ]]>
-			</if>
-			<if test="marketDelivery != null and marketDelivery !=''"><![CDATA[ AND a.market_delivery = #{marketDelivery} ]]> </if>
-			<if test="buyerConfirmTime != null and buyerConfirmTime != ''"><![CDATA[AND a.buyer_confirm_time = #{buyerConfirmTime}]]></if>
-			<if test="createTime != null and createTime != ''"><![CDATA[AND a.create_time = #{createTime}]]></if>
-			<if test="versionNum != null and versionNum != ''"><![CDATA[AND a.version_num = #{versionNum}]]></if>
-			<if test="shopId != null and shopId != ''"><![CDATA[AND a.shop_id = #{shopId}]]></if>
-			<if test="shopName != null and shopName != ''"><![CDATA[AND a.shop_name like CONCAT(#{shopName},'%')]]></if>
-			<!-- 商品名称like搜索 -->
-			<if test="productsTitle != null and productsTitle != ''"><![CDATA[AND a.products_title like CONCAT('%',#{productsTitle},'%')]]></if>
-			<if test="tradeNo != null and tradeNo != ''"><![CDATA[AND a.trade_no = #{tradeNo}]]></if>
-			<!--当id值为0时，此判断条件无法通过判断，不能生成a.id=0的查询条件，导致查询出错
-			<if test="isCommented != null and isCommented != ''"><![CDATA[AND a.is_commented = #{isCommented}]]></if>
-			-->
-			<if test="isCommented != null"><![CDATA[AND a.is_commented = #{isCommented}]]></if>
-			<if test="printFlag != null and printFlag != ''"><![CDATA[AND a.print_flag = #{printFlag}]]></if>
-			<!-- 可以进行出厂的：1.未出厂,2.订单状态(待提货、待发货、交易完成),3.现场交易且(赊账付款或(线下付款且待付款))-->
-		    <choose>
-	            <when test="orderStatus != null and orderStatus != ''">
-	               <![CDATA[AND a.order_status = #{orderStatus}]]>
-	            </when>
-	            <otherwise>
-	              <if test="queryData != null and queryData != '' 
-	              	and queryData.orderStateSet != null and queryData.orderStateSet.size>0">
-					  <![CDATA[ and a.order_status in ]]>
-					  <foreach item="item" index="index" collection="queryData.orderStateSet" open="(" separator="," close=")">
-					   	#{item}
-			      	  </foreach>
-		         </if>
-	            </otherwise>
-			 </choose>
-			<if test="queryData != null and queryData != ''">
-				<if test="queryData.submitBeginTime != null and queryData.submitBeginTime != ''">
-					<![CDATA[AND a.create_time >=  #{queryData.submitBeginTime}  ]]>
-			   </if>
-			   <if test="queryData.submitEndTime != null and queryData.submitEndTime != ''">
-					<![CDATA[AND a.create_time  <=  #{queryData.submitEndTime} ]]>
-			   </if>
-			   <if test="queryData.payBeginTime != null and queryData.payBeginTime != ''">
-					<![CDATA[AND a.pay_time >= #{queryData.payBeginTime}]]>
-			   </if>
-			   <if test="queryData.payEndTime != null and queryData.payEndTime != ''">
-					<![CDATA[AND a.pay_time <= #{queryData.payEndTime}]]>
-			   </if>
-				<if test="queryData.orderStatusLastValidTimeBegin != null and queryData.orderStatusLastValidTimeBegin != ''">
-					<![CDATA[AND a.order_status_last_valid_time >= #{queryData.orderStatusLastValidTimeBegin} ]]>
-			   </if>
-			   <if test="queryData.orderStatusLastValidTimeEnd != null and queryData.orderStatusLastValidTimeEnd != ''">
-					<![CDATA[AND a.order_status_last_valid_time  <= #{queryData.orderStatusLastValidTimeEnd} ]]>
-			   </if>
-			   <!-- 根据城市id搜索 -->
-			   <if test="queryData.cityIdList != null and queryData.cityIdList.size() > 0">
-			          AND a.buyer_city_id in
-		              <foreach collection="queryData.cityIdList" index="index" item="cityId" open="(" separator="," close=")">
-		                #{cityId}
-		              </foreach>
-			   </if>
-			   <!-- 根据卖家来源进行查询搜索 -->
-			   <if test="queryData.sellerSourceList != null and queryData.sellerSourceList.size > 0">
-			          AND a.seller_source in
-		              <foreach collection="queryData.sellerSourceList" index="index" item="sellerSource" open="(" separator="," close=")">
-		              	#{sellerSource}
-		              </foreach>
-			   </if>
-		    </if>
-			<choose>
-                  <when test="payType != null and payType != ''">
-                        <![CDATA[AND a.pay_type = #{payType}]]>
-                  </when>
-                  <otherwise>
-                     <if test="queryData != null and queryData != ''">
-                           <if test="queryData.payTypeList!=null and queryData.payTypeList.size()>0">
-                                  AND a.pay_type in
-                                  <foreach collection="queryData.payTypeList" index="index" item="payType" open="(" separator="," close=")">
-                                    #{payType}
-                                  </foreach>
-                           </if>
-                     </if>
-                  </otherwise>
-            </choose>
-            <choose>
-                  <when test="comeFrom != null and comeFrom != ''">
-                        <![CDATA[AND a.come_from = #{comeFrom}]]>
-                  </when>
-                  <otherwise>
-                     <if test="queryData != null and queryData != ''">
-                           <if test="queryData.comeFromList!=null and queryData.comeFromList.size()>0">
-                                  AND a.come_from in
-                                  <foreach collection="queryData.comeFromList" index="index" item="comeFrom" open="(" separator="," close=")">
-                                    #{comeFrom}
-                                  </foreach>
-                           </if>
-                     </if>
-                  </otherwise>
-            </choose>
-	</sql>
-	
-	<!-- 智能排序与分页 -->
-	<sql id="QUERY_ORDER_LIMIT_CONDTION">
-		<choose>
-		   <when test="orderField != null and orderField != ''">
-		        <choose>
-		            <when test="orderFieldType != null and orderFieldType != ''">
-		                <![CDATA[ORDER BY a.${orderField} ${orderFieldType}]]>
-		            </when>
-		            <otherwise>
-		                <![CDATA[ORDER BY a.${orderField} desc]]>
-		            </otherwise>
-		        </choose>
-		   </when>
-		   <otherwise>
-		        <![CDATA[ORDER BY a.create_time desc,a.id desc]]>
-		   </otherwise>
-		</choose>
-		<if test="startIndex != null and startIndex &gt;= 0 and pageSize != null and pageSize &gt; 0">
-		       <![CDATA[LIMIT #{startIndex},#{pageSize}]]>
-	    </if>
-	</sql>
-
-	<!-- 更新列字段,只要不为NULL则更新,除开主键列 -->
-	<sql id="UPDATE_COLUMN_SET">
-		<set>
-			<if test="buyerId != null"><![CDATA[a.buyer_id = #{buyerId},]]></if>
-			<if test="sellerId != null"><![CDATA[a.seller_id = #{sellerId},]]></if>
-			<if test="buyerName != null"><![CDATA[a.buyer_name = #{buyerName},]]></if>
-			<if test="sellerName != null"><![CDATA[a.seller_name = #{sellerName},]]></if>
-			<if test="marketName != null"><![CDATA[a.market_name = #{marketName},]]></if>
-			<if test="marketId != null"><![CDATA[a.market_id = #{marketId},]]></if>
-			<if test="deliveryType != null"><![CDATA[a.delivery_type = #{deliveryType},]]></if>
-			<if test="shipingAddress != null"><![CDATA[a.shiping_address = #{shipingAddress},]]></if>
-			<if test="orderType != null"><![CDATA[a.order_type = #{orderType},]]></if>
-			<if test="orderStatus != null"><![CDATA[a.order_status = #{orderStatus},]]></if>
-			<if test="payStatus != null"><![CDATA[a.pay_status = #{payStatus},]]></if>
-			<if test="buyerMemo != null"><![CDATA[a.buyer_memo = #{buyerMemo},]]></if>
-			<if test="orderStatusInTime != null"><![CDATA[a.order_status_in_time = #{orderStatusInTime},]]></if>
-			<if test="logisticsRemarks != null"><![CDATA[a.logistics_remarks = #{logisticsRemarks},]]></if>
-            <choose>
-                  <when test="queryData != null and queryData.setOrderStatusLastValidTimeToNull=='true'">
-                        <![CDATA[a.order_status_last_valid_time = #{orderStatusLastValidTime},]]>
-                  </when>
-                  <otherwise>
-                     <if test="orderStatusLastValidTime !=null">
-                          <![CDATA[a.order_status_last_valid_time = #{orderStatusLastValidTime},]]>
-                     </if>
-                  </otherwise>
-            </choose>
-			<choose>
-				<when test="queryData != null and queryData.setPayTimeToNull=='true'">
-					<![CDATA[a.pay_time = NULL ,]]>
-				</when>
-				<otherwise>
-					<if test="payTime != null"><![CDATA[a.pay_time = #{payTime},]]></if>
-				</otherwise>
-			</choose>
-			<if test="stockingInTime != null"><![CDATA[a.stocking_in_time = #{stockingInTime},]]></if>
-			<if test="stockingCompleteTime != null"><![CDATA[a.stocking_complete_time = #{stockingCompleteTime},]]></if>
-			<if test="reservationStime != null"><![CDATA[a.reservation_stime = #{reservationStime},]]></if>
-			<if test="reservationFtime != null"><![CDATA[a.reservation_ftime = #{reservationFtime},]]></if>
-			<if test="buyerConfirmTime != null"><![CDATA[a.buyer_confirm_time = #{buyerConfirmTime},]]></if>
-			<if test="payType != null"><![CDATA[a.pay_type = #{payType},]]></if>
-			<if test="priceTotal != null"><![CDATA[a.price_total = #{priceTotal},]]></if>
-			<if test="pricePrivilege != null"><![CDATA[a.price_privilege = #{pricePrivilege},]]></if>
-			<if test="priceOffset != null"><![CDATA[a.price_offset = #{priceOffset},]]></if>
-			<if test="pricePaid != null"><![CDATA[a.price_paid = #{pricePaid},]]></if>
-			<if test="priceRefund != null"><![CDATA[a.price_refund = #{priceRefund},]]></if>
-			<if test="pricePostage != null"><![CDATA[a.price_postage = #{pricePostage},]]></if>
-			<if test="isDelete != null"><![CDATA[a.is_delete = #{isDelete},]]></if>
-			<if test="shopId != null"><![CDATA[a.shop_id = #{shopId},]]></if>
-			<if test="shopName != null"><![CDATA[a.shop_name = #{shopName},]]></if>
-            <if test="deliveryVerCode != null"><![CDATA[a.delivery_ver_code = #{deliveryVerCode},]]></if>
-			<if test="tradeNo != null"><![CDATA[a.trade_no = #{tradeNo},]]></if>
-			<if test="productsTitle != null"><![CDATA[a.products_title = #{productsTitle},]]></if>
-			<if test="statusInReason != null"><![CDATA[a.status_in_reason = #{statusInReason},]]></if>
-			<if test="isCommented != null"><![CDATA[a.is_commented = #{isCommented},]]></if>
-			<if test="comeFrom != null"><![CDATA[a.come_from = #{comeFrom},]]></if>
-			<if test="printFlag != null"><![CDATA[a.print_flag = #{printFlag},]]></if>
-			<if test="marketDelivery != null"><![CDATA[ a.market_delivery = #{marketDelivery} ]]> </if>
-			<choose>
-				<when test="editTime != null">
-					<![CDATA[edit_time = #{editTime},]]>
-				</when>
-				<otherwise>
-					<![CDATA[a.edit_time = NOW(),]]>
-				</otherwise>
-			</choose>
-			<![CDATA[a.version_num = a.version_num + 1,]]>
-		</set>
-	</sql>
-
-	<!-- 插入orders记录 -->
-	<insert id="insertEntry" parameterType="orders" >
-		<![CDATA[
-			INSERT INTO orders (id,parent_id,buyer_id,seller_id,buyer_name,seller_name,market_name,market_id,delivery_type,shiping_address,order_type,order_status,pay_status,buyer_memo,order_status_in_time,order_status_last_valid_time,pay_time,stocking_in_time,stocking_complete_time,reservation_stime,reservation_ftime,buyer_confirm_time,create_time,edit_time,pay_type,price_total,price_privilege,price_offset,price_paid,price_postage,version_num,shop_id,shop_name,delivery_ver_code,trade_no,products_title,status_in_reason,is_commented,price_total_original,price_postage_original,come_from,logistics_remarks,buyer_city_id,seller_source,goods_weight,warrant_type,market_delivery)
-			VALUES (#{id},#{parentId},#{buyerId},#{sellerId},#{buyerName},#{sellerName},#{marketName},#{marketId},#{deliveryType},#{shipingAddress},#{orderType},#{orderStatus},#{payStatus},#{buyerMemo},#{orderStatusInTime},#{orderStatusLastValidTime},#{payTime},#{stockingInTime},#{stockingCompleteTime},#{reservationStime},#{reservationFtime},#{buyerConfirmTime},#{createTime},#{editTime},#{payType},#{priceTotal},#{pricePrivilege},#{priceOffset},#{pricePaid},#{pricePostage},#{versionNum},#{shopId},#{shopName},#{deliveryVerCode},#{tradeNo},#{productsTitle},#{statusInReason},#{isCommented},#{priceTotalOriginal},#{pricePostageOriginal},#{comeFrom},#{logisticsRemarks},#{buyerCityId},#{sellerSource},#{goodsWeight},#{warrantType},#{marketDelivery})
-		]]>
-	</insert>
-	
-	<!-- 返回插入的编号,在事务开启状态下有效 -->
-	<select id="lastSequence" resultType="int"><![CDATA[SELECT LAST_INSERT_ID() AS id]]></select>
-
-	<!-- 删除记录,主键IN(array) -->
-	<delete id="deleteByArrayKey" parameterType="java.lang.reflect.Array" >
-		<![CDATA[DELETE FROM orders a WHERE a.id IN]]>
-		<foreach collection="array" item="id" open="(" separator="," close=")">
-			<![CDATA[#{id}]]>
-		</foreach>
-	</delete>
-
-	<!-- 删除,通过条件 -->
-	<update id="deleteByCondtion" parameterType="orders" >
-		<![CDATA[DELETE FROM orders a]]>
-		<include refid="QUERY_WHERE_CLAUSE"/>
-	</update>
-
-	<!-- 修改记录通过主键 -->
-	<update id="updateByKey" parameterType="orders" >
-		<![CDATA[UPDATE orders a]]>
-		<include refid="UPDATE_COLUMN_SET"/>
-		<![CDATA[WHERE a.id = #{id} and a.version_num = #{versionNum}]]>
-	</update>
-
-	<!-- 根据符合情况的订单前置状态，更新订单的状态 -->
-	<update id="updateOrderStatusById" parameterType="java.util.HashMap">
-		   update orders a set a.order_status = #{nextStatus},a.edit_time = #{editTime}
-		   where a.id = #{id} AND a.version_num = #{versionNum} AND a.order_status in
-			<foreach item="item" index="index" collection="preStatusIds" open="(" separator="," close=")">
-				#{item}
-			</foreach>
-	</update>
-
-	<!-- 查询,通过主键IN(array) -->
-	<select id="selectEntryArray" parameterType="java.lang.reflect.Array" resultType="orders">
-		<![CDATA[SELECT]]>
-		<include refid="QUERY_COLUMN_LIST"/>
-		<include refid="QUERY_FROM_TABLE"/>
-		<![CDATA[WHERE a.id IN]]>
-		<foreach collection="array" item="id" open="(" separator="," close=")">
-			<![CDATA[#{id}]]>
-		</foreach>
-	</select>
-
-	<!-- 查询,通过条件 -->
-	<select id="selectEntryList" parameterType="orders" resultType="orders">
-		<![CDATA[SELECT]]>
-		<include refid="QUERY_COLUMN_LIST"/>
-		<include refid="QUERY_FROM_TABLE"/>
-		<include refid="QUERY_WHERE_CLAUSE"/>
-		<include refid="QUERY_ORDER_LIMIT_CONDTION"/>
-	</select>
-
-	<!-- 总数查询,通过条件 -->
-	<select id="selectEntryListCount" parameterType="orders" resultType="int">
-		<![CDATA[SELECT COUNT(a.id) AS dataCount]]>
-		<include refid="QUERY_FROM_TABLE"/>
-		<include refid="QUERY_WHERE_CLAUSE"/>
-	</select>
-	
-	<!--统计第三方订单相关数量-->
-	<sql id="THIRD_QUERY_SUM_COLUMN_LIST">
-		<![CDATA[ sum(case when a.order_status=#{queryData.dividedOrderStatus} then 1 else 0 end) as dividedOrderCount,
-		          sum(case when a.order_status=#{queryData.takeWaitOrderStatus} then 1 else 0 end) as takeWaitCount,
-		          sum(case when a.order_status=#{queryData.receiveWaitOrderStatus} then 1 else 0 end) as receiveWaitCount,
-		          sum(case when a.order_status=#{queryData.deliveredOrderStatus} then 1 else 0 end) as deliveredOrderCount,
-		          sum(case when a.order_status=#{queryData.refundAppliedOrderStatus} then 1 else 0 end) as refundAppliedCount,
-		          sum(case when a.order_status=#{queryData.refundCompleteOrderStatus} then 1 else 0 end) as refundCompleteCount]]>
-	</sql>
-        
-	<!--统计自营代销订单相关数量-->
-	<sql id="AGENT_QUERY_SUM_COLUMN_LIST">
-		<![CDATA[ sum(case when a.order_status=#{queryData.divideWaitStatus} then 1 else 0 end) as divideWaitCount,
-		          sum(case when a.order_status=#{queryData.dividedStatus} then 1 else 0 end) as dividedCount,
-		          sum(case when a.order_status=#{queryData.completeStockUpStatus} then 1 else 0 end) as completeStockUpOrderCount,
-		          sum(case when a.order_status=#{queryData.deliveredOutStatus} then 1 else 0 end) as deliveredOutCount,
-		          sum(case when a.order_status=#{queryData.completeStockUpStatus} AND a.reservation_ftime<NOW() then 1 else 0 end) as deliveredOutAlertCount,
-		          sum(case when a.order_status=#{queryData.refundAppliedStatus} then 1 else 0 end) as refundAppliedCount,
-		          sum(case when a.order_status=#{queryData.paymentWaitStatus} then 1 else 0 end) as paymentWaitCount
-		          ]]>
-	</sql>
-    <select id="selectThirdOrdersSum" parameterType="orders" resultType="ordersSumVO">
-		<![CDATA[SELECT]]>
-		<include refid="THIRD_QUERY_SUM_COLUMN_LIST"/>
-		<include refid="QUERY_FROM_TABLE"/>
-		<include refid="QUERY_WHERE_CLAUSE"/>
-	</select>
-	<select id="selectSelfOrdersSum" parameterType="orders" resultType="ordersSumVO">
-		<![CDATA[SELECT]]>
-		<include refid="AGENT_QUERY_SUM_COLUMN_LIST"/>
-		<include refid="QUERY_FROM_TABLE"/>
-		<include refid="QUERY_WHERE_CLAUSE"/>
-	</select>
-	<select id="getVersionNum" parameterType="long" resultType="long">
-		<![CDATA[SELECT a.version_num ]]>
-		<include refid="QUERY_FROM_TABLE"/>
-		<![CDATA[ WHERE a.id = #{orderId}]]>
-	</select>
-	
-	<!-- 统计各状态订单量 -->
-	<select id="statisticsOrderAmountByStatus" parameterType="orders" resultType="keyValueVO">
-		<![CDATA[SELECT a.order_status AS code, count(1) AS value from orders a  ]]>
-		<include refid="QUERY_WHERE_CLAUSE"/>
-		<![CDATA[group by a.order_status]]>
-	</select>
-	
-	<!-- 获取订单交易号 -->
-	<select id="getOrderTradeNo" parameterType="long" resultType="keyValueVO">
-		<![CDATA[SELECT id as code,trade_no AS value FROM orders]]>
-		<![CDATA[WHERE id IN]]>
-		<foreach collection="array" item="id" open="(" separator="," close=")">
-			<![CDATA[#{id}]]>
-		</foreach>
-	</select>
-	<!-- 获取订单所有商品名称串 -->
-	<select id="getOrderProductTitle" parameterType="long" resultType="string">
-		<![CDATA[SELECT products_title AS productsTitle FROM orders WHERE id =#{id}]]>
-	</select>
-	
-	<!--获取订单， 只查询指定字段的值-->
-	<!--  
-	   statementType 分为：STATEMENT（非预编译，使用$符号取变量），PREPARED（预编译，使用#变量取变量，且$同时可用）或 CALLABLE(调用存储过程)
-	-->
-	<select id="getOrderBySpecFields" parameterType="orders" resultType="orders" statementType="STATEMENT">
-        <![CDATA[select]]>
-        <if test="queryData != null and queryData.fieldsMapEntryList != null and queryData.fieldsMapEntryList.size()>0">
-            <foreach collection="queryData.fieldsMapEntryList"  index="index"  item="item" separator=",">
-                <if test="item.dbFieldName!=null and item.dbFieldName!='' and item.domainFieldName!=null and item.domainFieldName!=''">
-                  ${item.dbFieldName} AS ${item.domainFieldName}                
-                </if>
-            </foreach>
-        </if>
-        <![CDATA[from orders where id=${id}]]>
-        <!--因为非预编译原因，为了提高查询效率， 暂时只支持通过id查询 ，后期需要通过其他条件来查询，则使用QUERY_WHERE_CLAUSE_STATEMENT即可-->
-        <!--<include refid="QUERY_WHERE_CLAUSE_STATEMENT"/>-->
-     </select>
-
-  	 
-  	 <!-- 根据店铺id查询，未完结订单数量-->
-  	 <select id="getValidOrderNumByShop" parameterType="long" resultType="int">
-  	 	<![CDATA[
-	  	 	SELECT count(id) FROM orders 
-	  	 	WHERE shop_id =#{shopId} 
-	  	 	AND order_status IN(10,15,20,30,40,45,80,85)
-  	 	]]>
-  	 </select>
-    
-</mapper>
 \ No newline at end of file
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-	"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.diligrp.orders.dao.OrdersJobDao">
-
-	<!-- orders_job 所有查询列 -->
-	<sql id="QUERY_COLUMN_LIST">
-		<![CDATA[id,business_key AS businessKey,business_type AS businessType,expire_date AS expireDate,callback_type AS callbackType,callback_hander AS callbackHander]]>
-	</sql>
-
-	<!-- orders_job 查询列来源表-->
-	<sql id="QUERY_FROM_TABLE"><![CDATA[FROM orders_job]]></sql>
-	
-	<!-- 全部条件(更多功能可以通过queryData扩展实现)  -->
-	<sql id="QUERY_WHERE_CLAUSE">
-		<where>
-			<if test="id != null and id != ''"><![CDATA[AND id = #{id}]]></if>
-			<if test="businessKey != null and businessKey != ''"><![CDATA[AND business_key = #{businessKey}]]></if>
-			<if test="businessType != null and businessType != ''"><![CDATA[AND business_type = #{businessType}]]></if>
-			<if test="expireDate != null and expireDate != ''"><![CDATA[AND expire_date = #{expireDate}]]></if>
-			<if test="callbackType != null and callbackType != ''"><![CDATA[AND callback_type = #{callbackType}]]></if>
-			<if test="callbackHander != null and callbackHander != ''"><![CDATA[AND callback_hander = #{callbackHander}]]></if>
-		</where>
-	</sql>
-	
-	<!-- 智能排序与分页 -->
-	<sql id="QUERY_ORDER_LIMIT_CONDTION">
-		<if test="orderField != null and orderField != '' and orderFieldType != null and orderFieldType != ''"><![CDATA[ORDER BY ${orderField} ${orderFieldType}]]></if>
-		<if test="startIndex != null and startIndex &gt;= 0 and pageSize != null and pageSize &gt; 0"><![CDATA[LIMIT #{startIndex},#{pageSize}]]></if>
-	</sql>
-
-	<!-- 更新列字段,只要不为NULL则更新,除开主键列 -->
-	<sql id="UPDATE_COLUMN_SET">
-		<set>
-			<if test="businessKey != null"><![CDATA[business_key = #{businessKey},]]></if>
-			<if test="businessType != null"><![CDATA[business_type = #{businessType},]]></if>
-			<if test="expireDate != null"><![CDATA[expire_date = #{expireDate},]]></if>
-			<if test="callbackType != null"><![CDATA[callback_type = #{callbackType},]]></if>
-			<if test="callbackHander != null"><![CDATA[callback_hander = #{callbackHander},]]></if>
-		</set>
-	</sql>
-
-	<!-- 插入orders_job记录 -->
-	<insert id="insertEntry" parameterType="ordersJob" >
-		<![CDATA[
-			INSERT INTO orders_job (id,business_key,business_type,expire_date,callback_type,callback_hander)
-			VALUES (#{id},#{businessKey},#{businessType},#{expireDate},#{callbackType},#{callbackHander})
-		]]>
-	</insert>
-	
-	<!-- 返回插入的编号,在事务开启状态下有效 -->
-	<select id="lastSequence" resultType="int"><![CDATA[SELECT LAST_INSERT_ID() AS id]]></select>
-
-	<!-- 删除记录,主键IN(array) -->
-	<delete id="deleteByArrayKey" parameterType="java.lang.reflect.Array" >
-		<![CDATA[DELETE FROM orders_job WHERE id IN]]>
-		<foreach collection="array" item="id" open="(" separator="," close=")">
-			<![CDATA[#{id}]]>
-		</foreach>
-	</delete>
-
-	<!-- 删除,通过条件 -->
-	<update id="deleteByCondtion" parameterType="ordersJob" >
-		<![CDATA[DELETE FROM orders_job]]>
-		<include refid="QUERY_WHERE_CLAUSE"/>
-	</update>
-
-	<!-- 修改记录通过主键 -->
-	<update id="updateByKey" parameterType="ordersJob" >
-		<![CDATA[UPDATE orders_job]]>
-		<include refid="UPDATE_COLUMN_SET"/>
-		<![CDATA[WHERE id = #{id}]]>
-	</update>
-
-	<!-- 查询,通过主键IN(array) -->
-	<select id="selectEntryArray" parameterType="java.lang.reflect.Array" resultType="ordersJob">
-		<![CDATA[SELECT]]>
-		<include refid="QUERY_COLUMN_LIST"/>
-		<include refid="QUERY_FROM_TABLE"/>
-		<![CDATA[WHERE id IN]]>
-		<foreach collection="array" item="id" open="(" separator="," close=")">
-			<![CDATA[#{id}]]>
-		</foreach>
-	</select>
-
-	<!-- 查询,通过条件 -->
-	<select id="selectEntryList" parameterType="ordersJob" resultType="ordersJob">
-		<![CDATA[SELECT]]>
-		<include refid="QUERY_COLUMN_LIST"/>
-		<include refid="QUERY_FROM_TABLE"/>
-		<include refid="QUERY_WHERE_CLAUSE"/>
-		<include refid="QUERY_ORDER_LIMIT_CONDTION"/>
-	</select>
-
-	<!-- 总数查询,通过条件 -->
-	<select id="selectEntryListCount" parameterType="ordersJob" resultType="int">
-		<![CDATA[SELECT COUNT(id) AS dataCount]]>
-		<include refid="QUERY_FROM_TABLE"/>
-		<include refid="QUERY_WHERE_CLAUSE"/>
-	</select>
-	
-	<!-- 其它SQL语句 -->
-	<sql id="QUERYTASK_WHERE_CLAUSE">
-		<where>
-			<if test="businessType != null and businessType != ''"><![CDATA[AND business_type = #{businessType}]]></if>
-			<if test="expireDate != null and expireDate != ''"><![CDATA[AND expire_date <= #{expireDate}]]></if>
-		</where>
-	</sql>
-	<select id="taskList" parameterType="java.util.Map" resultType="ordersJob">
-		<![CDATA[SELECT]]>
-		<include refid="QUERY_COLUMN_LIST"/>
-		<include refid="QUERY_FROM_TABLE"/>
-		<include refid="QUERYTASK_WHERE_CLAUSE"/>
-		order by id limit #{startRow},#{endRow}
-	</select>
-	
-</mapper>
 \ No newline at end of file
@@ -16,12 +16,12 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<name>org.eclipse.wst.validation.validationbuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.wst.validation.validationbuilder</name>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
@@ -3,21 +3,21 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>com.b2c.orders</groupId>
-		<artifactId>orders-parent</artifactId>
+		<artifactId>b2c-orders-parent</artifactId>
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
-	<artifactId>orders-domain</artifactId>
+	<artifactId>b2c-orders-domain</artifactId>
  
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>orders-commons</artifactId>
+			<artifactId>b2c-orders-commons</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>orders-client</artifactId>
-			<version>1.1.0-SNAPSHOT</version>
+			<artifactId>b2c-orders-client</artifactId>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.projectlombok</groupId>
@@ -28,17 +28,17 @@
 			<artifactId>guava</artifactId>
 		</dependency>
 		<!-- https://mvnrepository.com/artifact/cglib/cglib -->
-		<dependency>
+	<!-- 	<dependency>
 			<groupId>cglib</groupId>
 			<artifactId>cglib</artifactId>
-		</dependency>
+		</dependency> -->
 		<dependency>
 			<groupId>commons-lang</groupId>
 			<artifactId>commons-lang</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>orders-rpc</artifactId>
+			<artifactId>b2c-orders-rpc</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 	</dependencies>
@@ -16,12 +16,12 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<name>org.eclipse.wst.validation.validationbuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.wst.validation.validationbuilder</name>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
@@ -3,15 +3,15 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>com.b2c.orders</groupId>
-		<artifactId>orders-parent</artifactId>
+		<artifactId>b2c-orders-parent</artifactId>
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
-	<artifactId>orders-manager</artifactId>
+	<artifactId>b2c-orders-manager</artifactId>
  
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>orders-dao</artifactId>
+			<artifactId>b2c-orders-dao</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 	</dependencies>
@@ -4,6 +4,8 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
  
 import com.alibaba.fastjson.JSON;
 import com.b2c.dtms.client.domain.dto.request.DtmsProduceRequestDto;
@@ -23,6 +25,7 @@ import com.b2c.orders.manager.OrderManager;
 import com.b2c.orders.rpc.DtmsRPCService;
 import com.b2c.orders.rpc.exception.DtmsRpcException;
  
+@Transactional(propagation = Propagation.REQUIRED)
 @Component
 public class OrderManagerBean implements OrderManager {
  
@@ -3,15 +3,15 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>com.b2c.orders</groupId>
-		<artifactId>orders-parent</artifactId>
+		<artifactId>b2c-orders-parent</artifactId>
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
-	<artifactId>orders-rpc</artifactId>
+	<artifactId>b2c-orders-rpc</artifactId>
  
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>orders-commons</artifactId>
+			<artifactId>b2c-orders-commons</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
@@ -6,4 +6,5 @@ import com.b2c.orders.rpc.exception.DtmsRpcException;
 public interface DtmsRPCService {
  
 	void produceDtmsMessage(DtmsProduceRequestDto request) throws DtmsRpcException;
+
 }
@@ -16,12 +16,12 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<name>org.eclipse.wst.validation.validationbuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.wst.validation.validationbuilder</name>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
@@ -3,15 +3,15 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>com.b2c.orders</groupId>
-		<artifactId>orders-parent</artifactId>
+		<artifactId>b2c-orders-parent</artifactId>
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
-	<artifactId>orders-service</artifactId>
+	<artifactId>b2c-orders-service</artifactId>
  
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>orders-manager</artifactId>
+			<artifactId>b2c-orders-manager</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 	</dependencies>
@@ -3,6 +3,7 @@ package com.b2c.orders.service;
 import com.b2c.orders.client.domain.dto.request.SubmitOrderRequestDto;
 import com.b2c.orders.commons.exceptions.OrderException;
 import com.b2c.orders.commons.exceptions.OrderRepositoryException;
+import com.b2c.orders.rpc.exception.DtmsRpcException;
  
 public interface OrderService {
  
@@ -11,8 +12,9 @@ public interface OrderService {
 	 * 
 	 * @param order
 	 *            订单id
+	 * @throws DtmsRpcException 
 	 */
-	void submit(SubmitOrderRequestDto order);
+	void submit(SubmitOrderRequestDto order) throws DtmsRpcException;
  
 	/**
 	 * 商家接单
@@ -25,8 +27,9 @@ public interface OrderService {
 	 *            TODO
 	 * @throws OrderRepositoryException
 	 * @throws OrderException
+	 * @throws DtmsRpcException 
 	 */
-	void take(Long orderId, Long sellerId, Long totalPrice) throws OrderException, OrderRepositoryException;
+	void take(Long orderId, Long sellerId, Long totalPrice) throws OrderException, OrderRepositoryException, DtmsRpcException;
  
 	/**
 	 * 买家支付
@@ -10,6 +10,7 @@ import com.b2c.orders.commons.exceptions.ApplicationException;
 import com.b2c.orders.commons.exceptions.OrderException;
 import com.b2c.orders.commons.exceptions.OrderRepositoryException;
 import com.b2c.orders.manager.OrderManager;
+import com.b2c.orders.rpc.exception.DtmsRpcException;
 import com.b2c.orders.service.OrderService;
  
 @Service
@@ -20,12 +21,13 @@ public class OrderServiceBean implements OrderService {
 	private OrderManager orderManager;
  
 	@Override
-	public void submit(SubmitOrderRequestDto order) {
+	public void submit(SubmitOrderRequestDto order) throws DtmsRpcException {
 		this.orderManager.submit(order);
 	}
  
 	@Override
-	public void take(Long orderId, Long sellerId, Long totalPrice) throws OrderException, OrderRepositoryException {
+	public void take(Long orderId, Long sellerId, Long totalPrice)
+			throws OrderException, OrderRepositoryException, DtmsRpcException {
 		this.orderManager.take(orderId, sellerId, totalPrice);
 	}
  
@@ -16,12 +16,12 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<name>org.eclipse.wst.validation.validationbuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.wst.validation.validationbuilder</name>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src/main/webapp"/>
-	<classpathentry excluding="**/bower_components/*|**/node_modules/*|**/*.min.js" kind="src" path="target/m2e-wtp/web-resources"/>
+	<classpathentry excluding="**/bower_components/*|**/node_modules/*|**/*.min.js" kind="src" path="src/main/webapp"/>
+	<classpathentry kind="src" path="target/m2e-wtp/web-resources"/>
 	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
 		<attributes>
@@ -4,28 +4,25 @@
         <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
-        <dependent-module archiveName="orders-service-0.0.1-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/b2c-orders-service/b2c-orders-service">
+        <dependent-module archiveName="b2c-orders-service-0.0.1-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/b2c-orders-service/b2c-orders-service">
             <dependency-type>uses</dependency-type>
         </dependent-module>
-        <dependent-module archiveName="orders-manager-0.0.1-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/b2c-orders-manager/b2c-orders-manager">
+        <dependent-module archiveName="b2c-orders-manager-0.0.1-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/b2c-orders-manager/b2c-orders-manager">
             <dependency-type>uses</dependency-type>
         </dependent-module>
-        <dependent-module archiveName="orders-dao-0.0.1-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/b2c-orders-dao/b2c-orders-dao">
+        <dependent-module archiveName="b2c-orders-dao-0.0.1-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/b2c-orders-dao/b2c-orders-dao">
             <dependency-type>uses</dependency-type>
         </dependent-module>
-        <dependent-module archiveName="orders-domain-0.0.1-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/b2c-orders-domain/b2c-orders-domain">
+        <dependent-module archiveName="b2c-orders-domain-0.0.1-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/b2c-orders-domain/b2c-orders-domain">
             <dependency-type>uses</dependency-type>
         </dependent-module>
-        <dependent-module archiveName="orders-commons-0.0.1-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/b2c-orders-commons/b2c-orders-commons">
+        <dependent-module archiveName="b2c-orders-commons-0.0.1-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/b2c-orders-commons/b2c-orders-commons">
             <dependency-type>uses</dependency-type>
         </dependent-module>
-        <dependent-module archiveName="orders-client-1.1.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/b2c-orders-client/b2c-orders-client">
+        <dependent-module archiveName="b2c-orders-client-0.0.1-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/b2c-orders-client/b2c-orders-client">
             <dependency-type>uses</dependency-type>
         </dependent-module>
-        <dependent-module archiveName="orders-rpc-0.0.1-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/b2c-orders-rpc/b2c-orders-rpc">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module archiveName="dtms-client-0.0.1-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/dtms-client/dtms-client">
+        <dependent-module archiveName="b2c-orders-rpc-0.0.1-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/b2c-orders-rpc/b2c-orders-rpc">
             <dependency-type>uses</dependency-type>
         </dependent-module>
         <property name="context-root" value="b2c-orders-web"/>
@@ -2,6 +2,6 @@
 <faceted-project>
   <fixed facet="wst.jsdt.web"/>
   <installed facet="java" version="1.7"/>
-  <installed facet="jst.web" version="2.5"/>
+  <installed facet="jst.web" version="3.0"/>
   <installed facet="wst.jsdt.web" version="1.0"/>
 </faceted-project>
@@ -3,28 +3,144 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>com.b2c.orders</groupId>
-		<artifactId>orders-parent</artifactId>
+		<artifactId>b2c-orders-parent</artifactId>
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
-	<artifactId>orders-web</artifactId>
+	<artifactId>b2c-orders-web</artifactId>
 	<packaging>war</packaging>
  
 	<dependencies>
 		<dependency>
+			<groupId>org.aspectj</groupId>
+			<artifactId>aspectjweaver</artifactId>
+		</dependency>
+		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>orders-service</artifactId>
+			<artifactId>b2c-orders-service</artifactId>
 			<version>${project.version}</version>
 		</dependency>
-		<!-- https://mvnrepository.com/artifact/com.mangofactory/swagger-springmvc -->
-		<!-- https://mvnrepository.com/artifact/io.springfox/springfox-swagger2 -->
+		<!--swagger -->
 		<dependency>
 			<groupId>io.springfox</groupId>
 			<artifactId>springfox-swagger2</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>org.springframework</groupId>
+					<artifactId>spring-web</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.springframework</groupId>
+					<artifactId>spring-beans</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.springframework</groupId>
+					<artifactId>spring-webmvc</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.springframework</groupId>
+					<artifactId>spring-beans</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.springframework</groupId>
+					<artifactId>spring-context</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.springframework</groupId>
+					<artifactId>spring-core</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.springframework</groupId>
+					<artifactId>spring-aop</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.aspectj</groupId>
+					<artifactId>aspectjweaver</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.slf4j</groupId>
+					<artifactId>slf4j-api</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>com.fasterxml.jackson.core</groupId>
+					<artifactId>jackson-annotations</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
+		<!-- https://mvnrepository.com/artifact/com.mangofactory/swagger-springmvc -->
+		<!-- https://mvnrepository.com/artifact/io.springfox/springfox-swagger2 -->
+		<!-- <dependency> <groupId>io.springfox</groupId> <artifactId>springfox-swagger2</artifactId> 
+			</dependency> -->
 		<dependency>
 			<groupId>com.b2c.dtms</groupId>
 			<artifactId>dtms-client</artifactId>
 			<version>0.0.1-SNAPSHOT</version>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-context-support</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>servlet-api</artifactId>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>ch.qos.logback</groupId>
+			<artifactId>logback-classic</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>ch.qos.logback</groupId>
+			<artifactId>logback-core</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+		</dependency>
+		<!-- if you enable @AspectJ style AOP in spring. -->
+		<dependency>
+			<groupId>org.aspectj</groupId>
+			<artifactId>aspectjrt</artifactId>
+		</dependency>
+
+		<!-- if you enable JSR303 (Bean Validation) in spring. -->
+		<dependency>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate-validator</artifactId>
+		</dependency>
+
+		<!-- if you enable json support in spring mvc. -->
+		<dependency>
+			<groupId>org.codehaus.jackson</groupId>
+			<artifactId>jackson-mapper-asl</artifactId>
+		</dependency>
+		<!-- if you use fileupload in spring mvc -->
+		<dependency>
+			<groupId>commons-fileupload</groupId>
+			<artifactId>commons-fileupload</artifactId>
+		</dependency>
+		<!-- test scope -->
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>servlet-api</artifactId>
+			<scope>provided</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>commons-lang</groupId>
+			<artifactId>commons-lang</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>commons-codec</groupId>
+			<artifactId>commons-codec</artifactId>
+		</dependency>
 	</dependencies>
 </project>
 \ No newline at end of file
 package com.b2c.orders.configuration;
  
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
  
+import springfox.documentation.builders.RequestHandlerSelectors;
 import springfox.documentation.service.ApiInfo;
 import springfox.documentation.spi.DocumentationType;
 import springfox.documentation.spring.web.plugins.Docket;
@@ -15,9 +15,10 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
 @Configuration
 @EnableWebMvc
 @EnableSwagger2
-@ComponentScan(basePackages = "com.b2c.orders.web.restful")
 public class SwaggerConfiguration extends WebMvcConfigurerAdapter {
  
+	public static final String SWAGGER_SCAN_BASE_PACKAGE = "com.b2c.orders";
+	
 	@Override
 	public void addResourceHandlers(ResourceHandlerRegistry registry) {
 		registry.addResourceHandler("swagger-ui.html").addResourceLocations("classpath:/META-INF/resources/");
@@ -29,8 +30,9 @@ public class SwaggerConfiguration extends WebMvcConfigurerAdapter {
 	@Bean
 	public Docket swaggerSpringMvcPlugin() {
 		Docket docket = new Docket(DocumentationType.SWAGGER_2);
-		ApiInfo apiInfo = new ApiInfo("一体化", "网关接口", "1.1", "urn:tos", "dili", "logistics-park", "http://dili.com");
-		docket.apiInfo(apiInfo);
+        docket.select().apis(RequestHandlerSelectors.basePackage(SWAGGER_SCAN_BASE_PACKAGE)).build();
+        ApiInfo apiInfo = new ApiInfo("咱的APP", "店铺用户接口", "1.1", "urn:tos", "b2c", "logistics-park", "http://zandeapp.com");
+        docket.apiInfo(apiInfo);
 		return docket;
 	}
 }
 package com.b2c.orders.web.restful;
  
+import javax.validation.Valid;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -12,16 +15,22 @@ import com.b2c.orders.client.domain.dto.request.BuyerCancelRequestDto;
 import com.b2c.orders.client.domain.dto.request.BuyerConfirmRequestDto;
 import com.b2c.orders.client.domain.dto.request.DtmsConfirmRequestDto;
 import com.b2c.orders.client.domain.dto.request.DtmsTimeoutRequestDto;
+import com.b2c.orders.client.domain.dto.request.OrderListRequestDto;
 import com.b2c.orders.client.domain.dto.request.PayOrderRequestDto;
 import com.b2c.orders.client.domain.dto.request.SellerConfirmRequestDto;
 import com.b2c.orders.client.domain.dto.request.SellerRefuseRequestDto;
 import com.b2c.orders.client.domain.dto.request.SubmitOrderRequestDto;
 import com.b2c.orders.client.domain.dto.request.TakeOrderRequestDto;
 import com.b2c.orders.client.domain.dto.response.BaseResponseDto;
+import com.b2c.orders.client.domain.dto.response.OrderListResponseDto;
 import com.b2c.orders.client.domain.dto.response.SubmitOrderResponseDto;
 import com.b2c.orders.commons.exceptions.ApplicationException;
+import com.b2c.orders.rpc.exception.DtmsRpcException;
 import com.b2c.orders.service.OrderService;
  
+import io.swagger.annotations.ApiOperation;
+
+//@Api("订单api")
 @RestController
 @RequestMapping("/api")
 public class OrderRestController {
@@ -29,17 +38,23 @@ public class OrderRestController {
 	@Autowired
 	private OrderService orderService;
  
+	@ApiOperation("提交订单")
 	@RequestMapping(value = "/buyer/submit", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-	public SubmitOrderResponseDto submit(@RequestBody SubmitOrderRequestDto order) {
+	public SubmitOrderResponseDto submit(@RequestBody @Valid SubmitOrderRequestDto order, BindingResult br) {
 		SubmitOrderResponseDto dto = new SubmitOrderResponseDto();
-		this.orderService.submit(order);
-		dto.setCode(BaseResponseDto.RESPONSE_CODE_SUCCESS);
-		dto.setSuccess(true);
+		try {
+			this.orderService.submit(order);
+			dto.setCode(BaseResponseDto.RESPONSE_CODE_SUCCESS);
+			dto.setSuccess(true);
+		} catch (DtmsRpcException e) {
+			dto.setMessage(e.getMessage());
+		}
 		return dto;
 	}
  
+	@ApiOperation("商家接单")
 	@RequestMapping(value = "/seller/take", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-	public BaseResponseDto take(@RequestBody TakeOrderRequestDto request) {
+	public BaseResponseDto take(@RequestBody @Valid TakeOrderRequestDto request, BindingResult br) {
 		BaseResponseDto dto = new BaseResponseDto();
 		try {
 			this.orderService.take(request.getOrderId(), request.getSellerId(), request.getTotalPrice());
@@ -51,8 +66,9 @@ public class OrderRestController {
 		return dto;
 	}
  
+	@ApiOperation("买家支付")
 	@RequestMapping(value = "/buyer/pay", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-	public BaseResponseDto pay(@RequestBody PayOrderRequestDto request) {
+	public BaseResponseDto pay(@RequestBody @Valid PayOrderRequestDto request, BindingResult br) {
 		BaseResponseDto dto = new BaseResponseDto();
 		try {
 			this.orderService.pay(request.getOrderId(), request.getBuyerId());
@@ -64,8 +80,9 @@ public class OrderRestController {
 		return dto;
 	}
  
+	@ApiOperation("买家确认收货")
 	@RequestMapping(value = "/buyer/confirm", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-	public BaseResponseDto buyerConfirm(@RequestBody BuyerConfirmRequestDto request) {
+	public BaseResponseDto buyerConfirm(@RequestBody @Valid BuyerConfirmRequestDto request, BindingResult br) {
 		BaseResponseDto response = new BaseResponseDto();
 		try {
 			this.orderService.buyerConfirm(request.getOrderId(), request.getBuyerId());
@@ -77,8 +94,9 @@ public class OrderRestController {
 		return response;
 	}
  
+	@ApiOperation("商家确认收款")
 	@RequestMapping(value = "/seller/confirm", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-	public BaseResponseDto sellerConfirm(@RequestBody SellerConfirmRequestDto request) {
+	public BaseResponseDto sellerConfirm(@RequestBody @Valid SellerConfirmRequestDto request, BindingResult br) {
 		BaseResponseDto response = new BaseResponseDto();
 		try {
 			this.orderService.sellerConfirm(request.getOrderId(), request.getSellerId());
@@ -91,7 +109,7 @@ public class OrderRestController {
 	}
  
 	@RequestMapping(value = "/dtms/confirm", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-	public DtmsCallBackReturn dtmsConfirm(@RequestBody DtmsConfirmRequestDto dto) {
+	public DtmsCallBackReturn dtmsConfirm(@RequestBody @Valid DtmsConfirmRequestDto dto, BindingResult br) {
 		DtmsCallBackReturn response = new DtmsCallBackReturn();
 		try {
 			this.orderService.dtmsConfirm(dto.getOrderId());
@@ -103,8 +121,9 @@ public class OrderRestController {
 		return response;
 	}
  
+	@ApiOperation("商家拒绝接单")
 	@RequestMapping(value = "/seller/refuse", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-	public BaseResponseDto sellerRefuse(@RequestBody SellerRefuseRequestDto request) {
+	public BaseResponseDto sellerRefuse(@RequestBody @Valid SellerRefuseRequestDto request, BindingResult br) {
 		BaseResponseDto response = new BaseResponseDto();
 		try {
 			this.orderService.refuse(request.getOrderId(), request.getSellerId());
@@ -116,8 +135,9 @@ public class OrderRestController {
 		return response;
 	}
  
+	@ApiOperation("买家取消订单")
 	@RequestMapping(value = "/buyer/cancel", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-	public BaseResponseDto buyerCancel(@RequestBody BuyerCancelRequestDto request) {
+	public BaseResponseDto buyerCancel(@RequestBody @Valid BuyerCancelRequestDto request, BindingResult br) {
 		BaseResponseDto response = new BaseResponseDto();
 		try {
 			this.orderService.cancel(request.getOrderId(), request.getBuyerId());
@@ -130,7 +150,7 @@ public class OrderRestController {
 	}
  
 	@RequestMapping(value = "/dtms/timeout", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-	public DtmsCallBackReturn dtmsTimeout(@RequestBody DtmsTimeoutRequestDto request) {
+	public DtmsCallBackReturn dtmsTimeout(@RequestBody @Valid DtmsTimeoutRequestDto request, BindingResult br) {
 		DtmsCallBackReturn response = new DtmsCallBackReturn();
 		try {
 			this.orderService.timeout(request.getOrderId());
@@ -142,4 +162,10 @@ public class OrderRestController {
 		return response;
 	}
  
+	@ApiOperation("查询订单")
+	@RequestMapping(value = "/list", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+	public OrderListResponseDto list(@RequestBody OrderListRequestDto request) {
+		throw new RuntimeException("该方法还没实现");
+	}
+
 }
@@ -4,7 +4,7 @@
 	<!-- web 日志 -->
 	<appender name="ORDERS-WEB"
 		class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<file>${catalina.base}/logs/orders_web.log</file>
+		<!-- <file>${catalina.base}/logs/orders_web.log</file> -->
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
 			<FileNamePattern>${catalina.base}/logs/%d{yyyy-MM-dd}/orders_web.%i.log.zip
 			</FileNamePattern>
@@ -38,59 +38,46 @@
 				[%file:%line] %msg%n</pattern>
 		</encoder>
 	</appender>
-	<logger name="com.diligrp.orders.web.restful" level="INFO"
-		additivity="false">
+	<logger name="com.b2c.dtms.web.restful" level="INFO" additivity="false">
 		<appender-ref ref="ORDERS-API" />
 	</logger>
-	<logger name="com.diligrp.orders.web.common.ApiCallMonitorAspect"
+	<logger name="com.b2c.dtms.web.common.ApiCallMonitorAspect"
 		level="INFO" additivity="false">
 		<appender-ref ref="ORDERS-API" />
 	</logger>
-	<logger name="com.diligrp.orders.service.restful.impl" level="INFO"
+	<logger name="com.b2c.dtms.service.restful.impl" level="INFO"
 		additivity="false">
 		<appender-ref ref="ORDERS-API" />
 	</logger>
  
-	<!-- rpc 接口日志 -->
-	<appender name="ORDERS-RPC"
-		class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<file>${catalina.base}/logs/rpc/orders_rpc.log</file>
-		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-			<FileNamePattern>${catalina.base}/logs/rpc/%d{yyyy-MM-dd}/orders_rpc_%i.log
-			</FileNamePattern>
-			<maxHistory>30</maxHistory>
-			<timeBasedFileNamingAndTriggeringPolicy
-				class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-				<maxFileSize>5MB</maxFileSize>
-			</timeBasedFileNamingAndTriggeringPolicy>
-		</rollingPolicy>
-		<encoder>
-			<pattern>[orders-rpc] %date %-5level [%thread] %logger{36}
-				[%file:%line] %msg%n</pattern>
-		</encoder>
-	</appender>
-	<logger name="com.diligrp.orders.rpc.service" level="INFO"
-		additivity="false">
-		<appender-ref ref="ORDERS-RPC" />
-	</logger>
-	<logger name="com.diligrp.orders.rpc.service.aop.RpcLoggerAspect"
-		level="INFO" additivity="false">
-		<appender-ref ref="ORDERS-RPC" />
-	</logger>
 	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
 		<encoder>
 			<pattern>[orders] %d{yyyy-MM-dd HH:mm:ss.SSS}:[%thread] %-5level
 				%logger{36} - %msg%n</pattern>
 		</encoder>
 	</appender>
-	<logger name="com.diligrp.orders.dao" level="INFO">
+	<logger name="com.b2c.dtms.dao" level="DEBUG">
 		<appender-ref ref="ORDERS-WEB" />
 	</logger>
-	<logger name="org.apache.ibatis" level="INFO">
+	<logger name="org.apache.ibatis" level="DEBUG">
 		<appender-ref ref="STDOUT" />
 	</logger>
-	<root level="INFO">
-		<appender-ref ref="ORDERS-WEB" />
+	<logger name="com.ibatis" level="DEBUG" />
+	<logger name="com.ibatis.common.jdbc.SimpleDataSource" level="DEBUG" />
+	<logger name="com.ibatis.common.jdbc.ScriptRunner" level="DEBUG" />
+	<logger name="com.ibatis.sqlmap.engine.impl.SqlMapClientDelegate"
+		level="DEBUG" />
+	<logger name="java.sql.Connection" level="DEBUG" />
+	<logger name="java.sql.Statement" level="DEBUG" />
+	<logger name="java.sql.PreparedStatement" level="DEBUG" />
+
+	<root level="DEBUG">
+		<!-- <appender-ref ref="ORDERS-WEB" /> -->
 		<appender-ref ref="STDOUT" />
+		<appender-ref ref="org.apache.ibatis" />
+		<appender-ref ref="com.ibatis.common" />
+		<appender-ref ref="com.ibatis.common.jdbc.ScriptRunner" />
+		<appender-ref ref="com.ibatis.sqlmap.engine.impl.SqlMapClientDelegate" />
+		<appender-ref ref="java.sql" />
 	</root>
 </configuration> 
 \ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
+	xmlns:aop="http://www.springframework.org/schema/aop" xmlns:cache="http://www.springframework.org/schema/cache"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
+       		http://www.springframework.org/schema/beans/spring-beans.xsd 
+       		http://www.springframework.org/schema/context 
+       		http://www.springframework.org/schema/context/spring-context.xsd
+       		http://www.springframework.org/schema/aop 
+       		http://www.springframework.org/schema/aop/spring-aop.xsd
+            http://www.springframework.org/schema/mvc
+       		http://www.springframework.org/schema/mvc/spring-mvc.xsd
+			http://www.springframework.org/schema/cache
+			http://www.springframework.org/schema/cache/spring-cache-4.3.xsd"
+	default-lazy-init="true">
+
+	<bean id="dtmsRPCService" class="com.b2c.orders.rpc.impl.DtmsRPCServiceBean" />
+
+</beans>
 \ No newline at end of file
@@ -12,35 +12,52 @@
        		http://www.springframework.org/schema/mvc/spring-mvc.xsd
 			http://www.springframework.org/schema/cache
 			http://www.springframework.org/schema/cache/spring-cache-4.3.xsd"
-	default-autowire="byName" default-lazy-init="true">
-	<!--<context:component-scan base-package="com.diligrp.orders"> -->
-	<!--<context:exclude-filter type="annotation" expression="org.springframework.stereotype.Controller" 
-		/> -->
-	<!--</context:component-scan> -->
+	default-lazy-init="true">
+	<context:component-scan base-package="com.b2c.orders">
+		<context:exclude-filter type="annotation"
+			expression="org.springframework.stereotype.Controller" />
+	</context:component-scan>
 	<context:annotation-config />
  
-	<cache:annotation-driven cache-manager="cacheManager"
-		key-generator="cacheKeyGenerator" />
+	<!-- <cache:annotation-driven cache-manager="cacheManager" key-generator="cacheKeyGenerator" 
+		/> -->
  
 	<aop:aspectj-autoproxy proxy-target-class="true" />
  
-	<bean id="diliMQConsumer" class="com.diligrp.util.rocketMQUtil.impl.DiliMQConsumerImpl"
-		init-method="startListener" destroy-method="stopListener">
-		<property name="namesrvAddr" value="${mq.namesrvAddr}"></property>
-		<property name="producerGroup" value="${mq.producerGroup}"></property>
-	</bean>
 	<bean id="propertyConfigurer"
 		class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+		<property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE" />
+		<property name="ignoreResourceNotFound" value="true" />
+		<property name="ignoreUnresolvablePlaceholders" value="true" />
 		<property name="locations">
 			<list>
-				<value>classpath:conf/jdbc.properties</value>
-				<value>classpath:conf/config.properties</value>
+				<value>classpath:conf/important.properties</value>
+				<value>classpath:conf/orders-production.properties</value>
 				<value>classpath:conf/manage.properties</value>
 			</list>
 		</property>
 	</bean>
  
+	<!-- Access resource bundles with the specified basename -->
+	<bean id="messageSource"
+		class="org.springframework.context.support.ReloadableResourceBundleMessageSource">
+		<!-- <property name="basenames" value="/WEB-INF/i18n/content,/WEB-INF/i18n/validation,/WEB-INF/i18n/asset,/WEB-INF/i18n/enum" 
+			/> -->
+		<property name="basenames">
+			<list>
+				<value>/WEB-INF/i18n/msg-notice-template</value>
+				<value>/WEB-INF/i18n/msg-todoitem-template</value>
+			</list>
+		</property>
+		<!-- 刷新资源文件的周期，以秒为单位 -->
+		<property name="cacheSeconds" value="60" />
+	</bean>
  
-	<import resource="classpath*:spring-mvc.xml" />
-	<import resource="classpath*:spring-dao.xml" />
+	<!-- <import resource="classpath*:spring-config-service.xml"/> -->
+	<import resource="classpath*:springmvc-config.xml" />
+	<import resource="classpath*:spring-dao.xml"/>
+	<import resource="classpath*:spring-rpc.xml"/>
+	<!-- <import resource="classpath*:spring-redis.xml"/> -->
+	<!-- <import resource="classpath*:spring-website-redis.xml"/> -->
+	<!-- <import resource="classpath*:spring-config-dtms-forOrdersWeb.xml"/> -->
 </beans>
 \ No newline at end of file
@@ -11,10 +11,32 @@
     http://www.springframework.org/schema/aop/spring-aop-4.3.xsd"
 	default-autowire="byName">
  
-	<context:component-scan base-package="com.b2c.orders.web" />
+	<!--对于请求返回字符串时，默认StringHttpMessageConverter，且其默认编码为ISO-8859-1，不会通过上面的MappingJacksonJsonView，因此客服端看到的中文会是乱码 -->
+	<!--对于请求返回对象时，下面配置的MappingJacksonJsonView来处理，返回sjon串 -->
+	<bean id="stringHttpMessageConverter"
+		class="org.springframework.http.converter.StringHttpMessageConverter">
+		<constructor-arg value="UTF-8" />
+		<property name="supportedMediaTypes">
+			<list>
+				<value>application/xml;charset=UTF-8</value>
+				<value>text/html;charset=UTF-8</value>
+				<value>text/plain;charset=UTF-8</value>
+				<value>application/json;charset=UTF-8</value>
+			</list>
+		</property>
+	</bean>
  
+	<!-- mvc:annotation-driven 使用默认的 stringHttpMessageConverter，默认的编码为ISO-8859-1，因此需要替换它 -->
+	<mvc:annotation-driven>
+		<mvc:message-converters>
+			<ref bean="stringHttpMessageConverter" />
+		</mvc:message-converters>
+	</mvc:annotation-driven>
+
+	<context:component-scan base-package="com.b2c.orders.**" />
+
+	<aop:aspectj-autoproxy proxy-target-class="true" />
 	<context:annotation-config />
-	<mvc:default-servlet-handler />
  
 	<!-- 文件上传 -->
 	<bean id="multipartResolver"
@@ -38,11 +60,6 @@
 	<bean
 		class="org.springframework.web.servlet.view.ContentNegotiatingViewResolver">
 		<property name="contentNegotiationManager" ref="contentNegotiationManager" />
-		<property name="viewResolvers">
-			<list>
-				<ref bean="velocityViewResolver" />
-			</list>
-		</property>
 		<property name="defaultViews">
 			<list>
 				<!-- for application/json MappingJacksonJsonView 默认编码为UTF-8 因此，请求返回对象时，会自动使用此view，使用UTF-8编码将对象转换为json -->
@@ -60,16 +77,4 @@
 		<property name="cookieMaxAge" value="2147483647" />
 	</bean>
  
-	<bean id="conversionService"
-		class="org.springframework.context.support.ConversionServiceFactoryBean">
-		<property name="converters">
-			<set>
-				<bean
-					class="com.diligrp.orders.common.tools.StringToReOrderStatusConverterFactory" />
-			</set>
-		</property>
-	</bean>
-
-	<mvc:annotation-driven conversion-service="conversionService" />
-
 </beans>
 \ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE configuration PUBLIC "-//mybatis.org//DTD Config 3.0//EN" "http://mybatis.org/dtd/mybatis-3-config.dtd">
+
+<configuration>
+	<settings>
+		<!-- 全局映射器启用缓存 -->
+		<setting name="cacheEnabled" value="true" />
+		<!-- 对于未知的SQL查询，允许返回不同的结果集以达到通用的效果 -->
+		<setting name="multipleResultSetsEnabled" value="true" />
+		<!-- 允许使用列标签代替列名 -->
+		<setting name="useColumnLabel" value="true" />
+		<!-- 数据库超过25000秒仍未响应则超时 -->
+		<setting name="defaultStatementTimeout" value="25000" />
+		<setting name="logImpl" value="STDOUT_LOGGING" />
+	</settings>
+
+	<!-- 全局别名设置，在映射文件中只需写别名，而不必写出整个类路径 -->
+	<typeAliases>
+		<!-- <typeAlias type="com.diligrp.orders.domain.OrderItem" alias="orderItem"/>
+		<typeAlias type="com.diligrp.orders.domain.OrderStockLocker" alias="orderStockLocker"/>
+		<typeAlias type="com.diligrp.orders.domain.OrderTraceInfo" alias="orderTraceInfo"/>
+		<typeAlias type="com.diligrp.orders.domain.Orders" alias="orders"/>
+		<typeAlias type="com.diligrp.orders.domain.ReOrder" alias="reOrder"/>
+		<typeAlias type="com.diligrp.orders.domain.ClaimsOrder" alias="claimsOrder"/>
+		<typeAlias type="com.diligrp.orders.domain.ClaimsOrderTraceInfo" alias="claimsOrderTraceInfo"/>
+		<typeAlias type="com.diligrp.orders.domain.ReorderTraceInfo" alias="reorderTraceInfo"/>
+		<typeAlias type="com.diligrp.orders.domain.OrderMaxid" alias="orderMaxid"/>
+		<typeAlias type="com.diligrp.orders.domain.SettleBill" alias="settleBill"/>
+		<typeAlias type="com.diligrp.orders.domain.SettleCapitalFlow" alias="settleCapitalFlow"/>
+		<typeAlias type="com.diligrp.orders.domain.SettleRemitRecord" alias="settleRemitRecord"/>
+		<typeAlias type="com.diligrp.orders.domain.OrdersJob" alias="ordersJob"/>
+		<typeAlias type="com.diligrp.orders.domain.OrderShipInfo" alias="orderShipInfo"/>
+		<typeAlias type="com.diligrp.orders.domain.OrderRemindNumInfo" alias="orderRemindNumInfo"/>
+		<typeAlias type="com.diligrp.orders.domain.OrderPrint" alias="orderPrint"/>
+		<typeAlias type="com.diligrp.orders.domain.OrderReceiver" alias="orderReceiver" />
+		<typeAlias type="com.diligrp.orders.domain.OrderBrokerage" alias="orderBrokerage" />
+
+		<typeAlias type="com.diligrp.orders.vo.OrdersSumVO" alias="ordersSumVO"/>
+		<typeAlias type="com.diligrp.orders.vo.OrderItemVO" alias="orderItemVO"/>
+		<typeAlias type="com.diligrp.orders.vo.SettleBillVO" alias="settleBillVO"/>
+		<typeAlias type="com.diligrp.orders.vo.SettleBillSumVO" alias="settleBillSumVO"/>
+		<typeAlias type="com.diligrp.orders.vo.SettleRemitRecordVO" alias="settleRemitRecordVO"/>
+		<typeAlias type="com.diligrp.orders.vo.SettleCapitalFlowVO" alias="settleCapitalFlowVO"/>
+		<typeAlias type="com.diligrp.orders.vo.KeyValueVO" alias="keyValueVO"/>
+		<typeAlias type="com.diligrp.orders.vo.OrdersVO" alias="ordersVO"/>
+
+		<typeAlias type="com.diligrp.orders.domain.dtms.DtmsMessage" alias="dtmsMessage"/>
+		<typeAlias type="com.diligrp.orders.domain.dtms.DtmsMessageException" alias="dtmsMessageException"/>
+		<typeAlias type="com.diligrp.orders.domain.dtms.DtmsMessageConfig" alias="dtmsMessageConfig"/>
+		<typeAlias type="com.diligrp.orders.domain.dtms.DtmsMessageHistory" alias="dtmsMessageHistory"/> -->
+		
+
+	</typeAliases>
+
+	<typeHandlers>
+		<!-- <typeHandler handler="com.diligrp.orders.dao.typehandler.OrderManStatusHandler" javaType="com.diligrp.orders.common.enums.order.OrderManStatus" />
+		<typeHandler handler="com.diligrp.orders.dao.typehandler.OrderPayTypeHandler" javaType="com.diligrp.orders.publics.enums.PayType" />
+		<typeHandler handler="com.diligrp.orders.dao.typehandler.ReOrderStatusHandler" javaType="com.diligrp.orders.publics.enums.ReOrderStatus" />
+		<typeHandler handler="com.diligrp.orders.dao.typehandler.MarketDeliveryHandler" javaType="com.diligrp.orders.publics.enums.MarketDelivery" />
+		<typeHandler handler="com.diligrp.orders.dao.typehandler.RefundTypeHandler" javaType="com.diligrp.orders.common.enums.reorder.RefundType" />
+		<typeHandler handler="com.diligrp.orders.dao.typehandler.ClaimsOrderStatusHandler" javaType="com.diligrp.orders.publics.enums.ClaimsOrderStatus" />
+		<typeHandler handler="com.diligrp.orders.dao.typehandler.TraceTypeHandler" javaType="com.diligrp.orders.common.enums.TraceType" />
+		<typeHandler handler="com.diligrp.orders.dao.typehandler.OrderPayStatusHandler" javaType="com.diligrp.orders.publics.enums.PayStatus" />
+		<typeHandler handler="com.diligrp.orders.dao.typehandler.ClaimsDemandHandler" javaType="com.diligrp.orders.publics.enums.ClaimsDemand" />
+		<typeHandler handler="com.diligrp.orders.dao.typehandler.OrderTypeHandler" javaType="com.diligrp.orders.publics.enums.OrderType" />
+		<typeHandler handler="com.diligrp.orders.dao.typehandler.AuditResultHandler" javaType="com.diligrp.orders.publics.enums.AuditResult" />
+		<typeHandler handler="com.diligrp.orders.dao.typehandler.OrderBrokerageStatusHandler" javaType="com.diligrp.orders.common.enums.order.OrderBrokerageStatus" />
+		<typeHandler handler="com.diligrp.orders.dao.typehandler.RemitAuditStatusHandler" javaType="com.diligrp.orders.publics.enums.RemitAuditStatus" />
+		<typeHandler handler="com.diligrp.orders.dao.typehandler.OrderDeliveryTypeHandler" javaType="com.diligrp.orders.publics.enums.OrderDeliveryType" />
+		<typeHandler handler="com.diligrp.orders.dao.typehandler.OrderComeFromHandler" javaType="com.diligrp.orders.publics.enums.OrderComeFrom" />
+		<typeHandler handler="com.diligrp.orders.dao.typehandler.WarrantTypeHandler" javaType="com.diligrp.orders.publics.enums.WarrantType" />
+		<typeHandler handler="com.diligrp.orders.dao.typehandler.InvoiceTypeHandler" javaType="com.diligrp.orders.publics.enums.InvoiceType" /> -->
+	</typeHandlers>
+
+	<!-- 映射文件路径 -->
+	<mappers>
+		<mapper resource="sqlmap/OrderMaxid.xml" />
+	</mappers>
+
+
+</configuration>
 \ No newline at end of file
 <?xml version="1.0" encoding="UTF-8"?>
 <web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns="http://java.sun.com/xml/ns/javaee"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
-	id="WebApp_ID" version="3.0">
+		 xmlns="http://java.sun.com/xml/ns/javaee"
+		 xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+		 id="WebApp_ID" version="3.0">
  
-	<display-name>orders.zandeapp</display-name>
+	<display-name>b2c-orders</display-name>
  
 	<context-param>
 		<param-name>webAppRootKey</param-name>
 		<param-value>orders.webapp.root</param-value>
 	</context-param>
  
+	<!--<context-param>
+		<param-name>contextConfigLocation</param-name>
+		<param-value>classpath:spring.xml</param-value>
+	</context-param>
+
+	<listener>
+		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
+	</listener> -->
+
 	<servlet>
 		<servlet-name>springmvc</servlet-name>
 		<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
 		<init-param>
-			<param-name>contextConfigLocation</param-name>
-			<param-value>classpath:spring.xml</param-value>
+		  <param-name>contextConfigLocation</param-name>
+		  <param-value>classpath:spring.xml</param-value>
 		</init-param>
-		<load-on-startup>1</load-on-startup>
+        <load-on-startup>1</load-on-startup>
 	</servlet>
  
 	<servlet-mapping>
 		<servlet-name>springmvc</servlet-name>
-		<url-pattern>/*</url-pattern>
+		<url-pattern>/</url-pattern>
 	</servlet-mapping>
+	
+	<servlet-mapping>
+        <servlet-name>springmvc</servlet-name>
+        <url-pattern>/swagger-resources</url-pattern>
+    </servlet-mapping>
  
+    <!-- <filter>
+        <filter-name>EncodingFilter</filter-name>
+        <filter-class>com.diligrp.orders.web.interceptor.OrdersCharacterEncodingFilter</filter-class>
+        <init-param>
+            <param-name>encoding</param-name>
+            <param-value>UTF-8</param-value>
+        </init-param>
+    </filter> -->
+    
+    <filter>  
+        <filter-name>characterEncodingFilter</filter-name>  
+        <filter-class>org.springframework.web.filter.CharacterEncodingFilter</filter-class>  
+        <init-param>  
+            <param-name>encoding</param-name>  
+            <param-value>UTF-8</param-value>  
+        </init-param>  
+        <init-param>  
+            <param-name>forceEncoding</param-name>  
+            <param-value>true</param-value>  
+        </init-param>  
+    </filter>  
+    <filter-mapping>  
+        <filter-name>characterEncodingFilter</filter-name>  
+        <url-pattern>/*</url-pattern>  
+    </filter-mapping> 
+    
 	<filter>
-		<filter-name>characterEncodingFilter</filter-name>
-		<filter-class>org.springframework.web.filter.CharacterEncodingFilter</filter-class>
-		<init-param>
-			<param-name>encoding</param-name>
-			<param-value>UTF-8</param-value>
-		</init-param>
-		<init-param>
-			<param-name>forceEncoding</param-name>
-			<param-value>true</param-value>
-		</init-param>
+		<filter-name>HiddenHttpMethodFilter</filter-name>
+		<filter-class>org.springframework.web.filter.HiddenHttpMethodFilter</filter-class>
 	</filter>
-	<filter-mapping>
-		<filter-name>characterEncodingFilter</filter-name>
-		<url-pattern>/*</url-pattern>
-	</filter-mapping>
+    <!-- <filter-mapping>
+        <filter-name>EncodingFilter</filter-name>
+        <servlet-name>springmvc</servlet-name>
+    </filter-mapping> -->
+	<!-- <filter-mapping>
+		<filter-name>HiddenHttpMethodFilter</filter-name>
+		<servlet-name>springmvc</servlet-name>
+	</filter-mapping> -->
  
 	<!--统一管理平台权限管理配置 -->
-	<filter>
-		<filter-name>sessionFilter</filter-name>
-		<filter-class>com.diligrp.manage.sdk.session.SessionFilter</filter-class>
-	</filter>
-	<filter-mapping>
-		<filter-name>sessionFilter</filter-name>
-		<url-pattern>*</url-pattern>
-	</filter-mapping>
+    <!-- <filter>
+            <filter-name>sessionFilter</filter-name>
+            <filter-class>com.diligrp.manage.sdk.session.SessionFilter</filter-class>
+    </filter>
+    <filter-mapping>
+            <filter-name>sessionFilter</filter-name>
+            <url-pattern>*</url-pattern>
+    </filter-mapping> -->
  
 </web-app>
 \ No newline at end of file
@@ -2,7 +2,7 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.b2c.orders</groupId>
-	<artifactId>orders-parent</artifactId>
+	<artifactId>b2c-orders-parent</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<packaging>pom</packaging>
  
@@ -12,18 +12,18 @@
 		<maven.compiler.encoding>UTF-8</maven.compiler.encoding>
 		<spring.version>4.3.2.RELEASE</spring.version>
 		<aspectj.version>1.6.11</aspectj.version>
-		<jackson.version>2.8.1</jackson.version>
+		<jackson.version>1.9.2</jackson.version>
 		<slf4j.version>1.7.21</slf4j.version>
 		<logback.version>1.1.3</logback.version>
-		<titan.devlop.version>0.0.2-SNAPSHOT</titan.devlop.version>
-		<titan.product.version>0.0.2-SNAPSHOT</titan.product.version>
+		<titan.devlop.version>0.0.3-SNAPSHOT</titan.devlop.version>
+		<titan.product.version>0.0.3-SNAPSHOT</titan.product.version>
 		<orders.client.sdk.version>1.1.0-SNAPSHOT</orders.client.sdk.version>
 		<srvce.client.sdk.version>1.4-SNAPSHOT</srvce.client.sdk.version>
 		<user.client.devlop.version>0.0.1-SNAPSHOT</user.client.devlop.version>
 		<user.client.product.version>0.0.3-SNAPSHOT</user.client.product.version>
 		<fastjson.version>1.2.7</fastjson.version>
 		<mybatis.version>3.2.5</mybatis.version>
-		<guava.version>14.0.1</guava.version>
+		<guava.version>20.0</guava.version>
 		<pnr-shop-develop.version>0.0.1-SNAPSHOT</pnr-shop-develop.version>
 		<pnr-shop-product.version>0.0.1-SNAPSHOT</pnr-shop-product.version>
 		<lombox.version>1.16.10</lombox.version>
@@ -48,29 +48,79 @@
 		<project.static.path>http://static.1n4j.com/static</project.static.path>
 		<!-- 订单请求和响应参数 -->
 		<orders.paramLog.enabled>true</orders.paramLog.enabled>
-		<pring.data.redis.version>1.6.2.RELEASE</pring.data.redis.version>
-		<commons-lang.vaersion>2.5</commons-lang.vaersion>
-		<commons-codec.version>1.6</commons-codec.version>
-		<servlet-api.version>2.5</servlet-api.version>
-		<mybatis-spring.version>1.2.0</mybatis-spring.version>
-		<druid.version>1.0.14</druid.version>
+		<mariadb-java-client.version>1.5.5</mariadb-java-client.version>
 		<aspectjweaver.version>1.7.2</aspectjweaver.version>
-		<woodstox.version>4.4.1</woodstox.version>
 	</properties>
  
 	<dependencyManagement>
 		<dependencies>
-			<!-- https://mvnrepository.com/artifact/io.springfox/springfox-swagger2 -->
+			<!--swagger -->
 			<dependency>
 				<groupId>io.springfox</groupId>
 				<artifactId>springfox-swagger2</artifactId>
-				<version>2.6.1</version>
+				<version>2.2.2</version>
+				<exclusions>
+					<exclusion>
+						<groupId>org.springframework</groupId>
+						<artifactId>spring-web</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>org.springframework</groupId>
+						<artifactId>spring-beans</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>org.springframework</groupId>
+						<artifactId>spring-webmvc</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>org.springframework</groupId>
+						<artifactId>spring-beans</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>org.springframework</groupId>
+						<artifactId>spring-context</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>org.springframework</groupId>
+						<artifactId>spring-core</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>org.springframework</groupId>
+						<artifactId>spring-aop</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>org.aspectj</groupId>
+						<artifactId>aspectjweaver</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>org.slf4j</groupId>
+						<artifactId>slf4j-api</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>com.fasterxml.jackson.core</groupId>
+						<artifactId>jackson-annotations</artifactId>
+					</exclusion>
+				</exclusions>
 			</dependency>
-			<!-- https://mvnrepository.com/artifact/cglib/cglib -->
 			<dependency>
-				<groupId>cglib</groupId>
-				<artifactId>cglib</artifactId>
-				<version>3.2.4</version>
+				<groupId>com.b2c.website</groupId>
+				<artifactId>diligrp-website-util</artifactId>
+				<version>0.0.2-SNAPSHOT</version>
+				<exclusions>
+					<exclusion>
+						<groupId>velocity</groupId>
+						<artifactId>velocity-dep</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>org.apache.hbase</groupId>
+						<artifactId>hbase-client</artifactId>
+					</exclusion>
+				</exclusions>
+			</dependency>
+			<dependency>
+				<groupId>com.yqyw</groupId>
+				<artifactId>orders-client</artifactId>
+				<version>${orders.client.sdk.version}</version>
 			</dependency>
 			<!-- 需求中心SDK -->
 			<dependency>
@@ -80,32 +130,26 @@
 			</dependency>
 			<!-- 商品库 -->
 			<dependency>
-				<groupId>com.yqyq.titan</groupId>
+				<groupId>com.yqyw.titan</groupId>
 				<artifactId>titan-sdk</artifactId>
 				<version>${titan.devlop.version}</version>
 			</dependency>
+			<!-- 供应商 -->
+			<dependency>
+				<groupId>com.diligrp</groupId>
+				<artifactId>diligrp-crm-api</artifactId>
+				<version>0.0.1-SNAPSHOT</version>
+			</dependency>
+			<!-- 客户信息 -->
+			<!-- <dependency> <groupId>com.yqyw.website.user</groupId> <artifactId>diligrp-user-client</artifactId> 
+				<version>${user.client.devlop.version}</version> </dependency> -->
 			<!-- 数据字典 -->
 			<dependency>
 				<groupId>com.b2c.website.web</groupId>
 				<artifactId>diligrp-website-api</artifactId>
-				<version>1.0.5-SNAPSHOT</version>
-				<exclusions>
-					<exclusion>
-						<groupId>org.apache.hbase</groupId>
-						<artifactId>hbase-client</artifactId>
-					</exclusion>
-				</exclusions>
-			</dependency>
-			<dependency>
-				<groupId>com.b2c.website</groupId>
-				<artifactId>diligrp-website-util</artifactId>
-				<version>0.0.2-SNAPSHOT</version>
+				<version>1.0.3-SNAPSHOT</version>
 				<exclusions>
 					<exclusion>
-						<groupId>velocity</groupId>
-						<artifactId>velocity-dep</artifactId>
-					</exclusion>
-					<exclusion>
 						<groupId>org.apache.hbase</groupId>
 						<artifactId>hbase-client</artifactId>
 					</exclusion>
@@ -113,7 +157,7 @@
 			</dependency>
 			<!--后台user -->
 			<dependency>
-				<groupId>com.b2c.manage</groupId>
+				<groupId>com.yqyw.manage</groupId>
 				<artifactId>diligrp-manage-sdk</artifactId>
 				<version>0.0.3-SNAPSHOT</version>
 				<exclusions>
@@ -131,7 +175,7 @@
 			</dependency>
 			<!-- 消息中心/待办事项 -->
 			<dependency>
-				<groupId>com.b2c.messageCenter.sdk</groupId>
+				<groupId>com.yqyw.messageCenter.sdk</groupId>
 				<artifactId>diligrp-messageCenter-sdk</artifactId>
 				<version>0.0.4-SNAPSHOT</version>
 				<exclusions>
@@ -143,7 +187,7 @@
 			</dependency>
 			<!-- 店铺API -->
 			<dependency>
-				<groupId>com.b2c.shop</groupId>
+				<groupId>com.yqyw.shop</groupId>
 				<artifactId>shop-sdk</artifactId>
 				<version>${pnr-shop-develop.version}</version>
 			</dependency>
@@ -242,12 +286,6 @@
 				<version>2.5</version>
 				<scope>provided</scope>
 			</dependency>
-			<!-- https://mvnrepository.com/artifact/org.mariadb.jdbc/mariadb-java-client -->
-			<dependency>
-				<groupId>org.mariadb.jdbc</groupId>
-				<artifactId>mariadb-java-client</artifactId>
-				<version>1.5.5</version>
-			</dependency>
 			<dependency>
 				<groupId>org.mybatis</groupId>
 				<artifactId>mybatis</artifactId>
@@ -263,10 +301,13 @@
 				<artifactId>druid</artifactId>
 				<version>1.0.14</version>
 			</dependency>
+			<!-- <dependency> <groupId>mysql</groupId> <artifactId>mysql-connector-java</artifactId> 
+				<version>5.1.25</version> </dependency> -->
+			<!-- https://mvnrepository.com/artifact/org.mariadb.jdbc/mariadb-java-client -->
 			<dependency>
-				<groupId>mysql</groupId>
-				<artifactId>mysql-connector-java</artifactId>
-				<version>5.1.25</version>
+				<groupId>org.mariadb.jdbc</groupId>
+				<artifactId>mariadb-java-client</artifactId>
+				<version>${mariadb-java-client.version}</version>
 			</dependency>
 			<!-- 工具类 -->
 			<!-- google sets,maps -->
@@ -284,7 +325,12 @@
 			<dependency>
 				<groupId>org.aspectj</groupId>
 				<artifactId>aspectjweaver</artifactId>
-				<version>1.7.2</version>
+				<version>${aspectjweaver.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>cglib</groupId>
+				<artifactId>cglib-nodep</artifactId>
+				<version>2.1_3</version>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.commons</groupId>
@@ -295,7 +341,7 @@
 			<dependency>
 				<groupId>junit</groupId>
 				<artifactId>junit</artifactId>
-				<version>4.11</version>
+				<version>4.5</version>
 				<scope>test</scope>
 			</dependency>
 			<!-- if you enable @AspectJ style AOP in spring. -->
@@ -310,82 +356,10 @@
 				<artifactId>hibernate-validator</artifactId>
 				<version>5.1.3.Final</version>
 			</dependency>
-			<!-- if you use velocity view in springmvc -->
-			<dependency>
-				<groupId>org.apache.velocity</groupId>
-				<artifactId>velocity</artifactId>
-				<version>1.7</version>
-			</dependency>
-			<!-- if you use velocity layout view in springmvc -->
-			<dependency>
-				<groupId>org.apache.velocity</groupId>
-				<artifactId>velocity-tools</artifactId>
-				<version>2.0</version>
-				<exclusions>
-					<exclusion>
-						<groupId>org.apache.struts</groupId>
-						<artifactId>struts-core</artifactId>
-					</exclusion>
-					<exclusion>
-						<groupId>org.apache.struts</groupId>
-						<artifactId>struts-taglib</artifactId>
-					</exclusion>
-					<exclusion>
-						<groupId>org.apache.struts</groupId>
-						<artifactId>struts-tiles</artifactId>
-					</exclusion>
-					<exclusion>
-						<groupId>sslext</groupId>
-						<artifactId>sslext</artifactId>
-					</exclusion>
-				</exclusions>
-			</dependency>
-			<dependency>
-				<groupId>com.fasterxml.jackson.core</groupId>
-				<artifactId>jackson-core</artifactId>
-				<version>${jackson.version}</version>
-			</dependency>
-
-			<!-- Just the annotations; use this dependency if you want to attach annotations 
-				to classes without connecting them to the code. -->
-			<dependency>
-				<groupId>com.fasterxml.jackson.core</groupId>
-				<artifactId>jackson-annotations</artifactId>
-				<version>${jackson.version}</version>
-			</dependency>
-
-			<!-- databinding; ObjectMapper, JsonNode and related classes are here -->
-			<dependency>
-				<groupId>com.fasterxml.jackson.core</groupId>
-				<artifactId>jackson-databind</artifactId>
-				<version>${jackson.version}</version>
-			</dependency>
-			<!-- smile (binary JSON). Other artifacts in this group do other formats. -->
-			<dependency>
-				<groupId>com.fasterxml.jackson.dataformat</groupId>
-				<artifactId>jackson-dataformat-smile</artifactId>
-				<version>${jackson.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>com.fasterxml.jackson.dataformat</groupId>
-				<artifactId>jackson-dataformat-xml</artifactId>
-				<version>${jackson.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.codehaus.woodstox</groupId>
-				<artifactId>woodstox-core-asl</artifactId>
-				<version>${woodstox.version}</version>
-			</dependency>
-			<!-- JAX-RS provider -->
-			<dependency>
-				<groupId>com.fasterxml.jackson.jaxrs</groupId>
-				<artifactId>jackson-jaxrs-json-provider</artifactId>
-				<version>${jackson.version}</version>
-			</dependency>
-			<!-- Support for JAX-B annotations as additional configuration -->
+			<!-- if you enable json support in spring mvc. -->
 			<dependency>
-				<groupId>com.fasterxml.jackson.module</groupId>
-				<artifactId>jackson-module-jaxb-annotations</artifactId>
+				<groupId>org.codehaus.jackson</groupId>
+				<artifactId>jackson-mapper-asl</artifactId>
 				<version>${jackson.version}</version>
 			</dependency>
 			<!-- if you use fileupload in spring mvc -->
@@ -438,8 +412,8 @@
 			</activation>
 			<properties>
 				<!-- 数据库 -->
-				<orders.jdbc.driver>com.mysql.jdbc.Driver</orders.jdbc.driver>
-				<orders.jdbc.url>jdbc:MySql://10.28.10.188:3306/1n4j_orders?characterEncoding=UTF-8</orders.jdbc.url>
+				<orders.jdbc.driver>org.mariadb.jdbc.Driver</orders.jdbc.driver>
+				<orders.jdbc.url>jdbc:mariadb://127.0.0.1:3306/b2c_orders?characterEncoding=UTF-8</orders.jdbc.url>
 				<orders.jdbc.username>root</orders.jdbc.username>
 				<orders.jdbc.password>123456</orders.jdbc.password>
 				<!-- 日志 -->
@@ -534,15 +508,21 @@
 			</plugins>
 		</pluginManagement>
 		<defaultGoal>compile</defaultGoal>
+		<resources>
+			<resource>
+				<directory>${project.basedir}/src/main/resources</directory>
+				<filtering>true</filtering>
+			</resource>
+		</resources>
 	</build>
 	<modules>
-		<module>orders-domain</module>
-		<module>orders-commons</module>
-		<module>orders-dao</module>
-		<module>orders-manager</module>
-		<module>orders-client</module>
-		<module>orders-service</module>
-		<module>orders-web</module>
-		<module>orders-rpc</module>
+		<module>b2c-orders-domain</module>
+		<module>b2c-orders-commons</module>
+		<module>b2c-orders-manager</module>
+		<module>b2c-orders-client</module>
+		<module>b2c-orders-service</module>
+		<module>b2c-orders-web</module>
+		<module>b2c-orders-rpc</module>
+		<module>b2c-orders-dao</module>
 	</modules>
 </project>
 \ No newline at end of file