Просмотр исходного кода

Merge branch 'release_toaliyun_real' into release_toaliyun_real_offline_activity

release_toaliyun_real
winter 1 год назад
Родитель
Сommit
9a4040c7fa
2 измененных файлов: 14 добавлений и 8 удалений
  1. +0
    -3
      mallinkService/src/main/java/com/iformall/print/data/PrintCustomedTableDataHandler.java
  2. +14
    -5
      mallinkService/src/main/java/com/iformall/service/impl/WxFinancePrintServiceImpl.java

+ 0
- 3
mallinkService/src/main/java/com/iformall/print/data/PrintCustomedTableDataHandler.java Просмотреть файл

@@ -54,12 +54,10 @@ public class PrintCustomedTableDataHandler{
}
String trclass = titleTr.attr("class");
String trstyle = titleTr.attr("style");
Element currentIndexElement = titleTr;
for (int i = 0 ; i < listdata.size(); i ++) {
Object object = listdata.get(i);
JSONObject o = JSON.parseObject(JSON.toJSONString(object));
Element tr = titleTr.parent().appendElement("tr");
tr.after(currentIndexElement);
if (StringUtils.isNotBlank(trclass)) {
tr.attr("class", trclass);
}
@@ -116,7 +114,6 @@ public class PrintCustomedTableDataHandler{
tre.appendText(tdcontent.toString());
}
}
currentIndexElement = tr;
}
return doc.head().html() + doc.body().html();
}


+ 14
- 5
mallinkService/src/main/java/com/iformall/service/impl/WxFinancePrintServiceImpl.java Просмотреть файл

@@ -193,10 +193,10 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService {
return isSetDefaultValue;
}
private PrintVo handleComponentData(Long templateId,JSONObject templateContent,JSONArray items,PrintDataParser objectParser,Object object,PrintDataParser listParser,List listdata,Object... params) {
private PrintVo handleComponentData(Long dataId,Long templateId,JSONObject templateContent,JSONArray items,PrintDataParser objectParser,Object object,PrintDataParser listParser,List listdata,Object... params) {
if (null != items) {
PrintVo vo = new PrintVo();
vo.setDataId(templateId);
vo.setDataId(dataId);
for (int j = 0 ; j < items.size() ; j ++) {
JSONObject ov = items.getJSONObject(j);
//是否是定制化的表格
@@ -278,7 +278,16 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService {
billList = wxAllBillService.list(billq);
}
PrintVo vo = handleComponentData(templateId,o,items, printFinanceReceiveDataHandler,re,printBillDataHandler, billList,merchantMap,feesMap,shopNumber);
if (null != billList) {
WxAllBill billq = new WxAllBill();
billq.setShopNumber("合计");
billq.setEnergyFeesName(PriceUtilV2.number2CNMontrayUnit(new BigDecimal(re.getAllReceiveMoney())));
billq.setReceivePay(re.getReceiveMoney());
billq.setSetOff(re.getSetOffMoney());
billList.add(billq);
}
PrintVo vo = handleComponentData(re.getId(),templateId,o,items, printFinanceReceiveDataHandler,re,printBillDataHandler, billList,merchantMap,feesMap,shopNumber);
if (null != vo) {
voList.add(vo);
}
@@ -295,7 +304,7 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService {
List<PrintVo> voList = new ArrayList<PrintVo>();
for (int i = 0 ; i < billAllList.size(); i ++) {
WxAllBill re = billAllList.get(i);
PrintVo vo = handleComponentData(templateId,o,items, printBillDataHandler,re,null, null,merchantMap,feesMap,shopNumber);
PrintVo vo = handleComponentData(re.getId(),templateId,o,items, printBillDataHandler,re,null, null,merchantMap,feesMap,shopNumber);
if (null != vo) {
voList.add(vo);
}
@@ -338,7 +347,7 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService {
owe.setNeedPay(payTotal.toPlainString());
sumlist.add(owe);
PrintVo vo = handleComponentData(templateId,o,items, printMerchantSettleDataHandler,bq,printMerchantSettleDataHandler, sumlist,merchantMap,feesMap,shopNumber);
PrintVo vo = handleComponentData(bq.getMerchantId(),templateId,o,items, printMerchantSettleDataHandler,bq,printMerchantSettleDataHandler, sumlist,merchantMap,feesMap,shopNumber);
if (null != vo) {
voList.add(vo);
}


Загрузка…
Отмена
Сохранить