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-19 18:42:52 +08:00
parent bfe9a581e5 02a3e487f7
commit 7cac34799c
3 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -509,7 +509,6 @@ public class WechatAppletController extends BaseController {
}
}
SysOrderPause orderPause = new SysOrderPause();
orderPause.setCusId(cusId);
List<SysOrderPause> pauses = sysOrderPauseService.selectSysOrderPauseList(orderPause);
@ -557,9 +556,15 @@ public class WechatAppletController extends BaseController {
return request.getParameter("echostr");
}
@GetMapping("/getToken")
public String getToken(@RequestParam String appId) {
return iWechatAppletService.getAccessToken(appId);
// @GetMapping("/getToken")
// public String getToken(@RequestParam String appId) {
// return iWechatAppletService.getAccessToken(appId);
// }
@GetMapping("/trans")
public AjaxResult transId(@RequestParam String customerId) {
Long cusId = StringUtils.isNotEmpty(customerId) ? Long.parseLong(AesUtils.decrypt(customerId)) : 0L;
return AjaxResult.success(String.valueOf(cusId));
}
@GetMapping("/subscribe")