bug fix

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

@@ -1,17 +1,21 @@
 package com.huiju.estateagents.controller;
 
 
+import com.alibaba.fastjson.JSONObject;
+import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.AliOSSUtils;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.SMSUtils;
 import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.service.IMiniAppService;
 import com.huiju.estateagents.service.ITdMiniappTemplateTypeService;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -20,13 +24,16 @@ import java.util.Map;
 
 @RestController
 @RequestMapping("/api")
-public class CommonController {
+public class CommonController extends BaseController {
     @Autowired
     SMSUtils smsUtils;
 
     @Autowired
     ITdMiniappTemplateTypeService iTdMiniappTemplateTypeService;
 
+    @Autowired
+    IMiniAppService iMiniAppService;
+
     /**
      * 图片
      * @param multipartFile
@@ -42,6 +49,43 @@ public class CommonController {
         }
     }
 
+    @PostMapping("/admin/qrcode")
+    public ResponseBean createQrCode(@RequestBody String jsonStr, HttpServletRequest request) {
+        Integer orgId = getOrgId(request);
+
+        if (StringUtils.isEmpty(jsonStr)) {
+            return ResponseBean.error("参数不能为空", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        JSONObject params = JSONObject.parseObject(jsonStr);
+        if (params == null) {
+            return ResponseBean.error("参数是非法的 JSON 对象", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        String paramStr = params.getString("params");
+        if (StringUtils.isEmpty(paramStr)) {
+            ResponseBean.error("参数 params 不能为空", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        JSONObject qrObj = JSONObject.parseObject(paramStr);
+        if (qrObj == null) {
+            return ResponseBean.error("小程序码参数是非法", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        String scene = qrObj.getString("scene");
+        String page = qrObj.getString("page");
+
+        if (StringUtils.isEmpty(scene) || StringUtils.isEmpty(page)) {
+            return ResponseBean.error("小程序码参数: scene 或者 page 不能为空", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        if (scene.indexOf("id=") == -1) {
+            return ResponseBean.error("小程序码参数: 必须存在 id 参数", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        return iMiniAppService.getOrgQrCode(paramStr, orgId);
+    }
+
     /**
      * 为适应 ANTD 特制的图片上传
      * plat 中心端传 center 管理端传 admin

src/main/java/com/huiju/estateagents/service/IMiniAppService.java

@@ -43,4 +43,6 @@ public interface IMiniAppService {
     TaMiniappTemplate getTplByType(String type, String appid);
 
     List<TaMiniappTemplate> getTpls(String appid);
+
+    ResponseBean getOrgQrCode(String paramsStr, Integer orgId);
 }

src/main/java/com/huiju/estateagents/service/impl/MiniAppServiceImpl.java

@@ -527,6 +527,20 @@ public class MiniAppServiceImpl implements IMiniAppService {
         return taMiniappTemplateMapper.selectList(query);
     }
 
+    @Override
+    public ResponseBean getOrgQrCode(String paramsStr, Integer orgId) {
+        QueryWrapper<TaMiniapp> query = new QueryWrapper<>();
+        query.eq("org_id", orgId);
+        query.last("limit 1");
+
+        TaMiniapp taMiniapp = taMiniappMapper.selectOne(query);
+        if (taMiniapp == null) {
+            return ResponseBean.error("当前组织没有维护小程序信息", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        return this.getQrCode(paramsStr, taMiniapp.getMiniappId());
+    }
+
     public TaMiniapp getMinappByOrg(Integer org) {
         QueryWrapper<TaMiniapp> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("org_id", org);