国际支付

src/main/java/com/fdkankan/ucenter/entity/AgentNewLog.java

@@ -0,0 +1,67 @@
+package com.fdkankan.ucenter.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 
+ * @since 2022-11-23
+ */
+@Getter
+@Setter
+@TableName("t_agent_new_log")
+public class AgentNewLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 代理商授权用户日志表
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @TableField("agent_id")
+    private Integer agentId;
+
+    /**
+     * 0专业会员，1高级会员，2场景下载
+     */
+    @TableField("type")
+    private Integer type;
+
+    /**
+     * 授权对象id
+     */
+    @TableField("user_id")
+    private Integer userId;
+
+    /**
+     * 授权次数
+     */
+    @TableField("count")
+    private Integer count;
+
+    @TableField("create_time")
+    private Date createTime;
+
+    @TableField("update_time")
+    private Date updateTime;
+
+    /**
+     * 0 经销商授权，1经销商续费,2官网自购，3平台授权
+     */
+    @TableField("give_type")
+    private Integer giveType;
+
+
+}

src/main/java/com/fdkankan/ucenter/generate/AutoGenerate.java

@@ -18,7 +18,7 @@ public class AutoGenerate {
         String path =System.getProperty("user.dir") ;
 
         generate(path,"ucenter", getTables(new String[]{
-                "t_auth_license",
+                "t_agent_new_log",
         }));
 
 //        generate(path,"goods", getTables(new String[]{

src/main/java/com/fdkankan/ucenter/mapper/IAgentNewLogMapper.java

@@ -0,0 +1,18 @@
+package com.fdkankan.ucenter.mapper;
+
+import com.fdkankan.ucenter.entity.AgentNewLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2022-11-23
+ */
+@Mapper
+public interface IAgentNewLogMapper extends BaseMapper<AgentNewLog> {
+
+}

src/main/java/com/fdkankan/ucenter/service/IAgentNewLogService.java

@@ -0,0 +1,16 @@
+package com.fdkankan.ucenter.service;
+
+import com.fdkankan.ucenter.entity.AgentNewLog;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 
+ * @since 2022-11-23
+ */
+public interface IAgentNewLogService extends IService<AgentNewLog> {
+
+}

src/main/java/com/fdkankan/ucenter/service/impl/AgentNewLogServiceImpl.java

@@ -0,0 +1,20 @@
+package com.fdkankan.ucenter.service.impl;
+
+import com.fdkankan.ucenter.entity.AgentNewLog;
+import com.fdkankan.ucenter.mapper.IAgentNewLogMapper;
+import com.fdkankan.ucenter.service.IAgentNewLogService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2022-11-23
+ */
+@Service
+public class AgentNewLogServiceImpl extends ServiceImpl<IAgentNewLogMapper, AgentNewLog> implements IAgentNewLogService {
+
+}

src/main/java/com/fdkankan/ucenter/service/impl/OrderServiceImpl.java

@@ -70,6 +70,8 @@ public class OrderServiceImpl extends ServiceImpl<IOrderMapper, Order> implement
     IDownloadOrderService downloadOrderService;
     @Autowired
     IIncrementTypeService incrementTypeService;
+    @Autowired
+    IOrderService orderService;
 
     @Override
     public PageInfo pageList(OrderParam param) {
@@ -264,11 +266,28 @@ public class OrderServiceImpl extends ServiceImpl<IOrderMapper, Order> implement
                 break;
             // paypal
             case 2:
-                orderSn = orderSn.split("_")[0];
-                log.warn("paypal out_trade_no：" + orderSn);
-                Order orderEntity = this.getByOrderSn(orderSn);
-                if (PaymentStatus.paid.name().equals(orderEntity.getPaymentStatus())){
-                    success = true;
+                String[] str = orderSn.split("_");
+                orderSn = str[0];
+                String key = str[1];
+
+                if(key.equals("increment")){
+                    log.warn("paypal out_trade_no：" + orderSn);
+                    IncrementOrder orderEntity = incrementOrderService.getByOrderSn(orderSn);
+                    if (orderEntity.getPayStatus().equals(1)){
+                        success = true;
+                    }
+                } else if(key.equals("download")) {
+                    log.warn("paypal out_trade_no：" + orderSn);
+                    DownloadOrder orderEntity = downloadOrderService.getByOrderSn(orderSn);
+                    if (orderEntity.getPayStatus().equals(1)) {
+                        success = true;
+                    }
+                }else{
+                    log.warn("paypal out_trade_no：" + orderSn);
+                    Order orderEntity = orderService.getByOrderSn(orderSn);
+                    if (PaymentStatus.paid.name().equals(orderEntity.getPaymentStatus())){
+                        success = true;
+                    }
                 }
                 break;
         }

src/main/resources/mapper/ucenter/AgentNewLogMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fdkankan.ucenter.mapper.IAgentNewLogMapper">
+
+</mapper>