From e37cd45c719d64f82c687fb458381235dc56e8da Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Thu, 31 Oct 2019 21:23:22 +0800 Subject: [PATCH] =?UTF-8?q?[=E9=9B=86=E5=9B=A2=E7=89=88][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9]:=E9=9B=86=E5=9B=A2=E7=89=88=E9=A2=84=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/app/WxAppinfoController.java | 11 +- .../basic/WxMerchantController.java | 2 +- .../datatower/WxChartDataController.java | 16 +-- .../market/WxCouponChannelController.java | 2 +- .../controller/sys/UploadController.java | 122 ++++++++++-------- .../com/iformall/ueditor/upload/Uploader.java | 24 +++- .../java/com/iformall/domain/po/WxCoupon.java | 2 +- .../iformall/domain/po/WxCouponChannel.java | 2 +- .../com/iformall/domain/po/WxCouponSend.java | 4 +- .../com/iformall/domain/po/WxFlowConfig.java | 2 +- .../com/iformall/domain/po/WxFlowModel.java | 2 +- .../com/iformall/domain/po/WxMerchant.java | 2 +- .../iformall/domain/vo/WxCouponSendVo.java | 2 +- .../java/com/iformall/enums/EnumChart.java | 2 +- .../enums/EnumCouponSendSendType.java | 2 +- .../com/iformall/enums/EnumMailMsgModel.java | 2 +- .../java/com/iformall/enums/EnumMsgModel.java | 2 +- .../com/iformall/mapper/WxCouponMapper.java | 2 +- .../com/iformall/service/QrCodeService.java | 9 +- .../service/WxCouponChannelService.java | 2 +- .../com/iformall/service/WxCouponService.java | 18 +-- .../service/impl/QrCodeServiceImpl.java | 29 +++-- .../service/impl/WxCampaignServiceImpl.java | 2 +- .../service/impl/WxChartServiceImpl.java | 4 +- .../impl/WxCouponChannelServiceImpl.java | 4 +- .../service/impl/WxCouponServiceImpl.java | 2 +- .../service/impl/WxFlowServiceImpl.java | 2 +- .../service/impl/WxGameServiceImpl.java | 2 +- .../service/impl/WxTopicServiceImpl.java | 2 +- 29 files changed, 159 insertions(+), 120 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java b/mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java index 158c3af1f..433df06f4 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java @@ -11,6 +11,7 @@ import com.iformall.exception.MallinkException; import com.iformall.mapper.WxCouponChannelMapper; import com.iformall.mapper.WxMerchantMapper; import com.iformall.service.QrCodeService; +import com.iformall.utils.Constant; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; @@ -46,7 +47,7 @@ public class WxAppinfoController extends BaseController { @GetMapping("/updateQrCode") public void updateQrCode(String p)throws ServletException, IOException { if("xlldxx".equals(p)) { - String pageUrl = "pages/index/index"; + String pageUrl = Constant.mainPageUrl; List list = wxMerchantMapper.findQrcodeEmptyList(); logger.info("updateQrCode.count:"+list.size()); @@ -55,7 +56,7 @@ public class WxAppinfoController extends BaseController { @Override public void run() { String param = merchant.getWeappScene(); - ResultData resultData = qrCodeService.uploadQrcode(merchant.getTenantId(), 1, pageUrl, param, 0, "", "", "店铺详情"); + ResultData resultData = qrCodeService.uploadQrcode(merchant, 1, pageUrl, param, 0, "", "", "店铺详情"); Map map = (Map) resultData.data; if(map!=null && map.get("url") !=null) { String url = map.get("url"); @@ -72,7 +73,7 @@ public class WxAppinfoController extends BaseController { @GetMapping("/updateCouponQrCode") public void updateCouponQrCode(String p)throws ServletException, IOException { if("xlldxx".equals(p)){ - String pageUrl = "pages/index/index"; + String pageUrl = Constant.mainPageUrl; List list = wxCouponChannelMapper.findQrcodeEmptyList(); logger.info("updateCouponQrCode.count:"+list.size()); @@ -81,7 +82,7 @@ public class WxAppinfoController extends BaseController { @Override public void run() { String param = couponChannel.getWeappScene(); - ResultData resultData = qrCodeService.uploadQrcode(couponChannel.getTenantId(),1,pageUrl,param,0,"","","卷"); + ResultData resultData = qrCodeService.uploadQrcode(couponChannel,1,pageUrl,param,0,"","","券"); Map map = (Map)resultData.data; if(map!=null && map.get("url") !=null) { String url = map.get("url"); @@ -122,7 +123,7 @@ public class WxAppinfoController extends BaseController { } try { qrCodeService.exportQrcode(request, response, - getTenantId(), type, pageUrl, sceneParam, + getTenantInfo(), type, pageUrl, sceneParam, withText, text1, text2, name); } catch (Exception e) { diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java index c5d1b489e..ed72e6cc0 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java @@ -131,7 +131,7 @@ public class WxMerchantController extends BaseController { //加载二维码图片 String pageUrl = "pages/index/index"; String param = "t:md:"+resultData.data; - ResultData resultQrCode = qrCodeService.uploadQrcode(wxMerchant.getTenantId(),1,pageUrl,param,0,"","","店铺详情"); + ResultData resultQrCode = qrCodeService.uploadQrcode(wxMerchant,1,pageUrl,param,0,"","","店铺详情"); Map map = (Map)resultQrCode.data; if(map!=null && map.get("url") !=null) { String url = map.get("url"); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxChartDataController.java b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxChartDataController.java index 56a4bbd39..3af40399f 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxChartDataController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxChartDataController.java @@ -32,10 +32,10 @@ public class WxChartDataController extends BaseController { "chart=45 卡营销数据:" + "saleHistory销售金额历史 paymentHistory核销历史 saleCardCount售出卡数量 tranCount转增数量 subsidyCount补贴金额"+ "--------------------------------------" + - "chart=46 卷营销数据:" + - "orderCountList卷购买数量历史 paymentCountList卷核销数量 priceCouponSaleCountList有价卷销售数量历史 " + - "priceCouponPaymentCountList有价卷核销数量历史 sumPriceSaleMoney有价券销售总额 sumPricePayMent有价卷核销总额 " + - "sumSubsidyMoney商场补贴金额 priceCouponCancelCount有价卷退款数量 priceCouponSaleCountListTotal有价券售出数量"+ + "chart=46 券营销数据:" + + "orderCountList券购买数量历史 paymentCountList券核销数量 priceCouponSaleCountList有价券销售数量历史 " + + "priceCouponPaymentCountList有价券核销数量历史 sumPriceSaleMoney有价券销售总额 sumPricePayMent有价券核销总额 " + + "sumSubsidyMoney商场补贴金额 priceCouponCancelCount有价券退款数量 priceCouponSaleCountListTotal有价券售出数量"+ "--------------------------------------" + "chart=47 砍价营销数据:" + "pressSendHistory砍价发起历史 pressSuccHistory砍价成功历史 pressPaymentHistory砍价核销历史 " + @@ -51,12 +51,12 @@ public class WxChartDataController extends BaseController { "ysje 应收金额 ssje 实收金额 zjsjl收缴率 rent*租赁收缴率 property*物业收缴率 deposit*押金收缴率 other*其他费用收缴率" + "rentOwe 租赁总额 propertyOwe物业总额 otherOwe其他总额 depositOwe押金总额 totalOwe欠缴总额"+ "--------------------------------------"+ - "chart=51首页场景发卷:" + - "carStopHistory停车发卷 couponVerifyHistory核销发卷 orderHistory交易发卷 micropayHistory收银台发卷 merchantHistory商户发券"+ + "chart=51首页场景发券:" + + "carStopHistory停车发券 couponVerifyHistory核销发券 orderHistory交易发券 micropayHistory收银台发券 merchantHistory商户发券"+ "--------------------------------------"+ "chart=52营销数据:" + - "当前”券交易数据“替换为”营销数据“:cardHistory卡营销历史 pressSendHistory砍价营销历史 groupHistory拼团营销历史 couponHistory卷营销历史," + - "卡、卷、砍价、拼团走势以及右边的数据总览,对应原来 营销系统->卡、卷、砍价、拼团营销数据" + + "当前”券交易数据“替换为”营销数据“:cardHistory卡营销历史 pressSendHistory砍价营销历史 groupHistory拼团营销历史 couponHistory券营销历史," + + "卡、券、砍价、拼团走势以及右边的数据总览,对应原来 营销系统->卡、券、砍价、拼团营销数据" + "--------------------------------------" + "触达用户=数据总览的活跃用户数据" + "------------------------------" + "chart=48拼团营销数据:拼团成功次数successList verifyList核销量 拼团发起次数groupCount 拼团成功successCount 参与拼团人次peopleCount" + diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java index 24b8f9702..8bb47f6be 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java @@ -82,7 +82,7 @@ public class WxCouponChannelController extends BaseController { if(couponChannel!=null){ String pageUrl = "pages/index/index"; String param = couponChannel.getWeappScene(); - ResultData resultDataQ = qrCodeService.uploadQrcode(couponChannel.getTenantId(),1,pageUrl,param,0,"","","卷"); + ResultData resultDataQ = qrCodeService.uploadQrcode(couponChannel,1,pageUrl,param,0,"","","券"); Map map = (Map)resultDataQ.data; if(map!=null && map.get("url") !=null) { String url = map.get("url"); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/sys/UploadController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/UploadController.java index 7d038d207..99470f4fc 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/UploadController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/UploadController.java @@ -5,6 +5,7 @@ import com.iformall.annotation.SystemControllerLog; import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.service.QrCodeService; import com.iformall.utils.ImgUtil; import io.swagger.annotations.Api; @@ -36,6 +37,11 @@ public class UploadController extends BaseController { @Autowired private QrCodeService qrCodeService; + private String getFileName(TenantEntity tenantEntity, String fileName) { + fileName = tenantEntity.getTenantId() + "/" + fileName; + return fileName; + } + /** * 上传文件 * @@ -49,6 +55,8 @@ public class UploadController extends BaseController { public ResultData awsfileUpload(@RequestParam("file") MultipartFile multiReq) throws Exception { logger.info("[" + getIpAddr() + "] UploadController::awsfileUpload"); + TenantEntity tenantEntity = getTenantInfo(); + ObjectMetadata metadata = new ObjectMetadata(); metadata.setContentType(multiReq.getContentType()); metadata.setContentLength(multiReq.getSize()); @@ -56,13 +64,14 @@ public class UploadController extends BaseController { String fileName = UUID.randomUUID().toString(); int dot = multiReq.getOriginalFilename().lastIndexOf('.'); if (dot >= 0) { - fileName = getTenantId() + "/" + fileName + multiReq.getOriginalFilename().substring(dot, multiReq.getOriginalFilename().length()); + String fileFormat = multiReq.getOriginalFilename().substring(dot, multiReq.getOriginalFilename().length()); + fileName = getFileName(tenantEntity, fileName + fileFormat); } else { - fileName = getTenantId() + "/" + fileName; + fileName = getFileName(tenantEntity, fileName); } System.out.println(fileName); - ResultData data = qrCodeService.awsUpload(multiReq.getInputStream(), metadata, fileName, getTenantId()); + ResultData data = qrCodeService.awsUpload(multiReq.getInputStream(), metadata, fileName, getTenantInfo()); return data; } @@ -77,63 +86,64 @@ public class UploadController extends BaseController { @PostMapping(value = "/awsImgUpload", consumes = "multipart/*", headers = "content-type=multipart/form-data") @ApiOperation("上传图片") @SystemControllerLog(description = "上传图片") - public ResultData awsImgUpload(@RequestParam("file") MultipartFile multiReq) { + public ResultData awsImgUpload(@RequestParam("file") MultipartFile multiReq) throws Exception{ logger.info("[" + getIpAddr() + "] UploadController::awsImgUpload"); + TenantEntity tenantEntity = getTenantInfo(); + long size = multiReq.getSize(); final long length = 2097152; if (size > length) { return new ResultData(ErrorCode.PICTURE_SIZE_EXCEED); } String fileName = UUID.randomUUID().toString(); - String tempFileName = fileName; + String tempFileName = fileName; String fileFormat = ""; int dot = multiReq.getOriginalFilename().lastIndexOf('.'); if (dot >= 0) { fileFormat = multiReq.getOriginalFilename().substring(dot, multiReq.getOriginalFilename().length()); - fileName = getTenantId() + "/" + fileName + fileFormat; + fileName = getFileName(tenantEntity, fileName + fileFormat); } else { - fileName = getTenantId() + "/" + fileName; + fileName = getFileName(tenantEntity, fileName); } - System.out.println(fileName); try { - FileOutputStream fos = null; - String imgFormat = ImgUtil.getImgFormat(fileFormat); - if (StringUtils.isNotBlank(imgFormat)) { - String localImgFileName = fmUploadDir + tempFileName + "-1" + fileFormat; - String localNewImgFileName = fmUploadDir + tempFileName + fileFormat; - BufferedInputStream fs = null; - File localFile = new File(localImgFileName); - fos = new FileOutputStream(localFile); - fs = (BufferedInputStream) multiReq.getInputStream(); - byte[] buffer = new byte[1024]; - int len = 0; - while ((len = fs.read(buffer)) != -1) { - fos.write(buffer, 0, len); - } - fos.close(); - fs.close(); - logger.info("local file: " + localImgFileName); - File newFile = ImgUtil.thinImage(localImgFileName, localNewImgFileName, imgFormat); - logger.info("local new file: " + localNewImgFileName); - // 删除本地缓存 - localFile.delete(); - ObjectMetadata metadata = new ObjectMetadata(); - metadata.setContentType(multiReq.getContentType()); - metadata.setContentLength(newFile.length()); - ResultData data = qrCodeService.awsUpload(new FileInputStream(newFile), metadata, fileName, getTenantId()); - // 删除本地缓存 - newFile.delete(); - return data; - } else { - ObjectMetadata metadata = new ObjectMetadata(); - metadata.setContentType(multiReq.getContentType()); - metadata.setContentLength(size); - ResultData data = qrCodeService.awsUpload(multiReq.getInputStream(), metadata, fileName, getTenantId()); - return data; - } + FileOutputStream fos = null; + String imgFormat = ImgUtil.getImgFormat(fileFormat); + if(StringUtils.isNotBlank(imgFormat)) { + String localImgFileName = fmUploadDir + tempFileName + "-1" + fileFormat; + String localNewImgFileName = fmUploadDir + tempFileName + fileFormat; + BufferedInputStream fs = null; + File localFile = new File(localImgFileName); + fos = new FileOutputStream(localFile); + fs = (BufferedInputStream) multiReq.getInputStream(); + byte[] buffer = new byte[1024]; + int len = 0; + while ((len = fs.read(buffer)) != -1) { + fos.write(buffer, 0, len); + } + fos.close(); + fs.close(); + logger.info("local file: " + localImgFileName); + File newFile = ImgUtil.thinImage(localImgFileName, localNewImgFileName, imgFormat); + logger.info("local new file: " + localNewImgFileName); + // 删除本地缓存 + localFile.delete(); + ObjectMetadata metadata = new ObjectMetadata(); + metadata.setContentType(multiReq.getContentType()); + metadata.setContentLength(newFile.length()); + ResultData data = qrCodeService.awsUpload(new FileInputStream(newFile), metadata, fileName, tenantEntity); + // 删除本地缓存 + newFile.delete(); + return data; + } else { + ObjectMetadata metadata = new ObjectMetadata(); + metadata.setContentType(multiReq.getContentType()); + metadata.setContentLength(size); + ResultData data = qrCodeService.awsUpload(multiReq.getInputStream(), metadata, fileName, tenantEntity); + return data; + } } catch (Exception e) { logger.error(e.getMessage()); return new ResultData(ErrorCode.PICTURE_ANALYZING_ERROR); @@ -150,13 +160,14 @@ public class UploadController extends BaseController { @PostMapping(value = "/awsFilesUpload", consumes = "multipart/*", headers = "content-type=multipart/form-data") @ApiOperation("多文件上传") @SystemControllerLog(description = "多文件上传") - public ResultData awsFilesUpload(@RequestParam("files") MultipartFile[] files) throws Exception { + public ResultData awsFilesUpload(@RequestParam("files") MultipartFile[] files) throws Exception{ logger.info("[" + getIpAddr() + "] UploadController::awsFilesUpload"); + TenantEntity tenantEntity = getTenantInfo(); - if (files.length > 0) { + if(files.length > 0){ ResultData data = new ResultData(); - List> dataList = new ArrayList>(); - for (MultipartFile multipartFile : files) { + List> dataList = new ArrayList>(); + for(MultipartFile multipartFile: files) { Map map = new HashMap<>(); ObjectMetadata metadata = new ObjectMetadata(); @@ -171,14 +182,15 @@ public class UploadController extends BaseController { String fileName = UUID.randomUUID().toString(); int dot = multipartFile.getOriginalFilename().lastIndexOf('.'); if (dot >= 0) { - fileName = getTenantId() + "/" + fileName + multipartFile.getOriginalFilename().substring(dot, multipartFile.getOriginalFilename().length()); + String fileFormat = multipartFile.getOriginalFilename().substring(dot, multipartFile.getOriginalFilename().length());; + fileName = getFileName(tenantEntity, fileName + fileFormat); } else { - fileName = getTenantId() + "/" + fileName; + fileName = getFileName(tenantEntity, fileName); } - ResultData data1 = qrCodeService.awsUpload(multipartFile.getInputStream(), metadata, fileName, getTenantId()); - if (data1.code == ResultData.SUCCESS) { - Map _data = (Map) data1.data; + ResultData data1 = qrCodeService.awsUpload(multipartFile.getInputStream(), metadata, fileName, getTenantInfo()); + if(data1.code == ResultData.SUCCESS) { + Map _data = (Map)data1.data; map.put("url", (String) _data.get("url")); dataList.add(map); } else { @@ -205,7 +217,7 @@ public class UploadController extends BaseController { */ @PostMapping(value = "/cimgUpload", consumes = "multipart/*", headers = "content-type=multipart/form-data") @ApiOperation("内部接口-C端上传图片文件") - public ResultData cimgUpload(@RequestParam("file") MultipartFile multiReq) throws Exception { + public ResultData cimgUpload(@RequestParam("file") MultipartFile multiReq) throws Exception{ logger.info("[" + getIpAddr() + "] UploadController::cimgUpload"); ObjectMetadata metadata = new ObjectMetadata(); @@ -214,7 +226,9 @@ public class UploadController extends BaseController { String fileName = multiReq.getOriginalFilename(); fileName = "cimg/" + fileName; - ResultData data = qrCodeService.awsUpload(multiReq.getInputStream(), metadata, fileName, "cimg"); + ResultData data = qrCodeService.awsUpload(multiReq.getInputStream(), metadata, fileName, new TenantEntity() {{ + setTenantId("cimg"); + }}); return data; } diff --git a/mallinkAdmin/src/main/java/com/iformall/ueditor/upload/Uploader.java b/mallinkAdmin/src/main/java/com/iformall/ueditor/upload/Uploader.java index 08a21b654..dcb6d548d 100644 --- a/mallinkAdmin/src/main/java/com/iformall/ueditor/upload/Uploader.java +++ b/mallinkAdmin/src/main/java/com/iformall/ueditor/upload/Uploader.java @@ -13,11 +13,14 @@ import com.amazonaws.services.s3.model.CannedAccessControlList; import com.amazonaws.services.s3.model.ObjectMetadata; import com.amazonaws.services.s3.model.PutObjectRequest; import com.iformall.domain.po.MallResource; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.service.MallResourceService; import com.iformall.shiro.UserSession; import com.iformall.ueditor.define.BaseState; import com.iformall.ueditor.define.State; +import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; +import org.apache.shiro.session.Session; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.web.multipart.MultipartFile; @@ -38,6 +41,11 @@ public class Uploader { private MallResourceService mallResourceService = null; private AmazonS3 s3 = null; + private String getFileName(TenantEntity tenantEntity, String fileName) { + fileName = tenantEntity.getTenantId() + "/" + fileName; + return fileName; + } + public Uploader(HttpServletRequest request, Map conf, MallResourceService mallResourceService) { this.request = request; this.conf = conf; @@ -67,14 +75,22 @@ public class Uploader { this.conf); } else { MultipartFile multiReq= ((MultipartHttpServletRequest) this.request).getFile("upfile"); - String tenantId = (String)SecurityUtils.getSubject().getSession().getAttribute(UserSession.tenantId); + Session session = SecurityUtils.getSubject().getSession(); + String tenantId = (String)session.getAttribute(UserSession.tenantId); + TenantEntity tenantEntity = new TenantEntity(){{ + setTenantId(tenantId); + }}; + if (StringUtils.isBlank(tenantId)) { + logger.error("TENANT is null"); + } String fileName = UUID.randomUUID().toString(); int dot = multiReq.getOriginalFilename().lastIndexOf('.'); if (dot >= 0) { - fileName = tenantId + "/" + fileName + multiReq.getOriginalFilename().substring(dot, multiReq.getOriginalFilename().length()); + String fileFormat = multiReq.getOriginalFilename().substring(dot, multiReq.getOriginalFilename().length()); + fileName = getFileName(tenantEntity, fileName + fileFormat); } else { - fileName = tenantId + "/" + fileName; + fileName = getFileName(tenantEntity, fileName); } state = state = new BaseState(true); @@ -97,7 +113,7 @@ public class Uploader { state.putInfo("url", url.toString()); MallResource mr = new MallResource(); - mr.setTenantId(tenantId); + mr.updateTenantInfo(tenantEntity); mr.setBucket(conf.get("bucketName").toString()); mr.setS3Key(fileName); mr.setUrl(url.toString()); diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java index d9cf2aa75..fba0cbd9d 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java @@ -204,7 +204,7 @@ public class WxCoupon extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value = "过滤可投放0不过滤 1过滤", name = "filterCanPut") @TableField(exist = false) private Integer filterCanPut; - //审批模板id 卷、卡、拼团、砍价 + //审批模板id 券、卡、拼团、砍价 @TableField(exist = false) private Long couponModelId; @TableField(exist = false) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponChannel.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponChannel.java index 5bffcbb45..3a59948ee 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponChannel.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponChannel.java @@ -65,7 +65,7 @@ public class WxCouponChannel extends TenantEntity { private String qrCode; @TableField(exist = false) - @io.swagger.annotations.ApiModelProperty(value="卷状态 0:可投放 1:作废",name="couponStatus") + @io.swagger.annotations.ApiModelProperty(value="券状态 0:可投放 1:作废",name="couponStatus") private Integer couponStatus; @TableField(exist = false) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSend.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSend.java index 9dc4aa793..f98d6690c 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSend.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSend.java @@ -91,7 +91,7 @@ public class WxCouponSend extends TenantEntity { @TableField(exist = false) protected Integer merchantRemain; - /**发卷所属商户名**/ + /**发券所属商户名**/ @TableField(exist = false) private String merchantName; /** @@ -105,7 +105,7 @@ public class WxCouponSend extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value="券名称",name="title") private String title; - @io.swagger.annotations.ApiModelProperty(value="2:停车发券 3:核销发券 4: B端刷卡发券 5:商户发卷 6:定时发券 7:商户发券",name="sendType") + @io.swagger.annotations.ApiModelProperty(value="2:停车发券 3:核销发券 4: B端刷卡发券 5:商户发券 6:定时发券 7:商户发券",name="sendType") private Integer sendType; @io.swagger.annotations.ApiModelProperty(value="发券条件",name="condition") private String conditions; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxFlowConfig.java b/mallinkService/src/main/java/com/iformall/domain/po/WxFlowConfig.java index f6cc11488..6460ed141 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxFlowConfig.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxFlowConfig.java @@ -25,7 +25,7 @@ public class WxFlowConfig extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value="模板名称",name="name") private String name; - @io.swagger.annotations.ApiModelProperty(value="流程类型1合同审批2账单审批3终止合同4有价卷上架",name="type") + @io.swagger.annotations.ApiModelProperty(value="流程类型1合同审批2账单审批3终止合同4有价券上架",name="type") private Integer type; @io.swagger.annotations.ApiModelProperty(value="排序",name="sort") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxFlowModel.java b/mallinkService/src/main/java/com/iformall/domain/po/WxFlowModel.java index f7cfb9966..0c28a8f40 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxFlowModel.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxFlowModel.java @@ -42,7 +42,7 @@ public class WxFlowModel extends TenantEntity { private String flowId; @TableField(exist = false) - @io.swagger.annotations.ApiModelProperty(value="流程类型4商铺签约5多径签约6商铺终止7多径终止8账单变更9有价卷上架",name="flowType") + @io.swagger.annotations.ApiModelProperty(value="流程类型4商铺签约5多径签约6商铺终止7多径终止8账单变更9有价券上架",name="flowType") private Integer flowType; @TableField(exist = false) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java index ca255582e..fee496f1e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java @@ -150,7 +150,7 @@ public class WxMerchant extends TenantEntity { private String phone; @TableField(exist = false) - @io.swagger.annotations.ApiModelProperty(value = "卷名称", name = "couponName") + @io.swagger.annotations.ApiModelProperty(value = "券名称", name = "couponName") private String couponName; public String getShopsStr() { diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponSendVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponSendVo.java index 6e189c340..e6f59b267 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponSendVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponSendVo.java @@ -26,7 +26,7 @@ public class WxCouponSendVo extends WxCouponSend implements Serializable{ @io.swagger.annotations.ApiModelProperty(value="总库存",name="inventory") private Integer inventory; - /**发卷所属商户名**/ + /**发券所属商户名**/ private String merchantName; private Date sendDate ; diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumChart.java b/mallinkService/src/main/java/com/iformall/enums/EnumChart.java index fa400f659..cc799e9a0 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumChart.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumChart.java @@ -51,7 +51,7 @@ public enum EnumChart { HYHYD(44, "会员活跃度"), SALE_CARD(45, "卡营销数据"), - SALE_COUPON(46, "卷营销数据"), + SALE_COUPON(46, "券营销数据"), SALE_PRESS(47, "砍价营销数据"), SALE_GROUP(48, "拼团营销数据"), diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumCouponSendSendType.java b/mallinkService/src/main/java/com/iformall/enums/EnumCouponSendSendType.java index ce205e21f..4f67d111d 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumCouponSendSendType.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumCouponSendSendType.java @@ -5,7 +5,7 @@ package com.iformall.enums; */ public enum EnumCouponSendSendType { - // -1: 未知 0:精准发券 1:主动(保留) 2:停车发券 3:核销发券 4: B端刷卡发券 5:商户发卷 6:定时发券 7:商户发券 8:会员生日券 + // -1: 未知 0:精准发券 1:主动(保留) 2:停车发券 3:核销发券 4: B端刷卡发券 5:商户发券 6:定时发券 7:商户发券 8:会员生日券 UNKNOWN(-1, "未知"), INJECT(0, "精准发券"), ACTIVE(1, "主动(保留)"), diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumMailMsgModel.java b/mallinkService/src/main/java/com/iformall/enums/EnumMailMsgModel.java index 5173720e3..b9afa9388 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumMailMsgModel.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumMailMsgModel.java @@ -12,7 +12,7 @@ public enum EnumMailMsgModel { MAIL_ASSIGNEE_NODIFY(14, "代办通知"), MAIL_REJECT_NODIFY(15, "驳回通知"), - //卷 + //券 MAIL_C_PASS_NODIFY(24, "审批通过通知"), MAIL_C_APPLY_NODIFY(25, "审批通知"), MAIL_C_ASSIGNEE_NODIFY(26, "代办通知"), diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumMsgModel.java b/mallinkService/src/main/java/com/iformall/enums/EnumMsgModel.java index 441099b22..9e45aef4e 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumMsgModel.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumMsgModel.java @@ -25,7 +25,7 @@ public enum EnumMsgModel { TIME_LIMIT_CAMPAIGN_JOIN_SUCCESS(17, "限时活动报名成功"), TIME_LIMIT_CAMPAIGN_NOTIFY(18, "限时活动参与提醒"), - //卷 + //券 FLOW_C_ASSIGNEE_NODIFY(19, "待办通知"), FLOW_C_APPLY_NODIFY(20, "审批通知"), FLOW_C_PASS_NODIFY(21, "通过审批通知"), diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCouponMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCouponMapper.java index 6b2b499d2..148b34fb8 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCouponMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCouponMapper.java @@ -48,7 +48,7 @@ public interface WxCouponMapper extends CommonMapper { String findSubsidyMoney(WxCoupon wxCoupon); - //-------卷-------- + //-------券-------- List findCouponOrderCount(WxCoupon wxCoupon); diff --git a/mallinkService/src/main/java/com/iformall/service/QrCodeService.java b/mallinkService/src/main/java/com/iformall/service/QrCodeService.java index e8a089bad..f27221e95 100644 --- a/mallinkService/src/main/java/com/iformall/service/QrCodeService.java +++ b/mallinkService/src/main/java/com/iformall/service/QrCodeService.java @@ -2,6 +2,7 @@ package com.iformall.service; import com.amazonaws.services.s3.model.ObjectMetadata; import com.iformall.common.ResultData; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.exception.MallinkException; import org.springframework.stereotype.Service; import org.springframework.web.bind.annotation.RequestBody; @@ -13,14 +14,14 @@ import java.util.Map; @Service public interface QrCodeService { - void downQrCode(String tenantId,HttpServletRequest request, HttpServletResponse response, @RequestBody Map params) throws MallinkException; + void downQrCode(TenantEntity tenantEntity, HttpServletRequest request, HttpServletResponse response, @RequestBody Map params) throws MallinkException; ResultData exportQrcode(HttpServletRequest request, HttpServletResponse response, - String tenantId, int type, String pageUrl, String sceneParam, + TenantEntity tenantEntity, int type, String pageUrl, String sceneParam, int withText, String text1, String text2, String name); - ResultData uploadQrcode(String tenantId, int type, String pageUrl, String sceneParam, + ResultData uploadQrcode(TenantEntity tenantEntity, int type, String pageUrl, String sceneParam, int withText, String text1, String text2, String name); - ResultData awsUpload(InputStream inputStream, ObjectMetadata metadata, String fileName, String tenantId); + ResultData awsUpload(InputStream inputStream, ObjectMetadata metadata, String fileName, TenantEntity tenantEntity); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxCouponChannelService.java b/mallinkService/src/main/java/com/iformall/service/WxCouponChannelService.java index 02d6991ba..fa9abb434 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCouponChannelService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCouponChannelService.java @@ -33,7 +33,7 @@ public interface WxCouponChannelService { /** - * 查询商户的卷信息 + * 查询商户的券信息 * @param record * @param pageIndex * @param pageSize diff --git a/mallinkService/src/main/java/com/iformall/service/WxCouponService.java b/mallinkService/src/main/java/com/iformall/service/WxCouponService.java index 63c3b7d57..aec2933b7 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCouponService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCouponService.java @@ -31,7 +31,7 @@ public interface WxCouponService { PageInfo findCountData(WxCoupon record, Integer pageNum, Integer pageSize); /** - * 卷列表,包括统计 + * 券列表,包括统计 * @param record * @return */ @@ -110,45 +110,45 @@ public interface WxCouponService { */ String findSubsidyMoney(WxCoupon wxCoupon); - //----------------卷-------------- + //----------------券-------------- /** - * 卷发放数量 + * 券发放数量 * @return */ //List findCouponSendCount(WxCoupon wxCoupon); /** - * 卷购买数量 + * 券购买数量 * @return */ List findCouponOrderCount(WxCoupon wxCoupon); /** - * 卷领取数量 + * 券领取数量 * @return */ //List findCouponGetCount(WxCoupon wxCoupon); /** - * 卷核销数量 + * 券核销数量 * @return */ List findCouponPaymentCount(WxCoupon wxCoupon); /** - * 有价卷销售数量 + * 有价券销售数量 * @return */ List priceCouponSaleCount(WxCoupon wxCoupon); /** - * 有价卷核销数量 + * 有价券核销数量 * @return */ List priceCouponPaymentCount(WxCoupon wxCoupon); /** - * 有价卷退款数量 + * 有价券退款数量 * @return */ Long priceCouponCancelCount(WxCoupon wxCoupon); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/QrCodeServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/QrCodeServiceImpl.java index 83f486365..16137972c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/QrCodeServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/QrCodeServiceImpl.java @@ -17,6 +17,7 @@ import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.config.AwsProperty; import com.iformall.domain.po.MallResource; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.WxAppinfo; import com.iformall.exception.MallinkException; import com.iformall.service.MallResourceService; @@ -59,7 +60,7 @@ public class QrCodeServiceImpl implements QrCodeService { private AmazonS3 s3 = null; @Override - public ResultData awsUpload(InputStream inputStream, ObjectMetadata metadata, String fileName, String tenantId) { + public ResultData awsUpload(InputStream inputStream, ObjectMetadata metadata, String fileName, TenantEntity tenantEntity) { ResultData data = new ResultData(); try { if(s3 == null) { @@ -86,7 +87,7 @@ public class QrCodeServiceImpl implements QrCodeService { logger.info(url.toString()); MallResource mr = new MallResource(); - mr.setTenantId(tenantId); + mr.updateTenantInfo(tenantEntity); mr.setBucket(awsProperty.getBucketName()); mr.setS3Key(fileName); mr.setUrl(url.toString()); @@ -125,7 +126,7 @@ public class QrCodeServiceImpl implements QrCodeService { } @Override - public void downQrCode(String tenantId,HttpServletRequest request, HttpServletResponse response, Map params) throws MallinkException { + public void downQrCode(TenantEntity tenantEntity, HttpServletRequest request, HttpServletResponse response, Map params) throws MallinkException { String name = (String) params.get("name"); String pageUrl = (String) params.get("pageUrl"); String sceneParam = (String) params.get("sceneParam"); @@ -149,7 +150,7 @@ public class QrCodeServiceImpl implements QrCodeService { } try { exportQrcode(request, response, - tenantId, type, pageUrl, sceneParam, + tenantEntity, type, pageUrl, sceneParam, withText, text1, text2, name); } catch (Exception e) { @@ -160,12 +161,12 @@ public class QrCodeServiceImpl implements QrCodeService { @Override public ResultData exportQrcode(HttpServletRequest request, HttpServletResponse response, - String tenantId, int type, String pageUrl, String sceneParam, + TenantEntity tenantEntity, int type, String pageUrl, String sceneParam, int withText, String text1, String text2, String name) { // type 0 有限二维码, 1 无限制二维码 // withText 0 不带字 1. 带下面的字,2 带下面的两行字 - WxAppinfo appinfo = wxAppinfoService.getCAppInfo(tenantId); + WxAppinfo appinfo = wxAppinfoService.getCAppInfo(tenantEntity.getTenantId()); boolean autoColor = false; boolean isHyaline = true; WxMaCodeLineColor color = new WxMaCodeLineColor("0", "0", "0"); @@ -222,12 +223,12 @@ public class QrCodeServiceImpl implements QrCodeService { } @Override - public ResultData uploadQrcode(String tenantId, int type, String pageUrl, String sceneParam, + public ResultData uploadQrcode(TenantEntity tenantEntity, int type, String pageUrl, String sceneParam, int withText, String text1, String text2, String name) { // type 0 有限二维码, 1 无限制二维码 // withText 0 不带字 1. 带下面的字,2 带下面的两行字 - WxAppinfo appinfo = wxAppinfoService.getCAppInfo(tenantId); + WxAppinfo appinfo = wxAppinfoService.getCAppInfo(tenantEntity.getTenantId()); boolean autoColor = false; boolean isHyaline = true; WxMaCodeLineColor color = new WxMaCodeLineColor("0", "0", "0"); @@ -286,12 +287,13 @@ public class QrCodeServiceImpl implements QrCodeService { String fn = UUID.randomUUID().toString(); int dot = fileName.lastIndexOf('.'); if (dot >= 0) { - fn = tenantId + "/" + fn + dest.getName().substring(dot, dest.getName().length()); + String fileFormat = dest.getName().substring(dot, dest.getName().length()); + fn = getFileName(tenantEntity, fn + fileFormat); } else { - fn = tenantId + "/" + fn; + fn = getFileName(tenantEntity, fn); } - ResultData data = awsUpload(new FileInputStream(dest), metadata, fn, tenantId); + ResultData data = awsUpload(new FileInputStream(dest), metadata, fn, tenantEntity); org.apache.commons.io.FileUtils.forceDelete(dest); return data; } catch (Exception e) { @@ -300,6 +302,11 @@ public class QrCodeServiceImpl implements QrCodeService { return new ResultData(); } + private String getFileName(TenantEntity tenantEntity, String fn) { + fn = tenantEntity.getTenantId() + "/" + fn; + return fn; + } + private void copyFileToDest(int withText, String text1, String text2, String destPath1, File dest, File codeFile) throws IOException { if (withText == 1) { File dest1 = new File(destPath1); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java index 8ebc7e025..e3b0257e4 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java @@ -269,7 +269,7 @@ public class WxCampaignServiceImpl implements WxCampaignService { couponChannel.setId(wxCouponChannel.getId()); couponChannel.setType(wxCouponChannel.getType()); String param = couponChannel.getWeappScene(); - ResultData resultDataQ = qrCodeService.uploadQrcode(wxCoupon.getTenantId(),1,pageUrl,param,0,"","","卷"); + ResultData resultDataQ = qrCodeService.uploadQrcode(wxCoupon,1,pageUrl,param,0,"","","券"); Map map = (Map)resultDataQ.data; if(map!=null && map.get("url") !=null) { String url = map.get("url"); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java index 0a6600ae8..066be9b9f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java @@ -2306,7 +2306,7 @@ public class WxChartServiceImpl implements WxChartDataService { result.put("sumPriceSaleMoney",wxCouponService.findSumPriceSaleMoney(wxCoupon)); result.put("sumPricePayMent",wxCouponService.findSumPricePayMent(wxCoupon)); result.put("sumSubsidyMoney",wxCouponService.findSumSubsidyMoney(wxCoupon)); - result.put("priceCouponCancelCount",priceCouponCancelCount);//有价卷退款数量 + result.put("priceCouponCancelCount",priceCouponCancelCount);//有价券退款数量 //有价券售出数量 int total = 0; @@ -2913,7 +2913,7 @@ public class WxChartServiceImpl implements WxChartDataService { } datamap.put("groupHistory",countHistoryMap); - //卷数据 + //券数据 wxCouponStatisVoList = wxCouponService.findCouponOrderCount(couponQuery); countHistoryMap = getDateMap(startDate,endDate); for (WxCouponStatisVo coupon:wxCouponStatisVoList){ diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java index b30b2faef..8a1838f2f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java @@ -128,7 +128,7 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService { } /** - * 清除c端首页卷列表缓存 + * 清除c端首页券列表缓存 * @param tenantId */ public void clearCache(String tenantId){ @@ -289,7 +289,7 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService { couponChannel.setId(vo.getId()); couponChannel.setType(vo.getType()); String param = couponChannel.getWeappScene(); - ResultData resultDataQ = qrCodeService.uploadQrcode(wxCoupon.getTenantId(),1,pageUrl,param,0,"","","卷"); + ResultData resultDataQ = qrCodeService.uploadQrcode(wxCoupon,1,pageUrl,param,0,"","","券"); Map map = (Map)resultDataQ.data; if(map!=null && map.get("url") !=null) { String url = map.get("url"); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java index 3617032be..cb12a26c8 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java @@ -444,7 +444,7 @@ import java.util.stream.Collectors; /** - * 清除c端首页卷列表缓存 + * 清除c端首页券列表缓存 * @param tenantId */ public void clearCache(String tenantId){ diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java index bbcc3fead..10b6369b4 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java @@ -333,7 +333,7 @@ public class WxFlowServiceImpl implements WxFlowService { } /** - * 清除c端首页卷列表缓存 + * 清除c端首页券列表缓存 * @param tenantId */ public void clearCache(String tenantId){ diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxGameServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxGameServiceImpl.java index ab911d527..c7265dff4 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxGameServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxGameServiceImpl.java @@ -317,7 +317,7 @@ public class WxGameServiceImpl implements WxGameService { couponChannel.setId(wxCouponChannel.getId()); couponChannel.setType(wxCouponChannel.getType()); String param = couponChannel.getWeappScene(); - ResultData resultDataQ = qrCodeService.uploadQrcode(wxCoupon.getTenantId(),1,pageUrl,param,0,"","","卷"); + ResultData resultDataQ = qrCodeService.uploadQrcode(wxCoupon,1,pageUrl,param,0,"","","券"); Map map = (Map)resultDataQ.data; if(map!=null && map.get("url") !=null) { String url = map.get("url"); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java index aa52b828c..a335b481f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java @@ -140,7 +140,7 @@ public class WxTopicServiceImpl implements WxTopicService { couponChannel.setId(wxCouponChannel.getId()); couponChannel.setType(wxCouponChannel.getType()); String param = couponChannel.getWeappScene(); - ResultData resultDataQ = qrCodeService.uploadQrcode(wxCoupon.getTenantId(),1,pageUrl,param,0,"","","卷"); + ResultData resultDataQ = qrCodeService.uploadQrcode(wxCoupon,1,pageUrl,param,0,"","","券"); Map map = (Map)resultDataQ.data; if(map!=null && map.get("url") !=null) { String url = map.get("url");