|
|
@@ -121,6 +121,9 @@ public class WechatServiceImpl implements WechatService {
|
|
|
|
|
|
MergeOrderInfo mergeOrderInfo = mergeOrderInfoService.get(orderInfo.getMergeOrderId());
|
|
|
|
|
|
+ PaymentInfo paymentInfo = paymentInfoService.get(mergeOrderInfo.getPaymentId());
|
|
|
+
|
|
|
+
|
|
|
List<OrderInfo> orderInfoList = orderInfoService.findByMergeOrderId(mergeOrderInfo.getId());
|
|
|
BigDecimal totalDecimal = BigDecimal.ZERO;
|
|
|
if (orderInfoList.size()>0){
|
|
|
@@ -139,7 +142,7 @@ public class WechatServiceImpl implements WechatService {
|
|
|
Map<String, String> params = RefundModel.builder()
|
|
|
.appid(wxJpsoftConfig.getAppId())
|
|
|
.mch_id(wxJpsoftConfig.getMchId())
|
|
|
- .sub_mch_id(wxJpsoftConfig.getSubMchId())
|
|
|
+ .sub_mch_id(paymentInfo.getSubMchId())
|
|
|
.nonce_str(WxPayKit.generateStr())
|
|
|
.transaction_id(orderInfo.getTransactionId())
|
|
|
.out_trade_no(mergeOrderInfo.getOutOrderNo())
|
