fix:订单号

cooleshow-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/service/impl/OmsPortalOrderServiceImpl.java

@@ -431,7 +431,7 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
             List<Integer> collect = list.stream().map(Long::intValue).collect(Collectors.toList());
             criteria.andStatusIn(collect);
         }
-        orderExample.setOrderByClause("create_time desc");
+        orderExample.setOrderByClause(" field(status,'0','6','1','2','3','4','5'),create_time desc");
         List<OmsOrder> orderList = orderMapper.selectByExample(orderExample);
         CommonPage<OmsOrder> orderPage = CommonPage.restPage(orderList);
         //设置分页信息
@@ -846,7 +846,7 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
         Long increment = redisService.incr(key, 1);
         sb.append(date);
         sb.append(String.format("%02d", order.getSourceType()));
-        sb.append(String.format("%02d", order.getPayType()));
+        // sb.append(String.format("%02d", order.getPayType()));
         String incrementStr = increment.toString();
         if (incrementStr.length() <= 6) {
             sb.append(String.format("%06d", increment));