添加接口

dinner-application/src/main/resources/application-dev.properties

@@ -32,3 +32,33 @@ share.logo.oss.path=domain/4dhouse/
 oss.query.url=https://houseoss.4dkankan.com/
 image.local.path=C:\\Users\\4dage\\Desktop\\logo-file\\
 
+
+#小程序ID
+wx.appId=wx0509bd21546d1597
+#小程序密钥
+wx.secret=eeb67f6ccad20ae72b94cc4b7ffae6fc
+#商户号
+wx.mchId=1501483501
+#支付签名
+wx.paySignKey=CsArBv2NKBoLx27R5TujbmClo5BwIjlr
+#交易类型
+wx.tradeType=JSAPI
+#证书名称，对应不同的商户号
+#wx.certName=/cert/apiclient_cert.p12
+wx.certName=/root/user/java/apache-tomcat-8.0.51-platform/apiclient_cert.p12
+#支付回调地址
+wx.notifyUrl=https://testshop.4dkankan.com/platform-framework/api/pay/notify
+#获取code的请求地址
+wx.getCode=https://open.weixin.qq.com/connect/oauth2/authorize?appid=%s&redirect_uri=%s&response_type=code&scope=%s&state=STAT#wechat_redirect
+#获取Web_access_tokenhttps的请求地址
+wx.webAccessTokenhttps = https://api.weixin.qq.com/sns/jscode2session?appid=%s&secret=%s&js_code=%s&grant_type=authorization_code
+#拉取用户信息的请求地址
+wx.userMessage=https://api.weixin.qq.com/sns/userinfo?access_token=%s&openid=%s&lang=zh_CN
+#微信统一下单接口路径
+wx.uniformorder=https://api.mch.weixin.qq.com/pay/unifiedorder
+#退款地址
+wx.refundUrl=https://api.mch.weixin.qq.com/secapi/pay/refund
+#退款查询地址
+wx.refundqueryUrl=https://api.mch.weixin.qq.com/pay/refundquery
+#微信查询订单状态
+wx.orderquery=https://api.mch.weixin.qq.com/pay/orderquery

dinner-application/src/main/resources/application-prod.properties

@@ -28,3 +28,33 @@ share.logo.oss.path=domain/4dhouse/
 oss.query.url=https://houseoss.4dkankan.com/
 image.local.path=C:\\Users\\4dage\\Desktop\\logo-file\\
 
+
+#小程序ID
+wx.appId=wx0509bd21546d1597
+#小程序密钥
+wx.secret=eeb67f6ccad20ae72b94cc4b7ffae6fc
+#商户号
+wx.mchId=1501483501
+#支付签名
+wx.paySignKey=CsArBv2NKBoLx27R5TujbmClo5BwIjlr
+#交易类型
+wx.tradeType=JSAPI
+#证书名称，对应不同的商户号
+#wx.certName=/cert/apiclient_cert.p12
+wx.certName=/root/user/java/apache-tomcat-8.0.51-platform/apiclient_cert.p12
+#支付回调地址
+wx.notifyUrl=https://testshop.4dkankan.com/platform-framework/api/pay/notify
+#获取code的请求地址
+wx.getCode=https://open.weixin.qq.com/connect/oauth2/authorize?appid=%s&redirect_uri=%s&response_type=code&scope=%s&state=STAT#wechat_redirect
+#获取Web_access_tokenhttps的请求地址
+wx.webAccessTokenhttps = https://api.weixin.qq.com/sns/jscode2session?appid=%s&secret=%s&js_code=%s&grant_type=authorization_code
+#拉取用户信息的请求地址
+wx.userMessage=https://api.weixin.qq.com/sns/userinfo?access_token=%s&openid=%s&lang=zh_CN
+#微信统一下单接口路径
+wx.uniformorder=https://api.mch.weixin.qq.com/pay/unifiedorder
+#退款地址
+wx.refundUrl=https://api.mch.weixin.qq.com/secapi/pay/refund
+#退款查询地址
+wx.refundqueryUrl=https://api.mch.weixin.qq.com/pay/refundquery
+#微信查询订单状态
+wx.orderquery=https://api.mch.weixin.qq.com/pay/orderquery

dinner-application/src/main/resources/application-test.properties

@@ -32,3 +32,33 @@ share.logo.oss.path=domain/4dhouse/
 oss.query.url=https://houseoss.4dkankan.com/
 image.local.path=C:\\Users\\4dage\\Desktop\\logo-file\\
 
+
+#小程序ID
+wx.appId=wx0509bd21546d1597
+#小程序密钥
+wx.secret=eeb67f6ccad20ae72b94cc4b7ffae6fc
+#商户号
+wx.mchId=1501483501
+#支付签名
+wx.paySignKey=CsArBv2NKBoLx27R5TujbmClo5BwIjlr
+#交易类型
+wx.tradeType=JSAPI
+#证书名称，对应不同的商户号
+#wx.certName=/cert/apiclient_cert.p12
+wx.certName=/root/user/java/apache-tomcat-8.0.51-platform/apiclient_cert.p12
+#支付回调地址
+wx.notifyUrl=https://testshop.4dkankan.com/platform-framework/api/pay/notify
+#获取code的请求地址
+wx.getCode=https://open.weixin.qq.com/connect/oauth2/authorize?appid=%s&redirect_uri=%s&response_type=code&scope=%s&state=STAT#wechat_redirect
+#获取Web_access_tokenhttps的请求地址
+wx.webAccessTokenhttps = https://api.weixin.qq.com/sns/jscode2session?appid=%s&secret=%s&js_code=%s&grant_type=authorization_code
+#拉取用户信息的请求地址
+wx.userMessage=https://api.weixin.qq.com/sns/userinfo?access_token=%s&openid=%s&lang=zh_CN
+#微信统一下单接口路径
+wx.uniformorder=https://api.mch.weixin.qq.com/pay/unifiedorder
+#退款地址
+wx.refundUrl=https://api.mch.weixin.qq.com/secapi/pay/refund
+#退款查询地址
+wx.refundqueryUrl=https://api.mch.weixin.qq.com/pay/refundquery
+#微信查询订单状态
+wx.orderquery=https://api.mch.weixin.qq.com/pay/orderquery

dinner-application/src/main/resources/application-uat.properties

@@ -28,3 +28,33 @@ share.logo.oss.path=domain/4dhouse/
 oss.query.url=https://houseoss.4dkankan.com/
 image.local.path=C:\\Users\\4dage\\Desktop\\logo-file\\
 
+
+#小程序ID
+wx.appId=wx0509bd21546d1597
+#小程序密钥
+wx.secret=eeb67f6ccad20ae72b94cc4b7ffae6fc
+#商户号
+wx.mchId=1501483501
+#支付签名
+wx.paySignKey=CsArBv2NKBoLx27R5TujbmClo5BwIjlr
+#交易类型
+wx.tradeType=JSAPI
+#证书名称，对应不同的商户号
+#wx.certName=/cert/apiclient_cert.p12
+wx.certName=/root/user/java/apache-tomcat-8.0.51-platform/apiclient_cert.p12
+#支付回调地址
+wx.notifyUrl=https://testshop.4dkankan.com/platform-framework/api/pay/notify
+#获取code的请求地址
+wx.getCode=https://open.weixin.qq.com/connect/oauth2/authorize?appid=%s&redirect_uri=%s&response_type=code&scope=%s&state=STAT#wechat_redirect
+#获取Web_access_tokenhttps的请求地址
+wx.webAccessTokenhttps = https://api.weixin.qq.com/sns/jscode2session?appid=%s&secret=%s&js_code=%s&grant_type=authorization_code
+#拉取用户信息的请求地址
+wx.userMessage=https://api.weixin.qq.com/sns/userinfo?access_token=%s&openid=%s&lang=zh_CN
+#微信统一下单接口路径
+wx.uniformorder=https://api.mch.weixin.qq.com/pay/unifiedorder
+#退款地址
+wx.refundUrl=https://api.mch.weixin.qq.com/secapi/pay/refund
+#退款查询地址
+wx.refundqueryUrl=https://api.mch.weixin.qq.com/pay/refundquery
+#微信查询订单状态
+wx.orderquery=https://api.mch.weixin.qq.com/pay/orderquery

dinner-core/src/main/java/com/fdage/base/entity/TmDesk.java

@@ -67,4 +67,10 @@ public class TmDesk implements Serializable {
     private Integer status;
 
 
+    @ApiModelProperty(value = "热点ID")
+    private String hotId;
+
+    @ApiModelProperty(value = "热点标签")
+    private String hotTag;
+
 }

dinner-core/src/main/java/com/fdage/base/service/impl/TmDeskServiceImpl.java

@@ -1,9 +1,13 @@
 package com.fdage.base.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdage.base.entity.TmDesk;
 import com.fdage.base.dao.TmDeskDao;
 import com.fdage.base.service.ITmDeskService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 /**
@@ -17,4 +21,17 @@ import org.springframework.stereotype.Service;
 @Service
 public class TmDeskServiceImpl extends ServiceImpl<TmDeskDao, TmDesk> implements ITmDeskService {
 
+
+    public IPage<TmDesk> getListByCanteen(long pageNum , long pageSize , String canteenId){
+        IPage<TmDesk> page = new Page<>(pageNum , pageSize);
+        if(StringUtils.isBlank(canteenId)){
+            return page;
+        }
+        LambdaQueryWrapper<TmDesk> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(TmDesk::getCanteenId , canteenId);
+        lambdaQueryWrapper.eq(TmDesk::getIsDelete , 0);
+
+        return getBaseMapper().selectPage(page , lambdaQueryWrapper);
+    }
+
 }

dinner-core/src/main/java/com/fdage/base/service/impl/TmOrderServiceImpl.java

@@ -1,5 +1,9 @@
 package com.fdage.base.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdage.base.entity.TmOrder;
 import com.fdage.base.dao.TmOrderDao;
 import com.fdage.base.service.ITmOrderService;
@@ -17,4 +21,12 @@ import org.springframework.stereotype.Service;
 @Service
 public class TmOrderServiceImpl extends ServiceImpl<TmOrderDao, TmOrder> implements ITmOrderService {
 
+    public IPage<TmOrder> getListByUser(String userId , long pageNum , long pageSize){
+        LambdaQueryWrapper<TmOrder> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(TmOrder::getUserId , userId);
+        lambdaQueryWrapper.eq(TmOrder::getIsDelete , 0);
+        IPage<TmOrder> page = new Page<>(pageNum , pageSize);
+        return getBaseMapper().selectPage(page , lambdaQueryWrapper);
+    }
+
 }

dinner-core/src/main/java/com/fdage/controller/app/AppAuthController.java

@@ -107,6 +107,7 @@ public class AppAuthController extends BaseController {
 
         Map<String , Object> resultMap = new HashMap<>();
         resultMap.put("token" , token);
+        resultMap.put("user" , dbUser);
         return Result.success(resultMap);
     }
 }

dinner-core/src/main/java/com/fdage/controller/app/AppDeskController.java

@@ -0,0 +1,60 @@
+package com.fdage.controller.app;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.fdage.base.entity.TmDesk;
+import com.fdage.base.service.impl.TmDeskServiceImpl;
+import com.fdage.base.utils.DataUtils;
+import fdage.back.sdk.base.entity.Result;
+import fdage.back.sdk.base.enums.ResultCodeEnum;
+import fdage.back.sdk.base.exception.CommonBaseException;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.log4j.Log4j2;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 2 * @Author: Abner
+ * 3 * @Date: 2021/2/19 11:02
+ * 4
+ */
+@Api(tags = "餐桌相关接口")
+@RestController
+@RequestMapping("/app/desk")
+@Log4j2
+public class AppDeskController {
+
+    @Autowired
+    private TmDeskServiceImpl tmDeskService;
+
+    @GetMapping("/listOfCanteen")
+    @ApiOperation(value = "获取餐厅下所有可预订的桌子列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "canteenId", value = "餐厅ID", paramType = "query", required = true, dataType = "String"),
+            @ApiImplicitParam(name = "pageNum", value = "当前页码", paramType = "query", required = true, dataType = "Long"),
+            @ApiImplicitParam(name = "pageSize", value = "每页大小", paramType = "query", required = true, dataType = "Long")
+    })
+    public Result<Object> getListByCanteen( @RequestParam(name = "canteenId") String canteenId ,
+                                            @RequestParam(name = "pageNum")Long pageNum,
+                                            @RequestParam(name = "pageSize")Long pageSize){
+        if(null == pageNum || null == pageSize){
+            throw new CommonBaseException(ResultCodeEnum.D101 , "缺失分页参数");
+        }
+        if(StringUtils.isBlank(canteenId)){
+            throw new CommonBaseException(ResultCodeEnum.D101 , "餐厅ID缺失");
+        }
+        IPage<TmDesk> resultPage = tmDeskService.getListByCanteen(pageNum , pageSize , canteenId);
+
+        return  Result.success(DataUtils.assembleResult(resultPage.getTotal(), resultPage.getPages(),
+                resultPage.getCurrent(), resultPage.getRecords()));
+    }
+
+
+
+}

dinner-core/src/main/java/com/fdage/controller/app/AppOrderController.java

@@ -0,0 +1,60 @@
+package com.fdage.controller.app;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.fdage.base.entity.TmOrder;
+import com.fdage.base.entity.TmUser;
+import com.fdage.base.service.impl.TmOrderServiceImpl;
+import com.fdage.base.utils.DataUtils;
+import com.fdage.controller.BaseController;
+import fdage.back.sdk.base.entity.Result;
+import fdage.back.sdk.base.enums.ResultCodeEnum;
+import fdage.back.sdk.base.exception.CommonBaseException;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.log4j.Log4j2;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+
+/**
+ * 2 * @Author: Abner
+ * 3 * @Date: 2021/2/19 11:02
+ * 4
+ */
+@Api(tags = "订单相关接口")
+@RestController
+@RequestMapping("/app/order")
+@Log4j2
+public class AppOrderController extends BaseController {
+
+    @Autowired
+    private TmOrderServiceImpl tmOrderService;
+
+    @GetMapping("/listByUser")
+    @ApiOperation(value = "拉取用户所有订单列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "当前页码", paramType = "query", required = true, dataType = "Long"),
+            @ApiImplicitParam(name = "pageSize", value = "每页大小", paramType = "query", required = true, dataType = "Long")
+    })
+    public Result<Object> getUserOrderList( @RequestParam(name = "pageNum")Long pageNum,
+                                            @RequestParam(name = "pageSize")Long pageSize){
+
+        TmUser tmUser = getContextUserInfo();
+        if(null == tmUser){
+            throw new CommonBaseException(ResultCodeEnum.D101 , "未登录，请登录");
+        }
+        if(null == pageNum || null == pageSize){
+            throw new CommonBaseException(ResultCodeEnum.D101 , "缺失分页参数");
+        }
+        IPage<TmOrder> resultPage = tmOrderService.getListByUser(tmUser.getId() , pageNum , pageSize);
+
+        return  Result.success(DataUtils.assembleResult(resultPage.getTotal(), resultPage.getPages(),
+                resultPage.getCurrent(), resultPage.getRecords()));
+    }
+
+}

dinner-core/src/main/java/com/fdage/controller/app/AppUserController.java

@@ -0,0 +1,38 @@
+package com.fdage.controller.app;
+
+import com.fdage.base.entity.TmUser;
+import com.fdage.controller.BaseController;
+import fdage.back.sdk.base.entity.Result;
+import fdage.back.sdk.base.enums.ResultCodeEnum;
+import fdage.back.sdk.base.exception.CommonBaseException;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.log4j.Log4j2;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 2 * @Author: Abner
+ * 3 * @Date: 2021/2/19 11:42
+ * 4
+ */
+@Api(tags = "用户相关接口")
+@RestController
+@RequestMapping("/app/user")
+@Log4j2
+public class AppUserController extends BaseController {
+
+
+    @GetMapping("/detail")
+    @ApiOperation(value = "获当前用户详情")
+    public Result<TmUser> getByToken(){
+        TmUser tmUser = getContextUserInfo();
+        if(null == tmUser){
+            throw new CommonBaseException(ResultCodeEnum.D101 , "未登录，请登录");
+        }
+        return Result.success(tmUser);
+    }
+
+
+}