--no commit message

com.zrqx.order/src/main/java/com/zrqx/order/bg/mapper/OrderMapper.java

 package com.zrqx.order.bg.mapper;
 
+import java.util.List;
+
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Param;
 
+import com.zrqx.core.form.order.bg.order.OrderForm;
 import com.zrqx.core.mapper.BaseMapper;
 import com.zrqx.core.model.order.Order;
+import com.zrqx.core.util.page.PageInfo;
+import com.zrqx.core.util.page.PageParam;
+import com.zrqx.core.vo.order.bg.OrderListVO;
+import com.zrqx.core.vo.order.bg.OrderVO;
 
 @Mapper
 public interface OrderMapper extends BaseMapper<Order> {
 	
-	
+	/**
+	 * 查询订单列表
+	 * @param orderFormQuery
+	 * @return
+	 * @author xjg
+	 * @date 2019年1月7日 下午5:19:10
+	 */
+	@Select("<script>"
+			+ " select a.id,a.code,a.createrName,a.payment,a.status,a.createTime,a.needInvoice,a.invoiceStatus,a.orderSource,a.payType "
+			+ " from ord_order a "
+			+ " where 1 = 1 "
+			// 订单号
+			+ "<if test='"+ NOTBLANK +"(form.code)'>"
+			+ " and a.code in "
+		    + "<foreach item='item' index='index' collection= 'form.codes' open='(' separator=',' close=')'>"
+            + "#{item}"
+            + "</foreach>"
+			+ "</if>"
+			// 支付方式:请选择、支付宝、微信、网银
+			+ "<if test='form.payType!=null'>"
+			+ " and a.payType = #{form.payType} "
+			+ "</if>"
+			// 开票状态:请选择、已开票、未开票
+			+ "<if test='form.invoiceStatus!=null'>"
+			+ " and a.invoiceStatus = #{form.invoiceStatus} "
+			+ "</if>"
+			// 订单状态:待支付、已支付、已确认、待发货、配货中、已发货、已完成、已缺货、已取消、请选择
+			+ "<if test='form.status!=null'>"
+			+ " and a.status=#{form.status} "
+			+ "</if>"
+			// 下单时间-开始时间
+			+ "<if test='form.startTime!=null'>"
+			+ " and a.createTime <![CDATA[ >= ]]> #{form.startTime}  "
+			+ "</if>"
+			// 下单时间-结束时间
+			+ "<if test='form.endTime!=null'>"
+			+ " and date(a.createTime) <![CDATA[ <= ]]> #{form.endTime}  "
+			+ "</if>"
+			
+			// 下单会员
+			+ "<if test='"+ NOTBLANK +"(form.createrName)'>"
+			+ " and a.createrName = #{form.createrName} "
+			+ "</if>"
+			
+			+ " group by a.id "
+			+ " order by a.createTime desc "
+			+ "</script>")
+	List<OrderListVO>page(@Param("form")OrderForm form);
+
 	
 }

com.zrqx.order/src/main/java/com/zrqx/order/bg/mapper/OrderRemarkLogMapper.java

+package com.zrqx.order.bg.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import com.zrqx.core.mapper.BaseMapper;
+import com.zrqx.core.model.order.OrderRemarkLog;
+
+@Mapper
+public interface OrderRemarkLogMapper extends BaseMapper<OrderRemarkLog>{
+	
+	/**
+	 * 根据订单id查询备注历史
+	 * @param orderid
+	 * @return
+	 * @author ydm
+	 * @date: 2018年7月16日 上午10:42:11
+	 */
+	@Select("<script>"
+			+ "select a.operationContent,a.createTime,a.createrName "
+			+ " from ord_order_remark_log a where 1=1 "
+			// 订单id
+			+ "<if test='orderid!=null'>"
+			+ " and a.orderId = #{orderid} "
+			+ "</if>"
+			+ " order by a.createTime desc "
+			+ "</script>")
+	List<OrderRemarkLog> pageOrderRemarkLog(@Param("orderid")Integer orderid);
+
+}

com.zrqx.order/src/main/java/com/zrqx/order/bg/mapper/OrderStatusLogMapper.java

+package com.zrqx.order.bg.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import com.zrqx.core.mapper.BaseMapper;
+import com.zrqx.core.model.order.OrderStatusLog;
+
+@Mapper
+public interface OrderStatusLogMapper extends BaseMapper<OrderStatusLog>{
+
+	/**
+	 * 根据订单id查询备注历史
+	 * @param orderid
+	 * @return
+	 * @author ydm
+	 * @date: 2018年7月16日 上午10:42:11
+	 */
+	@Select("<script>"
+			+ "select a.operationContent,a.createTime,a.createrName "
+			+ " from ord_order_status_log a where 1=1 "
+			// 订单id
+			+ "<if test='orderid!=null'>"
+			+ " and a.orderId = #{orderid} "
+			+ "</if>"
+			+ " order by a.createTime desc "
+			+ "</script>")
+	List<OrderStatusLog> pageOrderStatusLog(@Param("orderid")Integer orderid);
+	
+}

com.zrqx.order/src/main/java/com/zrqx/order/bg/mapper/OrderinfoMapper.java

+package com.zrqx.order.bg.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import com.zrqx.core.mapper.BaseMapper;
+import com.zrqx.core.model.order.OrderInfo;
+
+
+@Mapper
+public interface OrderinfoMapper extends BaseMapper<OrderInfo>{
+	
+}