H5活动

src/main/java/com/huiju/estateagents/drainage/controller/TaDrainageController.java

@@ -66,7 +66,8 @@ public class TaDrainageController extends BaseController {
                                        @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                        @RequestParam(value ="drainageId",required = false) Integer drainageId,
                                        @RequestParam(value ="name",required = false) String name,
-                                       @RequestParam(value ="miniapp",required = false) Integer miniapp,
+                                       @RequestParam(value ="isMiniapp",required = false) Integer isMiniapp,
+                                       @RequestParam(value ="status",required = false) Integer status,
                                        HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
@@ -74,7 +75,8 @@ public class TaDrainageController extends BaseController {
 		    IPage<TaDrainage> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TaDrainage> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("org_id",getOrgId(request));
-            queryWrapper.eq(null != miniapp,"is_miniapp",miniapp);
+            queryWrapper.eq(null != isMiniapp,"is_miniapp",isMiniapp);
+            queryWrapper.eq(null != status,"status",status);
             queryWrapper.eq(null != drainageId,"drainage_id",drainageId);
             queryWrapper.like(!StringUtils.isEmpty(name),"name",name);
             queryWrapper.orderByDesc("create_date");
@@ -208,11 +210,21 @@ public class TaDrainageController extends BaseController {
      * 根据id查询对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/taDrainage/{id}",method= RequestMethod.GET)
-    public ResponseBean taDrainageGet(@PathVariable Integer id){
+    @RequestMapping(value="/admin/taDrainage/{id}",method= RequestMethod.GET)
+    public ResponseBean taDrainageGet(@PathVariable Integer id,HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean.addSuccess(iTaDrainageService.getById(id));
+            TaDrainage taDrainage = iTaDrainageService.getById(id);
+            QueryWrapper<TaThirdPartyMiniappConfig> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("target_type",CommConstant.TARGET_TYPE_H5);
+            queryWrapper.eq("target_id",taDrainage.getDrainageId());
+            queryWrapper.eq("org_id",getOrgId(request));
+            TaThirdPartyMiniappConfig taThirdPartyMiniappConfig = iTaThirdPartyMiniappConfigService.getOne(queryWrapper);
+            if (null != taThirdPartyMiniappConfig){
+                taDrainage.setAppid(taThirdPartyMiniappConfig.getAppid());
+                taDrainage.setAppSecret(taThirdPartyMiniappConfig.getAppSecret());
+            }
+            responseBean.addSuccess(taDrainage);
         }catch (Exception e){
             e.printStackTrace();
             logger.error("taDrainageDelete -=- {}",e.toString());
@@ -220,4 +232,38 @@ public class TaDrainageController extends BaseController {
         }
         return responseBean;
     }
+
+    /**
+     * 更改上架下架状态
+     * @param id  实体ID
+     * @param taDrainage 实体对象
+     * @return
+     */
+    @RequestMapping(value="/admin/taDrainage/exchange/{id}",method= RequestMethod.PUT)
+    public ResponseBean exchangeDrainage(@PathVariable Integer id,
+                                         @RequestBody TaDrainage taDrainage){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            taDrainage.setDrainageId(id);
+            if (null != taDrainage.getStatus() && taDrainage.getStatus().equals(CommConstant.STATUS_NORMAL)){
+                taDrainage.setStatus(CommConstant.STATUS_UNACCALIMED);
+            }else{
+                if (taDrainage.getEndDate().isBefore(LocalDateTime.now())){
+                    responseBean.addError("已过下架时间，无法上架");
+                    return responseBean;
+                }
+                taDrainage.setStatus(CommConstant.STATUS_NORMAL);
+            }
+            if (iTaDrainageService.updateById(taDrainage)){
+                responseBean.addSuccess(taDrainage);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taDrainageUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
 }

src/main/java/com/huiju/estateagents/drainage/entity/TaDrainage.java

@@ -69,6 +69,10 @@ public class TaDrainage implements Serializable {
     private String shareImg ;
     /** 分享标题 */
     private String shareTitle ;
+    /** 中间页飞机图 */
+    private String middleImg ;
+    /** 状态 */
+    private Integer status ;
 
     @TableField(exist = false)
     private String appid;