Merge branch '20200827-1000' of gitlab.freemud.com:order-group-application/order-group into qa

order-application-service/src/main/java/cn/freemud/fuyou/controller/FuYouOrderController.java

@@ -3,6 +3,7 @@ package cn.freemud.fuyou.controller;
 import cn.freemud.base.entity.BaseResponse;
 import cn.freemud.fuyou.controller.request.CompleteRequest;
 import cn.freemud.fuyou.controller.request.CreateOrderRequest;
+import cn.freemud.fuyou.controller.request.OrderDetailRequest;
 import cn.freemud.fuyou.controller.request.RefundRequest;
 import cn.freemud.fuyou.service.FuYouOrderService;
 import com.freemud.application.sdk.api.log.ApiAnnotation;
@@ -43,10 +44,22 @@ public class FuYouOrderController {
      */
     @ApiAnnotation(logMessage = "/refund")
     @PostMapping("/refund")
-    public BaseResponse refundOperation(@Validated @LogParams @RequestBody  RefundRequest request) {
+    public BaseResponse refund(@Validated @LogParams @RequestBody  RefundRequest request) {
         return fuyouOrderService.refund(request);
     }
 
+
+    /**
+     * 查询订单:
+     * @param request
+     * @return
+     */
+    @ApiAnnotation(logMessage = "/detail")
+    @PostMapping("/detail")
+    public BaseResponse detail(@Validated @LogParams @RequestBody OrderDetailRequest request) {
+        return fuyouOrderService.detail(request);
+    }
+
     /**
      * 订单完成
      * @param request

order-application-service/src/main/java/cn/freemud/fuyou/controller/request/BaseRequest.java

@@ -13,48 +13,32 @@ import java.util.List;
 @Setter
 public class BaseRequest {
 
-    /**
-     * 订单号
-     */
-    //@NotEmpty(message = "订单号不能为空")
-    //private String orderCode;
-
     @NotEmpty(message = "thirdOrderCode 不能为空")
     private String thirdOrderCode;
 
-    /**
-     * userId
-     */
     @NotEmpty(message = "用户id不能为空")
     private String userId;
 
-    /***
-     * posid
-     */
     @NotEmpty(message = "posCode不能为空")
     private String posCode;
 
     @NotEmpty(message = "商户id不能为空")
-    //商户号
     private String partnerId;
 
     @NotEmpty(message = "门店id不能为空")
     private String storeId;
 
-
     /**
      * 支付渠道
      * 1. 微信，2.支付宝，3.现金 4.svc，5.积分,6优惠券
      */
     @NotNull(message = "支付渠道不能为空")
     private Integer payChannel;
-
     /**
      * 支付金额  单位:分
      */
     @NotNull(message = "支付金额不能为空")
     private Long payAmount;
-
     /***
      * 支付码，微信，支付宝，svc
      */
@@ -63,28 +47,21 @@ public class BaseRequest {
      * 操作人
      */
     private String operator;
-
     /**
      * 商品信息
      */
     private List<OrderItemCreateReq> orderItemList;
-
-
     /***
      * 扩展字段
      * 支付流水号 ，用来查询支付信息,支付接口返回的无需入参
      */
     private String fmId;
-
-
     /**
      * 下单渠道
      * * 1:自营微信小程序 2:SAAS,i应用 3:自营支付宝小程序 4:自营H5 5:自营安卓APP 6:自营苹果APP 7:自营PC-WEB 8:饿了么 9:饿百 10:京东 11:美团外卖 12:自营APP 13:i应用会员 14:i应用订货 15:POS
      */
     @NotNull(message = "orderClient 不能为空")
     private String orderClient;
-
-
     /**
      *  根据 thirdOrderCode 查询的数据
      */

order-application-service/src/main/java/cn/freemud/fuyou/controller/request/CompleteRequest.java

@@ -14,21 +14,16 @@ public class CompleteRequest {
      */
     @NotEmpty(message = "thirdOrderCode 不能为空")
     private String thirdOrderCode;
-
     /**
      * 下单渠道
      * * 1:自营微信小程序 2:SAAS,i应用 3:自营支付宝小程序 4:自营H5 5:自营安卓APP 6:自营苹果APP 7:自营PC-WEB 8:饿了么 9:饿百 10:京东 11:美团外卖 12:自营APP 13:i应用会员 14:i应用订货 15:POS
      */
     @NotNull(message = "orderClient 不能为空")
     private String orderClient;
+
     @NotEmpty(message = "商户id不能为空")
-    //商户号
     private String partnerId;
 
-
-    /***
-     * posid
-     */
     @NotEmpty(message = "posCode不能为空")
     private String posCode;
 

order-application-service/src/main/java/cn/freemud/fuyou/controller/request/DiscountRequest.java

@@ -10,26 +10,18 @@ import lombok.Setter;
 public class DiscountRequest extends BaseRequest {
 
     /**
-     *优惠券
+     * 优惠券
      */
     private String coupon;
-
     /**
-     *优惠券
+     * 优惠券类型
      * {@link OldOrderAccountType}
      */
     private String couponType;
-
-
-
-
     /**
      * 积分
      */
     private Long score;
 
 
-
-
-
 }

order-application-service/src/main/java/cn/freemud/fuyou/controller/request/OrderDetailRequest.java

+package cn.freemud.fuyou.controller.request;
+
+import lombok.Getter;
+import lombok.Setter;
+import org.hibernate.validator.constraints.NotEmpty;
+
+import javax.validation.constraints.NotNull;
+
+@Setter
+@Getter
+public class OrderDetailRequest {
+
+    /**
+     * 三方订单号
+     */
+    @NotEmpty(message = "thirdOrderCode 不能为空")
+    private String thirdOrderCode;
+    /**
+     * 下单渠道
+     * * 1:自营微信小程序 2:SAAS,i应用 3:自营支付宝小程序 4:自营H5 5:自营安卓APP 6:自营苹果APP 7:自营PC-WEB 8:饿了么 9:饿百 10:京东 11:美团外卖 12:自营APP 13:i应用会员 14:i应用订货 15:POS
+     */
+    @NotNull(message = "orderClient 不能为空")
+    private String orderClient;
+}

order-application-service/src/main/java/cn/freemud/fuyou/controller/request/RefundRequest.java

@@ -10,7 +10,6 @@ import javax.validation.constraints.NotNull;
 @Getter
 public class RefundRequest {
 
-
     /**
      * 三方订单号
      */
@@ -26,16 +25,16 @@ public class RefundRequest {
     /**
      * userId
      */
-    @NotEmpty(message = "用户id不能为空")
+    //@NotEmpty(message = "用户id不能为空")
     private String userId;
 
     /***
-     * posid
+     * osCode
      */
     @NotEmpty(message = "posCode不能为空")
     private String posCode;
 
-    @NotEmpty(message = "用户id不能为空")
+    @NotEmpty(message = "门店id不能为空")
     private String storeId;
 
     /**

order-application-service/src/main/java/cn/freemud/fuyou/service/FuYouOrderService.java

@@ -159,6 +159,21 @@ public class FuYouOrderService {
         return ResponseUtil.success(orderResponse);
     }
 
+
+    /**
+     * 查询订单详情
+     * @param request
+     * @return
+     */
+    public BaseResponse detail(OrderDetailRequest request){
+        QueryByCodeResponse orderInfo = orderSdkService.getOrderInfo(request.getOrderClient(), null,
+                request.getThirdOrderCode(),null, LogThreadLocal.getTrackingNo());
+        if (ObjectUtils.notEqual(ResponseConstant.SUCCESS_RESPONSE_CODE, orderInfo.getCode())) {
+            return ResponseUtil.error(orderInfo.getCode(),orderInfo.getMessage());
+        }
+        return ResponseUtil.success(orderInfo.getResult());
+    }
+
     /**
      * 退款
      * TODO  需要分布式事物处理