|
@@ -2,6 +2,7 @@ package com.huijy.web.controller.api;
|
|
|
|
|
|
import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
|
|
|
import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo;
|
|
|
+import com.huijy.common.annotation.LoginMember;
|
|
|
import com.huijy.common.annotation.UnLogin;
|
|
|
import com.huijy.common.config.RuoYiConfig;
|
|
|
import com.huijy.common.core.domain.AjaxResult;
|
|
@@ -66,7 +67,7 @@ public class ApiIndexController extends ApiAbstractController {
|
|
|
@ApiImplicitParams({
|
|
|
@ApiImplicitParam(name = "phone", value = "会员手机号", paramType = "body")
|
|
|
})
|
|
|
- public AjaxResult bindMobile(@ApiIgnore Member member, @RequestBody Map params) {
|
|
|
+ public AjaxResult bindMobile(@ApiIgnore @LoginMember Member member, @RequestBody Map params) {
|
|
|
|
|
|
String phone = (String) params.get("phone");
|
|
|
member.setMobile(phone);
|
|
@@ -77,7 +78,7 @@ public class ApiIndexController extends ApiAbstractController {
|
|
|
//绑定微信手机号
|
|
|
@PostMapping("/bindWxMobile")
|
|
|
@ApiOperation("绑定会员微信手机号")
|
|
|
- public AjaxResult bindWxMobile(@ApiIgnore Member member, @RequestBody WxPhoneFrom wxPhoneFrom) {
|
|
|
+ public AjaxResult bindWxMobile(@ApiIgnore @LoginMember Member member, @RequestBody WxPhoneFrom wxPhoneFrom) {
|
|
|
|
|
|
if (null == wxPhoneFrom) {
|
|
|
return AjaxResult.error("无加密信息");
|
|
@@ -115,7 +116,7 @@ public class ApiIndexController extends ApiAbstractController {
|
|
|
@ApiImplicitParam(name = "lat", value = "坐标的lat", paramType = "body"),
|
|
|
@ApiImplicitParam(name = "lng", value = "坐标的lng", paramType = "body")
|
|
|
})
|
|
|
- public AjaxResult pushLatLng(@ApiIgnore Member member, @RequestBody Map params) {
|
|
|
+ public AjaxResult pushLatLng(@ApiIgnore @LoginMember Member member, @RequestBody Map params) {
|
|
|
|
|
|
String lat = (String) params.get("lat");
|
|
|
String lng = (String) params.get("lng");
|
|
@@ -162,7 +163,7 @@ public class ApiIndexController extends ApiAbstractController {
|
|
|
@ApiImplicitParam(name = "phone", value = "求助电话", dataType = "String", paramType = "body"),
|
|
|
@ApiImplicitParam(name = "memberPhone", value = "会员电话", dataType = "String", paramType = "body"),
|
|
|
})
|
|
|
- public AjaxResult pushHelp(@ApiIgnore Member member, @RequestBody MemberHelp help) {
|
|
|
+ public AjaxResult pushHelp(@ApiIgnore @LoginMember Member member, @RequestBody MemberHelp help) {
|
|
|
help.setMemberId(member.getMemberId());
|
|
|
if (StringUtils.isEmpty(help.getMemberPhone())) {
|
|
|
help.setMemberPhone(member.getMobile());
|
|
@@ -175,7 +176,7 @@ public class ApiIndexController extends ApiAbstractController {
|
|
|
@GetMapping("/getAboutUs")
|
|
|
@ApiOperation("获取关于我们的信息")
|
|
|
@UnLogin
|
|
|
- public AjaxResult getAboutUs(@ApiIgnore Member member) {
|
|
|
+ public AjaxResult getAboutUs(@ApiIgnore @LoginMember Member member) {
|
|
|
AboutUs aboutUs = aboutUsService.selectAboutUsByAboutUsId(1L);
|
|
|
Map<String, Object> resultObj = new HashMap<String, Object>();
|
|
|
resultObj.put("aboutUs", aboutUs);
|
|
@@ -192,7 +193,7 @@ public class ApiIndexController extends ApiAbstractController {
|
|
|
@ApiImplicitParam(name = "pageNum", required = true, defaultValue = "1", value = "页码", paramType = "query"),
|
|
|
@ApiImplicitParam(name = "pageSize", required = true, defaultValue = "20", value = "显示记录数", paramType = "query")
|
|
|
})
|
|
|
- public TableDataInfo getPageContent(@ApiIgnore Member member, Integer type) {
|
|
|
+ public TableDataInfo getPageContent(@ApiIgnore @LoginMember Member member, Integer type) {
|
|
|
// AboutUs aboutUs = aboutUsService.selectAboutUsByAboutUsId(1L);
|
|
|
Content content = new Content();
|
|
|
content.setServiceInfo(type + "");
|
|
@@ -209,7 +210,7 @@ public class ApiIndexController extends ApiAbstractController {
|
|
|
@ApiOperation("获取主要内容详细信息")
|
|
|
@UnLogin
|
|
|
|
|
|
- public AjaxResult getContentInfo(@ApiIgnore Member member, @PathVariable Integer contentId) {
|
|
|
+ public AjaxResult getContentInfo(@ApiIgnore @LoginMember Member member, @PathVariable Integer contentId) {
|
|
|
// AboutUs aboutUs = aboutUsService.selectAboutUsByAboutUsId(1L);
|
|
|
|
|
|
Content info = contentService.selectContentByContentId(contentId.longValue());
|
|
@@ -233,7 +234,7 @@ public class ApiIndexController extends ApiAbstractController {
|
|
|
@ApiImplicitParam(name = "lng", value = "坐标的lng", paramType = "body"),
|
|
|
@ApiImplicitParam(name = "shopType", value = "商铺类型 1、商铺 2、酒店", defaultValue = "1", paramType = "body"),
|
|
|
})
|
|
|
- public AjaxResult storeApply(@ApiIgnore Member member, @RequestBody Shop shop) {
|
|
|
+ public AjaxResult storeApply(@ApiIgnore @LoginMember Member member, @RequestBody Shop shop) {
|
|
|
if (shop == null) {
|
|
|
AjaxResult.error("提交数据为空");
|
|
|
}
|
|
@@ -246,7 +247,7 @@ public class ApiIndexController extends ApiAbstractController {
|
|
|
//门店开通申请
|
|
|
@GetMapping("/getShopList")
|
|
|
@ApiOperation("获取商铺列表")
|
|
|
- public AjaxResult getShopList(@ApiIgnore Member member) {
|
|
|
+ public AjaxResult getShopList(@ApiIgnore @LoginMember Member member) {
|
|
|
List list = shopService.getListByMemberId(member.getMemberId());
|
|
|
Map<String, Object> resultObj = new HashMap<String, Object>();
|
|
|
resultObj.put("list", list);
|
|
@@ -255,7 +256,7 @@ public class ApiIndexController extends ApiAbstractController {
|
|
|
|
|
|
@GetMapping("/getShopInfo/{shopId}")
|
|
|
@ApiOperation("获取商铺列表")
|
|
|
- public AjaxResult getShopInfo(@ApiIgnore Member member, @PathVariable Long shopId) {
|
|
|
+ public AjaxResult getShopInfo(@ApiIgnore @LoginMember Member member, @PathVariable Long shopId) {
|
|
|
if (shopId == null) {
|
|
|
return AjaxResult.error("提交数据为空");
|
|
|
}
|
|
@@ -288,7 +289,7 @@ public class ApiIndexController extends ApiAbstractController {
|
|
|
@ApiImplicitParam(name = "lat", value = "坐标的lat", paramType = "body"),
|
|
|
@ApiImplicitParam(name = "lng", value = "坐标的lng", paramType = "body")
|
|
|
})
|
|
|
- public AjaxResult storeApply(@ApiIgnore Member member, @RequestBody Map params) {
|
|
|
+ public AjaxResult storeApply(@ApiIgnore @LoginMember Member member, @RequestBody Map params) {
|
|
|
String lat = (String) params.get("lat");
|
|
|
String lng = (String) params.get("lng");
|
|
|
Integer shopId = (Integer) params.get("shopId");
|
|
@@ -309,7 +310,7 @@ public class ApiIndexController extends ApiAbstractController {
|
|
|
|
|
|
@PostMapping("/pushRecord")
|
|
|
@ApiOperation("门店数据上报")
|
|
|
- public AjaxResult storeApply(@ApiIgnore Member member, @RequestBody ShopSalesRecord shopSalesRecord) {
|
|
|
+ public AjaxResult storeApply(@ApiIgnore @LoginMember Member member, @RequestBody ShopSalesRecord shopSalesRecord) {
|
|
|
if (shopSalesRecord == null) {
|
|
|
AjaxResult.error("上传数据为空");
|
|
|
}
|