激活列表修改，修改gzpt激活表和日志表用mybatis保存

jsjp-admin/src/main/java/com/miaxis/pc/GzptSchActivationController.java

@@ -4,7 +4,9 @@ import com.miaxis.common.core.controller.BaseController;
 import com.miaxis.common.core.page.ResponsePageInfo;
 import com.miaxis.newgzpt.domain.GzptSchActivation;
 import com.miaxis.newgzpt.dto.GzptSchActivationDTO;
+import com.miaxis.newgzpt.dto.GzptSchActivationListDTO;
 import com.miaxis.newgzpt.service.IGzptSchActivationService;
+import com.miaxis.newgzpt.vo.GzptSchActivationListVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -40,9 +42,9 @@ public class GzptSchActivationController extends BaseController{
             @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
             @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
     })
-    public ResponsePageInfo<GzptSchActivation> list(@ModelAttribute GzptSchActivationDTO gzptSchActivationDTO){
+    public ResponsePageInfo<GzptSchActivationListVO> list(@ModelAttribute GzptSchActivationListDTO schActivationListDTO){
         startPage();
-        List<GzptSchActivation> list = gzptSchActivationService.selectSchActivationList(gzptSchActivationDTO);
+        List<GzptSchActivationListVO> list = gzptSchActivationService.selectSchActivationList(schActivationListDTO);
         return toResponsePageInfo(list);
     }
 

jsjp-service/src/main/java/com/miaxis/newgzpt/dto/GzptSchActivationListDTO.java

@@ -0,0 +1,40 @@
+package com.miaxis.newgzpt.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 学员基本信息表
+ * </p>
+ *
+ * @author ${author}
+ * @since 2021-03-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class GzptSchActivationListDTO implements Serializable {
+
+
+    @ApiModelProperty(value = "学员ID")
+    private Long userId;
+
+    @ApiModelProperty(value = "学员姓名")
+    private String userName;
+
+    @ApiModelProperty(value = "身份证号码")
+    private String logincode;
+
+    @ApiModelProperty(value = "地区名称")
+    private String dqmc;
+
+    @ApiModelProperty(value = "驾校名称")
+    private String jxmc;
+
+    @ApiModelProperty(value = "是否已经删除 0正常 1已删除")
+    private Integer isDel;
+
+}

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

@@ -3,8 +3,13 @@ package com.miaxis.newgzpt.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.miaxis.newgzpt.domain.GzptSchActivation;
+import com.miaxis.newgzpt.dto.GzptSchActivationDTO;
+import com.miaxis.newgzpt.dto.GzptSchActivationListDTO;
+import com.miaxis.newgzpt.vo.GzptSchActivationListVO;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * 视频VIP表 Mapper 接口
@@ -23,4 +28,6 @@ public interface GzptSchActivationMapper extends BaseMapper<GzptSchActivation> {
     void delSchActivationByUserId(Long userId);
 
     void upDelSchActivationByUserId(@Param("userId")Long stuId,@Param("state")Integer state);
+
+    List<GzptSchActivationListVO> selectSchActivationList(GzptSchActivationListDTO schActivationListDTO);
 }

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

@@ -4,6 +4,8 @@ package com.miaxis.newgzpt.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.miaxis.newgzpt.domain.GzptSchActivation;
 import com.miaxis.newgzpt.dto.GzptSchActivationDTO;
+import com.miaxis.newgzpt.dto.GzptSchActivationListDTO;
+import com.miaxis.newgzpt.vo.GzptSchActivationListVO;
 
 import java.util.List;
 
@@ -26,5 +28,5 @@ public interface IGzptSchActivationService extends IService<GzptSchActivation> {
 
     void upDelSchActivationByUserId(Long userId,Integer state);
 
-    List<GzptSchActivation> selectSchActivationList(GzptSchActivationDTO gzptSchActivationDTO);
+    List<GzptSchActivationListVO> selectSchActivationList(GzptSchActivationListDTO schActivationDTO);
 }

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

@@ -7,8 +7,11 @@ import com.miaxis.common.enums.DataSourceTypeEnum;
 import com.miaxis.common.utils.StringUtils;
 import com.miaxis.newgzpt.domain.GzptSchActivation;
 import com.miaxis.newgzpt.dto.GzptSchActivationDTO;
+import com.miaxis.newgzpt.dto.GzptSchActivationListDTO;
 import com.miaxis.newgzpt.mapper.GzptSchActivationMapper;
 import com.miaxis.newgzpt.service.IGzptSchActivationService;
+import com.miaxis.newgzpt.vo.GzptSchActivationListVO;
+import com.miaxis.newgzpt.vo.GzptSchActivationVO;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -61,19 +64,12 @@ public class GzptSchActivationServiceImpl extends ServiceImpl<GzptSchActivationM
     public void upDelSchActivationByUserId(Long userId,Integer state) { mapper.upDelSchActivationByUserId(userId,state); }
 
     @Override
-    public List<GzptSchActivation> selectSchActivationList(GzptSchActivationDTO gzptSchActivationDTO) {
-        QueryWrapper<GzptSchActivation> queryWrapper = new QueryWrapper<GzptSchActivation>();
-        if (!StringUtils.isEmpty(gzptSchActivationDTO.getJxmc())){;
-            queryWrapper.like("JXMC",gzptSchActivationDTO.getJxmc());
-        }
-        if (gzptSchActivationDTO.getUserId()!=null){;
-            queryWrapper.eq("USER_ID",gzptSchActivationDTO.getUserId());
-        }
-        if (gzptSchActivationDTO.getIsDel()!=null){;
-            queryWrapper.eq("IS_DEL",gzptSchActivationDTO.getIsDel());
-        }
-        List<GzptSchActivation> list = this.list(queryWrapper);
-        return list;
+    public List<GzptSchActivationListVO> selectSchActivationList(GzptSchActivationListDTO schActivationDTO) {
+        List<GzptSchActivationListVO> schActivationList = mapper.selectSchActivationList(schActivationDTO);
+        return schActivationList;
     }
 
+
+
+
 }

jsjp-service/src/main/java/com/miaxis/newgzpt/vo/GzptSchActivationListVO.java

@@ -0,0 +1,59 @@
+package com.miaxis.newgzpt.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+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)
+public class GzptSchActivationListVO implements Serializable {
+
+
+
+
+    @ApiModelProperty(value = "学员ID")
+    private Long userId;
+
+    @ApiModelProperty(value = "学员姓名")
+    private String userName;
+
+    @ApiModelProperty(value = "登录号 身份证号码")
+    private String loginCode;
+
+    @ApiModelProperty(value = "地区名称")
+    private String dqmc;
+
+    @ApiModelProperty(value = "驾校编号")
+    private String jxbh;
+
+    @ApiModelProperty(value = "驾校名称")
+    private String jxmc;
+
+    @ApiModelProperty(value = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date crTime;
+
+    @ApiModelProperty(value = "创建时间")
+    private Integer sync;
+
+    @ApiModelProperty(value = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date syncTime;
+
+    @ApiModelProperty(value = "是否已经删除 0正常 1已删除")
+    private Integer isDel;
+
+
+}

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

@@ -4,6 +4,7 @@ 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;
@@ -1761,7 +1762,8 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
         schPayLog.setState(state); // 1充值  2退款
         schPayLog.setGoodsName(order.getGoodsName());
         schPayLog.setOutTradeNo(order.getOutTradeNo());
-        schPayLogService.saveSchPayLog(schPayLog);
+        schPayLogService.save(schPayLog);
+        //schPayLogService.saveSchPayLog(schPayLog);
     }
 
     /**
@@ -1778,7 +1780,8 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
         schActivation.setUserId(order.getUserId());
         schActivation.setStuId(gzptUserInfo.getOutId());
         schActivation.setCrtime(new Date());
-        schActivationService.saveSchActivation(schActivation);
+        schActivationService.save(schActivation);
+        //schActivationService.saveSchActivation(schActivation);
     }
 
     private void delActiva(Long userId) {

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

@@ -2,6 +2,20 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.miaxis.newgzpt.mapper.GzptSchActivationMapper">
 
+    <resultMap type="GzptSchActivation" id="GzptSchActivationResult">
+        <result property="id"    column="id"    />
+        <result property="dqbh"    column="dqbh"    />
+        <result property="dqmc"    column="dqmc"    />
+        <result property="jxbh"    column="jxbh"    />
+        <result property="jxmc"    column="jxmc"    />
+        <result property="userId"    column="user_id"    />
+        <result property="stuId"    column="stu_id"    />
+        <result property="crtime"    column="crtime"    />
+        <result property="sync"    column="sync"    />
+        <result property="syncTime"    column="sync_time"    />
+        <result property="isDel"    column="IS_DEL"    />
+    </resultMap>
+
 
     <insert id="saveSchActivation" parameterType="com.miaxis.newgzpt.domain.GzptSchActivation">
 
@@ -28,6 +42,32 @@
 
 
 
+    <select id="selectSchActivationList" resultType="com.miaxis.newgzpt.vo.GzptSchActivationListVO">
+        select g.user_id,
+               u.user_name,
+               u.logincode,
+               g.dqmc,
+               g.jxbh,
+               g.jxmc,
+               g.crtime,
+               g.sync,
+               g.synctime,
+               g.is_del
+        from gzpt_sch_activation g
+                 join gzpt_user_info u
+                      on g.user_id = u.id
+        <where>
+            <if test="userId!=null"> and g.user_id = #{userId} </if>
+            <if test="userName!=null and userName!=''"> and u.user_name like '%' || #{userName,jdbcType=VARCHAR} || '%' </if>
+            <if test="logincode!=null and logincode!=''"> and u.logincode like '%' ||  #{logincode,jdbcType=VARCHAR} || '%' </if>
+            <if test="dqmc!= null  and dqmc!=''"> and g.dqmc = #{dqmc,jdbcType=VARCHAR}</if>
+            <if test="jxmc!= null  and jxmc!=''"> and g.jxmc like '%' ||  #{jxmc,jdbcType=VARCHAR} || '%'</if>
+            <if test="isDel!= null"> and g.is_del =#{isDel} </if>
+        </where>
+
+    </select>
+
+
 
     <select id="getSchActivation" resultType="com.miaxis.newgzpt.domain.GzptSchActivation">
         select * from GZPT_SCH_ACTIVATION where user_id = #{userId}