Merge branch 'master' of http://git3.nong12.com/xtrade/order-service.git

zhangxing
2 parents a18b1835 7ca0016e
Showing 4 changed files with 75 additions and 78 deletions
src/main/java/com/diligrp/xtrade/order/controllor/OrderApiController.java
src/main/java/com/diligrp/xtrade/product/controllor/MerchantController.java
src/main/java/com/diligrp/xtrade/product/domain/dto/MerchantResponseDto.java
src/main/java/com/diligrp/xtrade/product/repository/MerchantRepository.java
-package com.diligrp.xtrade.order.controllor;
-
-import javax.annotation.Resource;
-
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.diligrp.xtrade.order.domain.dto.OrderCreateRequestDto;
-import com.diligrp.xtrade.order.domain.dto.OrderRequestDto;
-import com.diligrp.xtrade.order.domain.dto.OrderResponseDto;
-import com.diligrp.xtrade.order.service.OrderService;
-import com.diligrp.xtrade.shared.domain.Message;
-import com.diligrp.xtrade.shared.domain.Page;
-
-/**
- * 订单相关接口实现
- * @author zhangxing
- * @Date 2020/04/13
- */
-@RestController
-@RequestMapping(value = "/sapi/order")
-public class OrderApiController {
-	
-	@Resource 
-	private OrderService orderservice;
-	
-	/**
-	 * 订单创建接口
-	 */
-	@RequestMapping(value = "/createOrder",method = {RequestMethod.POST})
-	public Message<Boolean> createOrder(@RequestBody @Validated OrderCreateRequestDto orderCreateRequestDto) {
-		orderservice.createOrder(orderCreateRequestDto);
-		return Message.success(Boolean.TRUE);
-	}
-	
-	/**
-	 * 订单列表接口
-	 */
-	@RequestMapping(value = "/listOrders")
-	public Message<Page<OrderResponseDto>> listOrders(@RequestBody OrderRequestDto orderQueryRequestDto) {
-		return Message.success(orderservice.orderLists(orderQueryRequestDto));
-	}
-	
-	/**
-	 * 订单详情
-	 */
-	@RequestMapping(value = "/orderDetail")
-	public Message<OrderResponseDto> orderDetail(@RequestBody @Validated OrderRequestDto orderQueryRequestDto) {
-		return Message.success(orderservice.orderDetail(orderQueryRequestDto.getOrderId()));
-	}
-	
-	/**
-	 * 订单详情
-	 */
-	@RequestMapping(value = "/updateBuyer")
-	public Message<Boolean> updateBuyer(@RequestBody @Validated OrderRequestDto orderQueryRequestDto) {
-		orderservice.updateBuyer(orderQueryRequestDto);
-		return Message.success(Boolean.TRUE);
-	}
-}
+package com.diligrp.xtrade.order.controllor;
+
+import javax.annotation.Resource;
+
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.diligrp.xtrade.order.domain.dto.OrderCreateRequestDto;
+import com.diligrp.xtrade.order.domain.dto.OrderRequestDto;
+import com.diligrp.xtrade.order.domain.dto.OrderResponseDto;
+import com.diligrp.xtrade.order.service.OrderService;
+import com.diligrp.xtrade.shared.domain.Message;
+import com.diligrp.xtrade.shared.domain.Page;
+
+/**
+ * 订单相关接口实现
+ * @author zhangxing
+ * @Date 2020/04/13
+ */
+@RestController
+@RequestMapping(value = "/sapi/order")
+public class OrderApiController {
+	
+	@Resource 
+	private OrderService orderservice;
+	
+	/**
+	 * 订单创建接口
+	 */
+	@RequestMapping(value = "/createOrder",method = {RequestMethod.POST})
+	public Message<Boolean> createOrder(@RequestBody @Validated OrderCreateRequestDto orderCreateRequestDto) {
+		orderservice.createOrder(orderCreateRequestDto);
+		return Message.success(Boolean.TRUE);
+	}
+	
+	/**
+	 * 订单列表接口
+	 */
+	@RequestMapping(value = "/listOrders")
+	public Message<Page<OrderResponseDto>> listOrders(@RequestBody OrderRequestDto orderQueryRequestDto) {
+		return Message.success(orderservice.orderLists(orderQueryRequestDto));
+	}
+	
+	/**
+	 * 订单详情
+	 */
+	@RequestMapping(value = "/orderDetail")
+	public Message<OrderResponseDto> orderDetail(@RequestBody @Validated OrderRequestDto orderQueryRequestDto) {
+		return Message.success(orderservice.orderDetail(orderQueryRequestDto.getOrderId()));
+	}
+	
+	/**
+	 * 订单详情
+	 */
+	@RequestMapping(value = "/updateBuyer")
+	public Message<Boolean> updateBuyer(@RequestBody @Validated OrderRequestDto orderQueryRequestDto) {
+		orderservice.updateBuyer(orderQueryRequestDto);
+		return Message.success(Boolean.TRUE);
+	}
+}
@@ -25,7 +25,7 @@ public class MerchantController {
     private MerchantService merchantService;
  
     /**
-    * 新建市场
+    * 新建商户
     * @author miaoguoxin
     * @date 2020/4/22
     */
@@ -9,31 +9,31 @@ import java.io.Serializable;
  * @Date: 2020/4/21 16:04
  */
 public class MerchantResponseDto implements Serializable {
-    //商户id
+    /**商户id*/
     private Long merId;
  
-    //商户名称
+    /**商户名称*/
     private String merName;
  
-    //园区编码
+   /** 园区编码*/
     private String marketId;
  
     /**类型 */
     private AccountType type;
  
-    //主账号
+    /**主账号*/
     private Long accountId;
  
-    //账户名称
+    /** 账户名称*/
     private String accountName;
  
-    //商户状态
+    /** 商户状态*/
     private Integer status;
  
-    //市场编码
+    /**市场编码*/
     private String marketCode;
  
-    //描述
+    /**描述*/
     private String description;
  
     public Long getMerId() {
 package com.diligrp.xtrade.product.repository;
  
 import com.diligrp.xtrade.product.dao.MerchantDao;
-import com.diligrp.xtrade.product.dao.ShopDao;
-import com.diligrp.xtrade.product.domain.emuns.AccountType;
 import com.diligrp.xtrade.product.domain.emuns.IKeyGeneratorKeys;
 import com.diligrp.xtrade.product.domain.entity.MerchantDo;
-import com.diligrp.xtrade.product.domain.entity.ShopDo;
 import com.diligrp.xtrade.shared.sequence.IKeyGenerator;
 import com.diligrp.xtrade.shared.sequence.KeyGeneratorManager;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
  
-import java.time.LocalDateTime;
 import java.util.List;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
  
 /**
  * @Auther: miaoguoxin
@@ -23,8 +21,6 @@ public class MerchantRepository implements IMerchantRepository {
     @Autowired
     private MerchantDao merchantDao;
     @Autowired
-    private ShopDao shopDao;
-    @Autowired
     private KeyGeneratorManager keyGeneratorManager;
  
     @Override
@@ -49,4 +45,5 @@ public class MerchantRepository implements IMerchantRepository {
     public void update(MerchantDo merchantDo) {
         merchantDao.update(merchantDo);
     }
+
 }