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

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/biz/OrderInfoBiz.java

@@ -1078,10 +1078,12 @@ public class OrderInfoBiz extends BaseBiz<OrderInfoMapper, OrderInfo> {
 			old.setPayType(3);
 			old.setPayTime(new Date());
 			old.setAuditStatus(1);
+			old.setPayStatus(2);
 			old.setStatus(OrderStatusEnum.ORDER_SEND.getType());
 			updateSelectiveByIdRe(old);
 		} else {
 			old.setAuditStatus(2);
+			old.setPayStatus(1);
 			old.setAuditReason(orderInfo.getAuditReason());
 			updateSelectiveByIdRe(old);
 		}

rs-website/rs-website-server/src/main/resources/mapper/NewsInfoMapper.xml

@@ -21,7 +21,7 @@
         <if test="sortType == 2">
             order by ni.rank DESC
         </if>
-        <if test="sortType != 3">
+        <if test="sortType == 3">
             order by ni.upd_time DESC
         </if>
     </select>