合并

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

@@ -407,8 +407,8 @@ public class TaBuildingDynamicController extends BaseController {
         TaMiniapp taMiniapp = taMiniappMapper.selectOne(taMiniappQuery);
         iBuildingDynamicService.save(dynamic);
         // 生成二维码
-        TaMiniappQrcode taMiniappQrcode = miniAppService.createActivityQrcode(taMiniapp.getMiniappId());
-        dynamic.setQrCode(taMiniappQrcode.getQrCode());
+        ResponseBean taMiniappQrcode = miniAppService.getQrCode(CommConstant.ACTIVITY_QRCODE.replace("#0",dynamic.getDynamicId()).replace("#1","activity"),taMiniapp.getMiniappId());
+        dynamic.setQrCode(String.valueOf(taMiniappQrcode.getData()));
         iBuildingDynamicService.updateById(dynamic);
         responseBean.addSuccess(dynamic);
         return responseBean;

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

@@ -40,11 +40,4 @@ public interface IMiniAppService {
     TaMiniappQrcode getQrCodeBySerialNo(Integer id);
 
     List<TaMiniapp> getAllAvaliableMiniapps();
-
-    /**
-     * 活动二维码生成
-     * @param miniappId
-     * @return
-     */
-    TaMiniappQrcode createActivityQrcode(String miniappId);
 }

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

@@ -220,38 +220,6 @@ public class MiniAppServiceImpl implements IMiniAppService {
         return taMiniappList;
     }
 
-    @Override
-    public TaMiniappQrcode createActivityQrcode(String miniappId) {
-
-        TaMiniappQrcode taQrcode = new TaMiniappQrcode();
-        taQrcode.setAppid(miniappId);
-        taQrcode.setCreateDate(LocalDateTime.now());
-        taQrcode.setExpireDate(LocalDateTime.now().plusDays(7));
-        taMiniappQrcodeMapper.insert(taQrcode);
-        //  使用serialNo作为场景值替换当前的ID
-        String replace = CommConstant.ACTIVITY_QRCODE.replace("#0",String.valueOf(taQrcode.getSerialNo())).replace("#1","activity");
-
-        WxMaService wxService = wxUtils.getMiniApp(miniappId);
-        JSONObject params = JSONObject.parseObject(replace);
-        String scene = params.getString("scene");
-        String page = StringUtils.ifNull(params.getString("page"), "");
-        String lineColorStr = StringUtils.ifNull(params.getString("line_color"), "{\"r\":0,\"g\":0,\"b\":0}");
-        WxMaCodeLineColor lineColor = JSONObject.parseObject(lineColorStr, WxMaCodeLineColor.class);
-        try {
-
-            File qrFile = wxService.getQrcodeService().createWxaCodeUnlimit(scene, page, 430, true, lineColor, true);
-            String qrcode = AliOSSUtils.putObject(qrFile, CommConstant.ALIOSS_DEFAULT_UPLOAD);
-            taQrcode.setQrParams(replace);
-            taQrcode.setQrCode(qrcode);
-            taMiniappQrcodeMapper.updateById(taQrcode);
-            return  taQrcode;
-        }catch (Exception e) {
-            e.printStackTrace();
-            log.error("活动二维码生成失败", e);
-        }
-        return taQrcode;
-    }
-
     private void sendMessage(String tplName, TaPerson toUser, String link, List<WxMaTemplateData> data) {
         String appid = toUser.getMiniappId();
         if (StringUtils.isEmpty(appid)) {