Ver a proveniência

Merge branch 'release_toaliyun_real_offline_activity' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real_offline_activity

release_toaliyun_real
xiaohu há 1 ano
ascendente
cometimento
5b5d31deef
1 ficheiros alterados com 2 adições e 2 eliminações
  1. +2
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java

+ 2
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java Ver ficheiro

@@ -929,8 +929,8 @@ public class WxFinanceServiceImpl implements WxFinanceService {
merchant.updateTenantInfo(record);
for (int i = 0 ; i < receiveBills.size() ; i ++) {
WxFinanceReceiveBill rb = receiveBills.get(i);
WxAllBill bill = wxBillAllHelper.getBillDetail(EnumBillAllType.getEnum(rb.getBillType()), merchant, rb.getId());
if (rb.getPayWay().equals(Constant.bill_pay_way_setoff)) {
WxAllBill bill = wxBillAllHelper.getBillDetail(EnumBillAllType.getEnum(rb.getBillType()), merchant, rb.getBillId());
if (!rb.getPayWay().equals(Constant.bill_pay_way_setoff)) {
//账单回退
WxBillPayDTO payDto = new WxBillPayDTO();
payDto.updateTenantInfo(record);


Carregando…
Cancelar
Guardar