Merge remote-tracking branch 'origin/master'

# Conflicts:
#	run-prod.sh

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/bo/ClassGradeUserQueryBo.java

@@ -311,5 +311,4 @@ public class ClassGradeUserQueryBo extends BaseEntity {
 	private Integer moreCertificateStatus;
 
 
-
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderServiceImpl.java

@@ -918,7 +918,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         add.setCreateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());
         add.setOrderType(Order.CONSUME_ORDER);
-        add.setOrderFrom(11);
         add.setHandleOrderSn(bo.getHandleOrderSn());
         if(orderHandle.getPayType()==1){
             add.setPayType(1);
@@ -1039,11 +1038,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         }
 
         add.setOrderSn(out_trade_no);
-        if (Validator.isNotEmpty(bo.getOrderFrom()) && bo.getOrderFrom() == 6) {
-            add.setOrderFrom(bo.getOrderFrom());
-        } else {
-            add.setOrderFrom(Order.FROM_INPUT);
-        }
+        add.setOrderFrom(11);
         add.setPayPrice(payPrice);//需要支付价格
         add.setOrderPrice(totalPrice);//标准价格
         orderHandle.setPayPrice(orderHandle.getPayPrice().add(payPrice));

zhongzheng-system/src/main/resources/mapper/modules/grade/ClassGradeMapper.xml

@@ -484,6 +484,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="studyCountMore != null and studyCountMore == 0 ">
             AND og.study_count = 0
         </if>
+        <if test="officialStatus != null and officialStatus == 1 ">
+            AND cgu.official_status = 1
+        </if>
+        <if test="officialStatus != null and officialStatus == 0 ">
+            AND cgu.official_status != 1
+        </if>
         <if test="realname != null and realname != ''">
             AND u.realname like concat('%', #{realname}, '%')
         </if>