diff --git a/yqzjService/src/main/java/com/iformall/service/QrCodeService.java b/yqzjService/src/main/java/com/iformall/service/QrCodeService.java deleted file mode 100644 index 3e8e753..0000000 --- a/yqzjService/src/main/java/com/iformall/service/QrCodeService.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.iformall.service; - -import com.iformall.common.ResultData; -import com.iformall.domain.po.base.TenantEntity; -import com.iformall.enums.EnumAppPlat; -import com.iformall.enums.EnumPayVersion; -import com.iformall.enums.EnumPayWay; -import com.iformall.enums.EnumProject; -import com.iformall.exception.MallinkException; -import org.springframework.stereotype.Service; -import org.springframework.web.bind.annotation.RequestBody; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.util.Map; - -@Service -public interface QrCodeService { - - void downQrCode(TenantEntity tenantEntity, HttpServletRequest request, HttpServletResponse response, @RequestBody Map params,EnumAppPlat plat) throws MallinkException; - - ResultData exportQrcode(HttpServletRequest request, HttpServletResponse response, - TenantEntity tenantEntity, int type, String pageUrl, String sceneParam, - int withText, String text1, String text2, - String name, EnumAppPlat plat); - ResultData uploadQrcode(TenantEntity tenantEntity, int type, String pageUrl, String sceneParam, - int withText, String text1, String text2, - String name,EnumAppPlat plat); - - /** - * 生成无限二维码 - * @param project - * @param plat - * @param pageUrl - * @param sceneParam - * @param name - * @param plat - * @return - */ - ResultData uploadQrcode(EnumProject project,EnumAppPlat plat,String pageUrl, String sceneParam,String name); - -} diff --git a/yqzjService/src/main/java/com/iformall/service/impl/UserBasicQrcodeServiceImpl.java b/yqzjService/src/main/java/com/iformall/service/impl/UserBasicQrcodeServiceImpl.java index f3315c9..61ca83a 100644 --- a/yqzjService/src/main/java/com/iformall/service/impl/UserBasicQrcodeServiceImpl.java +++ b/yqzjService/src/main/java/com/iformall/service/impl/UserBasicQrcodeServiceImpl.java @@ -9,7 +9,6 @@ import com.iformall.enums.EnumAppPlat; import com.iformall.enums.EnumProject; import com.iformall.exception.MallinkException; import com.iformall.mapper.UserBasicQrcodeMapper; -import com.iformall.service.QrCodeService; import com.iformall.service.UserBasicQrcodeService; import com.iformall.utils.Constant; import lombok.extern.slf4j.Slf4j; @@ -30,8 +29,6 @@ public class UserBasicQrcodeServiceImpl implements UserBasicQrcodeService { @Autowired UserBasicQrcodeMapper userBasicQrcodeMapper; - @Autowired - protected QrCodeService qrCodeService; @Override public String getQrCode(Long userId, Integer projectType, Integer platType) { @@ -48,21 +45,7 @@ public class UserBasicQrcodeServiceImpl implements UserBasicQrcodeService { String pageUrl = Constant.sharePageUrl; String param = "t:in_u:"+userId; String name = project.getCode() + "-" + plat.getCode() + "-" + userId.toString(); - ResultData resultData = qrCodeService.uploadQrcode(project, plat, pageUrl, param, name); - if(ResultData.SUCCESS == resultData.code){ - Map map = (Map) resultData.data; - String pathUrl = map.get("url"); - if(StringUtils.isBlank(pathUrl)){ - throw new MallinkException(ErrorCode.SYS_SERVER_ERROR); - } - final IdWorker idWorker = IdWorker.get(); - qrcode.setId(idWorker.nextId()); - qrcode.setQrcode(pathUrl); - userBasicQrcodeMapper.insert(qrcode); - return pathUrl; - }else{ - throw new MallinkException(resultData.code ,resultData.message); - } + return name; } } diff --git a/yqzjService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java b/yqzjService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java index 1d662f0..ff17e2f 100644 --- a/yqzjService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java +++ b/yqzjService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java @@ -15,7 +15,6 @@ import com.iformall.mapper.WxActivityMapper; import com.iformall.mapper.WxCampaignMapper; import com.iformall.mapper.WxCouponChannelMapper; import com.iformall.mapper.WxQuestionOneselfMapper; -import com.iformall.service.QrCodeService; import com.iformall.service.WxCampaignService; import com.iformall.service.WxCouponChannelService; import com.iformall.utils.Constant; @@ -48,9 +47,6 @@ public class WxCampaignServiceImpl implements WxCampaignService { WxCouponChannelMapper wxCouponChannelMapper; - @Autowired - QrCodeService qrCodeService; - @Autowired WxActivityMapper wxActivityMapper; diff --git a/yqzjService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java b/yqzjService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java index f8332cf..33e9723 100644 --- a/yqzjService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java +++ b/yqzjService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java @@ -15,7 +15,6 @@ import com.iformall.enums.*; import com.iformall.mapper.WxCouponChannelMapper; import com.iformall.mapper.WxCouponMapper; import com.iformall.mapper.WxTopicMapper; -import com.iformall.service.QrCodeService; import com.iformall.service.WxCouponChannelService; import com.iformall.service.WxTopicService; import com.iformall.utils.Constant; @@ -46,9 +45,6 @@ public class WxTopicServiceImpl implements WxTopicService { @Autowired private WxCouponChannelMapper wxCouponChannelMapper; - @Autowired - private QrCodeService qrCodeService; - @Autowired private WxCouponChannelService wxCouponChannelService;