|
@@ -2,6 +2,7 @@ package com.iamberry.rst.controllers.approval;
|
|
|
|
|
|
import com.iamberry.rst.faces.approval.ApplyPickItemService;
|
|
|
import com.iamberry.rst.faces.approval.ApplyPickService;
|
|
|
+import com.iamberry.wechat.core.entity.WechatUtils;
|
|
|
import com.iamberry.wechat.tools.ResponseJson;
|
|
|
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
@@ -9,8 +10,10 @@ import org.springframework.stereotype.Controller;
|
|
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
import org.springframework.web.bind.annotation.ResponseBody;
|
|
|
|
|
|
+import javax.servlet.http.HttpServletRequest;
|
|
|
+
|
|
|
@Controller
|
|
|
-@RequestMapping("/admin/applyPick")
|
|
|
+@RequestMapping("/wechat/applyPick")
|
|
|
public class ApplyPickController {
|
|
|
|
|
|
@Autowired
|
|
@@ -18,6 +21,7 @@ public class ApplyPickController {
|
|
|
@Autowired
|
|
|
private ApplyPickItemService applyPickItemService;
|
|
|
|
|
|
+
|
|
|
/**
|
|
|
* 获取已审批通过的订单
|
|
|
* @return
|
|
@@ -30,4 +34,20 @@ public class ApplyPickController {
|
|
|
return null;
|
|
|
}
|
|
|
|
|
|
+
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 获取提货列表
|
|
|
+ * @return
|
|
|
+ */
|
|
|
+ @ResponseBody
|
|
|
+ @RequestMapping("/listApplyPick")
|
|
|
+ public ResponseJson listApplyPick(HttpServletRequest request) {
|
|
|
+ String openId = WechatUtils.getUserBySession(request).getUserOpenid();
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ return null;
|
|
|
+ }
|
|
|
+
|
|
|
}
|