重复支付退款101 code判断

order-management/pom.xml

@@ -47,7 +47,7 @@
         <dependency>
             <artifactId>assortment-data-manager</artifactId>
             <groupId>com.freemud.sdk.api.assortment</groupId>
-            <version>4.3.0.RELEASE</version>
+            <version>5.5.31-RELEASE</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

order-management/src/main/java/cn/freemud/management/adapter/PaymentSdkAdapter.java

 package cn.freemud.management.adapter;
 
+import cn.freemud.management.entities.dto.request.pay.PayRefundRequestDto;
 import com.alibaba.fastjson.JSONObject;
 import com.freemud.application.sdk.api.ordercenter.entities.v1.OrderBeanV1;
 import com.freemud.application.sdk.api.ordercenter.request.OrderExtInfoDto;
-import com.freemud.application.sdk.api.paymentcenter.client.request.OrderRefundNewRequest;
 import com.freemud.sdk.api.assortment.order.request.order.MultiOrderRefundRequest;
 import lombok.SneakyThrows;
 import org.springframework.beans.factory.annotation.Value;
@@ -45,8 +45,8 @@ public class PaymentSdkAdapter {
         return refundRequestDTO;
     }
 
-    public OrderRefundNewRequest convert2OrderRefundNewRequest(OrderBeanV1 order, OrderExtInfoDto orderExtInfoDto) {
-        OrderRefundNewRequest refundRequest = new OrderRefundNewRequest();
+    public PayRefundRequestDto convert2OrderRefundNewRequest(OrderBeanV1 order, OrderExtInfoDto orderExtInfoDto) {
+        PayRefundRequestDto refundRequest = new PayRefundRequestDto();
         refundRequest.setPartnerId(order.getCompanyId());
         refundRequest.setVer(2);
         refundRequest.setStoreId(order.getShopId());

order-management/src/main/java/cn/freemud/management/annotations/LogIgnoreFeign.java

@@ -15,6 +15,8 @@ public @interface LogIgnoreFeign {
      */
     boolean printLog() default false;
 
+    String logMessage() default "";  // 输出方法名称，用以识别：Apollo临时开关temp-print-body-log-methods
+
     /**
      * printLog 设置成true的时候，可以排除哪些状态码的响应不用打印响应报文，只会打印状态码
      *

order-management/src/main/java/cn/freemud/management/entities/dto/request/pay/PayRefundRequestDto.java

+package cn.freemud.management.entities.dto.request.pay;
+
+import lombok.Data;
+
+import java.util.Map;
+
+@Data
+public class PayRefundRequestDto {
+
+    /**
+     * 接口版本，必须为2
+     */
+    private Integer ver;
+    /**
+     * 商户编号（由非码提供）
+     */
+    private String partnerId;
+    /**
+     * 退款交易序号
+     */
+    private String refundId;
+    /**
+     * 营业员编号（可以使用固定值）
+     */
+    private String operatorId;
+    /**
+     * 商家POS机编号（可以使用固定值）
+     */
+    private String stationId;
+    /**
+     * 商家门店号（在线支付需要提前定义）
+     */
+    private String storeId;
+    /**
+     * 终端交易序号
+     */
+    private String transId;
+    /**
+     * 业务日期
+     */
+    private String businessDate;
+    /**
+     * 客户端code
+     */
+    private Long clientCode;
+    /**
+     * 非码交易流水号
+     */
+    private String fmId;
+    /**
+     * 总金额
+     */
+    private Long totalAmount;
+    /**
+     * 退款金额
+     */
+    private Long refundAmount;
+    /**
+     * 退款原因描述
+     */
+    private String refundDesc;
+    /**
+     * 退款回调地址
+     */
+    private String notifyUrl;
+    /**
+     * 退款时分账规则
+     */
+    private String accountDivided;
+
+    /**
+     * 扩展字段，存放扩展信息
+     */
+    private Map<String, String> extendParams;
+
+}

order-management/src/main/java/cn/freemud/management/entities/dto/request/pay/PaymentQueryOrderRequestDto.java

+package cn.freemud.management.entities.dto.request.pay;
+
+import lombok.Data;
+
+@Data
+public class PaymentQueryOrderRequestDto {
+
+    private String transactionCode;
+    private String ver;
+    private String partnerId;
+    private String storeId;
+    private String frontTransId;
+    private String stationId;
+    private String operatorId;
+    private String transId;
+    private String businessDate;
+    private String clientCode;
+    private String fmId;
+    private String thirdPartTradeNo;
+
+}

order-management/src/main/java/cn/freemud/management/entities/dto/response/pay/PayRefundData.java

+package cn.freemud.management.entities.dto.response.pay;
+
+import lombok.Data;
+
+@Data
+public class PayRefundData {
+
+    private Integer resultCode;
+    private String resultMsg;
+    private String thirdPartTradeNo;
+    private String tradeNo;
+    private String refundTradeNo;
+    private String thirdPartRefundTradeNo;
+    private Long refundAmount;
+    private Long totalAmount;
+    private Integer refundStatus;
+
+}

order-management/src/main/java/cn/freemud/management/entities/dto/response/pay/PayRefundResponseDto.java

+package cn.freemud.management.entities.dto.response.pay;
+
+import lombok.Data;
+
+@Data
+public class PayRefundResponseDto {
+
+    private Integer code;
+    private String message;
+    private PayRefundData data;
+
+}

order-management/src/main/java/cn/freemud/management/entities/dto/response/pay/PaymentQueryOrderResponseDto.java

+package cn.freemud.management.entities.dto.response.pay;
+
+import lombok.Data;
+
+@Data
+public class PaymentQueryOrderResponseDto {
+
+    private String userId;
+    private Integer merchantCoupon;
+    private Integer platformCoupon;
+    private Integer vipAmount;
+    private Long amount;
+    private String transactionCode;
+    private String status;
+    private String payCode;
+
+}

order-management/src/main/java/cn/freemud/management/thirdparty/PaymentNewClient.java

+package cn.freemud.management.thirdparty;
+
+import cn.freemud.management.annotations.LogIgnoreFeign;
+import cn.freemud.management.entities.dto.request.pay.PayRefundRequestDto;
+import cn.freemud.management.entities.dto.request.pay.PaymentQueryOrderRequestDto;
+import cn.freemud.management.entities.dto.response.pay.PayRefundResponseDto;
+import cn.freemud.management.entities.dto.response.pay.PaymentQueryOrderResponseDto;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+/**
+ * All rights Reserved, Designed By www.freemud.cn
+ *
+ * @version V1.0
+ * @Title: PaymentNewClient
+ * @Package cn.freemud.service.thirdparty
+ * @Description:
+ * @author: ping1.wu
+ * @date: 2019/12/25 19:09
+ * @Copyright: 2019 www.freemud.cn Inc. All rights reserved.
+ * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
+ */
+@FeignClient(name = "payment-center-api",url="${payment.new.baseUrl:}")
+@RequestMapping(produces = {"application/json;charset=UTF-8"})
+public interface PaymentNewClient {
+
+    /**
+     * 关闭预支付订单
+     */
+//    @LogIgnoreFeign(logMessage="payClose")
+//    @PostMapping("paymentcenter/close")
+//    com.freemud.application.sdk.api.base.BaseResponse<PaymentCloseUnifiedOrderResponse> cancelNewUnifiedOrder(@RequestBody PaymentCloseUnifiedOrderRequest request);
+
+    /**
+     * 支付查询
+     */
+//    @LogIgnoreFeign(logMessage="payQuery")
+//    @PostMapping("paymentcenter/query")
+//    com.freemud.application.sdk.api.base.BaseResponse<PaymentQueryResponseDto> payQuery(@RequestBody PaymentQueryRequestDto request);
+
+    /**
+     * 支付退款查询
+     */
+    @LogIgnoreFeign(logMessage="payQueryOrder")
+    @PostMapping("paymentcenter/queryOrder")
+    com.freemud.application.sdk.api.base.BaseResponse<PaymentQueryOrderResponseDto> payQueryOrder(@RequestBody PaymentQueryOrderRequestDto request);
+
+    /**
+     * 现金支付退款接口
+     */
+    @LogIgnoreFeign(logMessage="payRefund")
+    @PostMapping("paymentcenter/refund")
+    com.freemud.application.sdk.api.base.BaseResponse<PayRefundResponseDto> payRefund(@RequestBody PayRefundRequestDto request);
+}