From be44ec90c0178e85d315fb7c4b2240a337127a10 Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 24 Aug 2023 19:47:38 +0800 Subject: [PATCH] // --- .../controller/CallbackPayController.java | 38 +++++++++++++++++++ ...troller.java => CallbackSmController.java} | 28 ++------------ .../com/iformall/domain/po/WxPayAccount.java | 16 ++------ 3 files changed, 45 insertions(+), 37 deletions(-) create mode 100644 suimangCApi/src/main/java/com/iformall/controller/CallbackPayController.java rename suimangCApi/src/main/java/com/iformall/controller/{CallbackController.java => CallbackSmController.java} (83%) diff --git a/suimangCApi/src/main/java/com/iformall/controller/CallbackPayController.java b/suimangCApi/src/main/java/com/iformall/controller/CallbackPayController.java new file mode 100644 index 0000000..3dc9119 --- /dev/null +++ b/suimangCApi/src/main/java/com/iformall/controller/CallbackPayController.java @@ -0,0 +1,38 @@ +package com.iformall.controller; + +import com.alibaba.fastjson.JSONObject; +import com.iformall.annotation.AuthIgnore; +import com.iformall.service.ProductOrderService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jdom2.JDOMException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.Map; + + +@RestController +@RequestMapping("/payCallBack") +@Api(description = "支付回调") +public class CallbackPayController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + @Autowired + private ProductOrderService productOrderService; + + @AuthIgnore + @ApiOperation("支付回调") + @PostMapping(value = "/pay/v3") + public void _payV3Notify(@RequestBody Map paranMap, HttpServletRequest request, HttpServletResponse response) throws IOException, JDOMException { + logger.debug("[" + getIpAddr() + "] CallbackPayController::photoSpeak"); + logger.info("支付回调结果通知{}"+JSONObject.toJSONString(paranMap)); + response.setStatus(200); + } + +} diff --git a/suimangCApi/src/main/java/com/iformall/controller/CallbackController.java b/suimangCApi/src/main/java/com/iformall/controller/CallbackSmController.java similarity index 83% rename from suimangCApi/src/main/java/com/iformall/controller/CallbackController.java rename to suimangCApi/src/main/java/com/iformall/controller/CallbackSmController.java index e14f4c1..d13623b 100644 --- a/suimangCApi/src/main/java/com/iformall/controller/CallbackController.java +++ b/suimangCApi/src/main/java/com/iformall/controller/CallbackSmController.java @@ -1,50 +1,28 @@ package com.iformall.controller; -import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.extension.api.R; -import com.github.pagehelper.PageInfo; import com.iformall.annotation.AuthIgnore; import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; -import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.po.sm.*; import com.iformall.enums.EnumDigitalAvatarOrderStatus; import com.iformall.enums.EnumVideoStatus; -import com.iformall.exception.MallinkException; import com.iformall.service.sm.*; -import com.iformall.sm.DigitalAvatarResult; -import com.iformall.video.VideoFactory; -import com.iformall.video.aliyun.sdk.server.UploadCacheHelper; -import com.iformall.video.entity.VideUploadResult; import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import lombok.SneakyThrows; import org.apache.commons.lang3.StringUtils; -import org.flowable.idm.engine.impl.persistence.entity.UserEntity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.net.URL; -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; import java.util.*; @RestController @RequestMapping("/callback") @Api(description = "视频回调") -public class CallbackController extends BaseController { +public class CallbackSmController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired @@ -57,7 +35,7 @@ public class CallbackController extends BaseController { @ApiOperation("视频回调") @PostMapping(value = "/photo/speak") public ResultData photoSpeak(@RequestBody Map paranMap) { - logger.debug("[" + getIpAddr() + "] VideoCallbackController::photoSpeak"); + logger.debug("[" + getIpAddr() + "] CallbackSmController::photoSpeak"); logger.info("照片生成视频结果通知{}"+JSONObject.toJSONString(paranMap)); Long task_id = (Long) paranMap.get("task_id");//任务ID String code = (String) paranMap.get("code");//code @@ -133,7 +111,7 @@ public class CallbackController extends BaseController { @ApiOperation("生成照片回调") @PostMapping(value = "/create/photo") public ResultData createPhoto(@RequestBody Map paranMap) { - logger.debug("[" + getIpAddr() + "] VideoCallbackController::photoSpeak"); + logger.debug("[" + getIpAddr() + "] CallbackSmController::photoSpeak"); logger.info("照片生成视频结果通知{}"+JSONObject.toJSONString(paranMap)); Long task_id = (Long) paranMap.get("task_id");//任务ID Integer code = (Integer) paranMap.get("code");//code diff --git a/suimangService/src/main/java/com/iformall/domain/po/WxPayAccount.java b/suimangService/src/main/java/com/iformall/domain/po/WxPayAccount.java index 58a50fa..9021072 100644 --- a/suimangService/src/main/java/com/iformall/domain/po/WxPayAccount.java +++ b/suimangService/src/main/java/com/iformall/domain/po/WxPayAccount.java @@ -78,25 +78,17 @@ public class WxPayAccount extends TenantEntity { private Integer sellRate; public String getPayNotifyV3Url() { - return notifyUrl + "/pay/v3/"+this.getTenantId(); + return notifyUrl + "/pay/v3"; } public String getPayNotifyUrl() { - return notifyUrl + "/pay/"+this.getTenantId(); + return notifyUrl + "/pay"; } public String getRefundNotifyV3Url() { - return notifyUrl + "/refund/v3/"+this.getTenantId(); + return notifyUrl + "/refund/v3"; } public String getRefundNotifyUrl() { - return notifyUrl + "/refund/"+this.getTenantId(); + return notifyUrl + "/refund"; } - public String getSubsidyNotifyV3Url() { - return notifyUrl + "/subsidyPay/v3/"+this.getTenantId(); - } - public String getSubsidyNotifyUrl() { - return notifyUrl + "/subsidyPay"; - } - - public boolean checkShare() { return share > 0; } @io.swagger.annotations.ApiModelProperty(value="微信支付分serviceId",name="serviceId") private String serviceId;