Просмотр исходного кода

fix 微信分账完结bug

release_toaliyun_real
winter 4 лет назад
Родитель
Сommit
401ad675ea
2 измененных файлов: 9 добавлений и 9 удалений
  1. +8
    -8
      mallinkSchedule/src/main/java/com/iformall/schedule/CouponOrderExpiringSchedule.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/service/pay/service/share/wx/WxPayShareService.java

+ 8
- 8
mallinkSchedule/src/main/java/com/iformall/schedule/CouponOrderExpiringSchedule.java Просмотреть файл

@@ -215,14 +215,14 @@ public class CouponOrderExpiringSchedule {
wxSharingOrderDto.setPayTimeEnd(wxPayOrder.getPayTimeEnd()); wxSharingOrderDto.setPayTimeEnd(wxPayOrder.getPayTimeEnd());
wxSharingOrderDto.updateTenantInfo(wxPayOrder); wxSharingOrderDto.updateTenantInfo(wxPayOrder);
wxSharingOrderDto.setTransactionId(wxPayOrder.getTransactionId()); wxSharingOrderDto.setTransactionId(wxPayOrder.getTransactionId());
// if (wxPayOrder.getChildOrderShare(co.getOrderId()).getRateAmount() != null) {
// // 实际分账金额为 分账金额 + 通道费差
// wxSharingOrderDto.setShareAmount(wxPayOrder.getChildOrderShare(co.getOrderId()).getShareAmount()+wxPayOrder.getChildOrderShare(co.getOrderId()).getRateAmount());
// } else {
// // 未设置通道费差
// wxSharingOrderDto.setShareAmount(wxPayOrder.getChildOrderShare(co.getOrderId()).getShareAmount());
// }
wxSharingOrderDto.setShareAmount(wxPayOrder.getPayAmount());
if (wxPayOrder.getChildOrderShare(co.getOrderId()).getRateAmount() != null) {
// 实际分账金额为 分账金额 + 通道费差
wxSharingOrderDto.setShareAmount(wxPayOrder.getChildOrderShare(co.getOrderId()).getShareAmount()+wxPayOrder.getChildOrderShare(co.getOrderId()).getRateAmount());
} else {
// 未设置通道费差
wxSharingOrderDto.setShareAmount(wxPayOrder.getChildOrderShare(co.getOrderId()).getShareAmount());
}
//wxSharingOrderDto.setShareAmount(wxPayOrder.getPayAmount());
wxProfitSharingOrderService.finishSharingOrder(wxSharingOrderDto,wxPayOrder.getPayVendor(),wxPayOrder.getShare()); wxProfitSharingOrderService.finishSharingOrder(wxSharingOrderDto,wxPayOrder.getPayVendor(),wxPayOrder.getShare());
} }




+ 1
- 1
mallinkService/src/main/java/com/iformall/service/pay/service/share/wx/WxPayShareService.java Просмотреть файл

@@ -82,7 +82,7 @@ public class WxPayShareService extends PayShareBaseAdapterService{
psFCmd.setNonce_str(Utility.generate32UUID()); psFCmd.setNonce_str(Utility.generate32UUID());
psFCmd.setTransaction_id(transcationId); psFCmd.setTransaction_id(transcationId);
psFCmd.setOut_order_no(record.getId().toString()); psFCmd.setOut_order_no(record.getId().toString());
psFCmd.setAmount(amount);
//psFCmd.setAmount(amount);
psFCmd.setDescription("分账已完结"); psFCmd.setDescription("分账已完结");
psFCmd.setSign_type("HMAC-SHA256"); psFCmd.setSign_type("HMAC-SHA256");




Загрузка…
Отмена
Сохранить