diff --git a/src/main/java/com/yxt/yyth/api/lpkcustomer/LpkCustomer.java b/src/main/java/com/yxt/yyth/api/lpkcustomer/LpkCustomer.java index 673ba63..66e6dfa 100644 --- a/src/main/java/com/yxt/yyth/api/lpkcustomer/LpkCustomer.java +++ b/src/main/java/com/yxt/yyth/api/lpkcustomer/LpkCustomer.java @@ -25,7 +25,9 @@ public class LpkCustomer { private String isEnable; @TableField(value = "wx_mp_openid") private String wxMpOpenid; + private String unionId; private String mobile; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private String bindDate; private String realName; private String nick; diff --git a/src/main/java/com/yxt/yyth/biz/lpkcustomer/LpkCustomerRest.java b/src/main/java/com/yxt/yyth/biz/lpkcustomer/LpkCustomerRest.java index f62cc7a..3cf90af 100644 --- a/src/main/java/com/yxt/yyth/biz/lpkcustomer/LpkCustomerRest.java +++ b/src/main/java/com/yxt/yyth/biz/lpkcustomer/LpkCustomerRest.java @@ -33,7 +33,7 @@ public class LpkCustomerRest { @ApiOperation(value = "微信静默登录") @GetMapping("/wxSilentLogin") - public ResultBean wxSilentLogin(@RequestParam(value = "wxCode") String wxCode) { + public ResultBean wxSilentLogin(@RequestParam(value = "wxCode") String wxCode) { return lpkCustomerService.wxSilentLogin(wxCode); } diff --git a/src/main/java/com/yxt/yyth/biz/lpkcustomer/LpkCustomerService.java b/src/main/java/com/yxt/yyth/biz/lpkcustomer/LpkCustomerService.java index 260f057..180abf4 100644 --- a/src/main/java/com/yxt/yyth/biz/lpkcustomer/LpkCustomerService.java +++ b/src/main/java/com/yxt/yyth/biz/lpkcustomer/LpkCustomerService.java @@ -2,8 +2,6 @@ package com.yxt.yyth.biz.lpkcustomer; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.base.utils.StringUtils; @@ -48,18 +46,17 @@ public class LpkCustomerService extends MybatisBaseService wxSilentLogin(String wxCode) { + public ResultBean wxSilentLogin(String wxCode) { ResultBean rb = ResultBean.fireFail(); // 通过wxCode获取unionid,失败返回微信的错误提示。 - ResultBean rbJsonObject = wxLogin(wxCode, APP_ID, SECRET); - if (!rbJsonObject.getSuccess()) { + ResultBean rbJsonObject = wxLogin(wxCode,APP_ID,SECRET); + if (!rbJsonObject.getSuccess()){ JSONObject jsonObject = rbJsonObject.getData(); String errcode = jsonObject.get("errcode").toString(); String errmsg = jsonObject.get("errmsg").toString(); @@ -67,36 +64,47 @@ public class LpkCustomerService extends MybatisBaseService map = new HashMap<>(); - map.put("unionid", unionid); - map.put("openid", openid); - LpkCustomer lpkCustomer = baseMapper.selectOne(new QueryWrapper().eq("wx_mp_openid", openid)); + Map map=new HashMap<>(); +// map.put("unionid",unionid); + map.put("openid",openid); + LpkCustomer lpkCustomer= baseMapper.selectOne(new QueryWrapper().eq("wx_mp_openid",openid)); //查询用户是否存在 - if (null == lpkCustomer) { + if(null==lpkCustomer){ //新增用户 - LpkCustomer newCustomer = new LpkCustomer(); + LpkCustomer newCustomer=new LpkCustomer(); newCustomer.setWxMpOpenid(openid); +// newCustomer.setUnionId(unionid); newCustomer.setCreateTime(new Date()); baseMapper.insert(newCustomer); - return rb.success().setData(newCustomer); + return rb.setData(newCustomer).setCode("110"); + } + //判断是否绑定手机号 + if(StringUtils.isBlank(lpkCustomer.getMobile())){ + return rb.setData(lpkCustomer).setCode("110"); } return rb.success().setData(lpkCustomer); } - public ResultBean wxBindMobile(WxBindMobileDto wxBindMobileDto) { ResultBean rb = ResultBean.fireFail(); String mobile = wxBindMobileDto.getMobile(); - LpkCustomer lpkCustomer = baseMapper.selectOne(new QueryWrapper().eq("wx_mp_openid", wxBindMobileDto.getOpenid())); - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + LpkCustomer lpkCustomer= baseMapper.selectOne(new QueryWrapper().eq("wx_mp_openid",wxBindMobileDto.getOpenid())); + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); lpkCustomer.setBindDate(sdf.format(new Date())); lpkCustomer.setMobile(mobile); - baseMapper.insert(lpkCustomer); - return rb.setMsg("绑定成功"); + baseMapper.updateById(lpkCustomer); + return rb.success().setMsg("绑定成功").setData(lpkCustomer.getSid()); + } + public ResultBean wxBindMobile(String sid) { + ResultBean rb = ResultBean.fireFail(); + + LpkCustomer lpkCustomer= baseMapper.selectOne(new QueryWrapper().eq("wx_mp_openid",wxBindMobileDto.getOpenid())); + + return rb.success().setMsg("绑定成功").setData(lpkCustomer.getSid()); } public ResultBean> customerListPage(PagerQuery pq) {