123
This commit is contained in:
@@ -0,0 +1,25 @@
|
||||
package com.ruoyi.cai.service;
|
||||
|
||||
import com.alibaba.fastjson2.JSONObject;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.ruoyi.cai.domain.OrderLogs;
|
||||
import com.ruoyi.cai.trdpay.TrdPayTypeEnum;
|
||||
|
||||
/**
|
||||
* 订单日志Service接口
|
||||
*
|
||||
* @author 77
|
||||
* @date 2024-12-13
|
||||
*/
|
||||
public interface OrderLogsService extends IService<OrderLogs> {
|
||||
|
||||
void createOrderLogs(String orderNo, String stepName, String flag, String inParams, String outParams);
|
||||
|
||||
void createOrderLogsNoFlag(String orderNo, String stepName, String inParams, String outParams);
|
||||
|
||||
void createBaseFail(String orderNo, String stepName, String remark);
|
||||
|
||||
void createBaseSuccess(String orderNo, String stepName);
|
||||
|
||||
void createAliPayLogs(String orderNo, String inParams, JSONObject jsonObject, TrdPayTypeEnum typeEnum);
|
||||
}
|
||||
@@ -0,0 +1,89 @@
|
||||
package com.ruoyi.cai.service.impl;
|
||||
|
||||
import com.alibaba.fastjson.JSON;
|
||||
import com.alibaba.fastjson2.JSONObject;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.ruoyi.cai.domain.OrderLogs;
|
||||
import com.ruoyi.cai.mapper.OrderLogsMapper;
|
||||
import com.ruoyi.cai.service.OrderLogsService;
|
||||
import com.ruoyi.cai.trdpay.TrdPayTypeEnum;
|
||||
import lombok.Data;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
/**
|
||||
* 订单日志Service业务层处理
|
||||
*
|
||||
* @author 77
|
||||
* @date 2024-12-13
|
||||
*/
|
||||
@Service
|
||||
public class OrderLogsServiceImpl extends ServiceImpl<OrderLogsMapper, OrderLogs> implements OrderLogsService {
|
||||
|
||||
@Override
|
||||
public void createOrderLogs(String orderNo, String stepName, String flag, String inParams, String outParams){
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void createOrderLogsNoFlag(String orderNo, String stepName, String inParams, String outParams){
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void createBaseFail(String orderNo, String stepName, String remark){
|
||||
OrderLogs orderLogs = new OrderLogs();
|
||||
orderLogs.setOrderNo(orderNo);
|
||||
orderLogs.setStepName(stepName);
|
||||
orderLogs.setSuccess("失败");
|
||||
orderLogs.setRemark(remark);
|
||||
this.save(orderLogs);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void createBaseSuccess(String orderNo, String stepName){
|
||||
OrderLogs orderLogs = new OrderLogs();
|
||||
orderLogs.setOrderNo(orderNo);
|
||||
orderLogs.setStepName(stepName);
|
||||
orderLogs.setSuccess("成功");
|
||||
this.save(orderLogs);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void createAliPayLogs(String orderNo, String inParams, JSONObject jsonObject, TrdPayTypeEnum typeEnum){
|
||||
OrderLogs orderLogs = new OrderLogs();
|
||||
orderLogs.setOrderNo(orderNo);
|
||||
orderLogs.setStepName("四方支付宝支付请求日志");
|
||||
orderLogs.setSuccess("请求日志");
|
||||
orderLogs.setInParams(JSON.toJSONString(new UrlJson(inParams)));
|
||||
orderLogs.setOutParams(JSON.toJSONString(jsonObject));
|
||||
orderLogs.setFlagName(typeEnum.name());
|
||||
if(typeEnum == TrdPayTypeEnum.V1) { // V1
|
||||
if(!"SUCCESS".equals(jsonObject.getString("retCode"))){
|
||||
orderLogs.setSuccess("失败");
|
||||
}
|
||||
}else if(typeEnum == TrdPayTypeEnum.V2){
|
||||
if(!"0".equals(jsonObject.getString("retCode"))){
|
||||
orderLogs.setSuccess("失败");
|
||||
}
|
||||
}else if(typeEnum == TrdPayTypeEnum.V3){
|
||||
if(!"SUCCESS".equals(jsonObject.getString("retCode"))){
|
||||
orderLogs.setSuccess("失败");
|
||||
}
|
||||
}
|
||||
orderLogs.setSuccess("成功");
|
||||
this.save(orderLogs);
|
||||
}
|
||||
|
||||
@Data
|
||||
public static class UrlJson{
|
||||
private String url;
|
||||
|
||||
public UrlJson() {
|
||||
}
|
||||
|
||||
public UrlJson(String url) {
|
||||
this.url = url;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -10,6 +10,7 @@ import com.ruoyi.cai.pay.PayManager;
|
||||
import com.ruoyi.cai.pay.PayOrderInfoDTO;
|
||||
import com.ruoyi.cai.pay.PayReturnResp;
|
||||
import com.ruoyi.cai.pay.PayTypeEnum;
|
||||
import com.ruoyi.cai.service.OrderLogsService;
|
||||
import com.ruoyi.cai.service.PayTrdConfigService;
|
||||
import com.ruoyi.cai.trdpay.TrdPayManager;
|
||||
import com.ruoyi.cai.trdpay.TrdPayTypeEnum;
|
||||
@@ -37,6 +38,8 @@ public class PayTrdConfigServiceImpl extends ServiceImpl<PayTrdConfigMapper, Pay
|
||||
private TrdPayManager trdPayManager;
|
||||
@Autowired
|
||||
private PayManager payManager;
|
||||
@Autowired
|
||||
private OrderLogsService orderLogsService;
|
||||
|
||||
@Override
|
||||
public PayReturnResp createOrderAli(PayOrderInfoDTO dto){
|
||||
|
||||
@@ -14,11 +14,13 @@ import com.ruoyi.cai.dto.commom.consumer.RechargeConsumerResp;
|
||||
import com.ruoyi.cai.enums.ConsumeLogType;
|
||||
import com.ruoyi.cai.enums.account.AccountChangeCodeEnum;
|
||||
import com.ruoyi.cai.enums.account.AccountTypeEnum;
|
||||
import com.ruoyi.cai.enums.version.VersionPlatformEnum;
|
||||
import com.ruoyi.cai.manager.IdManager;
|
||||
import com.ruoyi.cai.mapper.AccountMapper;
|
||||
import com.ruoyi.cai.mapper.RechargeOrderMapper;
|
||||
import com.ruoyi.cai.pay.*;
|
||||
import com.ruoyi.cai.service.*;
|
||||
import com.ruoyi.cai.util.VersionUtil;
|
||||
import com.ruoyi.common.core.domain.PageQuery;
|
||||
import com.ruoyi.common.exception.ServiceException;
|
||||
import com.ruoyi.common.helper.LoginHelper;
|
||||
@@ -79,6 +81,7 @@ public class RechargeOrderServiceImpl extends ServiceImpl<RechargeOrderMapper,Re
|
||||
throw new ServiceException("充值价格错误");
|
||||
}
|
||||
RechargeOrder order = new RechargeOrder();
|
||||
order.setDeviceType(VersionUtil.getVersionPlatformString());
|
||||
order.setUserId(addRechargeOrderDto.getUserId());
|
||||
order.setRechargeId(goods.getId());
|
||||
order.setRechargeName(goods.getName());
|
||||
|
||||
Reference in New Issue
Block a user