Merge remote-tracking branch 'origin/task-lyh-inctype2'

src/main/java/com/fdkankan/ucenter/service/impl/AppCameraService.java

@@ -67,7 +67,7 @@ public class AppCameraService {
                 Long sceneCount = sceneNumMap.get(cameraApp.getId()) == null ? 0L : sceneNumMap.get(cameraApp.getId()).getCount();
                 cameraApp.setSceneCount(Math.toIntExact(sceneCount));
             }
-            UserIncrement userIncrementEntity = userIncrementService.getByCameraId(cameraApp.getId());
+            UserIncrement userIncrementEntity = userIncrementService.getByCameraId(cameraApp.getCameraId());
             if(userIncrementEntity != null){
                 cameraApp.setMemberLevels(userIncrementEntity.getMemberLevels());
                 cameraApp.setUserIncrementId(userIncrementEntity.getId());

src/main/java/com/fdkankan/ucenter/vo/response/CameraAppVo.java

@@ -88,4 +88,6 @@ public class CameraAppVo extends GoodsVo {
     private String unit;
 
     private String memberLevels;
+
+    private Long cameraId;
 }

src/main/resources/mapper/ucenter/CameraDetailMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.fdkankan.ucenter.mapper.ICameraDetailMapper">
 
     <select id="getListByUserAndType" resultType="com.fdkankan.ucenter.vo.response.CameraAppVo">
-     SELECT * FROM t_camera_detail d
+     SELECT *,c.id as cameraId FROM t_camera_detail d
         LEFT JOIN t_camera c on d.camera_id = c.id
         LEFT JOIN t_goods g on d.goods_id = g.id
         WHERE d.rec_status = 'A'
@@ -12,7 +12,7 @@
     </select>
 
     <select id="getListByUserIdsAndType" resultType="com.fdkankan.ucenter.vo.response.CameraAppVo">
-        SELECT * FROM t_camera_detail d
+        SELECT *,c.id as cameraId FROM t_camera_detail d
             LEFT JOIN t_camera c on d.camera_id = c.id
               LEFT JOIN t_goods g on d.goods_id = g.id
         WHERE d.rec_status = 'A'