添加活动列表

src/main/java/com/chaozhanggui/system/cashierservice/controller/LoginContoller.java

@@ -217,21 +217,20 @@ public class LoginContoller {
     }
 
 
-//    /**
-//     * 获取会员码
-//     *
-//     * @param openId
-//     * @param token
-//     * @param id
-//     * @return
-//     */
-//    @GetMapping("createCardNo")
-//    public Result createCardNo(@RequestHeader("openId") String openId, @RequestHeader("token") String token, @RequestHeader("id") String id,
-//
-//                               @RequestParam("shopId") String shopId
-//                               ) {
-//        return loginService.createCardNo(id, openId,shopId);
-//    }
+    /**
+     * 获取会员码
+     *
+     * @param openId
+     * @param token
+     * @param id
+     * @return
+     */
+    @GetMapping("createCardNo")
+    public Result createCardNo(@RequestHeader("openId") String openId, @RequestHeader("token") String token, @RequestHeader("id") String id,
+                               @RequestParam("shopId") String shopId
+                               ) {
+        return loginService.createCardNo(id, openId,shopId);
+    }
 
     @GetMapping("/userInfo")
     public Result userInfo(@RequestParam("userId") Integer userId) {

src/main/java/com/chaozhanggui/system/cashierservice/controller/PayController.java

@@ -127,9 +127,15 @@ public class PayController {
     }
 
 
-//    public Result getActive(@RequestHeader("token") String token,@RequestParam("shopId") String shopId,@RequestParam("page") int page,@RequestParam("pageSize") int pageSize){
-//
-//    }
+    @RequestMapping("getActive")
+    public Result getActive(
+            @RequestHeader("token") String token,
+            @RequestParam("shopId") String shopId,
+            @RequestParam("page") int page,
+            @RequestParam("pageSize") int pageSize){
+        return payService.getActivate(shopId,page,pageSize);
+
+    }
 
     /**
      * 充值