调试订单流程

pom.xml

@@ -67,5 +67,10 @@
             <artifactId>framework-security</artifactId>
             <version>${framework-security.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-feign</artifactId>
+            <version>1.4.7.RELEASE</version>
+        </dependency>
     </dependencies>
-</project>
+</project>

src/main/java/com/chelvc/cloud/maintain/controller/InformController.java

@@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
 
 /**
  * 订单通知接口
@@ -72,8 +73,8 @@ public class InformController {
      *
      */
     @GetMapping("/merchant/new/inform")
-    public NewMerchantInformDTO getMerchantNewInform() {
-        return informService.getMerchantNewInform(SessionContextHolder.getId());
+    public NewMerchantInformDTO getMerchantNewInform(@NotNull(message = "商家标识不能为空") Long merchantId) {
+        return informService.getMerchantNewInform(merchantId);
     }
 
     /**
@@ -83,8 +84,8 @@ public class InformController {
      * @return 用户的订单列表
      */
     @GetMapping("/order/return/apply")
-    public Pagination<OmsOrderReturnApplyIdsDTO> listOrderReturnApply(@Valid Paging paging) {
-        return informService.listOrderReturnApply(SessionContextHolder.getId(), paging);
+    public Pagination<OmsOrderReturnApplyIdsDTO> listOrderReturnApply(@NotNull(message = "商家标识不能为空") Long merchantId, @Valid Paging paging) {
+        return informService.listOrderReturnApply(merchantId, paging);
     }
 
     /**

src/main/java/com/chelvc/cloud/maintain/controller/MerchantController.java

@@ -111,7 +111,7 @@ public class MerchantController {
         if (pageSize == null) {
             pageSize = 20;
         }
-        return this.balanceDetailService.queryByUserId(param, pageNum, pageSize, SessionContextHolder.getId(), 2);
+        return this.balanceDetailService.queryByMerchantId(param, pageNum, pageSize, 2);
     }
 
 

src/main/java/com/chelvc/cloud/maintain/controller/OmsOrderController.java

@@ -8,18 +8,14 @@ import com.chelvc.cloud.vehicle.api.param.OrderPagingParam;
 import com.chelvc.cloud.vehicle.api.service.IOmsOrderReturnApplyService;
 import com.chelvc.cloud.vehicle.api.service.IOmsOrderService;
 import com.chelvc.framework.base.annotation.ResponseWrapping;
-import com.chelvc.framework.base.context.SessionContextHolder;
 import com.chelvc.framework.common.model.Pagination;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
 import java.util.Map;
 
 /**
@@ -142,12 +138,15 @@ public class OmsOrderController {
     }
 
     /**
-     * 商家订单核验
+     *
+     *
      * @param orderId
+     * @param merchantId
      * @return
      */
-    @GetMapping("/order/verification")
-    public void orderVerification(@PathVariable("orderId") Long orderId) {
-        this.omsOrderService.orderVerification(orderId, SessionContextHolder.getId());
+    @GetMapping("/order/verification/{orderId}/{merchantId}")
+    public void orderVerification(@PathVariable("orderId") @NotNull(message = "订单错误") Long orderId,
+                                  @PathVariable("merchantId") @NotNull(message = "订单错误") Long merchantId) {
+        this.omsOrderService.orderVerification(orderId, merchantId);
     }
 }