diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/vo/HandoverTotalVo.java b/cash-common/cash-common-service/src/main/java/com/czg/account/vo/HandoverTotalVo.java index a8aeb7493..1e09d46ff 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/vo/HandoverTotalVo.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/vo/HandoverTotalVo.java @@ -119,4 +119,8 @@ public class HandoverTotalVo implements Serializable { * 售出商品列表 */ private List detailList; + /** + * 售出商品分类列表 + */ + private List categoryList; } diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/HandoverRecordServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/HandoverRecordServiceImpl.java index 6ee7104dc..bd6fa3b02 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/HandoverRecordServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/HandoverRecordServiceImpl.java @@ -88,6 +88,7 @@ public class HandoverRecordServiceImpl extends ServiceImpl categoryData = orderInfoRpcService.getHandoverCategoryList(shopId, loginTimeStr, handoverTimeStr); - entity.setCategoryData(JSON.toJSONString(categoryData, JSONWriter.Feature.WriteMapNullValue)); + entity.setCategoryData(JSON.toJSONString(data.getCategoryList(), JSONWriter.Feature.WriteMapNullValue)); List productData = data.getDetailList(); entity.setProductData(JSON.toJSONString(productData, JSONWriter.Feature.WriteMapNullValue)); super.updateById(entity); diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoCustomServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoCustomServiceImpl.java index 5c1789f01..479ecfb10 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoCustomServiceImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoCustomServiceImpl.java @@ -328,7 +328,7 @@ public class OrderInfoCustomServiceImpl implements OrderInfoCustomService { log.info("后付费生成订单{},第{}", orderInfo.getId(), orderInfo.getPlaceNum()); printerHandler.orderHandler(orderInfo.getId().toString(), PrinterHandler.PrintTypeEnum.GUEST_ORDER, orderInfo.getPlaceNum()); //发送打票信息 后付费推送多次 需要处理 - //orderId_0_0 订单ID_先付后付(1先付0后付)_订单状态 0未完成 1完成 + //orderId_0_0 订单ID_先付后付(1先付0后付)_订单状态 0未完成 1完成_第几次下单 //orderInfo.getId() + "_" + (!"after-pay".equals(orderInfo.getPayMode()) ? 1 : 0) + "_0" rabbitPublisher.sendKitchenOrderPrintMsg(orderInfo.getId() + "_0_0", false, "后付费打印"); rabbitPublisher.sendOrderPrintMsg(orderInfo.getId() + "_0_0_" + orderInfo.getPlaceNum(), true, "后付费打印");