|
|
@@ -255,6 +255,7 @@ public class ChinaumsSenselessPayService extends SuperService {
|
|
|
/**
|
|
|
* 支付
|
|
|
*/
|
|
|
+ @SneakyThrows
|
|
|
public ResultContent senselessPay(String projectOid, String oid, String userId, BigDecimal total, String orderNo, String remark) {
|
|
|
String projectAccountName = orgPayAccountService.queryOgPayAccount(projectOid, PaymentType.UnionFrictionlessPay);
|
|
|
//获取银联支付产品账户及需要签约的商户号
|
|
|
@@ -321,6 +322,7 @@ public class ChinaumsSenselessPayService extends SuperService {
|
|
|
return ResultContent.buildFail(bodyMap.get("respDesc").toString());
|
|
|
}
|
|
|
|
|
|
+ @SneakyThrows
|
|
|
public ResultContent refund(String projectOid, String oid, String userId, BigDecimal total, String orderNo, String refundOrderNo, String remark) {
|
|
|
|
|
|
String projectAccountName = orgPayAccountService.queryOgPayAccount(projectOid, PaymentType.UnionFrictionlessPay);
|
|
|
@@ -372,13 +374,14 @@ public class ChinaumsSenselessPayService extends SuperService {
|
|
|
shareOrder.setShareOrderNo(shareOrderNo);
|
|
|
shareOrder.setOriShareOrderNo(shareOrder.getShareOrderNo());
|
|
|
shareOrderDao.save(refundShareOrder);
|
|
|
- request.setSysSource(JsonUtil.toJson(Map.of("userId", userId, "oid", oid, "projectOid", projectOid, "orderNo", orderNo)));
|
|
|
+ request.setSrcReserve(JsonUtil.toJson(Map.of("userId", userId, "oid", oid, "projectOid", projectOid, "orderNo", orderNo)));
|
|
|
payProductParameter.setMeta(BeanUtil.bean2Map(request));
|
|
|
com.github.microservice.pay.client.ret.ResultContent<Object> refundResultContent = senselessPayService.refund(payProductParameter);
|
|
|
if (!refundResultContent.getState().equals(ResultState.Success)){
|
|
|
return ResultContent.buildFail("请求失败");
|
|
|
}
|
|
|
- Map<String, Object> bodyMap = BeanUtil.bean2Map(refundResultContent.getContent());
|
|
|
+ Map bodyMap = JsonUtil.toObject(JsonUtil.toJson(refundResultContent.getContent()), Map.class);
|
|
|
+
|
|
|
if (bodyMap.get("respCode").equals("0000")){
|
|
|
return ResultContent.buildContent(refundResultContent.getContent());
|
|
|
}
|