diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/controller/apporderevaluate/AppOrderEvaluateController.java b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/controller/apporderevaluate/AppOrderEvaluateController.java index 4e1861a..c85ff60 100644 --- a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/controller/apporderevaluate/AppOrderEvaluateController.java +++ b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/controller/apporderevaluate/AppOrderEvaluateController.java @@ -47,7 +47,7 @@ public class AppOrderEvaluateController extends BaseController { } /** - * 新增预约订单评价 + * 新增商品订单评价 * * @param orderEvaluateAndPictureDTO 评价信息 * @return AjaxResult diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/vo/nursingorder/AppletGoodsOrderVO.java b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/vo/nursingorder/AppletGoodsOrderVO.java index 8218f2d..dc0dffc 100644 --- a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/vo/nursingorder/AppletGoodsOrderVO.java +++ b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/vo/nursingorder/AppletGoodsOrderVO.java @@ -24,11 +24,6 @@ public class AppletGoodsOrderVO implements Serializable { */ private Long goodsOrderId; - /** - * 护理站id - */ - private Long nurseStationId; - /** * 会员id */ @@ -38,10 +33,6 @@ public class AppletGoodsOrderVO implements Serializable { * 订单编号 */ private String goOrderNo; - /** - * 订单编号 - */ - private String godOrderNo; /** * 订单状态,待付款:WAIT_PAY,已付款:PAY,已取消:CANCEL,待收货:WAIT_RECEIVED,已收货:RECEIVED,待退款:WAIT_REFUND,已退款:REFUNDED,待退货:WAIT_RETURNED,已退货:RETURNED @@ -81,7 +72,6 @@ public class AppletGoodsOrderVO implements Serializable { */ private Long goodsOrderDetailsId; - /** * 商品名称 */ @@ -107,7 +97,6 @@ public class AppletGoodsOrderVO implements Serializable { */ private BigDecimal goodsPrice; - /** * 优惠金额(元) */ diff --git a/xinelu-nurse-applet/src/main/resources/mapper/applet/nursingorder/NusringOrderMapper.xml b/xinelu-nurse-applet/src/main/resources/mapper/applet/nursingorder/NusringOrderMapper.xml index b463b16..68a1e8e 100644 --- a/xinelu-nurse-applet/src/main/resources/mapper/applet/nursingorder/NusringOrderMapper.xml +++ b/xinelu-nurse-applet/src/main/resources/mapper/applet/nursingorder/NusringOrderMapper.xml @@ -86,7 +86,6 @@ resultType="com.xinelu.applet.vo.nursingorder.AppletGoodsOrderVO"> SELECT gr.id goodsOrderId, - gr.nurse_station_id, gr.patient_id, gr.order_no goOrderNo, gr.order_status, @@ -110,7 +109,6 @@ gr.remark, god.integral_deduction_count, god.id goodsOrderDetailsId, - god.order_no godOrderNo, god.goods_name, god.goods_count, god.goods_attribute_name, @@ -141,6 +139,7 @@ LEFT JOIN goods_order_details god ON gr.id = god.goods_order_id LEFT JOIN goods_attribute_details gad ON god.goods_attribute_details_id = gad.id LEFT JOIN sys_dict_data sdd ON sdd.dict_code = gr.refund_reason_dict_id + LEFT JOIN hospital_person_info hpi on hpi.id = gr.hospital_person_id and gr.patient_id = #{patientId} @@ -166,6 +165,9 @@ #{orderTypeList} + + and hpi.person_name like concat('%', #{hospitalPersonName}, '%') + and gr.del_flag = 0 and god.del_flag = 0