合并

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

@@ -406,7 +406,7 @@ public class TaBuildingDynamicController extends BaseController {
         taMiniappQuery.eq("org_id",getOrgId(request));
         TaMiniapp taMiniapp = taMiniappMapper.selectOne(taMiniappQuery);
         iBuildingDynamicService.save(dynamic);
-        TaMiniappQrcode taMiniappQrcode = miniAppService.createActivityQrcode(taMiniapp.getMiniappId(),CommConstant.ACTIVITY_QRCODE.replace("#0",dynamic.getDynamicId()).replace("#1","activity"));
+        TaMiniappQrcode taMiniappQrcode = miniAppService.createActivityQrcode(taMiniapp.getMiniappId());
         dynamic.setQrCode(taMiniappQrcode.getQrCode());
         iBuildingDynamicService.updateById(dynamic);
         responseBean.addSuccess(dynamic);

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

@@ -44,8 +44,7 @@ public interface IMiniAppService {
     /**
      * 活动二维码生成
      * @param miniappId
-     * @param replace
      * @return
      */
-    TaMiniappQrcode createActivityQrcode(String miniappId, String replace);
+    TaMiniappQrcode createActivityQrcode(String miniappId);
 }

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

@@ -221,28 +221,29 @@ public class MiniAppServiceImpl implements IMiniAppService {
     }
 
     @Override
-    public TaMiniappQrcode createActivityQrcode(String miniappId, String replace) {
+    public TaMiniappQrcode createActivityQrcode(String miniappId) {
 
-        WxMaService wxService = wxUtils.getMiniApp(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);
-        TaMiniappQrcode taQrcode = new TaMiniappQrcode();
-        
         try {
-            // 使用ID作为场景值
+
             File qrFile = wxService.getQrcodeService().createWxaCodeUnlimit(scene, page, 430, true, lineColor, true);
             String qrcode = AliOSSUtils.putObject(qrFile, CommConstant.ALIOSS_DEFAULT_UPLOAD);
-            
-            taQrcode.setAppid(miniappId);
-            taQrcode.setCreateDate(LocalDateTime.now());
-            taQrcode.setExpireDate(LocalDateTime.now().plusDays(7));
             taQrcode.setQrParams(replace);
             taQrcode.setQrCode(qrcode);
-            taMiniappQrcodeMapper.insert(taQrcode);
+            taMiniappQrcodeMapper.updateById(taQrcode);
             return  taQrcode;
         }catch (Exception e) {
             e.printStackTrace();