diff --git a/cash-api/account-server/src/main/java/com/czg/controller/admin/PrintMachineController.java b/cash-api/account-server/src/main/java/com/czg/controller/admin/PrintMachineController.java index 2732a753..b1547866 100644 --- a/cash-api/account-server/src/main/java/com/czg/controller/admin/PrintMachineController.java +++ b/cash-api/account-server/src/main/java/com/czg/controller/admin/PrintMachineController.java @@ -91,14 +91,4 @@ public class PrintMachineController { return CzgResult.success(printMachineService.remove(new QueryWrapper().eq(PrintMachine::getShopId, StpKit.USER.getShopId()).eq(PrintMachine::getId, printerDelDTO.getId()))); } - /** - * 打印订单 - * @return 是否成功 - */ - @SaAdminCheckPermission(value = "printer:order", name = "打印机打印订单") - @PostMapping("/order") - public CzgResult printOrder(@RequestBody @Validated PrinterOrderDTO printerOrderDTO) { - return CzgResult.success(printMachineService.printOrder(StpKit.USER.getShopId(), printerOrderDTO)); - } - } diff --git a/cash-api/order-server/src/main/java/com/czg/controller/admin/AdminOrderController.java b/cash-api/order-server/src/main/java/com/czg/controller/admin/AdminOrderController.java index 86d41fb6..9547a596 100644 --- a/cash-api/order-server/src/main/java/com/czg/controller/admin/AdminOrderController.java +++ b/cash-api/order-server/src/main/java/com/czg/controller/admin/AdminOrderController.java @@ -1,6 +1,7 @@ package com.czg.controller.admin; import com.czg.order.dto.OrderInfoAddDTO; +import com.czg.order.dto.OrderInfoPrintDTO; import com.czg.order.dto.OrderInfoQueryDTO; import com.czg.order.dto.OrderInfoRefundDTO; import com.czg.order.entity.OrderInfo; @@ -72,4 +73,12 @@ public class AdminOrderController { public CzgResult refundOrder(@Validated @RequestBody OrderInfoRefundDTO refundDTO) { return payService.refundOrderBefore(refundDTO); } + + /** + * 订单打印 + */ + @PostMapping("/print") + public CzgResult printOrder(@Validated @RequestBody OrderInfoPrintDTO orderInfoPrintDTO) { + return CzgResult.success(orderInfoService.printOrder(StpKit.USER.getShopId(), orderInfoPrintDTO)); + } } diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/service/PrintMachineService.java b/cash-common/cash-common-service/src/main/java/com/czg/account/service/PrintMachineService.java index 13b89393..4e2f8023 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/service/PrintMachineService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/service/PrintMachineService.java @@ -19,6 +19,5 @@ public interface PrintMachineService extends IService { Boolean edit(Long shopId, PrinterEditDTO printerEditDTO); - Boolean printOrder(Long shopId, PrinterOrderDTO printerOrderDTO); } diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/dto/OrderInfoPrintDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/order/dto/OrderInfoPrintDTO.java new file mode 100644 index 00000000..768447d7 --- /dev/null +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/dto/OrderInfoPrintDTO.java @@ -0,0 +1,21 @@ + +package com.czg.order.dto; + +import jakarta.validation.constraints.NotNull; +import lombok.Data; + +/** + * 订单表 实体类。 + * + * @author ww + * @since 2025-02-13 + */ +@Data +public class OrderInfoPrintDTO{ + /** + * 订单id + */ + @NotNull(message = "id不为空") + private Long id; + +} diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/service/OrderInfoService.java b/cash-common/cash-common-service/src/main/java/com/czg/order/service/OrderInfoService.java index 37d27453..90e6cdb7 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/order/service/OrderInfoService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/service/OrderInfoService.java @@ -1,10 +1,7 @@ package com.czg.order.service; import com.alibaba.fastjson2.JSONObject; -import com.czg.order.dto.BigDecimalDTO; -import com.czg.order.dto.CheckOrderPay; -import com.czg.order.dto.OrderInfoAddDTO; -import com.czg.order.dto.OrderInfoQueryDTO; +import com.czg.order.dto.*; import com.czg.order.entity.OrderDetail; import com.czg.order.entity.OrderInfo; import com.czg.order.enums.PayEnums; @@ -53,4 +50,7 @@ public interface OrderInfoService extends IService { BigDecimalDTO prodCouponAmount, BigDecimalDTO totalAmount, BigDecimalDTO packAmount, boolean isAllPack, boolean isVipPrice); + + Boolean printOrder(Long shopId, OrderInfoPrintDTO orderInfoPrintDTO); + } diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/PrintMachineServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/PrintMachineServiceImpl.java index 27531b22..35140798 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/PrintMachineServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/PrintMachineServiceImpl.java @@ -5,19 +5,12 @@ import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; import com.czg.account.dto.print.PrinterAddDTO; import com.czg.account.dto.print.PrinterEditDTO; -import com.czg.account.dto.print.PrinterOrderDTO; -import com.czg.config.RabbitPublisher; import com.czg.exception.ApiNotPrintException; -import com.czg.order.entity.OrderInfo; -import com.czg.order.service.OrderInfoService; -import com.mybatisflex.core.paginate.Page; import com.mybatisflex.core.query.QueryWrapper; import com.mybatisflex.spring.service.impl.ServiceImpl; import com.czg.account.entity.PrintMachine; import com.czg.account.service.PrintMachineService; import com.czg.service.account.mapper.PrintMachineMapper; -import jakarta.annotation.Resource; -import org.apache.dubbo.config.annotation.DubboReference; import org.apache.dubbo.config.annotation.DubboService; import org.springframework.stereotype.Service; @@ -30,11 +23,6 @@ import org.springframework.stereotype.Service; @Service @DubboService public class PrintMachineServiceImpl extends ServiceImpl implements PrintMachineService{ - @DubboReference - private OrderInfoService orderInfoService; - - @Resource - private RabbitPublisher rabbitPublisher; @Override public boolean add(Long shopId, PrinterAddDTO dto) { @@ -68,19 +56,4 @@ public class PrintMachineServiceImpl extends ServiceImpl