|
|
|
@@ -17,7 +17,9 @@ import com.iformall.domain.po.WxFinancePrintData; |
|
|
|
import com.iformall.domain.po.WxFinancePrintTemplate; |
|
|
|
import com.iformall.domain.po.WxFinanceReceive; |
|
|
|
import com.iformall.domain.po.WxMerchant; |
|
|
|
import com.iformall.domain.po.base.BaseEntity; |
|
|
|
import com.iformall.domain.po.base.TenantEntity; |
|
|
|
import com.iformall.domain.vo.PrintMerchantSettleVo; |
|
|
|
import com.iformall.domain.vo.PrintVo; |
|
|
|
import com.iformall.enums.EnumFinancePrintDataType; |
|
|
|
import com.iformall.enums.EnumYesOrNo; |
|
|
|
@@ -26,6 +28,7 @@ import com.iformall.mapper.WxFinancePrintDataMapper; |
|
|
|
import com.iformall.mapper.WxFinancePrintTemplateMapper; |
|
|
|
import com.iformall.print.data.PrintBillDataHandler; |
|
|
|
import com.iformall.print.data.PrintFinanceReceiveDataHandler; |
|
|
|
import com.iformall.print.data.PrintMerchantSettleDataHandler; |
|
|
|
import com.iformall.service.WxAllBillService; |
|
|
|
import com.iformall.service.WxEnergyService; |
|
|
|
import com.iformall.service.WxFinancePrintService; |
|
|
|
@@ -67,6 +70,9 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService { |
|
|
|
@Autowired |
|
|
|
PrintBillDataHandler printBillDataHandler; |
|
|
|
|
|
|
|
@Autowired |
|
|
|
PrintMerchantSettleDataHandler printMerchantSettleDataHandler; |
|
|
|
|
|
|
|
@Lazy |
|
|
|
@Autowired |
|
|
|
WxMerchantService wxMerchantService; |
|
|
|
@@ -157,7 +163,7 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService { |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public List<PrintVo> parseTemplateData(String tenantId, Long templateId, List<Long> dataIds) { |
|
|
|
public List<PrintVo> parseTemplateData(String tenantId, Long templateId, List<Long> dataIds,BaseEntity entity) { |
|
|
|
WxFinancePrintTemplate template = this.getTemplateById(templateId); |
|
|
|
if (null == template) { |
|
|
|
return null; |
|
|
|
@@ -204,6 +210,22 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService { |
|
|
|
voList.add(vo); |
|
|
|
} |
|
|
|
return voList; |
|
|
|
}else if (printDatatype.getCode().intValue() == EnumFinancePrintDataType.RENT_OWE.getCode()) { |
|
|
|
WxMerchant bq = (WxMerchant) entity; |
|
|
|
List<WxMerchant> merchantList = wxMerchantService.findList(bq); |
|
|
|
if (null == merchantList || merchantList.size() <= 0 ) { |
|
|
|
return null; |
|
|
|
} |
|
|
|
WxMerchant m = merchantList.get(0); |
|
|
|
List<PrintVo> voList = new ArrayList<PrintVo>(); |
|
|
|
//TODO 获取结算单信息 |
|
|
|
PrintMerchantSettleVo sv = null; |
|
|
|
|
|
|
|
PrintVo vo = new PrintVo(); |
|
|
|
vo.setDataId(templateId); |
|
|
|
vo.setTemplate(printMerchantSettleDataHandler.parse(template.getContent(), sv,merchantMap,feesMap)); |
|
|
|
voList.add(vo); |
|
|
|
return voList; |
|
|
|
} |
|
|
|
return null; |
|
|
|
} |
|
|
|
|