diff --git a/cash-api/account-server/src/main/java/com/czg/controller/admin/HandoverRecordController.java b/cash-api/account-server/src/main/java/com/czg/controller/admin/HandoverRecordController.java index d93e13af..99a7478f 100644 --- a/cash-api/account-server/src/main/java/com/czg/controller/admin/HandoverRecordController.java +++ b/cash-api/account-server/src/main/java/com/czg/controller/admin/HandoverRecordController.java @@ -5,10 +5,7 @@ import com.czg.account.vo.HandoverTotalVo; import com.czg.log.annotation.OperationLog; import com.czg.resp.CzgResult; import lombok.AllArgsConstructor; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; /** @@ -37,13 +34,16 @@ public class HandoverRecordController { /** * 收银机-交班/关班 + * @param isPrint 是否打印交班小票 */ @PostMapping("handover") @OperationLog("收银机-交班/关班") //@SaAdminCheckPermission("handoverRecord:handover") - public CzgResult handover() { + public CzgResult handover(@RequestParam Integer isPrint) { Long id = handoverRecordService.handover(); - // TODO 后续需要发生mq消息给打印机 + if (isPrint == 1) { + // TODO 后续需要发生mq消息给打印机 + } return CzgResult.success(); } diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/PointsExchangeRecordServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/PointsExchangeRecordServiceImpl.java index 42b1da72..3d7ac817 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/PointsExchangeRecordServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/PointsExchangeRecordServiceImpl.java @@ -27,7 +27,6 @@ import com.czg.validator.ValidatorUtil; import com.czg.validator.group.DefaultGroup; import com.czg.validator.group.InsertGroup; import com.mybatisflex.core.paginate.Page; -import com.mybatisflex.core.query.QueryColumn; import com.mybatisflex.core.query.QueryWrapper; import com.mybatisflex.spring.service.impl.ServiceImpl; import jakarta.servlet.http.HttpServletRequest; @@ -442,7 +441,7 @@ public class PointsExchangeRecordServiceImpl extends ServiceImpl