bug

src/main/java/com/huiju/estateagents/controller/MiniAppController.java

@@ -387,26 +387,6 @@ public class MiniAppController extends BaseController {
         return miniAppService.getQrCode(paramsStr, appid);
     }
 
-
-    /**
-     * 第三方生成二维码
-     * @return
-     */
-    @PostMapping("/third/qrcode")
-    public ResponseBean thirdQrcode(@RequestBody String paramsStr, HttpServletRequest request) {
-        //获取H5项目相关信息
-        String xAppid = request.getHeader("x-appid");
-        QueryWrapper<TaThirdPartyMiniappConfig> taThirdPartyMiniappConfigQueryWrapper = new QueryWrapper<>();
-
-        taThirdPartyMiniappConfigQueryWrapper.eq("appid", xAppid);
-        TaThirdPartyMiniappConfig taThirdPartyMiniappConfig = iTaThirdPartyMiniappConfigService.getOne(taThirdPartyMiniappConfigQueryWrapper);
-        if (null == taThirdPartyMiniappConfig){
-            return ResponseBean.error("不存在的H5活动",ResponseBean.ERROR_UNAVAILABLE);
-        }
-        String appid = request.getHeader("appid");
-        return miniAppService.getQrCode(paramsStr, appid);
-    }
-
     /**
      * 获取二维码参数
      * @param serialNo

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

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

src/main/java/com/huiju/estateagents/third/controller/TaThirdPartyMiniappConfigController.java

@@ -5,18 +5,13 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.service.IMiniAppService;
 import com.huiju.estateagents.third.entity.TaThirdPartyMiniappConfig;
 import com.huiju.estateagents.third.service.ITaThirdPartyMiniappConfigService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 
@@ -37,6 +32,8 @@ public class TaThirdPartyMiniappConfigController extends BaseController {
     @Autowired
     public ITaThirdPartyMiniappConfigService iTaThirdPartyMiniappConfigService;
 
+    @Autowired
+    private IMiniAppService miniAppService;
 
     /**
      * 分页查询列表
@@ -148,4 +145,23 @@ public class TaThirdPartyMiniappConfigController extends BaseController {
         }
         return responseBean;
     }
+
+    /**
+     * 第三方生成二维码
+     * @return
+     */
+    @PostMapping("/third/qrcode")
+    public ResponseBean thirdQrcode(@RequestBody String paramsStr, HttpServletRequest request) {
+        //获取H5项目相关信息
+        String xAppid = request.getHeader("x-appid");
+        QueryWrapper<TaThirdPartyMiniappConfig> taThirdPartyMiniappConfigQueryWrapper = new QueryWrapper<>();
+
+        taThirdPartyMiniappConfigQueryWrapper.eq("appid", xAppid);
+        TaThirdPartyMiniappConfig taThirdPartyMiniappConfig = iTaThirdPartyMiniappConfigService.getOne(taThirdPartyMiniappConfigQueryWrapper);
+        if (null == taThirdPartyMiniappConfig){
+            return ResponseBean.error("不存在的H5活动",ResponseBean.ERROR_UNAVAILABLE);
+        }
+        String appid = request.getHeader("appid");
+        return miniAppService.getQrCode(paramsStr, appid);
+    }
 }