productDev/zbomyoujia.git

			@@ -19,10 +19,7 @@
			import com.doumee.dao.business.model.Shop;
			import com.doumee.dao.business.model.SmsEmail;
			import com.doumee.dao.business.model.Users;
			import com.doumee.dao.web.reqeust.EditMemberRequest;
			import com.doumee.dao.web.reqeust.EditShopDTO;
			import com.doumee.dao.web.reqeust.EditUsersRequest;
			import com.doumee.dao.web.reqeust.ContentShareImgDto;
			import com.doumee.dao.web.reqeust.*;
			import com.doumee.dao.web.response.AccountResponse;
			import com.doumee.service.business.*;
			import io.swagger.annotations.Api;
			@@ -35,6 +32,7 @@
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.web.bind.annotation.*;

			import javax.validation.Valid;
			import java.util.List;
			import java.util.Objects;

			@@ -88,7 +86,6 @@
			}



			@ApiOperation(value = "手机号验证码登陆", notes = "员工端小程序")
			@GetMapping("/loginByPhone")
			@ApiImplicitParams({
			@@ -111,6 +108,14 @@
			usersService.bindingOpenid(code,getUserId());
			return ApiResponse.success("操作成功");
			}


			@ApiOperation(value = "手机号快捷登录", notes = "客户端小程序")
			@PostMapping("/getWxMiniPhoneLogin")
			public ApiResponse<AccountResponse> getWxMiniPhone(@Valid @RequestBody WxPhoneRequest wxPhoneRequest) {
			return ApiResponse.success("获取成功",usersService.getWxMiniPhoneLogin(wxPhoneRequest));
			}


			@UserLoginRequired
			@ApiOperation(value = "获取个人信息详情", notes = "员工端小程序")
			@@ -226,7 +231,7 @@
			@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true)
			})
			public ApiResponse logOff() {
			ZTBaseRequst ztBaseRequst = usersService.logOff(getUserId());
			ZTBaseRequst ztBaseRequst = usersService.logOff(getUserId(),getToken());
			if(Objects.nonNull(ztBaseRequst)){
			getZhongTaiDataService.userLogout(ztBaseRequst);
			}