|
|
@@ -436,8 +436,14 @@ public class DiscountServiceImpl implements DiscountService {
|
|
|
* @return: java.util.List<java.util.Map < java.lang.String, java.lang.Object>>
|
|
|
*/
|
|
|
@Override
|
|
|
- public List<Map<String, Object>> queryTcByTemplateId(Long templateId) {
|
|
|
+ public Map<String, Object> queryTcByTemplateId(Long templateId) {
|
|
|
AssertUtil.isNotBlank(templateId,"模板id不能为空");
|
|
|
+ Map<String, Object> resultMap = new HashMap<>();
|
|
|
+ Discount discount =discountMapper.queryTcDiscuntByTemplateId(templateId);
|
|
|
+ if(discount == null) return resultMap;
|
|
|
+ BigDecimal tcFee = getTcFee(templateId, discount.getDiscountRate());
|
|
|
+ discount.setTcFee(tcFee);
|
|
|
+ resultMap.put("tcInfo", discount);
|
|
|
List<Map<String, Object>> result = new ArrayList<>();
|
|
|
Template template = templateService.queryById(templateId);
|
|
|
if (template != null && StrUtil.isNotBlank(template.getTemplateData())) {
|
|
|
@@ -459,6 +465,7 @@ public class DiscountServiceImpl implements DiscountService {
|
|
|
});
|
|
|
}
|
|
|
}
|
|
|
- return result;
|
|
|
+ resultMap.put("items", result);
|
|
|
+ return resultMap;
|
|
|
}
|
|
|
}
|