Bläddra i källkod

//

private_deployment
xhxu 1 år sedan
förälder
incheckning
be44ec90c0
3 ändrade filer med 45 tillägg och 37 borttagningar
  1. +38
    -0
      suimangCApi/src/main/java/com/iformall/controller/CallbackPayController.java
  2. +3
    -25
      suimangCApi/src/main/java/com/iformall/controller/CallbackSmController.java
  3. +4
    -12
      suimangService/src/main/java/com/iformall/domain/po/WxPayAccount.java

+ 38
- 0
suimangCApi/src/main/java/com/iformall/controller/CallbackPayController.java Visa fil

@@ -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<String, Object> paranMap, HttpServletRequest request, HttpServletResponse response) throws IOException, JDOMException {
logger.debug("[" + getIpAddr() + "] CallbackPayController::photoSpeak");
logger.info("支付回调结果通知{}"+JSONObject.toJSONString(paranMap));
response.setStatus(200);
}

}

suimangCApi/src/main/java/com/iformall/controller/CallbackController.java → suimangCApi/src/main/java/com/iformall/controller/CallbackSmController.java Visa fil

@@ -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<String, Object> 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<String, Object> 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

+ 4
- 12
suimangService/src/main/java/com/iformall/domain/po/WxPayAccount.java Visa fil

@@ -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;


Laddar…
Avbryt
Spara