|
|
|
@ -17,8 +17,6 @@
|
|
|
|
|
package com.logpm.distribution.service.impl; |
|
|
|
|
|
|
|
|
|
import cn.hutool.core.date.DateUtil; |
|
|
|
|
import com.alibaba.fastjson.JSON; |
|
|
|
|
import com.alibaba.fastjson.JSONArray; |
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.Wrapper; |
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; |
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
|
|
|
@ -3217,7 +3215,6 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
|
|
|
|
|
|
|
|
|
|
private List<PrintPreviewVO> handleShangPeiData(Long templateId, String[] idArray,String html) throws Exception { |
|
|
|
|
List<PrintPreviewVO> result = new ArrayList<>(); |
|
|
|
|
List<Map<String,Object>> test = new ArrayList<>(); |
|
|
|
|
for (String id : idArray) { |
|
|
|
|
|
|
|
|
|
//查询对应配送单
|
|
|
|
@ -3352,7 +3349,6 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
|
|
|
|
|
total.put("到付费用",totalPrice); |
|
|
|
|
map.put("明细",ls); |
|
|
|
|
map.put("合计",total); |
|
|
|
|
test.add(map); |
|
|
|
|
String popHtml =TemplateUtil.popTemplate("商配配配送单",map,html); |
|
|
|
|
PrintPreviewVO printPreviewVO = new PrintPreviewVO(); |
|
|
|
|
printPreviewVO.setTemplateId(templateId); |
|
|
|
@ -3360,9 +3356,6 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
|
|
|
|
|
result.add(printPreviewVO); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
log.info("#############test: test={}",test); |
|
|
|
|
String s = JSON.toJSONString(test); |
|
|
|
|
JSONArray array= JSONArray.parseArray(JSON.toJSONString(test)); |
|
|
|
|
return result; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|