Просмотр исходного кода

Merge remote-tracking branch 'origin/photo' into private_deployment

private_deployment
xmzhao71 1 год назад
Родитель
Сommit
ac536df42a
17 измененных файлов: 129 добавлений и 45 удалений
  1. +5
    -0
      open-api/src/main/java/com/iformall/controller/BaseController.java
  2. +4
    -6
      open-api/src/main/java/com/iformall/controller/ai/AiVideoController.java
  3. +3
    -4
      open-api/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java
  4. +1
    -1
      open-api/src/main/java/com/iformall/service/AiVideoService.java
  5. +10
    -3
      open-api/src/main/java/com/iformall/service/impl/AiVideoServiceImpl.java
  6. +1
    -1
      suimangService/src/main/java/com/iformall/domain/dto/neuver/SaveServiceInfoDTO.java
  7. +30
    -0
      suimangService/src/main/java/com/iformall/domain/dto/neuver/SaveServiceVideoRecordDTO.java
  8. +4
    -0
      suimangService/src/main/java/com/iformall/domain/po/WxThirdPartyApi.java
  9. +1
    -1
      suimangService/src/main/java/com/iformall/enums/EnumProductOrderPayVendor.java
  10. +1
    -1
      suimangService/src/main/java/com/iformall/service/impl/ProductOrderPayServiceImpl.java
  11. +4
    -1
      suimangService/src/main/java/com/iformall/service/pay/PayServiceFactory.java
  12. +20
    -13
      suimangService/src/main/java/com/iformall/service/pay/service/pay/ali/BaseAliPayAdapterService.java
  13. +19
    -12
      suimangService/src/main/java/com/iformall/service/pay/service/pay/ali/page/AliPagePayAdapterService.java
  14. +1
    -1
      suimangService/src/main/java/com/iformall/service/pay/service/pay/wx/v3/nativePay/WxNativePayV3AdapterService.java
  15. +11
    -0
      suimangService/src/main/java/com/iformall/service/sm/ServiceVideoRecordService.java
  16. +12
    -0
      suimangService/src/main/java/com/iformall/service/sm/impl/ServiceVideoRecordServiceImpl.java
  17. +2
    -1
      suimangService/src/main/java/com/iformall/utils/Constant.java

+ 5
- 0
open-api/src/main/java/com/iformall/controller/BaseController.java Просмотреть файл

@@ -64,4 +64,9 @@ public class BaseController {
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
return IPUtil.getIpAddr(request); return IPUtil.getIpAddr(request);
} }

public Long getServiceId() {
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
return (Long) request.getAttribute(Constant.SERVICE_ID);
}
} }

+ 4
- 6
open-api/src/main/java/com/iformall/controller/ai/AiVideoController.java Просмотреть файл

@@ -1,13 +1,11 @@
package com.iformall.controller.ai; package com.iformall.controller.ai;


import com.iformall.common.ResultData; import com.iformall.common.ResultData;
import com.iformall.domain.po.sm.UserMouldVideo;
import com.iformall.controller.BaseController;
import com.iformall.dto.GenerateVideoDTO; import com.iformall.dto.GenerateVideoDTO;
import com.iformall.dto.PreviewVideoDTO; import com.iformall.dto.PreviewVideoDTO;
import com.iformall.service.AiVideoService; import com.iformall.service.AiVideoService;
import com.iformall.sm.AiPreviewParam;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
@@ -18,13 +16,13 @@ import org.springframework.web.bind.annotation.RestController;
@Api(tags = "视频相关api") @Api(tags = "视频相关api")
@RestController @RestController
@RequestMapping("/ai/video") @RequestMapping("/ai/video")
public class AiVideoController {
public class AiVideoController extends BaseController {


@Autowired @Autowired
private AiVideoService aiVideoService; private AiVideoService aiVideoService;


@ApiOperation("预览") @ApiOperation("预览")
@PostMapping("/preview")
@PostMapping("/previewVideo")
public ResultData previewVideo(@RequestBody PreviewVideoDTO dto) { public ResultData previewVideo(@RequestBody PreviewVideoDTO dto) {
return new ResultData(aiVideoService.previewVideo(PreviewVideoDTO.mappingParam(dto))); return new ResultData(aiVideoService.previewVideo(PreviewVideoDTO.mappingParam(dto)));
} }
@@ -32,6 +30,6 @@ public class AiVideoController {
@ApiOperation("生成视频") @ApiOperation("生成视频")
@PostMapping("generateVideo") @PostMapping("generateVideo")
public ResultData generateVideo(@RequestBody GenerateVideoDTO dto) { public ResultData generateVideo(@RequestBody GenerateVideoDTO dto) {
return new ResultData(aiVideoService.generateVideo(dto.getAiVideoParam(), dto.getId()));
return new ResultData(aiVideoService.generateVideo(dto.getAiVideoParam(), dto.getId(), getServiceId()));
} }
} }

+ 3
- 4
open-api/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java Просмотреть файл

@@ -50,6 +50,7 @@ public class AuthorizationInterceptor extends HandlerInterceptorAdapter {
if(apiConfig == null){ if(apiConfig == null){
throw new MallinkException(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"非法请求"); throw new MallinkException(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"非法请求");
} }
request.setAttribute(Constant.SERVICE_ID, apiConfig.getServiceId());
request.setAttribute(Constant.APP_Id, apiConfig.getAppId()); request.setAttribute(Constant.APP_Id, apiConfig.getAppId());
request.setAttribute(Constant.TENANT_ID, apiConfig.getTenantId()); request.setAttribute(Constant.TENANT_ID, apiConfig.getTenantId());
request.setAttribute(Constant.PARENT_TENANT_ID, apiConfig.getParentTenantId()); request.setAttribute(Constant.PARENT_TENANT_ID, apiConfig.getParentTenantId());
@@ -77,7 +78,7 @@ public class AuthorizationInterceptor extends HandlerInterceptorAdapter {
if(StringUtils.isBlank(timeStamp)){ if(StringUtils.isBlank(timeStamp)){
throw new MallinkException(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"缺少timeStamp"); throw new MallinkException(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"缺少timeStamp");
} }
long timestampDate = Long.valueOf(timeStamp) + 1000*60*5;//五分钟有效
long timestampDate = Long.parseLong(timeStamp) + 1000*60*5;//五分钟有效
long currDate = System.currentTimeMillis(); long currDate = System.currentTimeMillis();
// 请求过期 // 请求过期
if (timestampDate < currDate) { if (timestampDate < currDate) {
@@ -85,9 +86,7 @@ public class AuthorizationInterceptor extends HandlerInterceptorAdapter {
} }


for (String key:notKeys) { for (String key:notKeys) {
if(parameterMap.containsKey(key)){
parameterMap.remove(key);
}
parameterMap.remove(key);
} }


String newSignature = SignUtils.getSign(apiConfig.getSignKey(), parameterMap, "MD5"); String newSignature = SignUtils.getSign(apiConfig.getSignKey(), parameterMap, "MD5");


+ 1
- 1
open-api/src/main/java/com/iformall/service/AiVideoService.java Просмотреть файл

@@ -23,5 +23,5 @@ public interface AiVideoService {
* @param aiVideoParam * @param aiVideoParam
* @return {@link AiVideoResult} * @return {@link AiVideoResult}
*/ */
AiVideoResult generateVideo(AiVideoParam aiVideoParam, Long taskId);
AiVideoResult generateVideo(AiVideoParam aiVideoParam, Long taskId, Long serviceId);
} }

+ 10
- 3
open-api/src/main/java/com/iformall/service/impl/AiVideoServiceImpl.java Просмотреть файл

@@ -1,12 +1,14 @@
package com.iformall.service.impl; package com.iformall.service.impl;


import com.iformall.common.ErrorCode; import com.iformall.common.ErrorCode;
import com.iformall.domain.dto.neuver.SaveServiceVideoRecordDTO;
import com.iformall.domain.po.sm.UserMouldVideo; import com.iformall.domain.po.sm.UserMouldVideo;
import com.iformall.dto.GenerateVideoDTO; import com.iformall.dto.GenerateVideoDTO;
import com.iformall.dto.PreviewVideoDTO; import com.iformall.dto.PreviewVideoDTO;
import com.iformall.enums.EnumVideoStatus; import com.iformall.enums.EnumVideoStatus;
import com.iformall.exception.BizException; import com.iformall.exception.BizException;
import com.iformall.service.AiVideoService; import com.iformall.service.AiVideoService;
import com.iformall.service.sm.ServiceVideoRecordService;
import com.iformall.service.sm.UserMouldVideoService; import com.iformall.service.sm.UserMouldVideoService;
import com.iformall.service.sm.VoiceInfoService; import com.iformall.service.sm.VoiceInfoService;
import com.iformall.sm.*; import com.iformall.sm.*;
@@ -26,10 +28,10 @@ import java.util.Optional;
@Service @Service
public class AiVideoServiceImpl implements AiVideoService { public class AiVideoServiceImpl implements AiVideoService {


@Autowired
private VoiceInfoService voiceInfoService;
@Autowired @Autowired
private UserMouldVideoService userMouldVideoService; private UserMouldVideoService userMouldVideoService;
@Autowired
private ServiceVideoRecordService serviceVideoRecordService;


@Override @Override
public AiPreviewResult previewVideo(AiPreviewParam aiPreviewParam) { public AiPreviewResult previewVideo(AiPreviewParam aiPreviewParam) {
@@ -37,7 +39,7 @@ public class AiVideoServiceImpl implements AiVideoService {
} }


@Override @Override
public AiVideoResult generateVideo(AiVideoParam aiVideoParam, Long taskId) {
public AiVideoResult generateVideo(AiVideoParam aiVideoParam, Long taskId, Long serviceId) {
// // 参数校验 // // 参数校验
// UserMouldVideo userMouldVideo = Optional.ofNullable(userMouldVideoService.getById(dto.getId())).orElseThrow(() -> new BizException(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "未找到用户数据")); // UserMouldVideo userMouldVideo = Optional.ofNullable(userMouldVideoService.getById(dto.getId())).orElseThrow(() -> new BizException(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "未找到用户数据"));
// if (StringUtils.isBlank(userMouldVideo.getPaperwork())) { // if (StringUtils.isBlank(userMouldVideo.getPaperwork())) {
@@ -60,6 +62,11 @@ public class AiVideoServiceImpl implements AiVideoService {
AiVideoResult video = AiVideoHelper.createVideo(aiVideoParam, taskId); AiVideoResult video = AiVideoHelper.createVideo(aiVideoParam, taskId);
if (video.isSuccess()) { if (video.isSuccess()) {
// 记录时长 // 记录时长
SaveServiceVideoRecordDTO dto = SaveServiceVideoRecordDTO.builder()
.serviceId(serviceId)
.videoTime(String.valueOf(video.getDuration()))
.build();
serviceVideoRecordService.saveServiceVideoRecord(dto);
} }
return video; return video;
} }


+ 1
- 1
suimangService/src/main/java/com/iformall/domain/dto/neuver/SaveServiceInfoDTO.java Просмотреть файл

@@ -9,7 +9,7 @@ import lombok.Data;


import java.util.Date; import java.util.Date;


@ApiModel(value = "获取语种")
@ApiModel(value = "新增接入商")
@Data @Data
public class SaveServiceInfoDTO { public class SaveServiceInfoDTO {
@ApiModelProperty("客户名称") @ApiModelProperty("客户名称")


+ 30
- 0
suimangService/src/main/java/com/iformall/domain/dto/neuver/SaveServiceVideoRecordDTO.java Просмотреть файл

@@ -0,0 +1,30 @@
package com.iformall.domain.dto.neuver;

import com.iformall.common.IdWorker;
import com.iformall.domain.po.sm.ServiceVideoRecord;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Builder;
import lombok.Data;

import java.util.Date;

@ApiModel(value = "新增生成视频时长记录")
@Data
@Builder
public class SaveServiceVideoRecordDTO {
@ApiModelProperty("接入商标识")
private Long serviceId;
@ApiModelProperty("视频时长")
private String videoTime;

public static ServiceVideoRecord mapping(SaveServiceVideoRecordDTO dto) {
ServiceVideoRecord serviceVideoRecord = new ServiceVideoRecord();
serviceVideoRecord.setId(IdWorker.get().nextId());
serviceVideoRecord.setCreateTime(new Date());
serviceVideoRecord.setUpdateTime(new Date());
serviceVideoRecord.setServiceId(dto.getServiceId());
serviceVideoRecord.setVideoTime(dto.getVideoTime());
return serviceVideoRecord;
}
}

+ 4
- 0
suimangService/src/main/java/com/iformall/domain/po/WxThirdPartyApi.java Просмотреть файл

@@ -2,6 +2,7 @@ package com.iformall.domain.po;


import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.base.TenantEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;


@@ -52,5 +53,8 @@ public class WxThirdPartyApi extends TenantEntity {


@io.swagger.annotations.ApiModelProperty(value="",name="tpId") @io.swagger.annotations.ApiModelProperty(value="",name="tpId")
private String tpId; private String tpId;

@ApiModelProperty("接入商id")
private Long serviceId;
} }

+ 1
- 1
suimangService/src/main/java/com/iformall/enums/EnumProductOrderPayVendor.java Просмотреть файл

@@ -8,7 +8,7 @@ public enum EnumProductOrderPayVendor {
PAY_WAY_WECHAT(1, "微信小程序",EnumAppPlat.WX.getCode(),EnumProfitSharing.PROFIT_SHARING_NO.getCode()), PAY_WAY_WECHAT(1, "微信小程序",EnumAppPlat.WX.getCode(),EnumProfitSharing.PROFIT_SHARING_NO.getCode()),
PAY_WAY_WECHAT_NATIVE(2, "微信Native",EnumAppPlat.WX.getCode(),EnumProfitSharing.PROFIT_SHARING_NO.getCode()), PAY_WAY_WECHAT_NATIVE(2, "微信Native",EnumAppPlat.WX.getCode(),EnumProfitSharing.PROFIT_SHARING_NO.getCode()),
PAY_WAY_ALIPAY(3, "支付宝小程序",null,null), PAY_WAY_ALIPAY(3, "支付宝小程序",null,null),
PAY_WAY_ALIPAY_WAP(4, "支付宝H5",null,null),
PAY_WAY_ALIPAY_WAP(4, "支付宝H5",EnumAppPlat.ALI.getCode(),EnumProfitSharing.PROFIT_SHARING_NO.getCode()),
PAY_WAY_TT(5, "抖音小程序",EnumAppPlat.TOUTIAO.getCode(),EnumProfitSharing.PROFIT_SHARING_NO.getCode()), PAY_WAY_TT(5, "抖音小程序",EnumAppPlat.TOUTIAO.getCode(),EnumProfitSharing.PROFIT_SHARING_NO.getCode()),
; ;
public static EnumProductOrderPayVendor getEnum(Integer code) { public static EnumProductOrderPayVendor getEnum(Integer code) {


+ 1
- 1
suimangService/src/main/java/com/iformall/service/impl/ProductOrderPayServiceImpl.java Просмотреть файл

@@ -159,7 +159,7 @@ public class ProductOrderPayServiceImpl implements ProductOrderPayService {
PayAdapterResult payResult = payAdapterService.createPay(productOrderPay, appinfo, payAccount); PayAdapterResult payResult = payAdapterService.createPay(productOrderPay, appinfo, payAccount);
if(payResult.isSuccess()){ if(payResult.isSuccess()){
ProductOrderPay updPay = new ProductOrderPay(); ProductOrderPay updPay = new ProductOrderPay();
updPay.setId(productOrder.getId());
updPay.setId(productOrderPay.getId());
updPay.setTransactionId(payResult.getTransactionId()); updPay.setTransactionId(payResult.getTransactionId());
updPay.setUpdateDate(new Date()); updPay.setUpdateDate(new Date());
productOrderPayMapper.updateById(updPay); productOrderPayMapper.updateById(updPay);


+ 4
- 1
suimangService/src/main/java/com/iformall/service/pay/PayServiceFactory.java Просмотреть файл

@@ -5,6 +5,7 @@ import java.util.concurrent.ConcurrentHashMap;
import com.iformall.enums.EnumAppPlat; import com.iformall.enums.EnumAppPlat;
import com.iformall.enums.EnumPayVersion; import com.iformall.enums.EnumPayVersion;
import com.iformall.enums.EnumProductOrderPayVendor; import com.iformall.enums.EnumProductOrderPayVendor;
import com.iformall.service.pay.service.pay.ali.page.AliPagePayAdapterService;
import com.iformall.service.pay.service.pay.wx.v3.nativePay.WxNativePayV3AdapterService; import com.iformall.service.pay.service.pay.wx.v3.nativePay.WxNativePayV3AdapterService;
import com.iformall.service.pay.service.refund.ali.AliRefundAdapterService; import com.iformall.service.pay.service.refund.ali.AliRefundAdapterService;
import com.iformall.service.pay.service.refund.douyin.TtRefundAdapterService; import com.iformall.service.pay.service.refund.douyin.TtRefundAdapterService;
@@ -65,6 +66,8 @@ public class PayServiceFactory {
@Autowired @Autowired
WxNativePayV3AdapterService wxNativePayV3AdapterService; WxNativePayV3AdapterService wxNativePayV3AdapterService;


@Autowired
AliPagePayAdapterService aliPagePayAdapterService;


@Autowired @Autowired
WxMiniMaPayAdapterService wxMiniAppMaPayService; WxMiniMaPayAdapterService wxMiniAppMaPayService;
@@ -158,7 +161,7 @@ public class PayServiceFactory {
payVendorServiceMap.put(EnumProductOrderPayVendor.PAY_WAY_WECHAT.getCode()+"_", wxMiniAppPayV3AdapterService); payVendorServiceMap.put(EnumProductOrderPayVendor.PAY_WAY_WECHAT.getCode()+"_", wxMiniAppPayV3AdapterService);
payVendorServiceMap.put(EnumProductOrderPayVendor.PAY_WAY_WECHAT_NATIVE.getCode()+"_", wxNativePayV3AdapterService); payVendorServiceMap.put(EnumProductOrderPayVendor.PAY_WAY_WECHAT_NATIVE.getCode()+"_", wxNativePayV3AdapterService);
// payVendorServiceMap.put(EnumProductOrderPayVendor.PAY_WAY_ALIPAY.getCode()+"_", ); // payVendorServiceMap.put(EnumProductOrderPayVendor.PAY_WAY_ALIPAY.getCode()+"_", );
// payVendorServiceMap.put(EnumProductOrderPayVendor.PAY_WAY_ALIPAY_WAP.getCode()+"_",);
payVendorServiceMap.put(EnumProductOrderPayVendor.PAY_WAY_ALIPAY_WAP.getCode()+"_",aliPagePayAdapterService);
payVendorServiceMap.put(EnumProductOrderPayVendor.PAY_WAY_TT.getCode()+"_",ttMiniAppPayService); payVendorServiceMap.put(EnumProductOrderPayVendor.PAY_WAY_TT.getCode()+"_",ttMiniAppPayService);
} }
return payVendorServiceMap; return payVendorServiceMap;


+ 20
- 13
suimangService/src/main/java/com/iformall/service/pay/service/pay/ali/BaseAliPayAdapterService.java Просмотреть файл

@@ -2,6 +2,7 @@ package com.iformall.service.pay.service.pay.ali;


import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.alipay.api.AlipayApiException;
import com.alipay.api.AlipayClient; import com.alipay.api.AlipayClient;
import com.alipay.api.request.AlipayTradeQueryRequest; import com.alipay.api.request.AlipayTradeQueryRequest;
import com.alipay.api.response.AlipayTradeQueryResponse; import com.alipay.api.response.AlipayTradeQueryResponse;
@@ -48,22 +49,28 @@ public class BaseAliPayAdapterService {
bizContent.put("out_trade_no", orderPay.getOrderNumber()); bizContent.put("out_trade_no", orderPay.getOrderNumber());


request.setBizContent(bizContent.toString()); request.setBizContent(bizContent.toString());
AlipayTradeQueryResponse response = alipayClient.execute(request);
try{
AlipayTradeQueryResponse response = alipayClient.execute(request);


if(response.isSuccess()){
if("10000".equals(response.getCode())){
PayQueryAdapterResult result = new PayQueryAdapterResult();
result.setCode(getPayStatusFrom(response.getTradeStatus()));
result.setTransactionId(response.getTradeNo());
return result;
}
if("ACQ.TRADE_NOT_EXIST".equals(response.getSubCode())){
PayQueryAdapterResult result = new PayQueryAdapterResult();
result.setCode(EnumPayOrderStatus.ORDER_STATUS_PENDING_PAYMENT.getCode());
result.setMsg(EnumPayOrderStatus.ORDER_STATUS_PENDING_PAYMENT.getMessage());
return result;
if(response.isSuccess()){
if("10000".equals(response.getCode())){
PayQueryAdapterResult result = new PayQueryAdapterResult();
result.setCode(getPayStatusFrom(response.getTradeStatus()));
result.setTransactionId(response.getTradeNo());
return result;
}
if("ACQ.TRADE_NOT_EXIST".equals(response.getSubCode())){
PayQueryAdapterResult result = new PayQueryAdapterResult();
result.setCode(EnumPayOrderStatus.ORDER_STATUS_PENDING_PAYMENT.getCode());
result.setMsg(EnumPayOrderStatus.ORDER_STATUS_PENDING_PAYMENT.getMessage());
return result;
}
} }

}catch(AlipayApiException e){
log.error("ali pay query error",e);
} }

throw new MallinkException(ErrorCode.PAY_ORDER_QUERY_ERROR); throw new MallinkException(ErrorCode.PAY_ORDER_QUERY_ERROR);
} }




+ 19
- 12
suimangService/src/main/java/com/iformall/service/pay/service/pay/ali/page/AliPagePayAdapterService.java Просмотреть файл

@@ -1,11 +1,14 @@
package com.iformall.service.pay.service.pay.ali.page; package com.iformall.service.pay.service.pay.ali.page;


import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.alipay.api.AlipayApiException;
import com.alipay.api.AlipayClient; import com.alipay.api.AlipayClient;
import com.alipay.api.request.AlipayTradePagePayRequest; import com.alipay.api.request.AlipayTradePagePayRequest;
import com.alipay.api.response.AlipayTradePagePayResponse; import com.alipay.api.response.AlipayTradePagePayResponse;
import com.iformall.common.ErrorCode;
import com.iformall.domain.po.*; import com.iformall.domain.po.*;
import com.iformall.enums.*; import com.iformall.enums.*;
import com.iformall.exception.MallinkException;
import com.iformall.service.order.OrderFactory; import com.iformall.service.order.OrderFactory;
import com.iformall.service.order.entity.WxComposeOrder; import com.iformall.service.order.entity.WxComposeOrder;
import com.iformall.service.pay.entity.PayExtraParam; import com.iformall.service.pay.entity.PayExtraParam;
@@ -66,21 +69,25 @@ public class AliPagePayAdapterService extends BaseAliPayAdapterService implement
bizContent.put("time_expire", after15); bizContent.put("time_expire", after15);


request.setBizContent(bizContent.toString()); request.setBizContent(bizContent.toString());
AlipayTradePagePayResponse response = alipayClient.pageExecute(request);
PayAdapterResult par = new PayAdapterResult();
if(response.isSuccess()){
if("10000".equals(response.getCode())){
par.setSuccess(true);
par.setTransactionId(response.getTradeNo());
par.setData(response);
}else{
par.setSuccess(false);
par.setMsg(response.getMsg());
try{
AlipayTradePagePayResponse response = alipayClient.pageExecute(request);
PayAdapterResult par = new PayAdapterResult();
if(response.isSuccess()){
if("10000".equals(response.getCode())){
par.setSuccess(true);
par.setTransactionId(response.getTradeNo());
par.setData(response);
}
} }
} else {
par.setSuccess(false); par.setSuccess(false);
par.setMsg(response.getMsg());
return par;
}catch(AlipayApiException e){
log.error("ali pay error",e);
throw new MallinkException(ErrorCode.PAY_ORDER_ERROR.getCode(),e.getMessage());
} }
return par;


} }


@Override @Override


+ 1
- 1
suimangService/src/main/java/com/iformall/service/pay/service/pay/wx/v3/nativePay/WxNativePayV3AdapterService.java Просмотреть файл

@@ -107,7 +107,7 @@ public class WxNativePayV3AdapterService extends BaseWxPayV3AdapterService imple
return getOrderPResult(response,payService,appInfo,payAccount,orderPay.getOrderNumber()); return getOrderPResult(response,payService,appInfo,payAccount,orderPay.getOrderNumber());
}catch(WxPayException e) { }catch(WxPayException e) {
log.error("wexin pay v3 error",e); log.error("wexin pay v3 error",e);
throw new MallinkException(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),e.getCustomErrorMsg());
throw new MallinkException(ErrorCode.PAY_ORDER_ERROR.getCode(),e.getCustomErrorMsg());
} }
} }




+ 11
- 0
suimangService/src/main/java/com/iformall/service/sm/ServiceVideoRecordService.java Просмотреть файл

@@ -1,4 +1,15 @@
package com.iformall.service.sm; package com.iformall.service.sm;


import com.iformall.domain.dto.neuver.SaveServiceVideoRecordDTO;

/**
* @author xmzhao71
* @date 2023-10-20
*/
public interface ServiceVideoRecordService { public interface ServiceVideoRecordService {

/**
* @param dto
*/
void saveServiceVideoRecord(SaveServiceVideoRecordDTO dto);
} }

+ 12
- 0
suimangService/src/main/java/com/iformall/service/sm/impl/ServiceVideoRecordServiceImpl.java Просмотреть файл

@@ -1,8 +1,20 @@
package com.iformall.service.sm.impl; package com.iformall.service.sm.impl;


import com.iformall.domain.dto.neuver.SaveServiceVideoRecordDTO;
import com.iformall.domain.po.sm.ServiceVideoRecord;
import com.iformall.mapper.ServiceVideoRecordMapper;
import com.iformall.service.sm.ServiceVideoRecordService; import com.iformall.service.sm.ServiceVideoRecordService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;


@Service @Service
public class ServiceVideoRecordServiceImpl implements ServiceVideoRecordService { public class ServiceVideoRecordServiceImpl implements ServiceVideoRecordService {

@Autowired
private ServiceVideoRecordMapper serviceVideoRecordMapper;

@Override
public void saveServiceVideoRecord(SaveServiceVideoRecordDTO dto) {
serviceVideoRecordMapper.insert(SaveServiceVideoRecordDTO.mapping(dto));
}
} }

+ 2
- 1
suimangService/src/main/java/com/iformall/utils/Constant.java Просмотреть файл

@@ -69,7 +69,8 @@ public class Constant {
public static final String APP_Id = "APP_Id"; public static final String APP_Id = "APP_Id";
public static final String APP_NAME = "APP_NAME"; public static final String APP_NAME = "APP_NAME";
public static final String APP_INFO = "APPINFO"; public static final String APP_INFO = "APPINFO";
public static final String SERVICE_ID = "SERVICE_ID";

public static final String LOGIN_B_USER_KEY = "LOGIN_B_USER_KEY"; public static final String LOGIN_B_USER_KEY = "LOGIN_B_USER_KEY";






Загрузка…
Отмена
Сохранить