diff --git a/han-hai-job/src/main/java/org/jeecg/job/controller/HouseAppletController.java b/han-hai-job/src/main/java/org/jeecg/job/controller/HouseAppletController.java index 6f3f0d8..2e49659 100644 --- a/han-hai-job/src/main/java/org/jeecg/job/controller/HouseAppletController.java +++ b/han-hai-job/src/main/java/org/jeecg/job/controller/HouseAppletController.java @@ -34,6 +34,18 @@ public class HouseAppletController { return houseAppletService.wxHouseAppletLogin(bean); } + + /** + * 查看用户协议与隐私政策 + * @return + */ + @ApiOperation(value="查看用户协议与隐私政策", notes="查看用户协议与隐私政策") + @GetMapping(value = "/findAgree") + public Result findAgree(String state){ + return null; + } + + /** * 微信小程序获取banner * @param state @@ -46,15 +58,22 @@ public class HouseAppletController { } - + /** + * 微信小程序获取通知 + * @param state + * @return + */ @ApiOperation(value = "用户/通知的接口",notes = "用户/通知的接口") @GetMapping("/notice") - public Result wxHouseNotice(){ + public Result wxHouseNotice(String state){ return null; } - + /** + * 微信小程序获取首页分类的方法 + * @return + */ @ApiOperation(value = "用户/首页分类的方法",notes = "用户/首页分类的方法") @GetMapping("/indexClass") public Result wxHouseIndexClass(){ diff --git a/han-hai-job/src/main/java/org/jeecg/job/service/HouseAppletService.java b/han-hai-job/src/main/java/org/jeecg/job/service/HouseAppletService.java index 107d94a..704b59b 100644 --- a/han-hai-job/src/main/java/org/jeecg/job/service/HouseAppletService.java +++ b/han-hai-job/src/main/java/org/jeecg/job/service/HouseAppletService.java @@ -16,6 +16,13 @@ public interface HouseAppletService { */ Result wxHouseAppletLogin(HouseAppletLoginBean bean); + /** + * 微信用户协议与隐私政策 + * @param state + * @return + */ + Result findAgree(String state); + /** * 微信小程序获取banner * @param state @@ -23,7 +30,155 @@ public interface HouseAppletService { */ Result wxHouseBanner(String state); + /** + * 微信小程序获取通知 + * @param state + * @return + */ + Result wxHouseNotice(String state); + + + /** + * 微信小程序获取首页分类的方法 + * @return + */ + Result wxHouseIndexClass(); + + /** + * 租房列表信息带分页 + * @return + */ + Result wxHouseIndexListPage(); + + + /** + * 租房列表信息带分页-根据标识 + * @return + */ + Result wxHouseIndexGetById(); + + /** + * 便民信息banner的接口 + * @return + */ + Result wxHouseHomeBanner(); + + + /** + * 便民信息列表分页的接口 + * @return + */ + Result wxHouseHomeListPage(); + + + /** + * 便民信息列表分页的接口-根据标识查看详情 + * @return + */ + Result wxHouseHomeById(); + + + /** + * 家具信息列表的接口 + * @return + */ + Result wxHouseHomeShopListPage(); + + + /** + * 家具信息列表的接口-根据标识查看详情 + * @return + */ + Result wxHouseHomeShopById(); + + + /** + * 创建家具订单 + * @return + */ + Result wxHouseHomeShopCreateOrder(); + + /** + * 创建家具订单-创建支付 + * @return + */ + Result wxHouseHomeShopCreateOrderPay(); + + + /** + * 创建家具订单-支付回调 + * @param requestBody + * @return + */ + Object createWxNotify(String requestBody); + + + /** + * 获取个人信息 + * @param token + * @return + */ + Result info(String token); + + + /** + * 修改个人信息 + * @param token + * @return + */ + Result infoEdit(String token); + + + /** + * 获取我的粉丝 + * @param token + * @return + */ + Result infoFans(String token); + + + /** + * 获取邀请二维码 + * @param token + * @return + */ + Result QRCode(String token); + + + /** + * 获取基础信息 + * @return + */ + Result getConfig(); + + + /** + * 发布房源 + * @return + */ + Result saveHouse(); + + + /** + * 我发布的房源列表信息 + * @return + */ + Result getMyHouseListPage(); + + + /** + * 获取家具订单列表 + * @return + */ + Result getMyHouseOrderListPage(); + + + /** + * 获取订单详情 + * @return + */ + Result getMyHouseOrderById(); } diff --git a/han-hai-job/src/main/java/org/jeecg/job/service/JobOfficialService.java b/han-hai-job/src/main/java/org/jeecg/job/service/JobOfficialService.java index de0ad2e..a6b2999 100644 --- a/han-hai-job/src/main/java/org/jeecg/job/service/JobOfficialService.java +++ b/han-hai-job/src/main/java/org/jeecg/job/service/JobOfficialService.java @@ -22,7 +22,11 @@ public interface JobOfficialService { Result findAgree(String state); - + /** + * 查看banner信息接口 + * @param state + * @return + */ Result bannerList(String state); diff --git a/han-hai-job/src/main/java/org/jeecg/job/service/impl/HouseAppletServiceImpl.java b/han-hai-job/src/main/java/org/jeecg/job/service/impl/HouseAppletServiceImpl.java index ef7d0a8..6c9f6d9 100644 --- a/han-hai-job/src/main/java/org/jeecg/job/service/impl/HouseAppletServiceImpl.java +++ b/han-hai-job/src/main/java/org/jeecg/job/service/impl/HouseAppletServiceImpl.java @@ -10,6 +10,8 @@ import org.jeecg.common.system.util.JwtUtil; import org.jeecg.common.util.RedisUtil; import org.jeecg.job.req.HouseAppletLoginBean; import org.jeecg.job.service.HouseAppletService; +import org.jeecg.modules.binyuanConfig.entity.BinyuanConfig; +import org.jeecg.modules.binyuanConfig.service.IBinyuanConfigService; import org.jeecg.modules.common.login.HttpConf; import org.jeecg.modules.hanhai.hanHaiMember.entity.HanHaiMember; import org.jeecg.modules.hanhai.hanHaiMember.service.IHanHaiMemberService; @@ -38,11 +40,12 @@ public class HouseAppletServiceImpl implements HouseAppletService { */ @Value("${weHouseChat.mpAppSecret}") private String mpAppSecret; - /** - * 个人信息 - */ + //个人信息 @Resource private IHanHaiMemberService memberService; + //配置信息 + @Resource + private IBinyuanConfigService configService; /** * 缓存 */ @@ -55,6 +58,9 @@ public class HouseAppletServiceImpl implements HouseAppletService { private HttpConf httpConf; + + + /** * 微信小程序授权登录 * @param bean @@ -122,6 +128,22 @@ public class HouseAppletServiceImpl implements HouseAppletService { } + /** + * 微信用户协议与隐私政策 + * @param state + * @return + */ + @Override + public Result findAgree(String state){ + BinyuanConfig config = configService.lambdaQuery() + .eq(BinyuanConfig::getConfigKey,"treaty_policy") + .eq(BinyuanConfig::getIsShow,1) + .one(); + return Result.OK("查询成功",config); + } + + + /** * 微信小程序获取banner * @param state @@ -132,4 +154,219 @@ public class HouseAppletServiceImpl implements HouseAppletService { return null; } + + /** + * 微信小程序获取通知 + * @param state + * @return + */ + @Override + public Result wxHouseNotice(String state){ + return null; + } + + + /** + * 微信小程序获取首页分类的方法 + * @return + */ + @Override + public Result wxHouseIndexClass(){ + return null; + } + + /** + * 租房列表信息带分页 + * @return + */ + @Override + public Result wxHouseIndexListPage(){ + return null; + } + + + /** + * 租房列表信息带分页-根据标识 + * @return + */ + @Override + public Result wxHouseIndexGetById(){ + return null; + } + + /** + * 便民信息banner的接口 + * @return + */ + @Override + public Result wxHouseHomeBanner(){ + return null; + } + + + /** + * 便民信息列表分页的接口 + * @return + */ + @Override + public Result wxHouseHomeListPage(){ + return null; + } + + + /** + * 便民信息列表分页的接口-根据标识查看详情 + * @return + */ + @Override + public Result wxHouseHomeById(){ + return null; + } + + + /** + * 家具信息列表的接口 + * @return + */ + @Override + public Result wxHouseHomeShopListPage(){ + return null; + } + + + /** + * 家具信息列表的接口-根据标识查看详情 + * @return + */ + @Override + public Result wxHouseHomeShopById(){ + return null; + } + + + /** + * 创建家具订单 + * @return + */ + @Override + public Result wxHouseHomeShopCreateOrder(){ + return null; + } + + + /** + * 创建家具订单-创建支付 + * @return + */ + @Override + public Result wxHouseHomeShopCreateOrderPay(){ + return null; + } + + + /** + * 创建家具订单-支付回调 + * @param requestBody + * @return + */ + @Override + public Object createWxNotify(String requestBody){ + return null; + } + + + /** + * 获取个人信息 + * @param token + * @return + */ + @Override + public Result info(String token){ + return null; + } + + + /** + * 修改个人信息 + * @param token + * @return + */ + @Override + public Result infoEdit(String token){ + return null; + } + + + /** + * 获取我的粉丝 + * @param token + * @return + */ + @Override + public Result infoFans(String token){ + return null; + } + + + /** + * 获取邀请二维码 + * @param token + * @return + */ + @Override + public Result QRCode(String token){ + return null; + } + + + /** + * 获取基础信息 + * @return + */ + @Override + public Result getConfig(){ + return null; + } + + + /** + * 发布房源 + * @return + */ + @Override + public Result saveHouse(){ + return null; + } + + + /** + * 我发布的房源列表信息 + * @return + */ + @Override + public Result getMyHouseListPage(){ + return null; + } + + + /** + * 获取家具订单列表 + * @return + */ + @Override + public Result getMyHouseOrderListPage(){ + return null; + } + + + /** + * 获取订单详情 + * @return + */ + @Override + public Result getMyHouseOrderById(){ + return null; + } + + } diff --git a/han-hai-job/src/main/java/org/jeecg/job/service/impl/JobOfficialServiceImpl.java b/han-hai-job/src/main/java/org/jeecg/job/service/impl/JobOfficialServiceImpl.java index f4cc829..224f091 100644 --- a/han-hai-job/src/main/java/org/jeecg/job/service/impl/JobOfficialServiceImpl.java +++ b/han-hai-job/src/main/java/org/jeecg/job/service/impl/JobOfficialServiceImpl.java @@ -3,6 +3,8 @@ package org.jeecg.job.service.impl; import org.jeecg.common.api.vo.Result; import org.jeecg.job.req.OfficialLoginBean; import org.jeecg.job.service.JobOfficialService; +import org.jeecg.modules.binyuanConfig.entity.BinyuanConfig; +import org.jeecg.modules.binyuanConfig.service.IBinyuanConfigService; import org.jeecg.modules.common.login.ApiLoginService; import org.jeecg.modules.common.login.LoginReq; import org.springframework.stereotype.Service; @@ -13,11 +15,12 @@ import javax.annotation.Resource; @Service public class JobOfficialServiceImpl implements JobOfficialService { - /** - * 公共用户表数据 - */ + //公共用户登录 @Resource private ApiLoginService apiLoginService; + //配置信息 + @Resource + private IBinyuanConfigService configService; /** * 客户端-微信授权登录 @@ -44,9 +47,23 @@ public class JobOfficialServiceImpl implements JobOfficialService { */ @Override public Result findAgree(String state){ - return null; + BinyuanConfig config = configService.lambdaQuery() + .eq(BinyuanConfig::getConfigKey,"treaty_policy") + .eq(BinyuanConfig::getIsShow,1) + .one(); + return Result.OK("查询成功",config); } + /** + * 查看banner信息接口 + * @param state + * @return + */ + @Override + public Result bannerList(String state){ + return null; + } + }