Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj

Browse Source
This commit is contained in:
xiezhijun
2021-05-21 18:59:52 +08:00
parent f913774025 fdf44c3624
commit 167cb3fda0
5 changed files with 102 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
stdiet-admin/src/main/java/com/stdiet/web/controller/custom/WechatAppletController.java
View File

@@ -488,8 +488,17 @@ public class WechatAppletController extends BaseController {
}
@GetMapping("/getRecipesPlans")
public AjaxResult getRecipesPlans(@RequestParam String customerId) {
Long cusId = StringUtils.isNotEmpty(customerId) ? Long.parseLong(AesUtils.decrypt(customerId)) : 0L;
public AjaxResult getRecipesPlans(@RequestParam String customerId, @RequestParam String openid) {
Long cusId = 0L;
if (StringUtils.isNull(customerId)) {
SysWxUserInfo wxUserInfo = sysWxUserInfoService.selectSysWxUserInfoById(openid);
cusId = StringUtils.isNotNull(wxUserInfo) ? wxUserInfo.getCusId() : 0L;
} else {
cusId = StringUtils.isNotEmpty(customerId) ? Long.parseLong(AesUtils.decrypt(customerId)) : 0L;
}
if (cusId == 0L) {
return AjaxResult.error(5000, "需要手机号进一步匹配");
}
List<SysRecipesPlanListInfo> plans = sysRecipesPlanService.selectRecipesPlanListInfoByCusId(cusId);
@@ -541,12 +550,12 @@ public class WechatAppletController extends BaseController {
@GetMapping("/getRecipesDetail")
public AjaxResult getRecipesDetail(@RequestParam Long menuId) {
return AjaxResult.success(iSysRecipesService.selectDishesByMenuId(menuId));
return AjaxResult.success(iSysRecipesService.selectDishesByMenuIdShow(menuId));
}
@GetMapping("/getPlanDetail")
public AjaxResult getPlanDetail(@RequestParam Long planId) {
return AjaxResult.success(iSysRecipesService.selectSysRecipesByRecipesId(planId));
return AjaxResult.success(iSysRecipesService.selectSysRecipesByRecipesIdShow(planId));
}
@GetMapping("/authServer")