diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/bankmanager/BankManagerService.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/bankmanager/BankManagerService.java index 88bcd318..365fa11e 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/bankmanager/BankManagerService.java +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/bankmanager/BankManagerService.java @@ -15,6 +15,8 @@ import com.yxt.supervise.system.sysuser.SysUserDto; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; + /** * @author wangpengfei * @date 2023/4/23 11:49 @@ -47,6 +49,10 @@ public class BankManagerService extends MybatisBaseService l=baseMapper.selectList(new QueryWrapper().eq("telephone",dto.getTelephone())); + if(l.size()>0){ + return rb.setMsg("此手机号已存在"); + } BankManager entity=new BankManager(); BeanUtil.copyProperties(dto, entity, "id", "sid"); baseMapper.insert(entity); diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/feign/crm/BankInformationFeign.java b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/feign/crm/BankInformationFeign.java new file mode 100644 index 00000000..e1081097 --- /dev/null +++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/feign/crm/BankInformationFeign.java @@ -0,0 +1,22 @@ +package com.yxt.supervise.feign.crm; + +import com.yxt.common.core.result.ResultBean; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; + +import java.util.List; + +/** + * @author wangpengfei + * @date 2023/8/10 9:59 + */ +@FeignClient( + contextId = "supervise-crm-loadbankinformation", + name = "supervise-crm", + path = "v1/loanbankinformation") +public interface BankInformationFeign { + @ApiOperation("查询银行全部数据") + @PostMapping("/list") + public ResultBean> list(); +} diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/feign/crm/BankManagerDto.java b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/feign/crm/BankManagerDto.java new file mode 100644 index 00000000..6763c30e --- /dev/null +++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/feign/crm/BankManagerDto.java @@ -0,0 +1,34 @@ +package com.yxt.supervise.feign.crm; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/4/12 9:41 + */ +@ApiModel(value = "银行联系人信息 数据传输对象", description = "银行联系人信息 数据传输对象") +@Data +public class BankManagerDto implements Dto { + private String id; + private String sid; + private String lockVersion; + private String createTime; + private String modifyTime; + private String isEnable; + private String state; + private String isDeletec; + private String remarks; + private String createBySid; + private String updateBySid; + @ApiModelProperty("联系人") + private String name; + @ApiModelProperty("电话") + private String telephone; + @ApiModelProperty("职务") + private String post; + @ApiModelProperty("银行sid") + private String bankSid; +} diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/feign/crm/BankManagerFeign.java b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/feign/crm/BankManagerFeign.java new file mode 100644 index 00000000..d83aa5d1 --- /dev/null +++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/feign/crm/BankManagerFeign.java @@ -0,0 +1,21 @@ +package com.yxt.supervise.feign.crm; + +import com.yxt.common.core.result.ResultBean; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +/** + * @author wangpengfei + * @date 2023/8/10 9:50 + */ +@FeignClient( + contextId = "supervise-crm-bankmanger", + name = "supervise-crm", + path = "v1/bankmanager") +public interface BankManagerFeign { + @ApiOperation("保存") + @PostMapping("/save") + public ResultBean save(@RequestBody BankManagerDto dto); +} diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/feign/crm/BankManagerVo.java b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/feign/crm/BankManagerVo.java new file mode 100644 index 00000000..b50657ba --- /dev/null +++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/feign/crm/BankManagerVo.java @@ -0,0 +1,34 @@ +package com.yxt.supervise.feign.crm; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/4/12 9:41 + */ +@ApiModel(value = "银行联系人信息 视图数据对象", description = "银行联系人信息 视图数据对象") +@Data +public class BankManagerVo implements Vo { + private String id; + private String sid; + private String lockVersion; + private String createTime; + private String modifyTime; + private String isEnable; + private String state; + private String isDeletec; + private String remarks; + private String createBySid; + private String updateBySid; + @ApiModelProperty("联系人") + private String name; + @ApiModelProperty("电话") + private String telephone; + @ApiModelProperty("职务") + private String post; + @ApiModelProperty("银行sid") + private String bankSid; +} diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/feign/crm/LoanBankInformationVo.java b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/feign/crm/LoanBankInformationVo.java new file mode 100644 index 00000000..65feb513 --- /dev/null +++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/feign/crm/LoanBankInformationVo.java @@ -0,0 +1,42 @@ +package com.yxt.supervise.feign.crm; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @author wangpengfei + * @date 2023/4/11 16:08 + */ +@ApiModel(value = "贷款银行信息 视图数据对象", description = "贷款银行信息 视图数据对象") +@Data +public class LoanBankInformationVo implements Vo { + @ApiModelProperty("id") + private Integer id; + @ApiModelProperty("sid") + private String sid; + @ApiModelProperty("银行名称") + private String bankName; + @ApiModelProperty("银行简称") + private String bankAbbreviation; + @ApiModelProperty("地址") + private String address; + @ApiModelProperty("省") + private String province; + @ApiModelProperty("市") + private String city; + @ApiModelProperty("区") + private String county; + @ApiModelProperty("联系人") + private String contacts; + @ApiModelProperty("电话") + private String telephone; + @ApiModelProperty("上级sid") + private String pSid; + //下级银行 + private List pBank; + private List managerList; +} diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserRest.java b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserRest.java index 6635701d..e7b0eef2 100644 --- a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserRest.java +++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserRest.java @@ -163,6 +163,85 @@ public class SysUserRest implements SysUserFeign { } return rb.success(); } + public ResultBean pSave(SysUserDto dto) { + ResultBean rb = ResultBean.fireFail(); + //手机号 + String mobile = dto.getMobile(); + //姓名 + String name = dto.getName(); + //用户类型 + int userType = dto.getUserType(); +// //部门sid +// String deptSid = dto.getDeptSid(); +// //岗位sid +// String postSid = dto.getPostSid(); + //验证码 + String verificationCode = dto.getVerificationCode(); + + if (StringUtils.isBlank(mobile)) { + return new ResultBean().fail().setMsg("手机号不能为空"); + } else { + SysUser one = sysUserService.fetchByUserName(mobile); + if (null != one) { + return new ResultBean().fail().setMsg("手机号重复!`"); + } + } + if (StringUtils.isBlank(name)) { + return new ResultBean().fail().setMsg("姓名不能为空"); + } + if (userType == 0) { + return new ResultBean().fail().setMsg("用户类型不能为空"); + } + //取消验证码 +// if (StringUtils.isBlank(verificationCode)) { +// return new ResultBean().fail().setMsg("验证码不能为空"); +// } else { +// Map stringObjectMap = sysUserService.mobileValidateRegister(mobile, verificationCode); +// String code = stringObjectMap.get("code").toString(); +// String details = stringObjectMap.get("details").toString(); +// if (Tools.CODE_FAIL.equals(code)) { +// return ResultBean.fireFail().setMessage(details).setMsg(details); +// } +// } + //"15097329653"; + String password = mobile.substring(5, 11); + String md5 = Encodes.md5(password); + SysStaffinfo ssi = new SysStaffinfo(); + SysUser su = new SysUser(); + dto.fillEntity(su); + su.setStaffSid(ssi.getSid()); + su.setUserName(mobile); + su.setPassword(md5); + su.setIsAdmin("1"); + sysUserService.save(su); + ssi.setName(name); + ssi.setMobile(mobile); + ssi.setPinYinName(PinYinUtils.getPinYinName(name)); + ssi.setFirstPinYinLabel(PinYinUtils.getCharDuoPinYinChar(name)); + sysStaffinfoService.save(ssi); +// if (StringUtils.isNotBlank(deptSid)) { +// SysOrganization sysOrganization = sysOrganizationService.fetchBySid(deptSid); +// SysStaffOrg sso = new SysStaffOrg(); +// sso.setOrgName(sysOrganization.getName()); +// sso.setOrgSid(sysOrganization.getSid()); +// sso.setStaffSid(ssi.getSid()); +// sso.setOrgSidPath(sysOrganization.getOrgSidPath()); +// sso.setOrgNamePath(sysOrganization.getName()); +// sso.setManageType("3"); +// sysStaffOrgService.save(sso); +// } +// if (StringUtils.isNotBlank(postSid)) { +// SysPost sysPost = sysPostService.fetchBySid(postSid); +// SysStaffPost ssp = new SysStaffPost(); +// ssp.setStaffSid(ssi.getSid()); +// ssp.setOrgSid(deptSid); +// ssp.setPostSid(postSid); +// ssp.setStartDate(new Date()); +// ssp.setIsDepetHead(0); +// sysStaffPostService.save(ssp); +// } + return rb.success(); + } @PostMapping("/saveOpenId") public ResultBean saveOpenId(@RequestBody SysUserDto dto){ ResultBean rb=new ResultBean(); diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserService.java b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserService.java index c3a74b80..2d153618 100644 --- a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserService.java +++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserService.java @@ -33,6 +33,8 @@ import com.yxt.supervise.system.sysuserrole.SysUserRole; import com.yxt.supervise.system.sysuserrole.SysUserRoleService; import com.yxt.supervise.system.sysuserwxauth.SysUserWxAuth; import com.yxt.supervise.system.sysuserwxauth.SysUserWxAuthService; +import com.yxt.supervise.system.useropenid.UserOpenid; +import com.yxt.supervise.system.useropenid.UserOpenidService; import org.apache.ibatis.annotations.Param; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; @@ -109,6 +111,8 @@ public class SysUserService extends MybatisBaseService { private SysRoleService sysRoleService; @Autowired private SysUserRoleService userRoleService; + @Autowired + private UserOpenidService userOpenidService; public PagerVo listPage(PagerQuery pq) { @@ -1188,19 +1192,31 @@ public class SysUserService extends MybatisBaseService { if (!jsonObject.containsKey("openid")){ return rb.setMsg("未获得openid，请联系管理员"); } -// String unionid = jsonObject.get("unionid").toString(); + String unionid = jsonObject.get("unionid").toString(); String openid = jsonObject.get("openid").toString(); + Mapmap=new HashMap<>(); + map.put("unionid",unionid); + map.put("openid",openid); // 判断用户登陆授权表是否存在该用户unionid和openid，如果不存在就增加一条返回 - SysUser sysUser=baseMapper.selectOne(new QueryWrapper().eq("appletOpenid",openid)); -// Map map=new HashMap<>(); -// map.put("openid",openid); -// map.put("unionid",unionid); - if(sysUser==null){ - return rb.setMsg("此微信没有绑定用户").setCode("100").setData(openid); - }else{ - + List sysUserWxAuths = sysUserWxAuthService.fetchByUnionid(unionid); + if(sysUserWxAuths.size()==0){ + return rb.setMsg("此微信没有绑定用户信息，请先去绑定用户").setCode("110").setData(map); } - + SysUserWxAuth sysUserWxAuth = sysUserWxAuthService.fetchByUnionidAndOpenid(unionid,openid); + if (sysUserWxAuth == null) { + // 添加一个新用户授权记录 + SysUserWxAuth sysUserWxAuth1=new SysUserWxAuth(); + sysUserWxAuth1.setUnionid(unionid); + sysUserWxAuth1.setOpenid(openid); + sysUserWxAuth1.setSysUserSid(sysUserWxAuths.get(0).getSysUserSid()); + boolean isSave = sysUserWxAuthService.save(sysUserWxAuth1); + if ( !isSave ){ + return rb.setMsg("登陆：新增用户授权表失败"); + } + //return rb.setMsg(SysUserWxAuth_Not_Exist.getMsg()).setCode(SysUserWxAuth_Not_Exist.getCode()); + } + String sysUserSid = sysUserWxAuths.get(0).getSysUserSid(); + SysUser sysUser = fetchBySid(sysUserSid); // 重置Token失效时间 // {写代码} SysUserVo sysUserVo=setUserRedisSessionToken(sysUser); @@ -1221,8 +1237,6 @@ public class SysUserService extends MybatisBaseService { */ public ResultBean vSilentLogin(String wxCode){ ResultBean rb = ResultBean.fireFail(); - // 通过wxCode获取unionid，失败返回微信的错误提示。 -// ResultBean rbJsonObject = getCode2Session(wxCode,APP_ID,SECRET); ResultBean rbJsonObject = wxLogin(wxCode,APP_ID,SECRET); if (!rbJsonObject.getSuccess()){ JSONObject jsonObject = rbJsonObject.getData(); @@ -1240,7 +1254,7 @@ public class SysUserService extends MybatisBaseService { // 判断用户登陆授权表是否存在该用户unionid和openid，如果不存在就增加一条返回 List sysUserWxAuths = sysUserWxAuthService.fetchByUnionid(unionid); if(sysUserWxAuths.size()==0){ - return rb.setMsg("此微信没有绑定用户信息，请先去绑定用户"); + return rb.setMsg("此微信没有绑定用户信息，请先去绑定用户").setCode("110"); } SysUserWxAuth sysUserWxAuth = sysUserWxAuthService.fetchByUnionidAndOpenid(unionid,openid); if (sysUserWxAuth == null) { @@ -1308,17 +1322,12 @@ public class SysUserService extends MybatisBaseService { if (!jsonObject.containsKey("openid")){ return rb.setMsg("未获得openid，请联系管理员"); } -// String unionid = jsonObject.get("unionid").toString(); + String unionid = jsonObject.get("unionid").toString(); String openid = jsonObject.get("openid").toString(); - // 判断用户登陆授权表是否存在该用户unionid和openid，如果不存在就增加一条返回 -// SysUser sysUser=baseMapper.selectOne(new QueryWrapper().eq("appletOpenid",openid)); -// Map map=new HashMap<>(); -// map.put("openid",openid); -// map.put("unionid",unionid); -// if(sysUser==null){ -// return rb.setMsg("此微信没有绑定用户").setCode("100").setData(openid); -// } - return rb.success().setData(openid); + Map map=new HashMap<>(); + map.put("unionid",unionid); + map.put("openid",openid); + return rb.success().setData(map); } /** @@ -1396,14 +1405,14 @@ public class SysUserService extends MybatisBaseService { if(!vali.get("code").equals("200")){ return rb.setMsg(vali.get("details").toString()); } - sysUserSid = sysUser.getSid(); - sysUser.setAppletOpenid(sysUserWxBindMobileDto.getOpenid()); - sysUser.setUnionid(sysUserWxBindMobileDto.getUnionid()); - int i= baseMapper.updateById(sysUser); - if (i>0){ + SysUserWxAuth sysUserWxAuth1=new SysUserWxAuth(); + sysUserWxAuth1.setUnionid(sysUserWxBindMobileDto.getUnionid()); + sysUserWxAuth1.setOpenid(sysUserWxBindMobileDto.getOpenid()); + sysUserWxAuth1.setSysUserSid(sysUser.getSid()); + boolean isSave = sysUserWxAuthService.save(sysUserWxAuth1); + if (true==isSave){ return rb.success().setMsg("绑定成功").setData(sysUser); - } - else{ + }else{ return rb.setMsg("绑定失败"); } }else{ @@ -1434,8 +1443,14 @@ public class SysUserService extends MybatisBaseService { return rb.setMsg("绑定成功"); }else{ - - return rb.setMsg("您的平台应用未被授权，请联系工作人员。"); + //注册用户 + UserOpenid user=new UserOpenid(); + user.setSid(UUID.randomUUID().toString()); + user.setMobile(sysUserWxBindMobileDto.getMobile()); + user.setOpenid(sysUserWxBindMobileDto.getOpenid()); + user.setUnionid(sysUserWxBindMobileDto.getUnionid()); + userOpenidService.save(user); + return rb.setMsg("注册信息已提交，请耐心等待审核"); } } } \ No newline at end of file diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/wx/WxSysUserRest.java b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/wx/WxSysUserRest.java index 4569659a..7f8c58eb 100644 --- a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/wx/WxSysUserRest.java +++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/wx/WxSysUserRest.java @@ -391,11 +391,6 @@ public class WxSysUserRest implements WxSysUserFeign { return sysUserService.wxSilentLogin(wxCode); } @ApiOperation(value = "微信静默登录") - @GetMapping("/vSilentLogin") - public ResultBean vSilentLogin(@RequestParam(value = "wxCode") String wxCode) { - return sysUserService.vSilentLogin(wxCode); - } - @ApiOperation(value = "微信静默登录") @GetMapping("/SilentLogin") public ResultBean SilentLogin(@RequestParam(value = "wxCode") String wxCode) { return sysUserService.SilentLogin(wxCode); diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuserwxauth/SysUserWxAuthMapper.java b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuserwxauth/SysUserWxAuthMapper.java index 61b1a43a..237e0ab8 100644 --- a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuserwxauth/SysUserWxAuthMapper.java +++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuserwxauth/SysUserWxAuthMapper.java @@ -2,11 +2,12 @@ package com.yxt.supervise.system.sysuserwxauth; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @Mapper public interface SysUserWxAuthMapper extends BaseMapper { - SysUserWxAuth fetchByUnionidAndOpenid(String unionid, String openid); - List fetchByUnionid(String unionid); + SysUserWxAuth fetchByUnionidAndOpenid(@Param("unionid") String unionid, @Param("openid") String openid); + List fetchByUnionid(@Param("unionid") String unionid); } diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/useropenid/UserOpenid.java b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/useropenid/UserOpenid.java index df332a47..6d11e5dd 100644 --- a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/useropenid/UserOpenid.java +++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/useropenid/UserOpenid.java @@ -14,5 +14,8 @@ public class UserOpenid { private String sid; private String mobile; private String openid; + private String unionid; private String state; + private String bankName; + private String name; } diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/useropenid/UserOpenidDto.java b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/useropenid/UserOpenidDto.java index 9bbea5c2..a425283d 100644 --- a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/useropenid/UserOpenidDto.java +++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/useropenid/UserOpenidDto.java @@ -11,7 +11,13 @@ import lombok.Data; public class UserOpenidDto implements Dto { private String id; private String sid; + //手机号 private String mobile; private String openid; + private String unionid; private String state; + //银行名 + private String bankName; + //姓名 + private String name; } diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/useropenid/UserOpenidMapper.java b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/useropenid/UserOpenidMapper.java index fab9d38f..6a930b29 100644 --- a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/useropenid/UserOpenidMapper.java +++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/useropenid/UserOpenidMapper.java @@ -39,4 +39,5 @@ public interface UserOpenidMapper extends BaseMapper { String selectPost(String sid); List getPost(String staffSid); + } \ No newline at end of file diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/useropenid/UserOpenidRest.java b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/useropenid/UserOpenidRest.java index 2f6a6f1f..16b5c4ca 100644 --- a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/useropenid/UserOpenidRest.java +++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/useropenid/UserOpenidRest.java @@ -70,5 +70,9 @@ public class UserOpenidRest { UserOpenidService.delByIds(ids); return rb.success(); } - + public ResultBean process(String ids,String type,String bankSid) { + ResultBean rb = ResultBean.fireFail(); + UserOpenidService.process(ids,type,bankSid); + return rb.success(); + } } diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/useropenid/UserOpenidService.java b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/useropenid/UserOpenidService.java index a899a51c..4d49123a 100644 --- a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/useropenid/UserOpenidService.java +++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/useropenid/UserOpenidService.java @@ -8,7 +8,16 @@ import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.vo.PagerVo; +import com.yxt.supervise.feign.crm.BankManagerDto; +import com.yxt.supervise.feign.crm.BankManagerFeign; +import com.yxt.supervise.system.sysuser.SysUser; +import com.yxt.supervise.system.sysuser.SysUserDto; +import com.yxt.supervise.system.sysuser.SysUserRest; +import com.yxt.supervise.system.sysuser.SysUserService; +import com.yxt.supervise.system.sysuserwxauth.SysUserWxAuth; +import com.yxt.supervise.system.sysuserwxauth.SysUserWxAuthService; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @@ -20,6 +29,14 @@ import java.util.UUID; */ @Service public class UserOpenidService extends MybatisBaseService { + @Autowired + BankManagerFeign bankManagerFeign; + @Autowired + SysUserService sysUserService; + @Autowired + SysUserWxAuthService sysUserWxAuthService; + @Autowired + SysUserRest sysUserRest; public PagerVo listPage(PagerQuery pq) { UserOpenidQuery query = pq.getParams(); QueryWrapper qw = new QueryWrapper<>(); @@ -89,7 +106,38 @@ public class UserOpenidService extends MybatisBaseService().eq("sid",sid)); + if(type.equals("1")){ + SysUserDto dto =new SysUserDto(); + dto.setMobile(use.getMobile()); + dto.setUserType(1); + dto.setName(""); + sysUserRest.pSave(dto); + //保存第三方关联信息 + SysUser sysUser=sysUserService.getOne(new QueryWrapper().eq("mobile",use.getMobile())); + SysUserWxAuth sysUserWxAuth1=new SysUserWxAuth(); + sysUserWxAuth1.setUnionid(use.getUnionid()); + sysUserWxAuth1.setOpenid(use.getOpenid()); + sysUserWxAuth1.setSysUserSid(sysUser.getSid()); + boolean isSave = sysUserWxAuthService.save(sysUserWxAuth1); + }else if(type.equals("3")){ + BankManagerDto dto=new BankManagerDto(); + dto.setBankSid(bankSid); + dto.setName(""); + dto.setTelephone(use.getMobile()); + bankManagerFeign.save(dto); + //保存第三方关联信息 + SysUser sysUser=sysUserService.getOne(new QueryWrapper().eq("mobile",use.getMobile())); + SysUserWxAuth sysUserWxAuth1=new SysUserWxAuth(); + sysUserWxAuth1.setUnionid(use.getUnionid()); + sysUserWxAuth1.setOpenid(use.getOpenid()); + sysUserWxAuth1.setSysUserSid(sysUser.getSid()); + boolean isSave = sysUserWxAuthService.save(sysUserWxAuth1); + } + //this.saveOrUpdate(entity); + } public UserOpenidVo fetchByIdVo(String id) { UserOpenid entity = this.fetchById(id); UserOpenidVo vo = new UserOpenidVo(); diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/useropenid/UserOpenidVo.java b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/useropenid/UserOpenidVo.java index f000c46d..90330297 100644 --- a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/useropenid/UserOpenidVo.java +++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/useropenid/UserOpenidVo.java @@ -13,5 +13,8 @@ public class UserOpenidVo implements Vo { private String sid; private String mobile; private String openid; + private String unionid; private String state; + private String bankName; + private String name; }