2025008071805

ruoyi-system/src/main/java/com/ruoyi/system/controller/AppleOrderController.java

@@ -311,10 +311,10 @@ public class AppleOrderController extends BaseController {
                ordertype=2;
                UserUseSecondaryCard userUseSecondaryCard =  userUseSecondaryCardService.selectUserUseSecondaryCardByorderId(cikaid);
                if (userUseSecondaryCard == null){
-                   return AjaxResult.error("此卡不存在");
+                   return AppletControllerUtil.appletWarning("此卡不存在");
                }
                if (userUseSecondaryCard.getStatus() != 1){
-                   return AjaxResult.error("此卡不是使用状态");
+                   return AppletControllerUtil.appletWarning("此卡不是使用状态");
                }
            }
            String ptcode=GenerateCustomCode.generCreateOrder("PT");

ruoyi-system/src/main/java/com/ruoyi/system/controller/DiyCityController.java

@@ -49,6 +49,19 @@ public class DiyCityController extends BaseController
         List<DiyCity> list = diyCityService.selectDiyCityList(diyCity);
         return getDataTable(list);
     }
+
+
+    /**
+     * 查询自定义地区列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:DiyCity:list')")
+    @GetMapping("/datalist")
+    public AjaxResult listdata(DiyCity diyCity)
+    {
+         List<DiyCity> list = diyCityService.selectDiyCityList(diyCity);
+        return success(list);
+    }
+
     /**
      * 获取自定义地区树形结构数据
      */

ruoyi-system/src/main/java/com/ruoyi/system/controller/SiteSkillController.java

@@ -71,13 +71,13 @@ public class SiteSkillController extends BaseController
         SiteSkill siteSkill = new SiteSkill();
         siteSkill.setStatus(1L); // 只获取启用状态的技能
         List<SiteSkill> list = siteSkillService.selectSiteSkillList(siteSkill);
-        // 按照排序字段升序排列
+//        // 按照排序字段升序排列
-        list.sort((a, b) -> {
+//        list.sort((a, b) -> {
-            if (a.getSort() == null && b.getSort() == null) return 0;
+//            if (a.getSort() == null && b.getSort() == null) return 0;
-            if (a.getSort() == null) return 1;
+//            if (a.getSort() == null) return 1;
-            if (b.getSort() == null) return -1;
+//            if (b.getSort() == null) return -1;
-            return a.getSort().compareTo(b.getSort());
+//            return a.getSort().compareTo(b.getSort());
-        });
+//        });
         return success(list);
     }
 

ruoyi-ui/src/api/system/DiyCity.js

@@ -8,6 +8,17 @@ export function listDiyCity(query) {
     params: query
   })
 }
+// 查询自定义地区列表
+export function datalist(query) {
+  return request({
+    url: '/system/DiyCity/datalist',
+    method: 'get',
+    params: query
+  })
+}
+
+
+
 
 // 查询自定义地区详细
 export function getDiyCity(id) {