提交 申请退款开发代码

Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

@@ -2145,6 +2145,21 @@ public class OrderAdapter {
         return orderPayRefundRequest;
     }
 
+    public com.freemud.sdk.api.assortment.payment.request.OrderRefundRequest getOrderPayRefundRequest(OrderInfoReqs orderBean, Long refundId, String fatherOrderId) {
+        com.freemud.sdk.api.assortment.payment.request.OrderRefundRequest orderPayRefundRequest = new com.freemud.sdk.api.assortment.payment.request.OrderRefundRequest();
+        orderPayRefundRequest.setOrgTransId(fatherOrderId);
+        orderPayRefundRequest.setPartnerId(orderBean.getPartnerId());
+        orderPayRefundRequest.setStoreId(orderBean.getStoreId());
+        orderPayRefundRequest.setOrgPayFmId(orderBean.getPayRequestNo());
+        orderPayRefundRequest.setRefundAmount(orderBean.getActualPayAmount().longValue());
+        orderPayRefundRequest.setRefundId(refundId);
+        OrderExtInfoDto orderExtInfoDTO = gson.fromJson(orderBean.getExtInfo(), OrderExtInfoDto.class);
+        orderPayRefundRequest.setOpenid(orderExtInfoDTO != null ? orderExtInfoDTO.getOpenid() : "");
+        orderPayRefundRequest.setAppId(orderExtInfoDTO != null ? orderExtInfoDTO.getAppid() : "");
+        orderPayRefundRequest.setNotifyUrl(refundNotifyCallback);
+        return orderPayRefundRequest;
+    }
+
     public MultiOrderRefundRequest getMultiOrderPayRefundRequest(OrderBeanV1 orderBean, Long refundId) {
         MultiOrderRefundRequest multiQueryRequest = new MultiOrderRefundRequest();
         multiQueryRequest.setStationId("1");

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

@@ -246,6 +246,7 @@ public class OrderController {
      */
     @ApiAnnotation(logMessage = "virtualGoodsRefund")
     @PostMapping("/virtualGoodsRefund")
+    @Deprecated
     public BaseResponse virtualGoodsRefund(@Validated @LogParams @RequestBody OrderRefundVo orderRefundVo) {
         return orderservice.virtualGoodsRefund(orderRefundVo);
     }

order-application-service/src/main/java/cn/freemud/enums/BaseOrderStatus.java

 package cn.freemud.enums;
 
+import java.util.Objects;
+
 /**
  * @author : xh.Z
  * @email : fisherman0510@163.com
@@ -18,29 +20,39 @@ package cn.freemud.enums;
  * @see OrderStatus
  */
 public enum BaseOrderStatus {
-    WAIT_PAY(1, "待支付", "To be paid"),
-    TAKE_ORDER(2, "下单", "place an order"),
-    RECEIPT(3, "接单", "Receiving orders"),
-    COMPLETE_MAKE(4, "制作完成", "Complete Make"),
-    DISTRIBUTION(5, "配送中", "In delivery"),
-    COMPLETE(6, "已完成", "Complete"),
-    CALCEL(7, "已关闭(退款完成)", "Cancel");
+    WAIT_PAY(1, "待支付", "To be paid", 2),
+    TAKE_ORDER(2, "下单", "place an order", 1),
+    RECEIPT(3, "接单", "Receiving orders", 3),
+    COMPLETE_MAKE(4, "制作完成", "Complete Make", 31),
+    DISTRIBUTION(5, "配送中", "In delivery", 4),
+    COMPLETE(6, "已完成", "Complete", 5),
+    CALCEL(7, "已关闭(退款完成)", "Cancel", 6);
 
-    private Integer code;
+    // 订单数据库记录的状态
+    private Integer baseStatus;
     private String desc;
     private String descEn;
+    // 老业务订单的状态
+    private Integer oldStatus;
 
-    BaseOrderStatus(Integer code, String desc, String descEn) {
-        this.code = code;
+    BaseOrderStatus(Integer code, String desc, String descEn, Integer oldStatus) {
+        this.baseStatus = code;
         this.desc = desc;
         this.descEn = descEn;
+        this.oldStatus = oldStatus;
+    }
+
+    public static Integer getOldStatus(Integer baseStatus) {
+        BaseOrderStatus byCode = getByCode(baseStatus);
+        Objects.requireNonNull(byCode, "新老订单类型转化错误,入参:" + baseStatus);
+        return byCode.getOldStatus();
     }
 
     public static Integer[] getAllCodes() {
         Integer[] codeArray = new Integer[values().length];
         int i = 0;
         for (BaseOrderStatus orderStatus : values()) {
-            codeArray[i] = orderStatus.getCode();
+            codeArray[i] = orderStatus.getBaseStatus();
             i++;
         }
         return codeArray;
@@ -51,7 +63,7 @@ public enum BaseOrderStatus {
             return null;
         }
         for (BaseOrderStatus orderStatus : values()) {
-            if (orderStatus.getCode().equals(code)) {
+            if (orderStatus.getBaseStatus().equals(code)) {
                 return orderStatus;
             }
         }
@@ -66,12 +78,12 @@ public enum BaseOrderStatus {
         this.descEn = descEn;
     }
 
-    public Integer getCode() {
-        return code;
+    public Integer getBaseStatus() {
+        return baseStatus;
     }
 
-    public void setCode(Integer code) {
-        this.code = code;
+    public void setBaseStatus(Integer baseStatus) {
+        this.baseStatus = baseStatus;
     }
 
     public String getDesc() {
@@ -81,4 +93,12 @@ public enum BaseOrderStatus {
     public void setDesc(String desc) {
         this.desc = desc;
     }
+
+    public Integer getOldStatus() {
+        return oldStatus;
+    }
+
+    public void setOldStatus(Integer oldStatus) {
+        this.oldStatus = oldStatus;
+    }
 }

order-application-service/src/main/java/cn/freemud/service/Orderservice.java

@@ -86,7 +86,9 @@ public interface Orderservice extends OrderFactoryService{
 
     /**
      * 订单申请退款
+     * @see Orderservice#couponOrderRefund(cn.freemud.entities.vo.OrderRefundVo)
      */
+    @Deprecated
     BaseResponse virtualGoodsRefund(OrderRefundVo orderRefundVo);
 
     /**