--no commit message

com.zrqx.order/src/main/java/com/zrqx/order/fg/mapper/FgOrderMapper.java

@@ -24,7 +24,9 @@ public interface FgOrderMapper extends BaseMapper<Order>{
 
 	/** @see GoodsTypeEnum.TOPUP.getCode() */
 	String TOPUP = "2-99";
+	String VIP = "2-98";
 	String NOT_TOPUP = " and i.type != '" + TOPUP + "' ";
+	String NOT_VIP = " and i.type != '" + VIP + "' ";
 	/** @see OrderStatusEnum.HAVE_PAID.getCode() */
 	String HAVE_PAID = "1";
 	/** 订单查询默认条件 */
@@ -68,7 +70,7 @@ public interface FgOrderMapper extends BaseMapper<Order>{
 	 */
 	@Select(" SELECT o.id,o.code,i.cover goodsCover , i.name goodsName, SUM(i.num) num ,o.payment, o.realReaderCarriage, o.status,o.createTime  "
 			+ "	FROM ord_order o LEFT JOIN ord_orderinfo i ON o.id = i.orderid "
-			+ " where "
+			+ " where o.orderType != 1 and "
 			+ " o.creater = #{memberId}"
 			+ DEFAULT_PARAM
 			+ " and createTime >= DATE_SUB(now(), INTERVAL #{form.month} MONTH) "
@@ -84,7 +86,7 @@ public interface FgOrderMapper extends BaseMapper<Order>{
 	 * @date: 2019年1月28日 上午9:26:21
 	 */
 	@Select(" <script> "
-			+ " select count(*) from  ( select o.id from ord_order o, ord_orderinfo i where o.creater = #{memberId} and o.id = i.orderid "
+			+ " select count(*) from  ( select o.id from ord_order o, ord_orderinfo i where o.creater = #{memberId} and o.id = i.orderid and o.orderType != 1 "
 			+ DEFAULT_PARAM
 			+ "<if test='"+ NOTBLANK +"(form.status)'>"
 			+ " and o.status = #{form.status} "
@@ -110,7 +112,8 @@ public interface FgOrderMapper extends BaseMapper<Order>{
 	 * @date: 2019年1月28日 上午11:47:30
 	 */
 	@Select (" <script> "
-			+ " select o.id,o.code,o.createTime,o.status,o.payment,o.realReaderCarriage,o.hasComment from ord_order o, ord_orderinfo i where o.creater = #{memberId} and o.id = i.orderid "
+			+ " select o.id,o.code,o.createTime,o.status,o.payment,o.realReaderCarriage,o.hasComment from ord_order o, ord_orderinfo i "
+			+ " where o.orderType != 1 and o.creater = #{memberId} and o.id = i.orderid "
 			+ DEFAULT_PARAM
 			// 订单状态
 			+ "<if test='"+ NOTBLANK +"(form.status)'>"
@@ -148,7 +151,7 @@ public interface FgOrderMapper extends BaseMapper<Order>{
 	Integer display(@Param("ids") List<Integer> ids, @Param("memberId") String opId);
 
 	/**
-	 * 查询已购买商品 id type 订单创建时间倒序  商品类型不为充值
+	 * 查询已购买商品 id type 订单创建时间倒序  商品类型不为充值,开通vip
 	 * @param form
 	 * @param opId
 	 * @return
@@ -156,9 +159,11 @@ public interface FgOrderMapper extends BaseMapper<Order>{
 	 * @date: 2019年2月13日 下午3:40:10
 	 */
 	@Select(" <script> "
-			+ " select i.id,i.goodsid,i.type,i.name,i.cover,o.createTime from ord_order o, ord_orderinfo i where o.creater = #{memberId}  and o.id = i.orderid "
+			+ " select i.id,i.goodsid,i.type,i.name,i.cover,o.createTime from ord_order o, ord_orderinfo i "
+			+ " where o.status >= 1 and o.creater = #{memberId}  and o.id = i.orderid "
 			+ DEFAULT_PARAM
 			+ NOT_TOPUP
+			+ NOT_VIP
 			// 商品类型
 			+ "<if test='"+ NOTBLANK +"(form.goodsType)'>"
 			+ " and i.type = #{form.goodsType} "
@@ -198,7 +203,8 @@ public interface FgOrderMapper extends BaseMapper<Order>{
 	@Select(" <script> "
 			+ " select i.goodsid as id,i.type "
 			+ " from ord_order o, ord_orderinfo i "
-			+ " where o.creater = #{memberId}  and o.id = i.orderid "
+			+ " where o.status >= " + HAVE_PAID
+			+ " and o.creater = #{memberId}  and o.id = i.orderid "
 			+ DEFAULT_PARAM
 			+ NOT_TOPUP
 			+ " group by i.goodsid,i.type "