Merge remote-tracking branch 'origin/master'

game-business/src/main/java/com/game/business/controller/AppGameItemController.java

@@ -225,9 +225,6 @@ public class AppGameItemController extends BaseController
             return R.fail("游戏赔率配置长度与选项长度不一致");
         }
 
-        // 升序排序
-        itemList.stream().sorted(Comparator.comparing(AppGameItem::getItemLocation));
-
         for (int i = 0; i < itemList.size(); i++) {
             AppGameItem gameItem = itemList.get(i);
             gameItem.setItemMultiple(Double.valueOf(configArry[i]));
@@ -270,9 +267,6 @@ public class AppGameItemController extends BaseController
             return R.fail("游戏未配置选项设置");
         }
 
-        // 升序排序
-        itemList.stream().sorted(Comparator.comparing(AppGameItem::getItemLocation));
-
         String config = "";
         for (int i = 0; i < itemList.size(); i++) {
             AppGameItem gameItem = itemList.get(i);

game-business/src/main/java/com/game/business/task/AppGameBettingTask.java

@@ -155,9 +155,6 @@ public class AppGameBettingTask {
                     appGameItemMultipleService.save(appGameItemMultiple);
                 }
 
-                // 升序排序
-                itemList.stream().sorted(Comparator.comparing(AppGameItem::getItemLocation));
-
                 for (int j = 0; j < itemList.size(); j++) {
                     AppGameItem gameItem = itemList.get(j);
                     gameItem.setItemMultiple(items.getDouble(j));

game-business/src/main/resources/mapper/business/AppGameItemMapper.xml

@@ -30,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="lotteryCount != null "> and lottery_count = #{lotteryCount}</if>
             <if test="consecutive != null "> and consecutive = #{consecutive}</if>
         </where>
-        order by item_location asc
+        order by cast(item_location as UNSIGNED) asc
     </select>
     
     <select id="selectAppGameItemById" parameterType="Long" resultMap="AppGameItemResult">