|
|
@@ -429,7 +429,9 @@ public class RegisterOrderDonServiceImpl extends ServiceImpl<RegisterOrderDonMap
|
|
|
.setAlgorithm(Codec.DoDigest.Algorithm.MD5)
|
|
|
.setStringData(time + String.valueOf(registerOrderDon.getId()))
|
|
|
.toHexString();
|
|
|
- refundReq.setRefundMoney(registerOrderDon.getMoney());
|
|
|
+ if (refundReq.getRefundMoney() == null) {
|
|
|
+ refundReq.setRefundMoney(registerOrderDon.getMoney());
|
|
|
+ }
|
|
|
weChatService.refundWxOrder(weChatConfig.getAppid(),
|
|
|
Optional.ofNullable(registerOrderDon.getShopId()).orElse(ShopConfig.WX_DEFAULT_APP_ID),
|
|
|
registerOrderDon.getTransactionId(),
|
|
|
@@ -478,6 +480,9 @@ public class RegisterOrderDonServiceImpl extends ServiceImpl<RegisterOrderDonMap
|
|
|
AlipayTradeRefundModel model = new AlipayTradeRefundModel();
|
|
|
//支付宝交易号
|
|
|
model.setTradeNo(registerOrderDon.getTransactionId());
|
|
|
+ if (refundReq.getRefundMoney() == null) {
|
|
|
+ refundReq.setRefundMoney(registerOrderDon.getMoney());
|
|
|
+ }
|
|
|
model.setRefundAmount(refundReq.getRefundMoney().divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_EVEN).toString());
|
|
|
model.setQueryOptions(List.of("gmt_refund_pay"));
|
|
|
long time = System.currentTimeMillis();
|