diff --git a/src/main/java/com/ycwl/basic/mapper/PrinterMapper.java b/src/main/java/com/ycwl/basic/mapper/PrinterMapper.java index a4fc788d..1257a999 100644 --- a/src/main/java/com/ycwl/basic/mapper/PrinterMapper.java +++ b/src/main/java/com/ycwl/basic/mapper/PrinterMapper.java @@ -55,4 +55,6 @@ public interface PrinterMapper { void updateUserPhotoListToPrinter(Long memberId, Long scenicId, Integer printerId); List listRelationByOrderId(Long orderId); + + PrintTaskResp queryTaskByMpId(Integer id); } diff --git a/src/main/java/com/ycwl/basic/model/mobile/goods/GoodsDetailVO.java b/src/main/java/com/ycwl/basic/model/mobile/goods/GoodsDetailVO.java index cf64cbf5..b83dd89c 100644 --- a/src/main/java/com/ycwl/basic/model/mobile/goods/GoodsDetailVO.java +++ b/src/main/java/com/ycwl/basic/model/mobile/goods/GoodsDetailVO.java @@ -43,7 +43,9 @@ public class GoodsDetailVO { private Integer isFree; private Integer parts; private Integer sort; - + private String printerName; + private String printerPaper; + @JsonProperty("sourceType") public Integer getSourceType() { return goodsType; diff --git a/src/main/java/com/ycwl/basic/model/printer/resp/PrintTaskResp.java b/src/main/java/com/ycwl/basic/model/printer/resp/PrintTaskResp.java index 321d12bb..70999a28 100644 --- a/src/main/java/com/ycwl/basic/model/printer/resp/PrintTaskResp.java +++ b/src/main/java/com/ycwl/basic/model/printer/resp/PrintTaskResp.java @@ -10,6 +10,7 @@ public class PrintTaskResp { private Integer printerId; private Integer status; private String printerName; + private String paper; private String url; private Integer width; private Integer height; diff --git a/src/main/java/com/ycwl/basic/service/pc/impl/OrderServiceImpl.java b/src/main/java/com/ycwl/basic/service/pc/impl/OrderServiceImpl.java index 3679c4f8..30ecf568 100644 --- a/src/main/java/com/ycwl/basic/service/pc/impl/OrderServiceImpl.java +++ b/src/main/java/com/ycwl/basic/service/pc/impl/OrderServiceImpl.java @@ -4,6 +4,7 @@ import cn.hutool.core.date.DateUtil; import com.ycwl.basic.dto.MobileOrderRequest; import com.ycwl.basic.model.pc.source.entity.MemberSourceEntity; import com.ycwl.basic.model.pc.video.entity.MemberVideoEntity; +import com.ycwl.basic.model.printer.resp.PrintTaskResp; import com.ycwl.basic.order.dto.PaymentParamsRequest; import com.ycwl.basic.order.dto.PaymentParamsResponse; import com.ycwl.basic.pricing.dto.CouponUseRequest; @@ -351,6 +352,11 @@ public class OrderServiceImpl implements OrderService { goods.setScenicId(sourceEntity.getScenicId()); goods.setTemplateCoverUrl(sourceEntity.getCropUrl()); goods.setCreateTime(sourceEntity.getCreateTime()); + PrintTaskResp printTaskResp = printerMapper.queryTaskByMpId(sourceEntity.getId()); + if (printTaskResp != null) { + goods.setPrinterName(printTaskResp.getPrinterName()); + goods.setPrinterPaper(printTaskResp.getPaper()); + } goodsList.add(goods); } } diff --git a/src/main/resources/mapper/PrinterMapper.xml b/src/main/resources/mapper/PrinterMapper.xml index 00513d2e..055f6e87 100644 --- a/src/main/resources/mapper/PrinterMapper.xml +++ b/src/main/resources/mapper/PrinterMapper.xml @@ -68,6 +68,9 @@ FROM member_print p WHERE p.id in (select order_item.goods_id from order_item where order_item.order_id = #{orderId} and order_item.goods_type = 3) +