傅行帆 5 years ago
parent
commit
7dc8c8b8a6

+ 8
- 0
src/main/java/com/huiju/estateagents/drainage/controller/TaDrainageController.java View File

13
 import com.huiju.estateagents.drainage.service.ITaDrainageService;
13
 import com.huiju.estateagents.drainage.service.ITaDrainageService;
14
 import com.huiju.estateagents.third.entity.TaThirdPartyMiniappConfig;
14
 import com.huiju.estateagents.third.entity.TaThirdPartyMiniappConfig;
15
 import com.huiju.estateagents.third.service.ITaThirdPartyMiniappConfigService;
15
 import com.huiju.estateagents.third.service.ITaThirdPartyMiniappConfigService;
16
+import io.swagger.models.auth.In;
16
 import org.slf4j.Logger;
17
 import org.slf4j.Logger;
17
 import org.slf4j.LoggerFactory;
18
 import org.slf4j.LoggerFactory;
18
 import org.springframework.beans.factory.annotation.Autowired;
19
 import org.springframework.beans.factory.annotation.Autowired;
65
                                        @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
66
                                        @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
66
                                        @RequestParam(value ="drainageId",required = false) Integer drainageId,
67
                                        @RequestParam(value ="drainageId",required = false) Integer drainageId,
67
                                        @RequestParam(value ="name",required = false) String name,
68
                                        @RequestParam(value ="name",required = false) String name,
69
+                                       @RequestParam(value ="miniapp",required = false) Integer miniapp,
68
                                        HttpServletRequest request){
70
                                        HttpServletRequest request){
69
         ResponseBean responseBean = new ResponseBean();
71
         ResponseBean responseBean = new ResponseBean();
70
         try {
72
         try {
72
 		    IPage<TaDrainage> pg = new Page<>(pageNum, pageSize);
74
 		    IPage<TaDrainage> pg = new Page<>(pageNum, pageSize);
73
             QueryWrapper<TaDrainage> queryWrapper = new QueryWrapper<>();
75
             QueryWrapper<TaDrainage> queryWrapper = new QueryWrapper<>();
74
             queryWrapper.eq("org_id",getOrgId(request));
76
             queryWrapper.eq("org_id",getOrgId(request));
77
+            queryWrapper.eq(null != miniapp,"is_miniapp",miniapp);
75
             queryWrapper.eq(null != drainageId,"drainage_id",drainageId);
78
             queryWrapper.eq(null != drainageId,"drainage_id",drainageId);
76
             queryWrapper.like(!StringUtils.isEmpty(name),"name",name);
79
             queryWrapper.like(!StringUtils.isEmpty(name),"name",name);
77
             queryWrapper.orderByDesc("create_date");
80
             queryWrapper.orderByDesc("create_date");
183
         ResponseBean responseBean = new ResponseBean();
186
         ResponseBean responseBean = new ResponseBean();
184
         try {
187
         try {
185
             taDrainage.setDrainageId(id);
188
             taDrainage.setDrainageId(id);
189
+            if (!taDrainage.getIsMiniapp()){
190
+                taDrainage.setShareImg("");
191
+                taDrainage.setH5Address("");
192
+                taDrainage.setShareTitle("");
193
+            }
186
             if (iTaDrainageService.updateById(taDrainage)){
194
             if (iTaDrainageService.updateById(taDrainage)){
187
                 responseBean.addSuccess(taDrainage);
195
                 responseBean.addSuccess(taDrainage);
188
             }else {
196
             }else {

+ 9
- 0
src/main/java/com/huiju/estateagents/drainage/entity/TaDrainage.java View File

61
      */
61
      */
62
     private Integer enlistNum;
62
     private Integer enlistNum;
63
 
63
 
64
+    /** 是否投放小程序 */
65
+    private Boolean isMiniapp ;
66
+    /** H5活动链接 */
67
+    private String h5Address ;
68
+    /** 分享图片 */
69
+    private String shareImg ;
70
+    /** 分享标题 */
71
+    private String shareTitle ;
72
+
64
     @TableField(exist = false)
73
     @TableField(exist = false)
65
     private String appid;
74
     private String appid;
66
     
75