From 3fd36846ad612f627c0784587dc6099a322a158e Mon Sep 17 00:00:00 2001 From: houruijun <411269194@kidgrow.com> Date: Wed, 24 Jun 2020 18:55:09 +0800 Subject: [PATCH] 1.编写扣费业务4大接口(AI 调用前,失败退,调用后,人工读) 2.增加写mq消息队列 3.增加扣费业务相关全局静态值 4.调整扣费,套餐,套餐记录services里面的调用关系。 --- kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/ProductOrderDetail.java | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/ProductOrderDetail.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/ProductOrderDetail.java index d13c348..46ac6c3 100644 --- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/ProductOrderDetail.java +++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/ProductOrderDetail.java @@ -2,6 +2,9 @@ import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.kidgrow.common.model.SuperModel; import lombok.AllArgsConstructor; import lombok.Data; @@ -33,11 +36,13 @@ * 对应product_order表中的id */ @NotEmpty(message = "对应product_order表中的id不能为空") + @JsonSerialize(using = ToStringSerializer.class) private Long orderId; /** * 产品/明细ID */ @NotEmpty(message = "产品/明细ID不能为空") + @JsonSerialize(using = ToStringSerializer.class) private Long proId; /** * 产品/明细名称 @@ -63,23 +68,29 @@ /** * 读片量 */ - @NotEmpty(message = "读片量不能为空") + @NotNull(message = "读片量不能为空") private Integer ailightCount; /** * 报告量 */ - @NotEmpty(message = "报告量不能为空") + @NotNull(message = "报告量不能为空") private Integer recordCount; /** * 有效的开始时间 */ + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") private Date proBegintime; /** * 有效的结束时间 */ + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") private Date proEndtime; /** * 状态,1启用,0停用 */ private Boolean enabled; + /** + * 创建者的部门 + */ + private String createUserOrgCode; } -- Gitblit v1.8.0