钱包导出时间不对、第三方扣款

pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/constant/order/HardOrderTypeEnum.java

@@ -17,6 +17,7 @@ public enum HardOrderTypeEnum {
     RESERVE("2", "线上订餐"),
     FOREIGN_TICKET("3", "外来人员"),
     STRIDE_DEPT("4", "跨单位"),
+    ZY("5", "正元公务餐"),
     ;
     private final String type;
     private final String description;

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

@@ -0,0 +1,25 @@
+package com.bsd.pjcloud.hard.api.constant.third;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.bsd.pjcloud.hard.api.constant.HardPrintStatusEnum;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+
+@AllArgsConstructor
+@Getter
+public enum HardCallbackPayStatus {
+    SUCCESS("0", "省平台认为流水交易完成，扣费成功"),
+    REPETITION("0001", "省平台则会每天定时重新发起扣费流程"),
+    ERROR("0002", "省平台则不再扣费，认为是坏账"),
+    NOT_SUFFICIENT_FUNDS("0003", "余额不足返回，省平台将会禁止该账户后续交易权限"),
+    ;
+    private final String type;
+    private final String description;
+
+    public static HardCallbackPayStatus valueOfByType(String type) {
+        if (ObjectUtil.isEmpty(type)) return null;
+        return Arrays.stream(values()).filter(v -> ObjectUtil.equals(type, v.getType())).findFirst().get();
+    }
+}

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

@@ -0,0 +1,18 @@
+package com.bsd.pjcloud.hard.api.dto.third;
+
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+public class HardCallbackPayDto {
+
+    private Long userId;
+
+    private Integer payPrice;
+
+    private LocalDateTime payTime;
+
+    private String orderNo;
+
+}

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

@@ -0,0 +1,7 @@
+package com.bsd.pjcloud.hard.api.dto.third;
+
+import lombok.Data;
+
+@Data
+public class HardCallbackRefundDto {
+}

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

@@ -1,19 +1,24 @@
 package com.bsd.pjcloud.hard.api.feign;
 
 import com.bsd.pjcloud.common.core.constant.ServiceNameConstants;
+import com.bsd.pjcloud.common.core.util.R;
 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 org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 
 @FeignClient(contextId = "remoteHardThirdSelfZyService", value = ServiceNameConstants.HARDWARE_SERVICE)
 public interface RemoteHardThirdSelfZyService {
 
     @NoToken
     @PostMapping("/hard-third-callback/pay")
-    void pay();
+    R<HardCallbackPayVo> pay(@RequestBody HardCallbackPayDto dto);
 
     @NoToken
     @PostMapping("/hard-third-callback/refund")
-    void refund();
+    String refund(@RequestBody HardCallbackRefundDto dto);
 
 }

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

@@ -0,0 +1,20 @@
+package com.bsd.pjcloud.hard.api.vo.third;
+
+import com.bsd.pjcloud.hard.api.constant.third.HardCallbackPayStatus;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+public class HardCallbackPayVo {
+
+    private Long orderId;
+
+    private HardCallbackPayStatus code;
+
+    private LocalDateTime payTime;
+
+    private Long userId;
+
+    private String username;
+}