java/zhihuishenqu.git

			@@ -24,7 +24,7 @@
			public interface ComShopOrderDAO extends BaseMapper<ComShopOrderDO> {

			@Select("<script> " +
			"select order_no,store_id,`status`,pay_status,receiver_id,total_amount as orderTotal,pay_amount,delivery_type,remark,create_at from com_shop_order as cso" +
			"select id as orderId,order_no,store_id,`status`,pay_status,receiver_id,total_amount as orderTotal,pay_amount,delivery_type,remark,create_at from com_shop_order as cso" +
			" where 1=1 and cso.delete_status = 1 and cso.user_id = #{comOrderListDTO.userId}" +
			"<if test='comOrderListDTO.status != null'>" +
			" AND cso.status = #{comOrderListDTO.status} " +
			@@ -75,6 +75,12 @@
			"<if test='pageComShopOrderSearchDTO.storeName != null '>" +
			" AND ss.name like concat('%', #{pageComShopOrderSearchDTO.storeName}, '%') " +
			" </if> " +
			"<if test='pageComShopOrderSearchDTO.storeId != null '>" +
			" AND ss.id = #{pageComShopOrderSearchDTO.storeId} " +
			" </if> " +
			"<if test='pageComShopOrderSearchDTO.storeUserId != null '>" +
			" AND ss.sys_user_id = #{pageComShopOrderSearchDTO.storeUserId} " +
			" </if> " +
			" GROUP BY sr.id " +
			" ORDER BY sr.create_at "+
			"</script>")
			@@ -102,7 +108,10 @@
			" LEFT JOIN com_shop_store ss ON sr.store_id = ss.id \n" +
			" WHERE sr.delete_status = 1" +
			"<if test='comShopOrderExportDTO.userId != null'>" +
			" AND ss.user_id = #{comShopOrderExportDTO.userId} " +
			" AND sr.user_id = #{comShopOrderExportDTO.userId} " +
			" </if> " +
			"<if test='comShopOrderExportDTO.storeUserId != null '>" +
			" AND ss.sys_user_id = #{comShopOrderExportDTO.storeUserId} " +
			" </if> " +
			"<if test='comShopOrderExportDTO.orderIds != null and comShopOrderExportDTO.orderIds.length>0 '>" +
			" AND sr.id in " +