Quellcode durchsuchen

//拼团

release_toaliyun_real
xhxu vor 3 Jahren
Ursprung
Commit
84106d6171
3 geänderte Dateien mit 15 neuen und 15 gelöschten Zeilen
  1. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java
  2. +4
    -4
      mallinkService/src/main/java/com/iformall/service/pay/service/refund/wx/v2/WxRefundAdapterService.java
  3. +10
    -10
      mallinkService/src/main/java/com/iformall/service/pay/service/refund/wx/v3/WxRefundV3AdapterService.java

+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java Datei anzeigen

@@ -781,7 +781,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService {
throw new MallinkException(ErrorCode.SYS_SERVER_ERROR.getCode(), appInfo.getPayId()+"查询不到WxPayAccount");
}

RefundAdapterResult refundResult = payServiceFactory.getRefundPayAdapterService(payOrder.getPayVendor(),payAccount.getPayVersion()).refund(payAccount, appInfo, record, payOrder,orderId, null);
RefundAdapterResult refundResult = payServiceFactory.getRefundPayAdapterService(payOrder.getPayVendor(),payAccount.getPayVersion()).refund(payAccount, appInfo, record, payOrder,orderId, EnumPayType.PAY_AUTO_REFUND);
if (refundResult.isSuccess()) {
record.setRefundOrderStatus(EnumRefundStatus.REFUND_REQ_SUCCESS.getCode());
wxRefundOrderMapper.updateById(record);


+ 4
- 4
mallinkService/src/main/java/com/iformall/service/pay/service/refund/wx/v2/WxRefundAdapterService.java Datei anzeigen

@@ -223,9 +223,9 @@ public class WxRefundAdapterService implements RefundPayAdapterService{
wxRefundOrderP.setRefund_desc("管理端商户退款");
} else if (payType == EnumPayType.PAY_AUTO_REFUND) {
wxRefundOrderP.setRefund_desc("超期自动退款");
} else {
wxRefundOrderP.setRefund_desc("用户自己退款");
}
} else if (payType == EnumPayType.PAY_C_REFUND){
wxRefundOrderP.setRefund_desc("用户自己退款");
}
}
wxRefundOrderP.setNotify_url(payAccount.getRefundNotifyUrl());
return wxRefundOrderP;
@@ -294,7 +294,7 @@ public class WxRefundAdapterService implements RefundPayAdapterService{
wxRefundOrderSP.setRefund_desc("管理端商户退款");
} else if (payType == EnumPayType.PAY_AUTO_REFUND) {
wxRefundOrderSP.setRefund_desc("超期自动退款");
} else {
} else if (payType == EnumPayType.PAY_C_REFUND){
wxRefundOrderSP.setRefund_desc("用户自己退款");
}
}


+ 10
- 10
mallinkService/src/main/java/com/iformall/service/pay/service/refund/wx/v3/WxRefundV3AdapterService.java Datei anzeigen

@@ -74,11 +74,9 @@ public class WxRefundV3AdapterService implements RefundPayAdapterService{
private V3PayRefundReq getReq(WxPayAccount payAccount,WxAppinfo appInfo,WxRefundOrder record,WxPayOrder payOrder,Long orderId,EnumPayType payType) {
V3PayRefundReq req = new V3PayRefundReq();
log.error("ceshi+"+JSON.toJSONString(payAccount));
//直连
if (payAccount.getMchType() == EnumPayMchType.DIRECT.getCode()) {
WxComposeChildOrderShare share = payOrder.getChildOrderShare(orderId);
log.error("ceshi+"+JSON.toJSONString(share));
req.setSub_mchid(share.getMerchantUid());
//总分
}else if (payAccount.getMchType() == EnumPayMchType.TOTAL.getCode()) {
@@ -86,15 +84,18 @@ public class WxRefundV3AdapterService implements RefundPayAdapterService{
}else {
throw new MallinkException(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"当前支付模式非法");
}
log.error("ceshi+"+JSON.toJSONString(payOrder));
req.setOut_trade_no(payOrder.getPayOrderNo());
log.error("ceshi+"+JSON.toJSONString(record));
req.setOut_refund_no(String.valueOf(record.getId()));
log.error("ceshi+"+JSON.toJSONString(payType));
try {
req.setReason(WxPayV3.handleChinese(payType.getMessage()));
} catch (UnsupportedEncodingException e) {
req.setReason(payType.getCode().toString());
if(null != payType) {
if (payType == EnumPayType.PAY_B_REFUND) {
req.setReason("B端商户退款");
} else if (payType == EnumPayType.PAY_ADMIN_REFUND) {
req.setReason("管理端商户退款");
} else if (payType == EnumPayType.PAY_AUTO_REFUND) {
req.setReason("超期自动退款");
} else if (payType == EnumPayType.PAY_C_REFUND){
req.setReason("用户自己退款");
}
}
req.setNotify_url(payAccount.getRefundNotifyV3Url());
V3PayRefundAmountReq amount = new V3PayRefundAmountReq();
@@ -103,7 +104,6 @@ public class WxRefundV3AdapterService implements RefundPayAdapterService{
req.setAmount(amount);
List<V3PayRefundGoodsReq> goods = new ArrayList<V3PayRefundGoodsReq>();
WxOrder order = wxOrderService.getById(orderId, payAccount.getTenantId());
log.error("ceshi+"+JSON.toJSONString(order));
V3PayRefundGoodsReq gr = new V3PayRefundGoodsReq();
try {
gr.setGoods_name(WxPayV3.handleChinese("商品"+order.getProductId()));


Laden…
Abbrechen
Speichern