Merge branch 'release_toaliyun_real' into release_toaliyun_real_offline_activity

mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java

@@ -198,7 +198,8 @@ public class WxFinanceServiceImpl implements WxFinanceService {
 
 	@Override
 	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());
 		List<WxFinanceReceive> advanceList = wxFinanceReceiveMapper.getMerchantAdvanceGroupSumList(record);
     	BigDecimal total = new BigDecimal(0);