优化部分功能

sp-core/sp-api/src/main/java/com/pj/api/client/admin/AdminInterface.java

@@ -33,7 +33,7 @@ public interface AdminInterface {
     /**
      * 收购商认证 步骤1
      */
-    @RequestMapping("app/AppUser/rpc/getByPhoneAndUserType")
+    @PostMapping("app/AppUser/rpc/getByPhoneAndUserType")
     public AppUserDto getByPhoneAndUserType(@RequestParam("phone") String phone,@RequestParam("userType")Integer userType);
 
     /**
@@ -76,15 +76,10 @@ public interface AdminInterface {
     List<DistrictDTO> getDistrictList(@RequestParam("ids") String ids);
 
     /**
-     * 同步航通边民信息时,自动给边民注册app账号
+     * 创建APP账号
+     * @param createDTO
      */
-    @PostMapping("/AppUser/rpc/generatePeopleAccount")
-    public boolean generatePeopleAccount(@RequestBody HtPeopleDto peopleDto) throws Exception;
-
-    /**
-     * 同步航通边民信息时,自动给外籍商户注册app账号
-     */
-    @PostMapping("/AppUser/rpc/generateEnterpriseAccount")
-    public int generateEnterpriseAccount(@RequestBody EnterpriseDto enterpriseDto) throws Exception ;
+    @PostMapping("AppUser/rpc/createAppAccount")
+    public void createAccount(@RequestBody AppUserCreateDTO createDTO);
 
 }

sp-core/sp-api/src/main/java/com/pj/api/client/admin/AdminInterfaceFallback.java

@@ -76,16 +76,10 @@ public class AdminInterfaceFallback implements FallbackFactory<AdminInterface> {
             }
 
             @Override
-            public boolean generatePeopleAccount(HtPeopleDto appUser) throws Exception {
-                log.error("边民注册app账户失败。对象:{}",appUser);
-                return false;
-            }
+            public void createAccount(AppUserCreateDTO createDTO) {
 
-            @Override
-            public int generateEnterpriseAccount(EnterpriseDto enterpriseDto) throws Exception {
-                log.error("外籍商户注册app账户失败。对象:{}",enterpriseDto);
-                return 0;
             }
+
         };
     }
 

sp-core/sp-api/src/main/java/com/pj/api/dto/AppUserCreateDTO.java

@@ -0,0 +1,69 @@
+package com.pj.api.dto;
+
+import java.io.Serializable;
+
+public class AppUserCreateDTO implements Serializable {
+
+    /**
+     * 手机号码
+     */
+    private String phone;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    private String userType;
+
+    /**
+     * 外联id,user_type=1=>边民ID；user_type=3=>商户ID
+     */
+    private String fkId;
+
+    /**
+     * 是否认证(0=未认证,1=已认证)
+     */
+    private String auth="0";
+
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getUserType() {
+        return userType;
+    }
+
+    public void setUserType(String userType) {
+        this.userType = userType;
+    }
+
+    public String getFkId() {
+        return fkId;
+    }
+
+    public void setFkId(String fkId) {
+        this.fkId = fkId;
+    }
+
+    public String getAuth() {
+        return auth;
+    }
+
+    public void setAuth(String auth) {
+        this.auth = auth;
+    }
+}

sp-core/sp-base/src/main/java/com/pj/constants/UserTypeEnum.java

@@ -1,15 +0,0 @@
-package com.pj.constants;
-
-import io.swagger.models.auth.In;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-@Getter
-@AllArgsConstructor
-public enum UserTypeEnum {
-    ENTRPRISE_TYPE(3,"商户类型"),
-    PEOPLE_TYPE(1,"边民")
-    ;
-    private Integer code;
-    private String desc;
-}

sp-core/sp-base/src/main/java/com/pj/enummj/UserType.java

@@ -18,7 +18,9 @@ public enum UserType {
     USER_TYPE_GROUP_LEADER(2,"互市区边民组组长"),
     USER_TYPE_PURCHASER(3,"国内收购商"),
     USER_TYPE_DRIVER(4,"司机"),
-    USER_TYPE_ENTERPRISE(5,"互市区商家");
+    USER_TYPE_ENTERPRISE(5,"互市区商家"),
+    COOPERATIVE_TYPE(6,"合作社")
+    ;
 
     private Integer code;
 

sp-service/level-one-server/src/main/java/com/pj/tb_people/TbPeopleService.java

@@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.pj.api.client.admin.AdminInterface;
+import com.pj.api.consts.FeignFactory;
+import com.pj.api.dto.AppUserCreateDTO;
 import com.pj.api.dto.AppUserDto;
 import com.pj.api.dto.HtPeopleDto;
 import com.pj.api.dto.PeopleDto;
@@ -574,12 +576,14 @@ public class TbPeopleService extends ServiceImpl<TbPeopleMapper, TbPeople> imple
 
         if (isNew) {
             //给边民生成账号
-            List<TbPeople> tbPeopleList = tbPeopleMapper.selectList(new LambdaQueryWrapper<TbPeople>().eq(TbPeople::getPhone, tbPeople.getPhone()).eq(TbPeople::getDeleteStatus, DeleteStatus.DELETE_STATUS_ON.getCode()));
-            peopleDto.setId(tbPeopleList.get(0).getId());
-            Boolean aBoolean = adminInterface.generatePeopleAccount(peopleDto);
-            if (!aBoolean)
-                log.error("\n" + tbPeopleList.get(0).getName() + "生成账号时错误。 id = " + tbPeopleList.get(0).getId() + "\n");
-            return aBoolean;
+            AppUserCreateDTO createDTO = new AppUserCreateDTO();
+            createDTO.setAuth("1");
+            createDTO.setUserType(UserType.USER_TYPE_PEOPLE.getCode() + "");
+            createDTO.setPhone(peopleDto.getBorderTel());
+            createDTO.setName(peopleDto.getBorderName());
+            createDTO.setFkId(tbPeople.getId() + "");
+            FeignFactory.adminInterface.createAccount(createDTO);
+            return true;
         }
         return true;
     }
@@ -659,8 +663,10 @@ public class TbPeopleService extends ServiceImpl<TbPeopleMapper, TbPeople> imple
         return list.isEmpty() ? null : list.get(0);
     }
 
-    /** 边民保存银行卡信息 */
-    public boolean saveBankByPeople(Long id,String bankName,String bankAccount) {
+    /**
+     * 边民保存银行卡信息
+     */
+    public boolean saveBankByPeople(Long id, String bankName, String bankAccount) {
         LambdaUpdateWrapper<TbPeople> wrapper = new LambdaUpdateWrapper<>();
         wrapper.set(TbPeople::getBankName, bankName);
         wrapper.set(TbPeople::getBankCode, bankAccount);

sp-service/level-one-server/src/main/java/com/pj/tb_shop/TbShopService.java

@@ -11,6 +11,8 @@ import java.util.List;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.pj.api.client.admin.AdminInterface;
+import com.pj.api.consts.FeignFactory;
+import com.pj.api.dto.AppUserCreateDTO;
 import com.pj.api.dto.EnterpriseDto;
 import com.pj.api.dto.HtShopDTO;
 import com.pj.api.dto.ShopDto;
@@ -278,13 +280,14 @@ public class TbShopService extends ServiceImpl<TbShopMapper, TbShop> implements
         this.updateById(tbShop);
         //新增外籍商户
         if (isNew) {
-            //创建商家保存对象
-            EnterpriseDto enterpriseDto = new EnterpriseDto();
-            //查询数据库内的商家
-            //将数据拷贝至enterpriseDto
-            BeanUtils.copyProperties(enterprise, enterpriseDto);
             //远程调用生成商家账户方法
-            adminInterface.generateEnterpriseAccount(enterpriseDto);
+            AppUserCreateDTO createDTO = new AppUserCreateDTO();
+            createDTO.setAuth("1");
+            createDTO.setUserType(UserType.USER_TYPE_ENTERPRISE.getCode() + "");
+            createDTO.setPhone(enterprise.getOwnerTel());
+            createDTO.setName(enterprise.getOwnerName());
+            createDTO.setFkId(enterprise.getId() + "");
+            FeignFactory.adminInterface.createAccount(createDTO);
             return true;
         }
         return true;

sp-service/sp-admin/src/main/java/com/pj/project/app_user/AppUserApiController.java

@@ -1,5 +1,6 @@
 package com.pj.project.app_user;
 
+import com.pj.api.dto.AppUserCreateDTO;
 import com.pj.api.dto.AppUserDto;
 import com.pj.current.satoken.StpAPPUserUtil;
 import com.pj.project.app_user.dto.ForgetPasswordDto;
@@ -141,11 +142,13 @@ public class AppUserApiController {
     /**
      * 收购商认证
      */
-    @RequestMapping("rpc/getByPhoneAndUserType")
+    @PostMapping("rpc/getByPhoneAndUserType")
     public AppUserDto getByPhoneAndUserType(@RequestParam("phone") String phone,@RequestParam("userType")Integer userType) {
         AppUserDto byPhoneAndUserType = appUserService.getByPhoneAndUserType(phone, userType);
         return byPhoneAndUserType;
     }
 
 
+
+
 }

sp-service/sp-admin/src/main/java/com/pj/project/app_user/AppUserController.java

@@ -127,23 +127,6 @@ public class AppUserController {
 	}
 
 
-	/**
-	 * 同步航通边民信息时,自动给边民注册app账号
-	 */
-	@PostMapping("rpc/generatePeopleAccount")
-	public boolean generatePeopleAccount(@RequestBody HtPeopleDto peopleDto) throws Exception {
-		return appUserService.generatePeopleAccount(peopleDto);
-	}
-
-
-	/**
-	 * 同步航通边民信息时,自动给外籍商户注册app账号
-	 */
-	@PostMapping("rpc/generateEnterpriseAccount")
-	public int generateEnterpriseAccount(@RequestBody EnterpriseDto enterpriseDto) throws Exception {
-		int account = appUserService.generateEnterpriseAccount(enterpriseDto);
-		return account;
-	}
 
 	/**
 	 * 用户数量统计
@@ -154,4 +137,14 @@ public class AppUserController {
 		return AjaxJson.getSuccessData(appUserService.selectUsers());
 	}
 
+
+	/**
+	 * 创建账号
+	 * @param createDTO
+	 */
+	@PostMapping("rpc/createAppAccount")
+	public void createAccount(@RequestBody AppUserCreateDTO createDTO){
+		appUserService.createUser(createDTO);
+	}
+
 }

sp-service/sp-admin/src/main/java/com/pj/project/app_user/AppUserService.java

@@ -217,7 +217,8 @@ public class AppUserService extends ServiceImpl<AppUserMapper, AppUser> implemen
         String smsCode = RedisUtil.get(PREFIX + registerDto.getPhone());
         if (smsCode == null) throw new RuntimeException("验证码已过期,请重新发送!");
         //比对验证码
-        if (registerDto.getSmsCode()!=Integer.parseInt(smsCode)) throw new SecurityException("验证码输入错误,请检查!");
+        if (registerDto.getSmsCode() != Integer.parseInt(smsCode))
+            throw new SecurityException("验证码输入错误,请检查!");
         //4.开始新增
         AppUser appUser = new AppUser();
         //手机号
@@ -411,25 +412,25 @@ public class AppUserService extends ServiceImpl<AppUserMapper, AppUser> implemen
      * 获取验证码
      */
     boolean getPhoneSmsCode(String phone) {
-      AppUser appUser=  this.findByPhone(phone);
-      if (appUser!=null){
-          throw new AjaxError("该手机号已注册");
-      }
+        AppUser appUser = this.findByPhone(phone);
+        if (appUser != null) {
+            throw new AjaxError("该手机号已注册");
+        }
         //生成4位随机数
-        String code=RandomUtil.randomNumbers(4);
+        String code = RandomUtil.randomNumbers(4);
         //保存到缓存,默认1分钟 todo:届时放开手机验证码 randomNumber
         RedisUtil.setByMINUTES(PREFIX + phone, code, 5);
-        SystemObject.smsFactory.handler().sendSMS(phone,"您的验证码是"+code+"。如非本人操作，请忽略本短信");
+        SystemObject.smsFactory.handler().sendSMS(phone, "您的验证码是" + code + "。如非本人操作，请忽略本短信");
         //发送验证码短信
         return true;
 
     }
 
     private AppUser findByPhone(String phone) {
-        QueryWrapper<AppUser>ew=new QueryWrapper<>();
-        ew.lambda().eq(AppUser::getPhone,phone);
-        List<AppUser>list=list(ew);
-        return list.isEmpty()?null:list.get(0);
+        QueryWrapper<AppUser> ew = new QueryWrapper<>();
+        ew.lambda().eq(AppUser::getPhone, phone);
+        List<AppUser> list = list(ew);
+        return list.isEmpty() ? null : list.get(0);
     }
 
 
@@ -492,37 +493,38 @@ public class AppUserService extends ServiceImpl<AppUserMapper, AppUser> implemen
         return 1 == appUserMapper.updateById(appUser);
     }
 
-    /** 获取银行卡信息 */
+    /**
+     * 获取银行卡信息
+     */
     public SoMap getBankInfo() {
         SoMap so = new SoMap();
         Integer userType = StpAPPUserUtil.getAPPLoginInfo().getUserType();
         Long fk = StpAPPUserUtil.getAPPLoginInfo().getFk();
 
         //1=普通边民,2=边民组长,3=收购商,4=司机,5=外籍商户,6=合作社
-        if(1 == userType || 2 == userType) {
+        if (1 == userType || 2 == userType) {
             PeopleDto peopleDto = levelOneServerInterface.getRpcById(fk);
-            so.put("bankName",peopleDto.getBankName());
-            so.put("bankAccount",peopleDto.getBankCode());
-        }
-        else if(3 == userType) {
+            so.put("bankName", peopleDto.getBankName());
+            so.put("bankAccount", peopleDto.getBankCode());
+        } else if (3 == userType) {
             PurchaserDto purchaserDto = levelTwoServerInterface.getByPurchaserId(fk);
-            so.put("bankName",purchaserDto.getBankName());
-            so.put("bankAccount",purchaserDto.getBankAccount());
-        }
-        else if(5 == userType) {
+            so.put("bankName", purchaserDto.getBankName());
+            so.put("bankAccount", purchaserDto.getBankAccount());
+        } else if (5 == userType) {
             EnterpriseDto enterpriseDto = levelOneServerInterface.getEnterpriseById(fk);
-            so.put("bankName",enterpriseDto.getBank());
-            so.put("bankAccount",enterpriseDto.getBankAccount());
-        }
-        else if(6 == userType) {
+            so.put("bankName", enterpriseDto.getBank());
+            so.put("bankAccount", enterpriseDto.getBankAccount());
+        } else if (6 == userType) {
             CooperativeDto cooperativeDto = levelOneServerInterface.getCooperativeById(fk);
-            so.put("bankName",cooperativeDto.getBankName());
-            so.put("bankAccount",cooperativeDto.getBankAccount());
+            so.put("bankName", cooperativeDto.getBankName());
+            so.put("bankAccount", cooperativeDto.getBankAccount());
         }
         return so;
     }
 
-    /** 保存银行卡信息 */
+    /**
+     * 保存银行卡信息
+     */
     public boolean saveBankInfo(SoMap so) {
         Integer userType = StpAPPUserUtil.getAPPLoginInfo().getUserType();
         Long fk = StpAPPUserUtil.getAPPLoginInfo().getFk();
@@ -530,19 +532,16 @@ public class AppUserService extends ServiceImpl<AppUserMapper, AppUser> implemen
         String bankAccount = so.getString("bankAccount");
 
         //1=普通边民,2=边民组长,3=收购商,4=司机,5=外籍商户,6=合作社
-        if(1 == userType || 2 == userType) {
+        if (1 == userType || 2 == userType) {
             boolean result = levelOneServerInterface.saveBankByPeople(fk, bankName, bankAccount);
             return result;
-        }
-        else if(3 == userType) {
+        } else if (3 == userType) {
             boolean result = levelTwoServerInterface.saveBankByPurchaser(fk, bankName, bankAccount);
             return result;
-        }
-        else if(5 == userType) {
+        } else if (5 == userType) {
             boolean result = levelOneServerInterface.saveBankByEnterprise(fk, bankName, bankAccount);
             return result;
-        }
-        else if(6 == userType) {
+        } else if (6 == userType) {
             boolean result = levelOneServerInterface.saveBankByCooperative(fk, bankName, bankAccount);
             return result;
         }
@@ -570,109 +569,45 @@ public class AppUserService extends ServiceImpl<AppUserMapper, AppUser> implemen
         return update == 1;
     }
 
+
+
     /**
-     * 远程调用: 当从航通导入数据时,自动给边民生成账号
+     * 用户数量统计
+     *
+     * @return
      */
-    public boolean generatePeopleAccount(HtPeopleDto peopleDto) throws Exception {
-        //检查是否重复注册
-        AppUser appUser=this.findByPhone(peopleDto.getBorderTel());
-        if (appUser!=null) {
-            log.error("\n该用户已注册! phone = " + peopleDto.getBorderTel() + "\n");
-            return true;
-        }
-        //创建保存对象
-         appUser = new AppUser();
-        //设置基本属性
-        appUser.setAuth(1 + ""); // 默认已认证
-        appUser.setUserType(1); // 用户类型 1
-        appUser.setCreateTime(new Date()); // 创建时间
-        appUser.setPhone(peopleDto.getBorderTel()); // 电话
-        appUser.setStatus("1"); // 可用状态
-        appUser.setDeleteStatus(DeleteStatus.DELETE_STATUS_ON.getCode()); // 默认可用
-        appUser.setAuthTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date())); // 认证时间
-        appUser.setName(peopleDto.getBorderName()); // 昵称
-        appUser.setFkId(peopleDto.getId()); // 外键
-        appUser.setCreateUnit("航通");
-        //随机生成6位数密码
-        String password = RandomUtil.randomNumbers(6);
-        log.info("生成账号:{},{}",peopleDto.getBorderTel(),password);
-//        String password=appUser.getPhone();
-        //密码加密
-        String encodePassword = passwordEncoder.encode(password + "");
-        //设置密码
-        appUser.setPassword(encodePassword);
-        //保存
-        int insert = appUserMapper.insert(appUser);
-        //发送短信
-        if (insert == 1) {
-            //todo: 届时放开注释
-            String content="您好,您的[边民互市]app账号已生成。账号:" + peopleDto.getBorderTel() + ", 初始密码:" + password + "。可前往app进行修改";
-//			boolean msg = smsRetryService.sendSmsRegisteMsg(null, "您好,您已成功注册[边民互市]app账号。账号:" + peopleDto.getBorderTel() + ", 初始密码:" + password + "。可前往app进行修改");
-//			return msg;
-            System.out.println("注册成功! 账户 = " + peopleDto.getBorderTel() + " password = " + password);
-            SystemObject.smsFactory.handler().sendSMS(peopleDto.getBorderTel(),content);
-            return true;
-        }
-        throw new RuntimeException("同步航通信息时,边民注册app信息失败,边民手机号为: " + peopleDto.getBorderTel() + "。 时间: " + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+    public Map<String, Object> selectUsers() {
+        return appUserMapper.selectUsers();
     }
 
+    ;
+
     /**
-     * 远程调用: 当从航通导入数据时,自动给外籍商户生成账号
+     * 创建账号
+     *
+     * @param createDTO
      */
-    public int generateEnterpriseAccount(EnterpriseDto enterpriseDto) throws Exception {
-        //判断是否已被注册
-        List<AppUser> appUsers = appUserMapper.selectList(new LambdaQueryWrapper<AppUser>().eq(AppUser::getPhone, enterpriseDto.getOwnerTel()));
-        if (appUsers.size() != 0) {
-            StaticLog.error("用户手机号已被注册：{},{}", enterpriseDto.getOwnerTel(), JSONUtil.toJsonStr(enterpriseDto));
-            return 0;
+    public void createUser(AppUserCreateDTO createDTO) {
+        log.info("创建账号:{}",JSONUtil.toJsonStr(createDTO));
+        String phone = createDTO.getPhone();
+        AppUser appUser = this.findByPhone(phone);
+        if (appUser != null) {
+            return;
         }
-        //创建保存对象
-        AppUser appUser = new AppUser();
-        //设置基本属性
-        appUser.setAuth(1 + ""); // 默认已认证
-        appUser.setUserType(5); // 用户类型 1
-        appUser.setCreateTime(new Date()); // 创建时间
-        appUser.setPhone(enterpriseDto.getOwnerTel()); // 电话
-        appUser.setStatus(Status.STATUS_ONE.getCode() + ""); // 可用状态
-        appUser.setDeleteStatus(DeleteStatus.DELETE_STATUS_ON.getCode()); // 默认可用
-        appUser.setAuthTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date())); // 认证时间
-        appUser.setName(enterpriseDto.getOwnerName()); // 昵称
-        appUser.setFkId(enterpriseDto.getId()); // 外键
-        appUser.setCreateUnit("航通"); // 创建单位
-        //随机生成6位数密码
-        //int password = (int) (Math.random() * (999999 - 100000 + 1) + 100000);
-        String password = appUser.getPhone();
+        appUser = new AppUser();
+        BeanUtils.copyProperties(createDTO, appUser);
         //密码加密
-        String encodePassword = passwordEncoder.encode(password + "");
-        //设置密码
-        appUser.setPassword(encodePassword);
-        //保存
-        int insert = appUserMapper.insert(appUser);
-        //发送短信
-        if (insert == 1) {
-            //查询外籍商户和商铺是否存在,不存在则删除app user信息 ownTel
-//			List<ShopDto> shopDtoListByPhone = levelOneServerInterface.getShopDtoListByPhone(appUser.getPhone());
-//			List<EnterpriseDto> enterpriseDtoListByPhone = levelOneServerInterface.getEnterpriseDtoListByPhone(appUser.getPhone());
-//			if(shopDtoListByPhone.size() != 1 && enterpriseDtoListByPhone.size() != 1)
-//				throw new ServiceException("当航通同步商铺信息时,商铺或者外籍商户信息入库发生异常,故在自动创建appUser时抛出异常回滚数据。");
-            //todo: 届时放开注释
-//			boolean msg = smsRetryService.sendSmsRegisteMsg(null, "您好,您已成功注册[边民互市]app账号。账号:" + peopleDto.getBorderTel() + ", 初始密码:" + password + "。可前往app进行修改");
-//			return msg;
-            System.out.println("\n注册成功! 账户 = " + enterpriseDto.getOwnerTel() + " password = " + password + "\n");
-            return 1;
-        }
-        StaticLog.error("同步航通信息时,边民注册app信息失败,边民手机号为: " + enterpriseDto.getOwnerTel() + "。 时间: " + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
-        return 1;
+        String encodePassword = passwordEncoder.encode(phone);
+        appUser.setPassword(encodePassword)
+                .setFkId(Long.parseLong(createDTO.getFkId()))
+                .setUserType(Integer.parseInt(createDTO.getUserType()))
+                .setDeleteStatus(DeleteStatus.DELETE_STATUS_ON.getCode())
+                .setCreateTime(new Date()).setUpdateTime(new Date());
+        this.save(appUser);
+        String content = "您好,您的app账号已生成。账号:" + phone + ", 初始密码:" + phone + "。可前往app进行修改";
+        // todo 发送短信
+        //SystemObject.smsFactory.handler().sendSMS(phone, content);
     }
 
-    /**
-     * 用户数量统计
-     * @return
-     */
-    public Map<String, Object> selectUsers(){
-        return appUserMapper.selectUsers();
-    };
-
-
 
 }

sp-service/sp-admin/src/main/java/com/pj/project4sp/admin/SpAdminController.java

@@ -187,5 +187,7 @@ public class SpAdminController {
         return spAdminMapper.getList(so.startPage());
     }
 
+    
+
 
 }