退款时，如果用户已删除，去取删除表用户

jsjp-admin/src/main/java/com/miaxis/app/controller/wx/WxJsjpController.java

@@ -11,12 +11,9 @@ import com.miaxis.common.core.domain.entity.SysDictData;
 import com.miaxis.common.enums.OrderStatusEnum;
 import com.miaxis.common.exception.CustomException;
 import com.miaxis.common.utils.uuid.CommonUtils;
-import com.miaxis.newgzpt.domain.GzptSchActivation;
-import com.miaxis.newgzpt.domain.GzptSchPayConfig;
 import com.miaxis.newgzpt.domain.GzptUserInfo;
 import com.miaxis.newgzpt.service.IGzptSchActivationService;
 import com.miaxis.newgzpt.service.IGzptSchPayConfigService;
-import com.miaxis.newgzpt.service.IGzptSchPayLogService;
 import com.miaxis.newgzpt.service.IGzptUserInfoService;
 import com.miaxis.system.service.ISysDictDataService;
 import com.miaxis.wx.domain.WxJsOrder;
@@ -46,7 +43,6 @@ import java.io.File;
 import java.security.PrivateKey;
 import java.security.Signature;
 import java.util.Base64;
-import java.util.Date;
 
 import static com.miaxis.common.utils.OrderCodeFactory.getOrderCode;
 

jsjp-service/src/main/java/com/miaxis/newgzpt/domain/GzptSchPayLog.java

@@ -77,7 +77,7 @@ public class GzptSchPayLog implements Serializable {
     @TableField("CREATE_ID")
     private Long createId;
 
-    @ApiModelProperty(value = "创建人ID")
+    @ApiModelProperty(value = "驾校提成")
     @TableField("SCHOOL_COMMISSION")
     private Integer schoolCommission;
 

jsjp-service/src/main/java/com/miaxis/newgzpt/domain/GzptUserInfoDel.java

@@ -0,0 +1,161 @@
+package com.miaxis.newgzpt.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 学员基本信息表
+ * </p>
+ *
+ * @author ${author}
+ * @since 2021-03-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("GZPT_USER_INFO_Del")
+@ApiModel(value="GzptUserInfoDel对象", description="学员基本信息删除表")
+public class GzptUserInfoDel implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId("ID")
+    private Long id;
+
+    @ApiModelProperty(value = "姓名")
+    @TableField("USER_NAME")
+    private String userName;
+
+    @ApiModelProperty(value = "性别 男 或 女")
+    @TableField("SEX")
+    private String sex;
+
+    @ApiModelProperty(value = "登录账号")
+    @TableField("LOGINCODE")
+    private String logincode;
+
+    @ApiModelProperty(value = "绑定手机号")
+    @TableField("TELPHONE")
+    private String telphone;
+
+    @ApiModelProperty(value = "申请车型")
+    @TableField("CARTYPE")
+    private String cartype;
+
+    @ApiModelProperty(value = "出生日期")
+    @TableField("BIRTHDAY")
+    private String birthday;
+
+    @ApiModelProperty(value = "电子邮箱")
+    @TableField("EMAIL")
+    private String email;
+
+    @ApiModelProperty(value = "登录密码 MD5加密")
+    @TableField("PASSWORD")
+    private String password;
+
+    @ApiModelProperty(value = "联系地址")
+    @TableField("ADDRESS")
+    private String address;
+
+    @ApiModelProperty(value = "照片 全路径为学员照片或QQ或微信读取全路径")
+    @TableField("PHOTO")
+    private String photo;
+
+    @ApiModelProperty(value = "用户昵称")
+    @TableField("NICKNAME")
+    private String nickname;
+
+    @ApiModelProperty(value = "归属驾校")
+    @TableField("SCHOOL")
+    private String school;
+
+    @ApiModelProperty(value = "归属驾校名称")
+    @TableField("SCHOOL_NAME")
+    private String schoolName;
+
+    @ApiModelProperty(value = "归属地区")
+    @TableField("CITY")
+    private String city;
+
+    @ApiModelProperty(value = "归属地区名称")
+    @TableField("CITY_NAME")
+    private String cityName;
+
+    @ApiModelProperty(value = "归属区县")
+    @TableField("COUNTRY")
+    private String country;
+
+    @ApiModelProperty(value = "归属区县名称")
+    @TableField("COUNTRY_NAME")
+    private String countryName;
+
+    @ApiModelProperty(value = "用户状态 0 未激活 1 正常  2 锁定 4 注销")
+    @TableField("STATUS")
+    private String status;
+
+    @ApiModelProperty(value = "外部系统主健ID 如果platForm=1")
+    @TableField("OUT_ID")
+    private Long outId;
+
+    @ApiModelProperty(value = "系统版本号 软件版本号")
+    @TableField("VERSION")
+    private String version;
+
+    @ApiModelProperty(value = "版本类型 1 安卓 2 IOS")
+    @TableField("APPTYPE")
+    private String apptype;
+
+    @ApiModelProperty(value = "手机操作系统版本")
+    @TableField("SYSTEM_VERSION")
+    private String systemVersion;
+
+    @ApiModelProperty(value = "注册时间")
+    @TableField("CRDATE")
+    private Date crdate;
+
+    @ApiModelProperty(value = "培训阶段 1、第一阶段 2、第二阶段 3、第三阶段 4、第四阶段")
+    @TableField("PXJD")
+    private Integer pxjd;
+
+    @ApiModelProperty(value = "MD5加密的支付密码")
+    @TableField("PAY_PWD")
+    private String payPwd;
+
+    @TableField("SYNC")
+    private String sync;
+
+    @ApiModelProperty(value = "模拟训练激活状态 0 未激活 1 已激活")
+    @TableField("MN_STATUS")
+    private Integer mnStatus;
+
+    @ApiModelProperty(value = "远程教育激活状态 0 未激活 1 已激活")
+    @TableField("EDU_STATUS")
+    private Integer eduStatus;
+
+    @ApiModelProperty(value = "小程序openin")
+    @TableField("OPEN_ID")
+    private String openId;
+
+    @ApiModelProperty(value = "小程序session_key")
+    @TableField("SESSION_KEY")
+    private String sessionKey;
+
+
+    @ApiModelProperty(value = "部分合作驾校的强执标志位")
+    @TableField("IS_SHARE")
+    private Integer isShare;
+
+    @ApiModelProperty(value = "创建人ID")
+    @TableField("OUT_CREATE_ID")
+    private Long outCreateId;
+
+}

jsjp-service/src/main/java/com/miaxis/newgzpt/mapper/GzptUserInfoDelMapper.java

@@ -0,0 +1,22 @@
+package com.miaxis.newgzpt.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.miaxis.newgzpt.domain.GzptUserInfo;
+import com.miaxis.newgzpt.domain.GzptUserInfoDel;
+import com.miaxis.newgzpt.dto.GzptUserInfoDTO;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 学员基本信息表 Mapper 接口
+ * </p>
+ *
+ * @author ${author}
+ * @since 2021-03-09
+ */
+public interface GzptUserInfoDelMapper extends BaseMapper<GzptUserInfoDel> {
+
+
+    GzptUserInfoDel getInfoDelById(Long id);
+}

jsjp-service/src/main/java/com/miaxis/newgzpt/service/IGzptUserInfoDelService.java

@@ -0,0 +1,25 @@
+package com.miaxis.newgzpt.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.miaxis.newgzpt.domain.GzptUserInfo;
+import com.miaxis.newgzpt.domain.GzptUserInfoDel;
+import com.miaxis.newgzpt.dto.GzptUserInfoDTO;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 学员基本信息表 服务类
+ * </p>
+ *
+ * @author ${author}
+ * @since 2021-03-09
+ */
+public interface IGzptUserInfoDelService extends IService<GzptUserInfoDel> {
+
+
+
+    GzptUserInfoDel getInfoDelById(Long id);
+
+
+}

jsjp-service/src/main/java/com/miaxis/newgzpt/service/IGzptUserInfoService.java

@@ -24,6 +24,4 @@ public interface IGzptUserInfoService extends IService<GzptUserInfo> {
     GzptUserInfo getInfoById(Long id);
 
 
-
-
 }

jsjp-service/src/main/java/com/miaxis/newgzpt/service/impl/GzptUserInfoDelServiceImpl.java

@@ -0,0 +1,40 @@
+package com.miaxis.newgzpt.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.miaxis.common.annotation.DataSource;
+import com.miaxis.common.enums.DataSourceTypeEnum;
+import com.miaxis.newgzpt.domain.GzptUserInfo;
+import com.miaxis.newgzpt.domain.GzptUserInfoDel;
+import com.miaxis.newgzpt.dto.GzptUserInfoDTO;
+import com.miaxis.newgzpt.mapper.GzptUserInfoDelMapper;
+import com.miaxis.newgzpt.mapper.GzptUserInfoMapper;
+import com.miaxis.newgzpt.service.IGzptUserInfoDelService;
+import com.miaxis.newgzpt.service.IGzptUserInfoService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * <p>
+ * 学员基本信息表 服务实现类
+ * </p>
+ *
+ * @author ${author}
+ * @since 2021-03-09
+ */
+@Service
+@DataSource(value = DataSourceTypeEnum.NEWGZPT)
+public class GzptUserInfoDelServiceImpl extends ServiceImpl<GzptUserInfoDelMapper, GzptUserInfoDel> implements IGzptUserInfoDelService {
+
+
+    @Resource
+    private GzptUserInfoDelMapper mapper;
+
+
+
+    @Override
+    public GzptUserInfoDel getInfoDelById(Long id) {
+        return  mapper.getInfoDelById(id);
+    }
+}

jsjp-service/src/main/java/com/miaxis/order/service/impl/OrderInfoServiceImpl.java

@@ -4,11 +4,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.miaxis.newgzpt.domain.GzptSchActivation;
 import com.miaxis.newgzpt.domain.GzptSchPayLog;
 import com.miaxis.newgzpt.domain.GzptUserInfo;
-import com.miaxis.newgzpt.mapper.GzptSchActivationMapper;
-import com.miaxis.newgzpt.service.IGzptSchActivationService;
-import com.miaxis.newgzpt.service.IGzptSchPayConfigService;
-import com.miaxis.newgzpt.service.IGzptSchPayLogService;
-import com.miaxis.newgzpt.service.IGzptUserInfoService;
+import com.miaxis.newgzpt.domain.GzptUserInfoDel;
+import com.miaxis.newgzpt.service.*;
 import com.miaxis.order.domain.OrderInfo;
 import com.miaxis.order.dto.QuerySchoolOrderListDTO;
 import com.miaxis.order.mapper.OrderInfoMapper;
@@ -18,6 +15,7 @@ import com.miaxis.order.vo.QuerySchoolOrderListVo;
 import com.miaxis.userInfo.domain.UserVip;
 import com.miaxis.userInfo.service.IUserVipService;
 import com.miaxis.wx.domain.WxJsOrder;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -41,6 +39,10 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
     @Autowired
     private IGzptUserInfoService userInfoService;
 
+    @Autowired
+    private IGzptUserInfoDelService userInfoDelService;
+
+
     @Autowired
     private IGzptSchActivationService schActivationService;
 
@@ -1353,6 +1355,11 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
         Date now = new Date();
 
         GzptUserInfo userInfo = userInfoService.getInfoById(order.getUserId());
+        if(userInfo==null){
+            GzptUserInfoDel userInfoDel = userInfoDelService.getInfoDelById(order.getUserId());
+            BeanUtils.copyProperties(userInfoDel,userInfo);
+        }
+
         int isActiva = schActivationService.isSchActivation(order.getUserId());
         if ("理论实操计时".equals(order.getGoodsName())) {
             //删除激活

jsjp-service/src/main/resources/mapper/newgzpt/GzptUserInfoDelMapper.xml

@@ -0,0 +1,15 @@
+<?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.miaxis.newgzpt.mapper.GzptUserInfoDelMapper">
+
+
+
+
+    <select id="getInfoDelById"  resultType="com.miaxis.newgzpt.domain.GzptUserInfoDel">
+        select * from GZPT_USER_INFO where id =#{id,jdbcType=NUMERIC}
+    </select>
+
+
+
+
+</mapper>