|
|
|
@@ -17,6 +17,7 @@ import com.iformall.domain.po.WxEnergyFees; |
|
|
|
import com.iformall.domain.po.WxFinancePrintData; |
|
|
|
import com.iformall.domain.po.WxFinancePrintTemplate; |
|
|
|
import com.iformall.domain.po.WxFinanceReceive; |
|
|
|
import com.iformall.domain.po.WxFinanceReceiveBill; |
|
|
|
import com.iformall.domain.po.WxMerchant; |
|
|
|
import com.iformall.domain.po.base.BaseEntity; |
|
|
|
import com.iformall.domain.po.base.TenantEntity; |
|
|
|
@@ -27,6 +28,7 @@ import com.iformall.enums.EnumYesOrNo; |
|
|
|
import com.iformall.exception.MallinkException; |
|
|
|
import com.iformall.mapper.WxFinancePrintDataMapper; |
|
|
|
import com.iformall.mapper.WxFinancePrintTemplateMapper; |
|
|
|
import com.iformall.print.PrintComponentHandler; |
|
|
|
import com.iformall.print.data.PrintBillDataHandler; |
|
|
|
import com.iformall.print.data.PrintFinanceReceiveDataHandler; |
|
|
|
import com.iformall.print.data.PrintMerchantSettleDataHandler; |
|
|
|
@@ -85,7 +87,14 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService { |
|
|
|
|
|
|
|
@Override |
|
|
|
public List<WxFinancePrintData> printDataList(WxFinancePrintData record) { |
|
|
|
return wxFinancePrintDataMapper.findList(record); |
|
|
|
List<WxFinancePrintData> list = wxFinancePrintDataMapper.findList(record); |
|
|
|
if (null != list) { |
|
|
|
for (int i = 0 ; i < list.size() ; i ++) { |
|
|
|
WxFinancePrintData pd = list.get(i); |
|
|
|
pd.setPrintComponents(PrintComponentHandler.parseComponent(pd)); |
|
|
|
} |
|
|
|
} |
|
|
|
return list; |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
@@ -205,10 +214,22 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService { |
|
|
|
WxFinanceReceive re = receiveList.get(i); |
|
|
|
PrintVo vo = new PrintVo(); |
|
|
|
vo.setDataId(templateId); |
|
|
|
|
|
|
|
WxFinanceReceiveBill rb = new WxFinanceReceiveBill(); |
|
|
|
rb.updateTenantInfo(re); |
|
|
|
rb.setReceiveId(re.getId()); |
|
|
|
List<Long> billIdList = wxFinanceService.getReceiveBillIds(rb); |
|
|
|
List<WxAllBill> billList = null; |
|
|
|
if (null != billIdList && billIdList.size() > 0 ) { |
|
|
|
WxAllBill billq = new WxAllBill(); |
|
|
|
billq.updateTenantInfo(re); |
|
|
|
billq.setIds(billIdList); |
|
|
|
billList = wxAllBillService.list(billq); |
|
|
|
} |
|
|
|
if (null != items) { |
|
|
|
for (int j = 0 ; j < items.size() ; j ++) { |
|
|
|
JSONObject ov = items.getJSONObject(j); |
|
|
|
ov.put("value", printFinanceReceiveDataHandler.getObjectValue(ov.getString("name"),re,merchantMap,feesMap,shopNumber)); |
|
|
|
ov.put("value", printFinanceReceiveDataHandler.getObjectValue(ov.getString("name"),re,merchantMap,feesMap,shopNumber,billList)); |
|
|
|
} |
|
|
|
} |
|
|
|
vo.setTemplate(o); |
|
|
|
|