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

src/main/java/com/shigongli/controller/TaPersonController.java

 package com.shigongli.controller;
 
+import cn.binarywang.wx.miniapp.api.WxMaService;
+import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.shigongli.common.BaseController;
-import com.shigongli.common.JWTUtils;
-import com.shigongli.common.ResponseBean;
+import com.shigongli.common.*;
+import com.shigongli.service.ITaShopKeeperService;
+import com.shigongli.vo.AuthPhoneParams;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import me.chanjar.weixin.mp.api.WxMpService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
     @Autowired
     public ITaPersonService iTaPersonService;
 
-//    @PostMapping("/ma/login")
-//    public ResponseBean login(String code) {
-//        // 用 code 去换 openid
-//        String openid = "";
-//
-//        // 先查询人员是否存在
-//        TaPerson taPerson = iTaPersonService.getByOpenId(openid);
-//
-//        // 如果人员不存在, 则新增
-//        if (null == taPerson) {
-//            taPerson = new TaPerson();
-//            taPerson.setOpenid(openid);
-//            iTaPersonService.save(taPerson);
-////            taPerson = iTaPersonService.getById(taPerson.getPersonId());
-//        }
-//
-//        // 生成 token
-//        Map<String, Object> claims = new HashMap<>();
-//        claims.put("personId", taPerson.getPersonId());
-//        String token = JWTUtils.encode(claims);
-//        taPerson.setToken(token);
-//
-//        return ResponseBean.success(taPerson);
-//    }
+    @Autowired
+    private ITaShopKeeperService iTaShopKeeperService;
+
+    @Autowired
+    private WxUtils wxUtils;
+
+    @ApiOperation(value="授权手机", notes = "授权手机", httpMethod = "POST", response = ResponseBean.class)
+    @PostMapping("/ma/taPerson/phone")
+    public ResponseBean phone(@ApiParam("授权手机参数") @RequestBody AuthPhoneParams authPhoneParams,
+                              HttpServletRequest request) {
+        if (null == authPhoneParams) {
+            return ResponseBean.error("请设置授权手机号的参数", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        TaPerson taPerson = getPerson(request);
+        if (null == taPerson) {
+            return ResponseBean.error("校验用户失败, 请退出重新进入", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        WxMaService maService = wxUtils.getMaService();
+        WxMaPhoneNumberInfo phoneNoInfo = maService.getUserService().getPhoneNoInfo(authPhoneParams.getSessionKey(), authPhoneParams.getEncryptedData(), authPhoneParams.getIv());
+
+        String phone = phoneNoInfo.getPhoneNumber();
+        taPerson.setPhone(phone);
+        iTaPersonService.updateById(taPerson);
+
+        // 绑定店主
+        iTaShopKeeperService.bindPerson(taPerson);
+
+        return ResponseBean.success(taPerson);
+    }
 
 
     /**

src/main/java/com/shigongli/controller/TaShopKeeperController.java

 import com.shigongli.common.BaseController;
 import com.shigongli.common.ResponseBean;
 import com.shigongli.constants.StatusConstant;
+import com.shigongli.entity.TaPerson;
+import com.shigongli.service.ITaPersonService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
     @Autowired
     public ITaShopKeeperService iTaShopKeeperService;
 
+    @Autowired
+    public ITaPersonService iTaPersonService;
+
 
     /**
      * 分页查询列表
     @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
     public ResponseBean taShopKeeperAdd(@ApiParam("保存内容") @RequestBody TaShopKeeper taShopKeeper) throws Exception{
 
+        TaPerson taPerson = iTaPersonService.getByPhone(taShopKeeper.getPhone());
+        if (null != taPerson) {
+            taShopKeeper.setPersonId(taPerson.getPersonId());
+        }
+
         if (iTaShopKeeperService.save(taShopKeeper)){
             return ResponseBean.success(taShopKeeper);
         }else {
     public ResponseBean taShopKeeperUpdate(@ApiParam("对象ID") @PathVariable String id,
                                         @ApiParam("更新内容") @RequestBody TaShopKeeper taShopKeeper) throws Exception{
 
+        TaPerson taPerson = iTaPersonService.getByPhone(taShopKeeper.getPhone());
+        if (null != taPerson) {
+            taShopKeeper.setPersonId(taPerson.getPersonId());
+        }
+
         if (iTaShopKeeperService.updateById(taShopKeeper)){
             return ResponseBean.success(iTaShopKeeperService.getById(id));
         }else {

src/main/java/com/shigongli/service/ITaPersonService.java

 
 import com.shigongli.entity.TaPerson;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.shigongli.entity.TaShopKeeper;
 
 /**
  * <p>
 public interface ITaPersonService extends IService<TaPerson> {
 
     TaPerson getByOpenId(String openid);
+
+    TaPerson getByPhone(String phone);
 }

src/main/java/com/shigongli/service/ITaShopKeeperService.java

 package com.shigongli.service;
 
+import com.shigongli.entity.TaPerson;
 import com.shigongli.entity.TaShopKeeper;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  * 店主 服务类
  */
 public interface ITaShopKeeperService extends IService<TaShopKeeper> {
 
+    void bindPerson(TaPerson taPerson);
+
+    List<TaShopKeeper> getByPhone(String phone);
 }

src/main/java/com/shigongli/service/impl/TaPersonServiceImpl.java

 package com.shigongli.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.shigongli.common.StringUtils;
+import com.shigongli.constants.StatusConstant;
 import com.shigongli.entity.TaPerson;
+import com.shigongli.entity.TaShopKeeper;
 import com.shigongli.mapper.TaPersonMapper;
 import com.shigongli.service.ITaPersonService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
     public TaPerson getByOpenId(String openid) {
         return taPersonMapper.getByOpenId(openid);
     }
+
+    @Override
+    public TaPerson getByPhone(String phone) {
+        if (StringUtils.isEmpty(phone)) {
+            return null;
+        }
+
+        QueryWrapper<TaPerson> queryWrapper = new QueryWrapper<TaPerson>()
+                .eq("phone", phone)
+                .eq("status", StatusConstant.NORMAL);
+
+        return getOne(queryWrapper);
+    }
 }

src/main/java/com/shigongli/service/impl/TaShopKeeperServiceImpl.java

 package com.shigongli.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.shigongli.constants.StatusConstant;
+import com.shigongli.entity.TaPerson;
 import com.shigongli.entity.TaShopKeeper;
 import com.shigongli.mapper.TaShopKeeperMapper;
 import com.shigongli.service.ITaShopKeeperService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 店主 服务实现类
 @Service
 public class TaShopKeeperServiceImpl extends ServiceImpl<TaShopKeeperMapper, TaShopKeeper> implements ITaShopKeeperService {
 
+    @Override
+    public void bindPerson(TaPerson taPerson) {
+        List<TaShopKeeper> shopKeeperList = getByPhone(taPerson.getPhone());
+
+        if (null == shopKeeperList) {
+            return ;
+        }
+
+        for (TaShopKeeper shopKeeper: shopKeeperList) {
+            shopKeeper.setPersonId(taPerson.getPersonId());
+            updateById(shopKeeper);
+        }
+    }
+
+    @Override
+    public List<TaShopKeeper> getByPhone(String phone) {
+        QueryWrapper<TaShopKeeper> queryWrapper = new QueryWrapper<TaShopKeeper>()
+                .eq("phone", phone)
+                .eq("status", StatusConstant.NORMAL);
+
+        return list(queryWrapper);
+    }
 }

src/main/java/com/shigongli/vo/AuthPhoneParams.java

+package com.shigongli.vo;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel(description = "授权手机参数")
+@Data
+public class AuthPhoneParams {
+
+    @ApiModelProperty("sessionKey")
+    String sessionKey;
+
+    @ApiModelProperty("encryptedData")
+    String encryptedData;
+
+    @ApiModelProperty("iv")
+    String iv;
+}

src/main/java/com/shigongli/vo/ImageTagUpdateParams.java

 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-@ApiModel(description = "登录参数")
+@ApiModel(description = "修改标签图片参数")
 @Data
 public class ImageTagUpdateParams {