Explorar el Código

Merge branch 'release_toaliyun_real' into release_toaliyun_real_offline_activity

release_toaliyun_real
winter hace 1 año
padre
commit
a351e61406
Se han modificado 1 ficheros con 2 adiciones y 1 borrados
  1. +2
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java

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

@@ -198,7 +198,8 @@ public class WxFinanceServiceImpl implements WxFinanceService {


@Override @Override
public FinanceBillSetoffSum getBillSetoffSum(WxFinanceReceive record) { public FinanceBillSetoffSum getBillSetoffSum(WxFinanceReceive record) {
record.setType(EnumFinanceReceiveType.ADVANCE.getCode());
record.setType(EnumFinanceCashierType.RECEIVE.getCode());
record.setReceiveType(EnumFinanceReceiveType.ADVANCE.getCode());
record.setStatus(EnumFinanceReceiveStatus.NORMAL.getCode()); record.setStatus(EnumFinanceReceiveStatus.NORMAL.getCode());
List<WxFinanceReceive> advanceList = wxFinanceReceiveMapper.getMerchantAdvanceGroupSumList(record); List<WxFinanceReceive> advanceList = wxFinanceReceiveMapper.getMerchantAdvanceGroupSumList(record);
BigDecimal total = new BigDecimal(0); BigDecimal total = new BigDecimal(0);


Cargando…
Cancelar
Guardar