Prechádzať zdrojové kódy

获取过期权益数量
获取用户的增值权益包列表

dengsixing 3 rokov pred
rodič
commit
48d403eb7f

+ 1 - 1
4dkankan-center-platform/src/main/java/com/fdkankan/platform/goods/mapper/ICameraSpaceMapper.java

@@ -21,7 +21,7 @@ import java.util.List;
 public interface ICameraSpaceMapper extends BaseMapper<CameraSpace> {
 public interface ICameraSpaceMapper extends BaseMapper<CameraSpace> {
 
 
     @Select(" select s.id, s.space_end_time, c.child_name, s.space from t_camera_space s " +
     @Select(" select s.id, s.space_end_time, c.child_name, s.space from t_camera_space s " +
-            "LEFT JOIN t_camera c on s.camera_id = c.id where s.rec_status = 'A' and " +
+            "LEFT JOIN t_camera c on s.camera_id = c.id where s.tb_status = 0 and " +
             "s.space_type = 2 and s.camera_id = #{cameraId} and TIMESTAMPDIFF(MINUTE, NOW(), s.space_end_time) > -1 ORDER BY s.space_end_time ")
             "s.space_type = 2 and s.camera_id = #{cameraId} and TIMESTAMPDIFF(MINUTE, NOW(), s.space_end_time) > -1 ORDER BY s.space_end_time ")
     List<ResponseCameraSpace> getVoListByCameraId(@Param("cameraId")Long cameraId);
     List<ResponseCameraSpace> getVoListByCameraId(@Param("cameraId")Long cameraId);
 }
 }

+ 1 - 1
4dkankan-center-platform/src/main/java/com/fdkankan/platform/user/controller/api/UserIncrementController.java

@@ -30,7 +30,7 @@ public class UserIncrementController {
      * @return
      * @return
      */
      */
     @RequestMapping(value = "/findIncrementList", method = RequestMethod.POST)
     @RequestMapping(value = "/findIncrementList", method = RequestMethod.POST)
-    public Page<ResponseUserIncrement> findIncrementList(@RequestBody RequestUserIncrement param, @RequestHeader String token) throws Exception {
+    public Page<ResponseUserIncrement> findIncrementList(RequestUserIncrement param, @RequestHeader String token) throws Exception {
         return userIncrementService.findIncrementList(param,token);
         return userIncrementService.findIncrementList(param,token);
     }
     }