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/request/CompleteRequest.java

@@ -10,13 +10,10 @@ import javax.validation.constraints.NotNull;
 @Getter
 public class CompleteRequest {
     /**
-     * 订单号
+     * 三方订单号
      */
     @NotEmpty(message = "thirdOrderCode 不能为空")
     private String thirdOrderCode;
-    @NotEmpty(message = "商户id不能为空")
-    //商户号
-    private String partnerId;
 
     /**
      * 下单渠道
@@ -24,6 +21,10 @@ public class CompleteRequest {
      */
     @NotNull(message = "orderClient 不能为空")
     private String orderClient;
+    @NotEmpty(message = "商户id不能为空")
+    //商户号
+    private String partnerId;
+
 
     /***
      * posid

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

@@ -4,15 +4,25 @@ import lombok.Getter;
 import lombok.Setter;
 import org.hibernate.validator.constraints.NotEmpty;
 
+import javax.validation.constraints.NotNull;
+
 
 @Getter
 @Setter
 public class PayQueryRequest {
+
         /**
-         * 订单号
+         * 三方订单号
          */
-        @NotEmpty(message = "订单号不能为空")
-        private String orderCode;
+        @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;
         /***
          * posid
          */
@@ -26,6 +36,4 @@ public class PayQueryRequest {
         @NotEmpty(message = "门店id不能为空")
         private String storeId;
 
-
-
 }

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

@@ -4,17 +4,26 @@ import lombok.Getter;
 import lombok.Setter;
 import org.hibernate.validator.constraints.NotEmpty;
 
+import javax.validation.constraints.NotNull;
+
 @Setter
 @Getter
 public class RefundRequest {
 
+
     /**
-     * 订单号
+     * 三方订单号
      */
-    @NotEmpty(message = "订单号不能为空")
-    private String orderCode;
+    @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;
+    /**
      * userId
      */
     @NotEmpty(message = "用户id不能为空")

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

@@ -170,9 +170,9 @@ public class FuYouOrderService {
      */
     public BaseResponse refund(RefundRequest req) {
         // 1.退款
-        QueryByCodeResponse orderInfo = orderSdkService.getOrderInfo(req.getOrderCode(), 0, LogThreadLocal.getTrackingNo());
+        QueryByCodeResponse orderInfo = orderSdkService.getOrderInfo(req.getOrderClient(), null,req.getThirdOrderCode(),null, LogThreadLocal.getTrackingNo());
         if (ObjectUtils.notEqual(ResponseConstant.SUCCESS_RESPONSE_CODE, orderInfo.getCode())) {
-           return ResponseUtil.error(orderInfo.getCode(),"订单号不存在");
+           return ResponseUtil.error(orderInfo.getCode(),orderInfo.getMessage());
         }
         final OrderInfoReqs order = orderInfo.getResult();
         if (ObjectUtils.notEqual(order.getPayState(), PayStatus.HAVE_PAID.getCode())) {

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

@@ -7,6 +7,7 @@ import cn.freemud.fuyou.controller.request.DiscountRequest;
 import cn.freemud.fuyou.controller.request.PayQueryRequest;
 import cn.freemud.fuyou.feign.ScoreFeignClient;
 import cn.freemud.fuyou.service.processor.EventProcessorRegister;
+import cn.freemud.utils.ResponseUtil;
 import com.alibaba.fastjson.JSON;
 import com.freemud.application.sdk.api.log.LogThreadLocal;
 import com.freemud.application.sdk.api.ordercenter.constant.ResponseConstant;
@@ -77,19 +78,7 @@ public class PaymentService {
         return eventProcessorRegister.getEventProcessor(payChannelEnum.getCode()).process(discountRequest);
     }
 
-    /**
-     * 获取订详情
-     *
-     * @param orderCOde 订单号
-     * @return
-     */
-    protected OrderInfoReqs getOrder(String orderCOde) {
-        QueryByCodeResponse orderInfo = orderSdkService.getOrderInfo(orderCOde, 0, LogThreadLocal.getTrackingNo());
-        if (ObjectUtils.notEqual(ResponseConstant.SUCCESS_RESPONSE_CODE, orderInfo.getCode())) {
-            throw new RuntimeException("订单号不存在");
-        }
-        return orderInfo.getResult();
-    }
+
 
     /**
      * 查询支付结果，微信，支付宝，svc
@@ -98,6 +87,13 @@ public class PaymentService {
      * @return
      */
     public BaseResponse paymentQuery(PayQueryRequest request) {
+
+        QueryByCodeResponse queryByCodeResponse  = orderSdkService.getOrderInfo(request.getOrderClient(), null,request.getThirdOrderCode(),null, LogThreadLocal.getTrackingNo());
+        if (ObjectUtils.notEqual(ResponseConstant.SUCCESS_RESPONSE_CODE, queryByCodeResponse.getCode())) {
+            throw  new RuntimeException(queryByCodeResponse.getMessage());
+        }
+        OrderInfoReqs order = queryByCodeResponse.getResult();
+
         log.info("paymentQuery:request:{}", JSON.toJSONString(request));
         BaseResponse baseResponse = new BaseResponse();
         baseResponse.setCode(ResponseConstant.SUCCESS_RESPONSE_CODE);
@@ -105,8 +101,8 @@ public class PaymentService {
         channelRequest.setPartnerId(request.getPartnerId());
         channelRequest.setVer("2");
         channelRequest.setStoreId(request.getStoreId());
-        channelRequest.setTransId(request.getOrderCode());
-        channelRequest.setFrontTransId(request.getOrderCode());
+        channelRequest.setTransId(order.getOrderCode());
+        channelRequest.setFrontTransId(order.getOrderCode());
         channelRequest.setStationId(request.getPosId());
         com.freemud.application.sdk.api.base.BaseResponse<PaymentQueryOrderResponse> query = paymentNewService.queryOrder(channelRequest, LogThreadLocal.getTrackingNo());
         baseResponse.setCode(query.getCode());
@@ -115,10 +111,10 @@ public class PaymentService {
             log.error("scoreFeignClient.query,error:{},入参:{}", JSON.toJSONString(query), JSON.toJSONString(channelRequest));
             return baseResponse;
         }
-        OrderInfoReqs order = getOrder(request.getOrderCode());
+
         //final PayChannelEnum payChannelEnum = getPayChannelEnum(request.getPayChannel());
         PaySuccessReq req = new PaySuccessReq();
-        req.setOrderCode(request.getOrderCode());
+        req.setOrderCode(order.getOrderCode());
         req.setActualPayAmount(String.valueOf(query.getData().getAmount()));
         req.setPayChannel(query.getData().getPayCode());
         req.setPayRequestNo(query.getData().getTransactionCode());