小程序订单查看修改

xinelu-nurse-applet/src/main/java/com/xinelu/applet/vo/nursingorder/AppletGoodsOrderVO.java

@@ -7,6 +7,7 @@ import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.Date;
+import java.util.List;
 
 
 /**
@@ -174,6 +175,10 @@ public class AppletGoodsOrderVO implements Serializable {
      */
     private String orderType;
 
+    /**
+     * 订单类型，积分兑换：INTEGRAL_EXCHANGE，直接购买：DIRECT_BUY，健康咨询：HEALTH_CONSULTATION
+     */
+    private List<String> orderTypeList;
 
     /**
      * 积分抵扣数量

xinelu-nurse-applet/src/main/resources/mapper/applet/nursingorder/NusringOrderMapper.xml

@@ -155,6 +155,9 @@
             <if test="orderType != null  and orderType != ''">
                 and gr.order_type = #{orderType}
             </if>
+            <if test="orderType = null  and orderType = ''">
+                and gr.order_type IN #{orderTypeList}
+            </if>
             and gr.del_flag = 0
             and god.del_flag = 0
         </where>
@@ -272,6 +275,7 @@
 
     <select id="getAppointmentOrderDetailsInfo" resultMap="getAppointmentDetailsResultMap">
 
+
                         SELECT pi.patient_name,
                                pi.phone patientPhone,
                                aor.id   appointmentOrderId,
@@ -316,11 +320,13 @@
                           AND aor.del_flag = 0
                           and aod.del_flag = 0
 
+
     </select>
 
     <select id="getNurseStationByItemId"
             resultType="com.xinelu.applet.vo.specialdisease.AppointmentOrderDetailsInfoVO">
 
+
                         SELECT ns.nurse_station_name nurseStationName,
                                ns.phone              stationPhone,
                                ns.address,
@@ -330,5 +336,6 @@
                                  LEFT JOIN nurse_station ns ON nsi.nurse_station_id = ns.id
                         WHERE nsi.id = #{nurseStationItemId}
 
+
     </select>
 </mapper>