feat:正元支付退款

pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/constant/third/HardCallbackRefundStatus.java

@@ -0,0 +1,16 @@
+package com.bsd.pjcloud.hard.api.constant.third;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@AllArgsConstructor
+@Getter
+public enum HardCallbackRefundStatus {
+    SUCCESS("0", "省平台认为流水交易完成，扣费成功"),
+    REPETITION("0001", "省平台则会每天定时重新发起扣费流程"),
+    ERROR("0002", "省平台则不再扣费，认为是坏账"),
+    ;
+    private final String type;
+
+    private final String description;
+}

pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/third/HardCallbackRefundDto.java

@@ -4,4 +4,12 @@ import lombok.Data;
 
 @Data
 public class HardCallbackRefundDto {
+
+    private Long orderId;
+
+    /**
+     * 智慧园区通刷服务平台冲正所产生的平台记录流水号
+     */
+    private String serialNum;
+
 }

pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/entity/order/HardOrderEntity.java

@@ -31,6 +31,12 @@ public class HardOrderEntity extends Model<HardOrderEntity> {
     @Schema(description="编号")
     private Long id;
 
+	/**
+	 * 订单编号
+	 */
+	@Schema(description="订单编号 目前正元正在使用")
+	private String orderNo;
+
 	/**
 	* 用户id
 	*/

pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/feign/RemoteHardThirdSelfZyService.java

@@ -6,6 +6,7 @@ import com.bsd.pjcloud.common.feign.annotation.NoToken;
 import com.bsd.pjcloud.hard.api.dto.third.HardCallbackPayDto;
 import com.bsd.pjcloud.hard.api.dto.third.HardCallbackRefundDto;
 import com.bsd.pjcloud.hard.api.vo.third.HardCallbackPayVo;
+import com.bsd.pjcloud.hard.api.vo.third.HardCallbackRefundVo;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -19,6 +20,6 @@ public interface RemoteHardThirdSelfZyService {
 
     @NoToken
     @PostMapping("/hard-third-callback/refund")
-    String refund(@RequestBody HardCallbackRefundDto dto);
+    R<HardCallbackRefundVo> refund(@RequestBody HardCallbackRefundDto dto);
 
 }

pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/third/HardCallbackPayVo.java

@@ -10,11 +10,11 @@ public class HardCallbackPayVo {
 
     private Long orderId;
 
-    private HardCallbackPayStatus code;
-
     private LocalDateTime payTime;
 
     private Long userId;
 
     private String username;
+
+    private HardCallbackPayStatus code;
 }

pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/third/HardCallbackRefundVo.java

@@ -0,0 +1,32 @@
+package com.bsd.pjcloud.hard.api.vo.third;
+
+import com.bsd.pjcloud.hard.api.constant.third.HardCallbackRefundStatus;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+public class HardCallbackRefundVo {
+
+    private Long userId;
+
+    private String username;
+
+    /**
+     * 退款id
+     */
+    private String refundId;
+
+    /**
+     * 订单编号
+     */
+    private String orderNo;
+
+    /**
+     * 退款时间
+     */
+    private LocalDateTime refundTime;
+
+    private HardCallbackRefundStatus code;
+
+}