记得上下班打卡 | git大法好，push需谨慎

Skip to content

L
liquidnet-bus-v1
Commit 0b1b3e4a authored by jiangxiulong's avatar jiangxiulong
Browse files
Options

refund

parent efa1d41c
Hide whitespace changes
Inline Side-by-side
Showing with 44 additions and 68 deletions
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/RefundCallbackParam.java
View file @ 0b1b3e4a
......@@ -16,46 +16,20 @@ import java.math.BigDecimal;
@Data
public class RefundCallbackParam implements Serializable {
/**
* 0失败 1成功
*/
private Integer status;
/**
* 订单表数据
*/
private String order_code;
private String code;
private String type;
private double price;
private String payment_type;
private String payment_at;
private String payment_id;
/**
* 退款表数据
*/
private String order_refund_code;
private String refund_code;
private Integer status;
private BigDecimal refund_price;
private BigDecimal refundPrice;
private String refund_reason;
private String refundError;
private String refund_type;
private String refundCode; // PAY
private String refund_id;
private String refundAt;
private String refund_at;
private String orderRefundCode;
private String refund_error;
private String refundId;
private String refundType;
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinOrderRefundsServiceImpl.java
View file @ 0b1b3e4a
......@@ -318,13 +318,13 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
}
RefundCallbackParam refundCallbackParam = new RefundCallbackParam();
refundCallbackParam.setRefund_code(refundInfo.getRefundCode());
refundCallbackParam.setRefundCode(refundInfo.getRefundCode());
BigDecimal refundPrice = refundInfo.getPrice().add(refundInfo.getPriceExpress());
refundCallbackParam.setRefund_price(refundPrice);
refundCallbackParam.setRefund_type("UNKNOWN");
refundCallbackParam.setRefund_id(refundInfo.getRefundId());
refundCallbackParam.setRefund_at(DateUtils.dateTimeNow());
refundCallbackParam.setRefund_error(refundInfo.getRefundError());
refundCallbackParam.setRefundPrice(refundPrice);
// refundCallbackParam.setRefund_type("UNKNOWN");
refundCallbackParam.setRefundId(refundInfo.getRefundId());
refundCallbackParam.setRefundAt(DateUtils.dateTimeNow());
refundCallbackParam.setRefundError(refundInfo.getRefundError());
boolean res = kylinRefundsStatusServiceImpl.orderTicketRefunded(refundCallbackParam, refundInfo);
if (res) {
String authId = ShiroUtils.getUserId().toString();
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinRefundsStatusServiceImpl.java
View file @ 0b1b3e4a
......@@ -411,16 +411,20 @@ public class KylinRefundsStatusServiceImpl {
BigDecimal refundPrice = refund.getPrice().add(refund.getPriceExpress());
MultiValueMap<String, String> params = new LinkedMultiValueMap();
params.add("code", oderInfo.getPayCode());
params.add("order_refund_code", refund.getOrderRefundCode());
params.add("notifyUrl", notifyUrl);
params.add("orderCode", oderInfo.getOrderCode());
params.add("orderRefundCode", refund.getOrderRefundCode());
params.add("paymentId", oderInfo.getPaymentId());
params.add("paymentType", oderInfo.getPaymentType());
params.add("price", String.valueOf(refundPrice));
params.add("priceTotal", String.valueOf(refundPrice));
params.add("reason", refund.getReason());
params.add("notify_url", notifyUrl);
String sign = StringUtils.Ksort(params);
/*String sign = StringUtils.Ksort(params);
sign = sign.concat("&key=").concat("R7tXY9smPQPG9Ku5yI0u6sfnlckmk04V");
// sign = MD5.getStrMD5(sign);
sign = sign.toUpperCase();
params.add("sign", sign);
params.add("sign", sign);*/
// 请求pay
String postResult = null;
......@@ -470,7 +474,7 @@ public class KylinRefundsStatusServiceImpl {
);
KylinOrderTicketStatus orderStatusTable = new KylinOrderTicketStatus();
int newStatus = 0;
if (refundCallbackParam.getRefund_price().add(orderInfo.getPriceRefund()).compareTo(orderInfo.getPriceActual()) == 0) {
if (refundCallbackParam.getRefundPrice().add(orderInfo.getPriceRefund()).compareTo(orderInfo.getPriceActual()) == 0) {
newStatus = KylinTableStatusConst.ORDER_STATUS4;
} else {
newStatus = KylinTableStatusConst.ORDER_STATUS6;
......@@ -537,7 +541,7 @@ public class KylinRefundsStatusServiceImpl {
}
// 订单表
BigDecimal price = orderInfo.getPriceRefund().add(refundCallbackParam.getRefund_price());
BigDecimal price = orderInfo.getPriceRefund().add(refundCallbackParam.getRefundPrice());
Integer num = orderInfo.getRefundNumber() + refundNumber;
KylinOrderTickets update = new KylinOrderTickets();
update.setRefundNumber(num);
......@@ -564,10 +568,10 @@ public class KylinRefundsStatusServiceImpl {
// 退款单完成
KylinOrderRefunds kylinOrderRefunds = new KylinOrderRefunds();
kylinOrderRefunds.setStatus(KylinTableStatusConst.ORDER_REFUND_STATUS_REFUNDED);
kylinOrderRefunds.setRefundCode(refundCallbackParam.getRefund_code());
kylinOrderRefunds.setRefundType(refundCallbackParam.getRefund_type());
kylinOrderRefunds.setRefundId(refundCallbackParam.getRefund_id());
kylinOrderRefunds.setRefundAt(refundCallbackParam.getRefund_at());
kylinOrderRefunds.setRefundCode(refundCallbackParam.getRefundCode());
kylinOrderRefunds.setRefundType(refundCallbackParam.getRefundType());
kylinOrderRefunds.setRefundId(refundCallbackParam.getRefundId());
kylinOrderRefunds.setRefundAt(refundCallbackParam.getRefundAt());
kylinOrderRefunds.setUpdatedAt(LocalDateTime.now());
kylinOrderRefundsMapper.update(
kylinOrderRefunds,
......
liquidnet-bus-config/liquidnet-config/application-dev.yml
View file @ 0b1b3e4a
......@@ -65,7 +65,7 @@ liquidnet:
addresses: 127.0.0.1:8090
client:
admin:
phpPayUrl: http://devpay.zhengzai.tv
phpPayUrl: https://devdragon.zhengzai.tv
kylinApiUrl: https://devkylin.zhengzai.tv
phpServiceUrl: https://devservice.zhengzai.tv
phpoMediaApiUrl: https://devmediaapi.zhengzai.tv
......
liquidnet-bus-config/liquidnet-config/application-test.yml
View file @ 0b1b3e4a
......@@ -65,7 +65,7 @@ liquidnet:
addresses: 172.17.121.166:8090
client:
admin:
phpPayUrl: http://testpay.zhengzai.tv
phpPayUrl: https://devdragon.zhengzai.tv/
kylinApiUrl: https://testkylin.zhengzai.tv
phpServiceUrl: https://testservice.zhengzai.tv
phpoMediaApiUrl: https://testmediaapi.zhengzai.tv
......
liquidnet-bus-config/liquidnet-config/liquidnet-client-admin-web.yml
View file @ 0b1b3e4a
......@@ -16,7 +16,7 @@ ruoyi:
#系统自定义配置
liquidnet:
url-refund:
apply: "${liquidnet.client.admin.phpPayUrl}/refund/single"
apply: "${liquidnet.client.admin.phpPayUrl}/dragon/refund/refundSingle"
notify: "${liquidnet.client.admin.platformUrl}/platform/refund/callback"
url-banner:
provinces: "${liquidnet.client.admin.phpServiceUrl}/provinces" #省份
......
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/refund/KylinRefundsStatusServiceImpl.java
View file @ 0b1b3e4a
......@@ -92,7 +92,7 @@ public class KylinRefundsStatusServiceImpl {
);
KylinOrderTicketStatus orderStatusTable = new KylinOrderTicketStatus();
int newStatus = 0;
if (refundCallbackParam.getRefund_price().add(orderInfo.getPriceRefund()).compareTo(orderInfo.getPriceActual()) == 0) {
if (refundCallbackParam.getRefundPrice().add(orderInfo.getPriceRefund()).compareTo(orderInfo.getPriceActual()) == 0) {
newStatus = KylinTableStatusConst.ORDER_STATUS4;
} else {
newStatus = KylinTableStatusConst.ORDER_STATUS6;
......@@ -159,7 +159,7 @@ public class KylinRefundsStatusServiceImpl {
}
// 订单表
BigDecimal price = orderInfo.getPriceRefund().add(refundCallbackParam.getRefund_price());
BigDecimal price = orderInfo.getPriceRefund().add(refundCallbackParam.getRefundPrice());
Integer num = orderInfo.getRefundNumber() + refundNumber;
KylinOrderTickets update = new KylinOrderTickets();
update.setRefundNumber(num);
......@@ -186,10 +186,10 @@ public class KylinRefundsStatusServiceImpl {
// 退款单完成
KylinOrderRefunds kylinOrderRefunds = new KylinOrderRefunds();
kylinOrderRefunds.setStatus(KylinTableStatusConst.ORDER_REFUND_STATUS_REFUNDED);
kylinOrderRefunds.setRefundCode(refundCallbackParam.getRefund_code());
kylinOrderRefunds.setRefundType(refundCallbackParam.getRefund_type());
kylinOrderRefunds.setRefundId(refundCallbackParam.getRefund_id());
kylinOrderRefunds.setRefundAt(refundCallbackParam.getRefund_at());
kylinOrderRefunds.setRefundCode(refundCallbackParam.getRefundCode());
kylinOrderRefunds.setRefundType(refundCallbackParam.getRefundType());
kylinOrderRefunds.setRefundId(refundCallbackParam.getRefundId());
kylinOrderRefunds.setRefundAt(refundCallbackParam.getRefundAt());
kylinOrderRefunds.setUpdatedAt(LocalDateTime.now());
kylinOrderRefundsMapper.update(
kylinOrderRefunds,
......
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/refund/OrderRefundsCallbackServiceImpl.java
View file @ 0b1b3e4a
......@@ -51,18 +51,18 @@ public class OrderRefundsCallbackServiceImpl extends ServiceImpl<KylinOrderRefun
public String refundCallback(RefundCallbackParam refundCallbackParam) {
KylinOrderRefunds refundInfo = kylinOrderRefundsMapper.selectOne(
new UpdateWrapper<KylinOrderRefunds>()
.eq("order_refund_code", refundCallbackParam.getOrder_refund_code())
.eq("order_refund_code", refundCallbackParam.getRefundCode())
);
if (refundInfo == null) {
log.info("Failed:{}.RefundController refundCallback: 退款订单查询失败，编号{}", "KylinOrderRefundsServiceImplRefundCallback", refundCallbackParam.getOrder_refund_code());
log.info("Failed:{}.RefundController refundCallback: 退款订单查询失败，编号{}", "KylinOrderRefundsServiceImplRefundCallback", refundCallbackParam.getOrderRefundCode());
return "fail";
}
if (refundInfo.getStatus() == KylinTableStatusConst.ORDER_REFUND_STATUS_CANCEL) {
log.info("Failed:{}.RefundController refundCallback: 退款订单已取消，编号{}", "KylinOrderRefundsServiceImplRefundCallback", refundCallbackParam.getOrder_refund_code());
log.info("Failed:{}.RefundController refundCallback: 退款订单已取消，编号{}", "KylinOrderRefundsServiceImplRefundCallback", refundCallbackParam.getOrderRefundCode());
return "fail";
}
if (refundInfo.getStatus() == KylinTableStatusConst.ORDER_REFUND_STATUS_REFUNDED) {
log.info("Failed:{}.RefundController refundCallback: 退款订单已退款，编号{}", "KylinOrderRefundsServiceImplRefundCallback", refundCallbackParam.getOrder_refund_code());
log.info("Failed:{}.RefundController refundCallback: 退款订单已退款，编号{}", "KylinOrderRefundsServiceImplRefundCallback", refundCallbackParam.getOrderRefundCode());
return "success";
}
......@@ -78,11 +78,9 @@ public class OrderRefundsCallbackServiceImpl extends ServiceImpl<KylinOrderRefun
if (0 == status) { // 退款失败
KylinOrderRefunds kylinOrderRefunds = new KylinOrderRefunds();
kylinOrderRefunds.setStatus(KylinTableStatusConst.ORDER_REFUND_STATUS_ERROR);
kylinOrderRefunds.setRefundCode(refundCallbackParam.getRefund_code());
kylinOrderRefunds.setRefundType(refundCallbackParam.getRefund_type());
kylinOrderRefunds.setRefundId(refundCallbackParam.getRefund_id());
kylinOrderRefunds.setRefundAt(refundCallbackParam.getRefund_at());
kylinOrderRefunds.setRefundError(refundCallbackParam.getRefund_error());
kylinOrderRefunds.setRefundCode(refundCallbackParam.getRefundCode());
kylinOrderRefunds.setRefundAt(refundCallbackParam.getRefundAt());
kylinOrderRefunds.setRefundError(refundCallbackParam.getRefundError());
kylinOrderRefunds.setUpdatedAt(LocalDateTime.now());
kylinOrderRefundsMapper.update(
kylinOrderRefunds,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment