傅行帆 5 年 前
コミット
0c5993437f

+ 0
- 20
src/main/java/com/huiju/estateagents/controller/MiniAppController.java ファイルの表示

@@ -387,26 +387,6 @@ public class MiniAppController extends BaseController {
387 387
         return miniAppService.getQrCode(paramsStr, appid);
388 388
     }
389 389
 
390
-
391
-    /**
392
-     * 第三方生成二维码
393
-     * @return
394
-     */
395
-    @PostMapping("/third/qrcode")
396
-    public ResponseBean thirdQrcode(@RequestBody String paramsStr, HttpServletRequest request) {
397
-        //获取H5项目相关信息
398
-        String xAppid = request.getHeader("x-appid");
399
-        QueryWrapper<TaThirdPartyMiniappConfig> taThirdPartyMiniappConfigQueryWrapper = new QueryWrapper<>();
400
-
401
-        taThirdPartyMiniappConfigQueryWrapper.eq("appid", xAppid);
402
-        TaThirdPartyMiniappConfig taThirdPartyMiniappConfig = iTaThirdPartyMiniappConfigService.getOne(taThirdPartyMiniappConfigQueryWrapper);
403
-        if (null == taThirdPartyMiniappConfig){
404
-            return ResponseBean.error("不存在的H5活动",ResponseBean.ERROR_UNAVAILABLE);
405
-        }
406
-        String appid = request.getHeader("appid");
407
-        return miniAppService.getQrCode(paramsStr, appid);
408
-    }
409
-
410 390
     /**
411 391
      * 获取二维码参数
412 392
      * @param serialNo

+ 3
- 3
src/main/java/com/huiju/estateagents/drainage/controller/TaDrainageController.java ファイルの表示

@@ -167,7 +167,7 @@ public class TaDrainageController extends BaseController {
167 167
             // 判断是否产生业务数据
168 168
             TaDrainage drainage = iTaDrainageService.getById(id);
169 169
             if (null != drainage.getEnlistNum() && drainage.getEnlistNum().intValue() > 0) {
170
-                responseBean.addError("此H5项目已有用户提交数据,删除项目会删除全部数据,且已发布H5页面再提交内容会报错,不建议删除数据。可以点击项目名称修改截止时间为过去时间来禁用项目。");
170
+                responseBean.addError("此H5活动已有用户提交数据,删除项目会删除全部数据,不建议删除数据。可以点击下架按钮终止活动。");
171 171
                 return responseBean;
172 172
             }
173 173
 
@@ -176,8 +176,8 @@ public class TaDrainageController extends BaseController {
176 176
             queryWrapper.eq("content_type",CommConstant.EVENT_H5);
177 177
             queryWrapper.eq("target_id",drainage.getDrainageId());
178 178
             List<ExtendContent> list = iExtendContentService.list(queryWrapper);
179
-            if (list.size() > 0){
180
-                responseBean.addError("此H5活动已有用户提交数据,删除项目会删除全部数据,不建议删除数据。可以点击下架按钮终止活动。");
179
+            if (drainage.getStatus().equals(CommConstant.STATUS_NORMAL) && list.size() > 0){
180
+                responseBean.addError("删除项目会删除全部数据,不建议删除数据。可以点击下架按钮终止活动。");
181 181
                 return responseBean;
182 182
             }
183 183
 

+ 23
- 7
src/main/java/com/huiju/estateagents/third/controller/TaThirdPartyMiniappConfigController.java ファイルの表示

@@ -5,18 +5,13 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
5 5
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
6 6
 import com.huiju.estateagents.base.BaseController;
7 7
 import com.huiju.estateagents.base.ResponseBean;
8
+import com.huiju.estateagents.service.IMiniAppService;
8 9
 import com.huiju.estateagents.third.entity.TaThirdPartyMiniappConfig;
9 10
 import com.huiju.estateagents.third.service.ITaThirdPartyMiniappConfigService;
10 11
 import org.slf4j.Logger;
11 12
 import org.slf4j.LoggerFactory;
12 13
 import org.springframework.beans.factory.annotation.Autowired;
13
-import org.springframework.web.bind.annotation.PathVariable;
14
-import org.springframework.web.bind.annotation.RequestBody;
15
-import org.springframework.web.bind.annotation.RequestMapping;
16
-import org.springframework.web.bind.annotation.RequestMethod;
17
-import org.springframework.web.bind.annotation.RequestParam;
18
-import org.springframework.web.bind.annotation.ResponseBody;
19
-import org.springframework.web.bind.annotation.RestController;
14
+import org.springframework.web.bind.annotation.*;
20 15
 
21 16
 import javax.servlet.http.HttpServletRequest;
22 17
 
@@ -37,6 +32,8 @@ public class TaThirdPartyMiniappConfigController extends BaseController {
37 32
     @Autowired
38 33
     public ITaThirdPartyMiniappConfigService iTaThirdPartyMiniappConfigService;
39 34
 
35
+    @Autowired
36
+    private IMiniAppService miniAppService;
40 37
 
41 38
     /**
42 39
      * 分页查询列表
@@ -148,4 +145,23 @@ public class TaThirdPartyMiniappConfigController extends BaseController {
148 145
         }
149 146
         return responseBean;
150 147
     }
148
+
149
+    /**
150
+     * 第三方生成二维码
151
+     * @return
152
+     */
153
+    @PostMapping("/third/qrcode")
154
+    public ResponseBean thirdQrcode(@RequestBody String paramsStr, HttpServletRequest request) {
155
+        //获取H5项目相关信息
156
+        String xAppid = request.getHeader("x-appid");
157
+        QueryWrapper<TaThirdPartyMiniappConfig> taThirdPartyMiniappConfigQueryWrapper = new QueryWrapper<>();
158
+
159
+        taThirdPartyMiniappConfigQueryWrapper.eq("appid", xAppid);
160
+        TaThirdPartyMiniappConfig taThirdPartyMiniappConfig = iTaThirdPartyMiniappConfigService.getOne(taThirdPartyMiniappConfigQueryWrapper);
161
+        if (null == taThirdPartyMiniappConfig){
162
+            return ResponseBean.error("不存在的H5活动",ResponseBean.ERROR_UNAVAILABLE);
163
+        }
164
+        String appid = request.getHeader("appid");
165
+        return miniAppService.getQrCode(paramsStr, appid);
166
+    }
151 167
 }