2
0

fix: 支付模块调整和对接

This commit is contained in:
caiyuchao
2025-01-14 15:47:51 +08:00
parent 3a289f9f2e
commit 79a420f07c
90 changed files with 5075 additions and 2604 deletions

View File

@@ -15,6 +15,7 @@ import org.wfc.common.core.domain.R;
import org.wfc.common.core.web.page.TableDataInfo;
import org.wfc.user.api.domain.UUser;
import org.wfc.user.api.domain.bo.UClientBo;
import org.wfc.user.api.domain.vo.UOrderVo;
import org.wfc.user.api.factory.RemoteUUserFallbackFactory;
/**
@@ -84,4 +85,10 @@ public interface RemoteUUserService
*/
@PostMapping("/client/recordClientUser")
public R<Boolean> recordClientUser(@RequestBody UClientBo clientBo);
@PostMapping("/order/paySuccess/{id}")
public R<Boolean> paySuccess(@PathVariable("id") Long id, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
@GetMapping(value = "/order/{id}")
public R<UOrderVo> getOrderById(@PathVariable("id") Long id);
}

View File

@@ -0,0 +1,40 @@
package org.wfc.user.api.domain.vo;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
/**
* @author: cyc
* @since: 2025-01-13
*/
@Data
public class UOrderVo {
private Long userId;
private Long packageId;
private Long paymentId;
private String orderNo;
private Integer type;
private BigDecimal orderAmount;
private Integer status;
private Long id;
private Boolean delFlag;
private Long createBy;
private Date createTime;
private Long updateBy;
private Date updateTime;
}

View File

@@ -11,6 +11,7 @@ import org.wfc.common.core.web.page.TableDataInfo;
import org.wfc.user.api.RemoteUUserService;
import org.wfc.user.api.domain.UUser;
import org.wfc.user.api.domain.bo.UClientBo;
import org.wfc.user.api.domain.vo.UOrderVo;
import java.util.Collections;
@@ -71,6 +72,16 @@ public class RemoteUUserFallbackFactory implements FallbackFactory<RemoteUUserSe
public R<Boolean> recordClientUser(UClientBo clientBo) {
return R.fail("根据设备mac保存或更新设备信息失败:" + throwable.getMessage());
}
@Override
public R<Boolean> paySuccess(Long id, String source) {
return R.fail("pay callback error:" + throwable.getMessage());
}
@Override
public R<UOrderVo> getOrderById(Long id) {
return R.fail("get order error:" + throwable.getMessage());
}
};
}
}