Merge remote-tracking branch 'origin/developer' into developer

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/impl/BillingOrderServiceImpl.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.gic.commons.util.GlobalInfo;
 import com.gic.enterprise.constant.BillingOrderStatusEnum;
 import com.gic.enterprise.constant.EnterpriseStatusTypeEnum;
+import com.gic.enterprise.constant.PayTypeEnum;
 import com.gic.enterprise.dao.mapper.TabBillingOrderMapper;
 import com.gic.enterprise.dto.BillingOrderDTO;
 import com.gic.enterprise.dto.SmsPackageOrderItemDTO;
@@ -57,6 +58,9 @@ public class BillingOrderServiceImpl implements BillingOrderService {
         order.setOrderId(orderId);
         order.setPayInfoId(payInfoId);
         order.setPayType(payType);
+        if(payType == PayTypeEnum.OFFLINE_PAY.getCode()){
+            order.setOrderStatus(BillingOrderStatusEnum.AUDITING.getCode());
+        }
         int result = this.tabBillingOrderMapper.updateByPrimaryKeySelective(order);
         if(result > 0){
             return true;

gic-platform-enterprise-service/src/main/resources/mapper/TabPushMessageMapper.xml

@@ -256,6 +256,7 @@
     <if test="pushClassifyId != null">
       and push_classify_id = #{pushClassifyId}
     </if>
+    order by update_time desc
   </select>
   <select id="pageUserMessage" resultMap="userMessageResult">
     select