Ver código fonte

提货盛情

wangxiaoming 6 anos atrás
pai
commit
81153cc90f

+ 1 - 1
watero-rst-interface/src/main/java/com/iamberry/rst/faces/sys/SysService.java

@@ -109,7 +109,7 @@ public interface SysService {
      * @param admin
      * @return
      */
-    Admin getByOpenid(String admin);
+    Admin getByOpenid(String openid);
     /**
      * 根据用户姓名获取登录信息
      * @param adminName

+ 2 - 2
watero-rst-service/src/main/java/com/iamberry/rst/service/sys/SysServiceImpl.java

@@ -119,8 +119,8 @@ public class SysServiceImpl implements SysService {
     }
 
     @Override
-    public Admin getByOpenid(String admin) {
-        return sysMapper.getByOpenid(admin);
+    public Admin getByOpenid(String openid) {
+        return sysMapper.getByOpenid(openid);
     }
 
     @Override

+ 5 - 1
watero-rst-web/src/main/java/com/iamberry/rst/controllers/approval/ApplyPickController.java

@@ -1,7 +1,9 @@
 package com.iamberry.rst.controllers.approval;
 
+import com.iamberry.rst.core.sys.Admin;
 import com.iamberry.rst.faces.approval.ApplyPickItemService;
 import com.iamberry.rst.faces.approval.ApplyPickService;
+import com.iamberry.rst.faces.sys.SysService;
 import com.iamberry.wechat.core.entity.WechatUtils;
 import com.iamberry.wechat.tools.ResponseJson;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -21,6 +23,8 @@ public class ApplyPickController {
     @Autowired
     private ApplyPickItemService applyPickItemService;
 
+    @Autowired
+    private SysService sysService;
 
     /**
      * 获取已审批通过的订单
@@ -44,7 +48,7 @@ public class ApplyPickController {
     @RequestMapping("/listApplyPick")
     public ResponseJson listApplyPick(HttpServletRequest request) {
         String openId = WechatUtils.getUserBySession(request).getUserOpenid();
-
+        Admin admin = sysService.getByOpenid(openId);
 
 
         return null;