From 50f5ff781d8fad69f34b2e12947c7dc418b28ef3 Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Thu, 20 Mar 2025 10:39:31 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E5=88=9B=E5=BB=BA=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E5=90=8E=E4=B8=8B=E5=8F=91=E6=89=93=E5=8D=B0=E5=8F=91=E7=A5=A8?= =?UTF-8?q?mq?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bsd/pjcloud/hard/api/utils/Drawing2D.java | 2 +- .../hard/service/HardOrderService.java | 21 ++++-------- .../impl/order/HardOrderServiceImpl.java | 34 ++++++++++++++++++- 3 files changed, 40 insertions(+), 17 deletions(-) diff --git a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/utils/Drawing2D.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/utils/Drawing2D.java index 9cf7531c5..c16b1f56a 100644 --- a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/utils/Drawing2D.java +++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/utils/Drawing2D.java @@ -30,7 +30,7 @@ public class Drawing2D { private final int horizontalPadding = 20; - private final String fontFamily = "SimSun"; + private final String fontFamily = "Arial Black"; /** * end ****************** config ****************** end diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardOrderService.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardOrderService.java index e05fa847f..8483dc39d 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardOrderService.java +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardOrderService.java @@ -9,7 +9,6 @@ import com.bsd.pjcloud.hard.api.dto.order.HardOrderDto; import com.bsd.pjcloud.hard.api.dto.order.app.HardAppCreateOrderDto; import com.bsd.pjcloud.hard.api.entity.order.HardOrderEntity; import com.bsd.pjcloud.hard.api.vo.order.HardOrderVo; -import com.bsd.pjcloud.hard.api.vo.order.excel.HardOrderExcelVo; import jakarta.validation.Valid; import java.util.List; @@ -28,24 +27,16 @@ public interface HardOrderService extends IService { /** * 创建app订单 - * - * @param dto 父订单id - * @return */ Long appCreateOrder(@Valid HardAppCreateOrderDto dto); /** - * 快速扣款 - * - * @param order 订单详情 + * 快速扣款,离线订单使用 */ void fastReduceBalance(HardOrderEntity order); /** * 计算额外金额 - * - * @param price 购物车总价 - * @return */ Integer computeExtraPrice(Integer price); @@ -61,16 +52,16 @@ public interface HardOrderService extends IService { /** * 扣减库存 - * - * @param isReduce true 扣件库存 false增加库存 */ void fastenerInventory(HardOrderEntity order, YesNoEnum isReduce); /** * 核销硬件二维码 - * - * @param dto - * @return */ Boolean handCancelCode(HandCancelCodeDto dto); + + /** + * 创建订单后发送mq消息 + */ + void createOrderAfterSendMqMsg(Long orderId); } \ No newline at end of file diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderServiceImpl.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderServiceImpl.java index 25971aa1c..666a9d140 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderServiceImpl.java +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderServiceImpl.java @@ -37,6 +37,7 @@ import com.bsd.pjcloud.hard.api.vo.order.HardOrderVo; import com.bsd.pjcloud.hard.mapper.HardManagerMapper; import com.bsd.pjcloud.hard.mapper.order.HardOrderMapper; import com.bsd.pjcloud.hard.service.HardCarService; +import com.bsd.pjcloud.hard.service.HardInvoiceService; import com.bsd.pjcloud.hard.service.HardManagerService; import com.bsd.pjcloud.hard.service.HardOrderService; import com.bsd.pjcloud.supermarket.api.feign.RemoteSupermarketSpuService; @@ -51,11 +52,12 @@ import com.bsd.pjcloud.wallet.api.entity.WalletTransactionEntity; import com.bsd.pjcloud.wallet.api.feign.*; import com.bsd.pjcloud.wallet.api.utils.WalletDataUtil; import com.bsd.pjcloud.wallet.api.vo.MchManageVo; -import com.bsd.pjcloud.wallet.api.vo.WalletManageVo; import com.bsd.pjcloud.wallet.api.vo.WalletSettingVo; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.context.annotation.Lazy; +import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; @@ -67,6 +69,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Optional; +import java.util.concurrent.CompletableFuture; /** * 订单表 @@ -85,6 +88,8 @@ public class HardOrderServiceImpl extends ServiceImpl { + Boolean isPrint = hardInvoiceService.printByOrder(orderdetail); + if (isPrint) { + log.info("|{}|发送mq消息成功,超市打印发票order|{}|", TAG, JSON.toJSONString(orderId)); + } + } + } + } + // 二维码类型的订单是否被核销 true被核销 false未核销 private boolean validateCodeIsCancel(HardOrderTypeEnum orderType, Long orderId) { Boolean flag = switch (orderType) {