diff --git a/pz-system/src/main/java/com/pz/system/domain/vo/DbghOrderItemVo.java b/pz-system/src/main/java/com/pz/system/domain/vo/DbghOrderItemVo.java index 3f57fba..fad442f 100644 --- a/pz-system/src/main/java/com/pz/system/domain/vo/DbghOrderItemVo.java +++ b/pz-system/src/main/java/com/pz/system/domain/vo/DbghOrderItemVo.java @@ -16,11 +16,6 @@ import java.util.Date; public class DbghOrderItemVo extends OrderCommonVo { /** - * 业务项目 - */ - private String project; - - /** * 用户名称 */ private String userName; @@ -44,14 +39,6 @@ public class DbghOrderItemVo extends OrderCommonVo { */ private String description; - /** - * 订单佣金 - */ - private Float commission; - /** - * 凭证 - */ - private String voucher; } diff --git a/pz-system/src/main/java/com/pz/system/domain/vo/DbmyOrderItemVo.java b/pz-system/src/main/java/com/pz/system/domain/vo/DbmyOrderItemVo.java index 4929bce..abe490c 100644 --- a/pz-system/src/main/java/com/pz/system/domain/vo/DbmyOrderItemVo.java +++ b/pz-system/src/main/java/com/pz/system/domain/vo/DbmyOrderItemVo.java @@ -14,11 +14,6 @@ import lombok.EqualsAndHashCode; public class DbmyOrderItemVo extends OrderCommonVo { /** - * 业务项目 - */ - private String project; - - /** * 药品名称 */ private String ypName; @@ -78,13 +73,4 @@ public class DbmyOrderItemVo extends OrderCommonVo { */ private String description; - /** - * 订单佣金 - */ - private Float commission; - - /** - * 凭证 - */ - private String voucher; } diff --git a/pz-system/src/main/java/com/pz/system/domain/vo/DbwzOrderItemVo.java b/pz-system/src/main/java/com/pz/system/domain/vo/DbwzOrderItemVo.java index 2e55577..8ff11e5 100644 --- a/pz-system/src/main/java/com/pz/system/domain/vo/DbwzOrderItemVo.java +++ b/pz-system/src/main/java/com/pz/system/domain/vo/DbwzOrderItemVo.java @@ -16,11 +16,6 @@ import java.util.Date; public class DbwzOrderItemVo extends OrderCommonVo { /** - * 业务项目 - */ - private String project; - - /** * 用户名称 */ private String userName; @@ -35,10 +30,6 @@ public class DbwzOrderItemVo extends OrderCommonVo { */ private Date visitTime; - /** - * 订单佣金 - */ - private Float commission; /** * 主诉 @@ -76,11 +67,6 @@ public class DbwzOrderItemVo extends OrderCommonVo { private String description; /** - * 凭证 - */ - private String voucher; - - /** * 上次就医情况 */ private String lastMedicalTreatmentSituation; diff --git a/pz-system/src/main/java/com/pz/system/domain/vo/OrderCommonVo.java b/pz-system/src/main/java/com/pz/system/domain/vo/OrderCommonVo.java index f00714a..2091fe4 100644 --- a/pz-system/src/main/java/com/pz/system/domain/vo/OrderCommonVo.java +++ b/pz-system/src/main/java/com/pz/system/domain/vo/OrderCommonVo.java @@ -36,5 +36,28 @@ public class OrderCommonVo { */ private Integer serviceStatus; + /** + * 评价标志 0-未评价,1-好评,2-差评 + */ + private Integer evaluationFlag; + /** + * 用户评价 + */ + private String evaluationContent; + + /** + * 凭证 + */ + private String voucher; + + /** + * 订单佣金 + */ + private Float commission; + + /** + * 业务项目 + */ + private String project; } diff --git a/pz-system/src/main/java/com/pz/system/domain/vo/YypzOrderItemVo.java b/pz-system/src/main/java/com/pz/system/domain/vo/YypzOrderItemVo.java index ee8b523..dde0c1e 100644 --- a/pz-system/src/main/java/com/pz/system/domain/vo/YypzOrderItemVo.java +++ b/pz-system/src/main/java/com/pz/system/domain/vo/YypzOrderItemVo.java @@ -16,10 +16,6 @@ import java.util.Date; @Data public class YypzOrderItemVo extends OrderCommonVo { - /** - * 业务项目 - */ - private String project; /** * 用户名称 @@ -36,10 +32,6 @@ public class YypzOrderItemVo extends OrderCommonVo { */ private String hospital; - /** - * 订单佣金 - */ - private Float commission; /** * 预约电话 @@ -51,25 +43,12 @@ public class YypzOrderItemVo extends OrderCommonVo { */ private Date visitTime; - /** - * 评价标志 0-未评价,1-好评,2-差评 - */ - private Integer evaluationFlag; /** * 需求描述 */ private String description; - /** - * 用户评价 - */ - private String evaluationContent; - - /** - * 完成凭证 - */ - private String voucher; /** * 备注 diff --git a/pz-system/src/main/java/com/pz/system/domain/vo/ZyphOrderItemVo.java b/pz-system/src/main/java/com/pz/system/domain/vo/ZyphOrderItemVo.java index c690424..c32f6f4 100644 --- a/pz-system/src/main/java/com/pz/system/domain/vo/ZyphOrderItemVo.java +++ b/pz-system/src/main/java/com/pz/system/domain/vo/ZyphOrderItemVo.java @@ -14,11 +14,6 @@ import lombok.EqualsAndHashCode; public class ZyphOrderItemVo extends OrderCommonVo { /** - * 业务项目 - */ - private String project; - - /** * 用户名称 */ private String userName; @@ -34,11 +29,6 @@ public class ZyphOrderItemVo extends OrderCommonVo { private String hospital; /** - * 订单佣金 - */ - private Float commission; - - /** * 其他需求 */ private String description; @@ -52,19 +42,4 @@ public class ZyphOrderItemVo extends OrderCommonVo { * 陪护时间 */ private String visitTime; - - /** - * 凭证 - */ - private String voucher; - - /** - * 评价 - */ - private String evaluationContent; - - /** - * 是否好评,0-未评价,1-好评,2-差评 - */ - private Integer evaluationFlag; } diff --git a/pz-system/src/main/resources/mapper/system/DbghOrderMapper.xml b/pz-system/src/main/resources/mapper/system/DbghOrderMapper.xml index d7ff6d4..3547c82 100644 --- a/pz-system/src/main/resources/mapper/system/DbghOrderMapper.xml +++ b/pz-system/src/main/resources/mapper/system/DbghOrderMapper.xml @@ -70,7 +70,7 @@ total_order.business_id, total_order.status as orderStatus, dbgh_order.status as serviceStatus, - services.name as project, + business.name as project, CONVERT((1 - services.fenmo / 100), decimal(10, 2)) * CONVERT(services.price, decimal(10, 2)) as commission, user_vsitor.name as userName, @@ -79,8 +79,11 @@ dbgh_order.visit_time, total_order.remark as description, dbgh_order.remark, + total_order.evaluation_content, + total_order.is_satisfaction as evaluation_flag, dbgh_order.voucher from total_order + left join business on total_order.business_id = business.id left join dbgh_order on dbgh_order.order_id = total_order.id left join services on total_order.service_id = services.id left join user_vsitor on user_vsitor.id = dbgh_order.visitor diff --git a/pz-system/src/main/resources/mapper/system/DbmyOrderMapper.xml b/pz-system/src/main/resources/mapper/system/DbmyOrderMapper.xml index 41f06b5..4522c0a 100644 --- a/pz-system/src/main/resources/mapper/system/DbmyOrderMapper.xml +++ b/pz-system/src/main/resources/mapper/system/DbmyOrderMapper.xml @@ -71,7 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" total_order.business_id, total_order.status as orderStatus, dbmy_order.status as serviceStatus, - services.name as project, + business.name as project, CONVERT((1 - services.fenmo / 100), decimal(10, 2)) * CONVERT(services.price, decimal(10, 2)) as commission, dbmy_order.yp_name, @@ -81,13 +81,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" dbmy_order.prescription_attachment, dbmy_order.phone, dbmy_order.recipient, - dbmy_order.address as address, + dbmy_order.address as address, dbmy_order.address_info, dbmy_order.is_refrigerate, - total_order.remark as description, + total_order.remark as description, dbmy_order.remark, - dbmy_order.voucher + dbmy_order.voucher, + total_order.evaluation_content, + total_order.is_satisfaction as evaluation_flag from total_order + left join business on total_order.business_id = business.id left join dbmy_order on dbmy_order.order_id = total_order.id left join services on total_order.service_id = services.id where total_order.id = #{id} diff --git a/pz-system/src/main/resources/mapper/system/DbwzOrderMapper.xml b/pz-system/src/main/resources/mapper/system/DbwzOrderMapper.xml index 745551b..4bdd00d 100644 --- a/pz-system/src/main/resources/mapper/system/DbwzOrderMapper.xml +++ b/pz-system/src/main/resources/mapper/system/DbwzOrderMapper.xml @@ -72,7 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" total_order.business_id, total_order.status as orderStatus, dbwz_order.status as serviceStatus, - services.name as project, + business.name as project, CONVERT((1 - services.fenmo / 100), decimal(10, 2)) * CONVERT(services.price, decimal(10, 2)) as commission, user_vsitor.name as userName, @@ -85,10 +85,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" dbwz_order.service_requirements, dbwz_order.last_medical_treatment_situation, dbwz_order.post_treatment_condition, - total_order.remark as description, + total_order.evaluation_content, + total_order.is_satisfaction as evaluation_flag, + total_order.remark as description, dbwz_order.remark, dbwz_order.voucher from total_order + left join business on total_order.business_id = business.id left join dbwz_order on dbwz_order.order_id = total_order.id left join services on total_order.service_id = services.id left join user_vsitor on user_vsitor.id = dbwz_order.visitor diff --git a/pz-system/src/main/resources/mapper/system/YypzOrderMapper.xml b/pz-system/src/main/resources/mapper/system/YypzOrderMapper.xml index 9a9e711..765b4f5 100644 --- a/pz-system/src/main/resources/mapper/system/YypzOrderMapper.xml +++ b/pz-system/src/main/resources/mapper/system/YypzOrderMapper.xml @@ -74,7 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" yypz_order.status as serviceStatus, yypz_order.phone, yypz_order.visit_time, - services.name as project, + business.name as project, total_order.evaluation_content, total_order.is_satisfaction as evaluation_flag, total_order.remark as description, @@ -86,6 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" department.title as department, yypz_order.remark from total_order + left join business on business.id = total_order.business_id left join yypz_order on yypz_order.order_id = total_order.id left join services on total_order.service_id = services.id left join user_vsitor on user_vsitor.id = yypz_order.visitor diff --git a/pz-system/src/main/resources/mapper/system/ZyphOrderMapper.xml b/pz-system/src/main/resources/mapper/system/ZyphOrderMapper.xml index a7220b9..fa09820 100644 --- a/pz-system/src/main/resources/mapper/system/ZyphOrderMapper.xml +++ b/pz-system/src/main/resources/mapper/system/ZyphOrderMapper.xml @@ -76,7 +76,7 @@ total_order.business_id, total_order.status as orderStatus, zyph_order.status as serviceStatus, - services.name as project, + business.name as project, CONVERT((1 - services.fenmo / 100), decimal(10, 2)) * CONVERT(services.price, decimal(10, 2)) as commission, user_vsitor.name as userName, @@ -90,6 +90,7 @@ total_order.evaluation_content, total_order.is_satisfaction as evaluation_flag from total_order + left join business on total_order.business_id = business.id left join zyph_order on zyph_order.order_id = total_order.id left join services on total_order.service_id = services.id left join user_vsitor on user_vsitor.id = zyph_order.visitor