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

# Conflicts:
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/OrderRentVehicleController.java

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserLoginBiz.java

@@ -198,12 +198,13 @@ public class AppUserLoginBiz extends BaseBiz<AppUserLoginMapper, AppUserLogin> {
         }
         return null;
     }
-    
-    @CacheClear(pre = "user{1}")
+
+    @CacheClear(pre = "user{1.id}")
     public void disable(AppUserLogin appUserLogin) {
       mapper.updateByPrimaryKeySelective(appUserLogin);
     }
 
+    @CacheClear(pre = "user{1.id}")
     public void available(AppUserLogin appUserLogin) {
         mapper.updateByPrimaryKeySelective(appUserLogin);
     }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/MyWalletBiz.java

@@ -31,6 +31,7 @@ import tk.mybatis.mapper.entity.Example;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import java.time.Instant;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -361,16 +362,6 @@ public class MyWalletBiz extends BaseBiz<MyWalletMapper, MyWallet> {
             }
         }
         return  ObjectRestResponse.succ();
-
-    }
-
-
-  public void insertBatchWallet(){
-
-      List<AppUserLogin> appUserLogins = appUserLoginBiz.selectListAll();
-      List<Integer> userIds = appUserLogins.stream().map(AppUserLogin::getId).collect(Collectors.toList());
-
-
   }
 
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/DataController.java

@@ -53,4 +53,15 @@ public class DataController {
         }
         return ObjectRestResponse.succ();
     }
+
+    @GetMapping("/clear_relation_withphone")
+    public ObjectRestResponse<Void> clearRelation(@RequestParam("phones") List<String> phones){
+        Map<String, Integer> phoneAndUserIdMapByPhones = appUserLoginBiz.findPhoneAndUserIdMapByPhones(phones);
+        if (Objects.nonNull(phoneAndUserIdMapByPhones)){
+            Collection<Integer> userIds = phoneAndUserIdMapByPhones.values();
+            appUserRelationBiz.deleteByMemberIds(userIds);
+            appUserSellingWaterBiz.deleteByMemberIds(userIds);
+        }
+        return ObjectRestResponse.succ();
+    }
 }
\ No newline at end of file

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/OrderApplication.java

@@ -12,8 +12,9 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 
 @SpringBootApplication(scanBasePackages = {
         "com.xxfc.platform",
-        "com.github.wxiaoqi.security.common.handler",
-        "com.github.wxiaoqi.security.common.log"
+        "com.github.wxiaoqi.security.common.handler"
+//        ,
+//        "com.github.wxiaoqi.security.common.log"
 })
 @EnableDiscoveryClient
 @EnableScheduling