diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantMediaUploadController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantMediaUploadController.java index e6d9707ce..f8b575bd7 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantMediaUploadController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantMediaUploadController.java @@ -7,6 +7,7 @@ import com.iformall.exception.MallinkException; import com.iformall.file.aliyun.AliyunOSS; import com.iformall.file.wx.MerchantMediaUpload; import com.iformall.utils.ImgUtil; +import com.iformall.utils.ImgYwsqhUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; @@ -21,6 +22,8 @@ import org.springframework.web.multipart.MultipartFile; import javax.imageio.ImageIO; import java.awt.image.BufferedImage; +import java.io.ByteArrayInputStream; +import java.io.InputStream; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -112,4 +115,53 @@ public class WxMerchantMediaUploadController extends BaseController { } } + /** + * 获取授权函 + * + * @param + * @return + */ + @PostMapping(value = "/getYwsqh") + @ApiOperation("获取图片") + public ResultData getYwsqh(@RequestParam Map param) { + logger.info("[" + getIpAddr() + "] WxMerchantMediaUploadController::getYwsqh"); + TenantEntity tenantEntity = getTenantInfo(); + + String contact_name = param.get("contact_name"); + String contact_id_number = param.get("contact_id_number"); + String contact_department = param.get("contact_department"); + String contact_job = param.get("contact_job"); + String legal_person = param.get("legal_person"); + String id_card_number = param.get("id_card_number"); + String card_period_begin = param.get("card_period_begin"); + String card_period_end = param.get("card_period_end"); + Boolean isSeal = "true".equals(param.get("isSeal"))?true:false; + String merchant_name = param.get("merchant_name"); + + byte[] bytes = ImgYwsqhUtil.imgCeate(contact_name, contact_id_number, contact_department, contact_job, + legal_person, id_card_number, card_period_begin, card_period_end, isSeal, merchant_name); + if(bytes == null){ + return new ResultData(ErrorCode.SYS_SERVER_ERROR.getCode(),"生成图片异常"); + } + try { + InputStream inputStream = new ByteArrayInputStream(bytes); + + String url = aliyunOSS.upload(tenantEntity.getTenantId(), ".png", inputStream); + if(StringUtils.isBlank(url)){ + return new ResultData(ErrorCode.SYS_SERVER_ERROR.getCode(),"获取图片异常"); + } + + Map map = new HashMap<>(); + map.put("url",url); + return new ResultData(map); + + } catch(MallinkException e){ + logger.error(e.getMessage()); + return new ResultData(e.getErrorCode(),e.getMessage()); + }catch (Exception e) { + logger.error(e.getMessage()); + return new ResultData(ErrorCode.PICTURE_ANALYZING_ERROR); + } + } + } diff --git a/mallinkBApi/src/main/java/com/iformall/utils/ImgYwsqhUtil.java b/mallinkBApi/src/main/java/com/iformall/utils/ImgYwsqhUtil.java index e8dfac300..128e88866 100644 --- a/mallinkBApi/src/main/java/com/iformall/utils/ImgYwsqhUtil.java +++ b/mallinkBApi/src/main/java/com/iformall/utils/ImgYwsqhUtil.java @@ -1,5 +1,7 @@ package com.iformall.utils; +import com.iformall.common.ErrorCode; +import com.iformall.common.ResultData; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -23,6 +25,7 @@ public class ImgYwsqhUtil { //模板图片 private static final String imgTempPath = "imgTemp/wxjjywsqh.jpg"; + /** * 生成图片证书 * @return diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingReceiverApplyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingReceiverApplyServiceImpl.java index b6f4ca7dd..c9c9fe600 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingReceiverApplyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingReceiverApplyServiceImpl.java @@ -97,7 +97,7 @@ public class WxProfitSharingReceiverApplyServiceImpl implements WxProfitSharingR receiverAdd.setUpdateTime(now); wxProfitSharingReceiverApplyMapper.updateById(receiverAdd); } - return new ResultData(receiverAdd); + return new ResultData(); } @Override