From 3df0e72bf7b848b8f7a6f2993001b7b1480eecd7 Mon Sep 17 00:00:00 2001
From: DB <2502523450@qq.com>
Date: Mon, 22 Jan 2024 23:43:44 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E6=88=90=E6=A8=A1=E6=9D=BF=E4=BA=8C?=
=?UTF-8?q?=E7=BB=B4=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Cpop-Jambox/pom.xml | 5 ++++
.../business/bo/CardTemplateUnionBo.java | 7 -----
.../service/impl/CardTemplateServiceImpl.java | 26 +++++++++++++++++++
Cpop-Oam/pom.xml | 5 ----
4 files changed, 31 insertions(+), 12 deletions(-)
diff --git a/Cpop-Jambox/pom.xml b/Cpop-Jambox/pom.xml
index 213b6e1..d690f37 100644
--- a/Cpop-Jambox/pom.xml
+++ b/Cpop-Jambox/pom.xml
@@ -28,6 +28,11 @@
com.cpop
Cpop-Pay
+
+
+ com.github.binarywang
+ weixin-java-miniapp
+
diff --git a/Cpop-Jambox/src/main/java/com/cpop/jambox/business/bo/CardTemplateUnionBo.java b/Cpop-Jambox/src/main/java/com/cpop/jambox/business/bo/CardTemplateUnionBo.java
index 263d5d2..2915d15 100644
--- a/Cpop-Jambox/src/main/java/com/cpop/jambox/business/bo/CardTemplateUnionBo.java
+++ b/Cpop-Jambox/src/main/java/com/cpop/jambox/business/bo/CardTemplateUnionBo.java
@@ -128,13 +128,6 @@ public class CardTemplateUnionBo {
*/
@ApiModelProperty(value = "是否是引流卡(0否1是)")
private Boolean isDrainage;
-
- /**
- * 二维码
- */
- @ApiModelProperty(value = "二维码")
- private String qrCode;
-
/**
* 先学后付支付
*/
diff --git a/Cpop-Jambox/src/main/java/com/cpop/jambox/business/service/impl/CardTemplateServiceImpl.java b/Cpop-Jambox/src/main/java/com/cpop/jambox/business/service/impl/CardTemplateServiceImpl.java
index 8821148..7097416 100644
--- a/Cpop-Jambox/src/main/java/com/cpop/jambox/business/service/impl/CardTemplateServiceImpl.java
+++ b/Cpop-Jambox/src/main/java/com/cpop/jambox/business/service/impl/CardTemplateServiceImpl.java
@@ -1,8 +1,13 @@
package com.cpop.jambox.business.service.impl;
+import cn.binarywang.wx.miniapp.api.WxMaQrcodeService;
+import cn.binarywang.wx.miniapp.api.WxMaService;
import com.cpop.common.utils.StringUtils;
import com.cpop.common.utils.bean.BeanUtils;
+import com.cpop.core.base.exception.ServiceException;
+import com.cpop.core.handler.TencentCosHandler;
import com.cpop.core.utils.SpringUtils;
+import com.cpop.core.utils.file.FileUtils;
import com.cpop.jambox.business.bo.CardTemplateUnionBo;
import com.cpop.jambox.business.bo.EasyLearnDigitalCurrencyBo;
import com.cpop.jambox.business.bo.EasyLearnOldContractBo;
@@ -30,9 +35,14 @@ import com.mybatisflex.core.query.QueryWrapper;
import com.mybatisflex.core.row.Db;
import com.mybatisflex.core.row.Row;
import com.mybatisflex.spring.service.impl.ServiceImpl;
+import com.qcloud.cos.model.UploadResult;
+import me.chanjar.weixin.common.error.WxErrorException;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
+import java.io.File;
+import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -110,6 +120,22 @@ public class CardTemplateServiceImpl extends ServiceImplcom.github.binarywang
weixin-java-open
-
-
- com.github.binarywang
- weixin-java-miniapp
-
org.springframework
spring-test