增加dtms RPC接口

Jiang
1 parent 4939f4b5
Showing 17 changed files with 307 additions and 21 deletions
b2c-orders-client/src/main/java/com/b2c/orders/client/domain/dto/request/DtmsTimeoutRequestDto.java
b2c-orders-commons/src/main/java/com/b2c/orders/commons/constant/Constant.java
b2c-orders-domain/pom.xml
b2c-orders-domain/src/main/java/com/b2c/orders/domain/Order.java
b2c-orders-manager/src/main/java/com/b2c/orders/manager/OrderManager.java
b2c-orders-manager/src/main/java/com/b2c/orders/manager/impl/OrderManagerBean.java
b2c-orders-rpc/pom.xml
b2c-orders-rpc/src/main/java/com/b2c/orders/rpc/DtmsRPCService.java
b2c-orders-rpc/src/main/java/com/b2c/orders/rpc/exception/DtmsRpcException.java
b2c-orders-rpc/src/main/java/com/b2c/orders/rpc/impl/DtmsRPCServiceBean.java
b2c-orders-service/src/main/java/com/b2c/orders/service/OrderService.java
b2c-orders-service/src/main/java/com/b2c/orders/service/impl/OrderServiceBean.java
b2c-orders-web/.settings/org.eclipse.wst.common.component
b2c-orders-web/pom.xml
b2c-orders-web/src/main/java/com/b2c/orders/configuration/SwaggerConfiguration.java
b2c-orders-web/src/main/java/com/b2c/orders/web/restful/OrderRestController.java
pom.xml
@@ -6,5 +6,16 @@ public class DtmsTimeoutRequestDto extends BaseRequestDto {
 	 * 
 	 */
 	private static final long serialVersionUID = 8454009010057359942L;
+	
+	private Long orderId;
+
+	public Long getOrderId() {
+		return orderId;
+	}
+
+	public void setOrderId(Long orderId) {
+		this.orderId = orderId;
+	}
+	
 }
+package com.b2c.orders.commons.constant;
+
+public class Constant {
+
+	/**
+	 * 商家未接单，订单超时api接口地址
+	 */
+	public static final String ORDER_TAKE_TIMEOUT_CALL_URL = "http://orders.zandeapp.com/api/dtms/timeout";
+	/**
+	 * 买家未付款，订单超时api接口
+	 */
+	public static final String ORDER_PAY_TIMEOUT_CALL_URL = "http://orders.zandeapp.com/api/dtms/timeout";
+	/**
+	 * 商家未接单，订单超时时间
+	 */
+	public static final int ORDER_TAKE_TIMEOUT_SECONDS = 24 * 60 * 60;
+	/**
+	 * 买家未支付，订单超时时间
+	 */
+	public static final int ORDER_PAY_TIMEOUT_SECONDS = 24 * 60 * 60;
+}
@@ -36,5 +36,10 @@
 			<groupId>commons-lang</groupId>
 			<artifactId>commons-lang</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>orders-rpc</artifactId>
+			<version>${project.parent.version}</version>
+		</dependency>
 	</dependencies>
 </project>
 \ No newline at end of file
@@ -102,7 +102,7 @@ public class Order extends BaseDomain {
 	 * 商家接单
 	 * 
 	 * @param totalPrice
-	 *            TODO
+	 *            订单总价（根据需求文档，商家接单接单需要手动修改订单价格）
 	 * 
 	 * @throws OrderException
 	 */
@@ -3,6 +3,7 @@ package com.b2c.orders.manager;
 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 OrderManager {
 	/**
@@ -10,8 +11,9 @@ public interface OrderManager {
 	 * 
 	 * @param orderVo
 	 *            订单属性
+	 * @throws DtmsRpcException
 	 */
-	void submit(SubmitOrderRequestDto orderVo);
+	void submit(SubmitOrderRequestDto orderVo) throws DtmsRpcException;
 	/**
 	 * 接单
@@ -20,11 +22,13 @@ public interface OrderManager {
 	 *            订单id
 	 * @param sellerId
 	 *            商家id
-	 * @param totalPrice TODO
+	 * @param totalPrice
+	 *            TODO
 	 * @throws OrderException
 	 * @throws OrderRepositoryException
+	 * @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;
 	/**
 	 * 支付
@@ -57,8 +61,8 @@ public interface OrderManager {
 	 *            订单id
 	 * @param sellerId
 	 *            商家id
-	 * @throws OrderRepositoryException 
-	 * @throws OrderException 
+	 * @throws OrderRepositoryException
+	 * @throws OrderException
 	 */
 	void sellerConfirm(Long orderId, Long sellerId) throws OrderRepositoryException, OrderException;
@@ -95,4 +99,14 @@ public interface OrderManager {
 	 * @throws OrderException
 	 */
 	void timeout(Long orderId) throws OrderRepositoryException, OrderException;
+
+	/**
+	 * 商家24小时没有确认收款或者买家24小时没确认收货由dtms确认收款、收货（需求文档要求商家确认收款或者买家确认收货则订单完成）
+	 * 
+	 * @param orderId
+	 *            订单id
+	 * @throws OrderRepositoryException 
+	 * @throws OrderException 
+	 */
+	void dtmsConfirm(Long orderId) throws OrderRepositoryException, OrderException;
 }
 package com.b2c.orders.manager.impl;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+import com.alibaba.fastjson.JSON;
+import com.b2c.dtms.client.domain.dto.request.DtmsProduceRequestDto;
+import com.b2c.dtms.common.enums.dtms.DtmsMessageType;
+import com.b2c.orders.client.domain.dto.request.DtmsTimeoutRequestDto;
 import com.b2c.orders.client.domain.dto.request.SubmitOrderRequestDto;
+import com.b2c.orders.commons.constant.Constant;
 import com.b2c.orders.commons.exceptions.ApplicationException;
 import com.b2c.orders.commons.exceptions.OrderException;
 import com.b2c.orders.commons.exceptions.OrderRepositoryException;
@@ -13,24 +20,40 @@ import com.b2c.orders.domain.Buyer;
 import com.b2c.orders.domain.Order;
 import com.b2c.orders.domain.Seller;
 import com.b2c.orders.manager.OrderManager;
+import com.b2c.orders.rpc.DtmsRPCService;
+import com.b2c.orders.rpc.exception.DtmsRpcException;
 @Component
 public class OrderManagerBean implements OrderManager {
+	private static final Logger LOG = LoggerFactory.getLogger(OrderManagerBean.class);
+
 	@Autowired
 	private OrderDao orderDao;
 	@Autowired
 	private OrderIdGenerator IdGenerator;
+	@Autowired
+	private DtmsRPCService dtmsService;
 	@Override
-	public void submit(SubmitOrderRequestDto orderVo) {
+	public void submit(SubmitOrderRequestDto orderVo) throws DtmsRpcException {
 		Order po = new Order();
 		po.submit(orderVo, this.IdGenerator);
 		this.orderDao.save(po);
+		DtmsProduceRequestDto request = new DtmsProduceRequestDto();
+		request.setBizId(po.getId().toString());
+		request.setCallUrl(Constant.ORDER_TAKE_TIMEOUT_CALL_URL);
+		DtmsTimeoutRequestDto param = new DtmsTimeoutRequestDto();
+		param.setOrderId(po.getId());
+		request.setContent(JSON.toJSONString(param));
+		request.setDelaySeconds(Constant.ORDER_TAKE_TIMEOUT_SECONDS);
+		request.setType(DtmsMessageType.Timer.code());
+		this.dtmsService.produceDtmsMessage(request);
 	}
 	@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 {
 		Order po = this.orderDao.getById(orderId);
 		if (po == null) {
 			throw new OrderRepositoryException(OrderRepositoryException.ENTITY_NOT_FOUND,
@@ -45,6 +68,16 @@ public class OrderManagerBean implements OrderManager {
 		}
 		po.take(totalPrice);
 		this.orderDao.update(po);
+		DtmsProduceRequestDto request = new DtmsProduceRequestDto();
+		request.setBizId(po.getId().toString());
+		request.setCallUrl(Constant.ORDER_PAY_TIMEOUT_CALL_URL);
+		DtmsTimeoutRequestDto param = new DtmsTimeoutRequestDto();
+		param.setOrderId(po.getId());
+		request.setContent(JSON.toJSONString(param));
+		request.setDelaySeconds(Constant.ORDER_PAY_TIMEOUT_SECONDS);
+		request.setType(DtmsMessageType.Timer.code());
+		this.dtmsService.produceDtmsMessage(request);
+
 	}
 	@Override
@@ -117,6 +150,7 @@ public class OrderManagerBean implements OrderManager {
 		}
 		po.refuse();
 		this.orderDao.update(po);
+
 	}
 	@Override
@@ -148,4 +182,15 @@ public class OrderManagerBean implements OrderManager {
 		this.orderDao.update(po);
 	}
+	@Override
+	public void dtmsConfirm(Long orderId) throws OrderRepositoryException, OrderException {
+		Order po = this.orderDao.getById(orderId);
+		if (po == null) {
+			throw new OrderRepositoryException(OrderRepositoryException.ENTITY_NOT_FOUND,
+					String.format("未找到id为%s的订单", orderId));
+		}
+		po.confirm();
+		this.orderDao.update(po);
+	}
+
 }
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	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>
+	<parent>
+		<groupId>com.b2c.orders</groupId>
+		<artifactId>orders-parent</artifactId>
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>orders-rpc</artifactId>
+
+	<dependencies>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>orders-commons</artifactId>
+			<version>${project.parent.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.b2c.dtms</groupId>
+			<artifactId>dtms-client</artifactId>
+			<version>0.0.1-SNAPSHOT</version>
+		</dependency>
+	</dependencies>
+</project>
 \ No newline at end of file
+package com.b2c.orders.rpc;
+
+import com.b2c.dtms.client.domain.dto.request.DtmsProduceRequestDto;
+import com.b2c.orders.rpc.exception.DtmsRpcException;
+
+public interface DtmsRPCService {
+
+	void produceDtmsMessage(DtmsProduceRequestDto request) throws DtmsRpcException;
+}
+package com.b2c.orders.rpc.exception;
+
+import com.b2c.orders.commons.exceptions.ApplicationException;
+
+public class DtmsRpcException extends ApplicationException {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 6485664433664748337L;
+
+	public DtmsRpcException(int code, String message, Throwable cause, boolean enableSuppression,
+			boolean writableStackTrace) {
+		super(code, message, cause, enableSuppression, writableStackTrace);
+		// TODO Auto-generated constructor stub
+	}
+
+	public DtmsRpcException(int code, String message, Throwable cause) {
+		super(code, message, cause);
+		// TODO Auto-generated constructor stub
+	}
+
+	public DtmsRpcException(int code, String message) {
+		super(code, message);
+		// TODO Auto-generated constructor stub
+	}
+
+	public DtmsRpcException(int code, Throwable cause) {
+		super(code, cause);
+		// TODO Auto-generated constructor stub
+	}
+
+	public DtmsRpcException(int code) {
+		super(code);
+		// TODO Auto-generated constructor stub
+	}
+
+}
+package com.b2c.orders.rpc.impl;
+
+import com.b2c.dtms.client.DtmsClient;
+import com.b2c.dtms.client.domain.dto.request.DtmsProduceRequestDto;
+import com.b2c.dtms.client.domain.dto.response.DtmsResponseDto;
+import com.b2c.dtms.common.enums.dtms.HandleCode;
+import com.b2c.orders.commons.exceptions.ApplicationException;
+import com.b2c.orders.rpc.DtmsRPCService;
+import com.b2c.orders.rpc.exception.DtmsRpcException;
+
+public class DtmsRPCServiceBean implements DtmsRPCService {
+
+	private DtmsClient dtmsClient = new DtmsClient();
+
+	@Override
+	public void produceDtmsMessage(DtmsProduceRequestDto request) throws DtmsRpcException {
+		DtmsResponseDto response = this.dtmsClient.produceMessage(request);
+		String code = response.getCode();
+		if (code.equals(HandleCode.FAILED.code())) {
+			throw new DtmsRpcException(ApplicationException.DATA_EXCEPTION, "创建dtms消息失败");
+		}
+		if (code.equals(HandleCode.SUCCESS)) {
+			return;
+		}
+		throw new DtmsRpcException(ApplicationException.DATA_EXCEPTION, "未知的返回类型");
+	}
+
+}
@@ -21,9 +21,10 @@ public interface OrderService {
 	 *            订单id
 	 * @param sellerId
 	 *            商家id
-	 * @param totalPrice TODO
-	 * @throws OrderRepositoryException 
-	 * @throws OrderException 
+	 * @param totalPrice
+	 *            TODO
+	 * @throws OrderRepositoryException
+	 * @throws OrderException
 	 */
 	void take(Long orderId, Long sellerId, Long totalPrice) throws OrderException, OrderRepositoryException;
@@ -58,8 +59,8 @@ public interface OrderService {
 	 *            订单id
 	 * @param sellerId
 	 *            卖家id
-	 * @throws OrderException 
-	 * @throws OrderRepositoryException 
+	 * @throws OrderException
+	 * @throws OrderRepositoryException
 	 */
 	void sellerConfirm(Long orderId, Long sellerId) throws OrderRepositoryException, OrderException;
@@ -82,8 +83,8 @@ public interface OrderService {
 	 *            订单id
 	 * @param buyerId
 	 *            买家id
-	 * @throws OrderException 
-	 * @throws OrderRepositoryException 
+	 * @throws OrderException
+	 * @throws OrderRepositoryException
 	 */
 	void cancel(Long orderId, Long buyerId) throws OrderRepositoryException, OrderException;
@@ -96,4 +97,14 @@ public interface OrderService {
 	 * @throws OrderRepositoryException
 	 */
 	void timeout(Long orderId) throws OrderRepositoryException, OrderException;
+
+	/**
+	 * 商家24小时没有确认收款或者买家24小时没确认收货由dtms确认收款、收货（需求文档要求商家确认收款或者买家确认收货则订单完成）
+	 * 
+	 * @param orderId
+	 *            订单id
+	 * @throws OrderException 
+	 * @throws OrderRepositoryException 
+	 */
+	void dtmsConfirm(Long orderId) throws OrderRepositoryException, OrderException;
 }
@@ -59,4 +59,9 @@ public class OrderServiceBean implements OrderService {
 		this.orderManager.timeout(orderId);
 	}
+	@Override
+	public void dtmsConfirm(Long orderId) throws OrderRepositoryException, OrderException {
+		this.orderManager.dtmsConfirm(orderId);
+	}
+
 }
@@ -22,7 +22,10 @@
         <dependent-module archiveName="orders-client-1.1.0-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="diligrp-website-util-0.0.2-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/diligrp-website-util/diligrp-website-util">
+        <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">
             <dependency-type>uses</dependency-type>
         </dependent-module>
         <property name="context-root" value="b2c-orders-web"/>
@@ -15,5 +15,16 @@
 			<artifactId>orders-service</artifactId>
 			<version>${project.version}</version>
 		</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>
 	</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.service.ApiInfo;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spring.web.plugins.Docket;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
+
+@Configuration
+@EnableWebMvc
+@EnableSwagger2
+@ComponentScan(basePackages = "com.b2c.orders.web.restful")
+public class SwaggerConfiguration extends WebMvcConfigurerAdapter {
+
+	@Override
+	public void addResourceHandlers(ResourceHandlerRegistry registry) {
+		registry.addResourceHandler("swagger-ui.html").addResourceLocations("classpath:/META-INF/resources/");
+
+		registry.addResourceHandler("/webjars/**").addResourceLocations("classpath:/META-INF/resources/webjars/");
+
+	}
+
+	@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);
+		return docket;
+	}
+}
@@ -6,6 +6,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import com.b2c.dtms.common.enums.dtms.HandleCode;
+import com.b2c.dtms.domain.DtmsCallBackReturn;
 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;
@@ -21,7 +23,7 @@ import com.b2c.orders.commons.exceptions.ApplicationException;
 import com.b2c.orders.service.OrderService;
 @RestController
-@RequestMapping("/order/api")
+@RequestMapping("/api")
 public class OrderRestController {
 	@Autowired
@@ -88,8 +90,17 @@ public class OrderRestController {
 		return response;
 	}
-	public BaseResponseDto dtmsConfirm(@RequestBody DtmsConfirmRequestDto dto) {
-		throw new RuntimeException("这个方法还没实现");
+	@RequestMapping(value = "/dtms/confirm", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+	public DtmsCallBackReturn dtmsConfirm(@RequestBody DtmsConfirmRequestDto dto) {
+		DtmsCallBackReturn response = new DtmsCallBackReturn();
+		try {
+			this.orderService.dtmsConfirm(dto.getOrderId());
+			response.setCode(HandleCode.SUCCESS.code());
+		} catch (ApplicationException e) {
+			response.setCode(HandleCode.FAILED.code());
+			response.setMessage(e.getMessage());
+		}
+		return response;
 	}
 	@RequestMapping(value = "/seller/refuse", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@@ -119,8 +130,16 @@ public class OrderRestController {
 	}
 	@RequestMapping(value = "/dtms/timeout", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-	public BaseResponseDto dtmsTimeout(@RequestBody DtmsTimeoutRequestDto request) {
-		throw new RuntimeException("这个方法还没实现");
+	public DtmsCallBackReturn dtmsTimeout(@RequestBody DtmsTimeoutRequestDto request) {
+		DtmsCallBackReturn response = new DtmsCallBackReturn();
+		try {
+			this.orderService.timeout(request.getOrderId());
+			response.setCode(HandleCode.SUCCESS.code());
+		} catch (ApplicationException e) {
+			response.setCode(HandleCode.FAILED.code());
+			response.setMessage(e.getMessage());
+		}
+		return response;
 	}
 }
@@ -60,6 +60,12 @@
 	<dependencyManagement>
 		<dependencies>
+			<!-- https://mvnrepository.com/artifact/io.springfox/springfox-swagger2 -->
+			<dependency>
+				<groupId>io.springfox</groupId>
+				<artifactId>springfox-swagger2</artifactId>
+				<version>2.6.1</version>
+			</dependency>
 			<!-- https://mvnrepository.com/artifact/cglib/cglib -->
 			<dependency>
 				<groupId>cglib</groupId>
@@ -537,5 +543,6 @@
 		<module>orders-client</module>
 		<module>orders-service</module>
 		<module>orders-web</module>
+		<module>orders-rpc</module>
 	</modules>
 </project>
 \ No newline at end of file