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

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rpc/service/AppPermissionService.java

@@ -309,6 +309,9 @@ public class AppPermissionService {
                     activityCode = codes[1];
                 }
                 parentId=appUserDetailBiz.getUserByCode(code);
+                if(parentId==null||parentId==0){
+                    return JsonResultUtil.createFailedResult(ResultCode.NOTEXIST_CODE, "邀请人不存在");
+                }
             }
             if(parentId!=null&&parentId>0){
                 relationBiz.bindRelation(userid, parentId, 1);

xx-im/xx-im-server/src/main/java/com/xxfc/platform/im/biz/UserBiz.java

@@ -68,7 +68,7 @@ public class UserBiz {
         String result = this.doPost(imUrl + "/user/register",str) ;
         JSONObject json = JSONObject.parseObject(result);
         //如果已经注册过，查询出手机号对应用户信息执行登录返回
-        if(0 == json.getInteger("resultCode")){
+        if(0 == json.getInteger("resultCode")||1040107 == json.getInteger("resultCode")){
             String phone = map.get("telephone").toString();
             Query query = new Query(Criteria.where("phone").is(phone));
             User mgt = mongoTemplate.findOne(query, User.class);

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/admin/VehicleModelCalendarPriceAdminController.java

@@ -30,8 +30,9 @@ public class VehicleModelCalendarPriceAdminController {
     private final VehicleModelCalendarPriceBiz vehicleModelCalendarPriceBiz;
 
     @ApiOperation("车型日历价格设置")
-    @PostMapping("/add_edit/{date}")
-    public ObjectRestResponse<Void> add(@RequestBody(required = false) List<VehicleModelCalendarPriceSaveDTO> vehicleModelCalendarPriceSaveDTO, @PathVariable(value = "date",required = false) String date ,UserDTO userDTO){
+    @PostMapping(value = {"/add_edit/{date}","/add_edit"})
+    public ObjectRestResponse<Void> add(@RequestBody(required = false) List<VehicleModelCalendarPriceSaveDTO> vehicleModelCalendarPriceSaveDTO,
+                                        @PathVariable(name = "date",required = false) String date ,UserDTO userDTO){
         vehicleModelCalendarPriceBiz.addVehicleModelCalendarPrice(vehicleModelCalendarPriceSaveDTO,date,userDTO.getId());
         return ObjectRestResponse.succ();
     }