Merge remote-tracking branch 'origin/master'

# Conflicts:
#	jsjp-admin/src/main/java/com/miaxis/app/controller/wx/WxNotifyController.java

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

@@ -0,0 +1,72 @@
+package com.miaxis.pc;
+
+import com.miaxis.common.core.controller.BaseController;
+import com.miaxis.common.core.domain.Response;
+import com.miaxis.common.core.page.ResponsePageInfo;
+import com.miaxis.newgzpt.domain.GzptSchPayConfig;
+import com.miaxis.newgzpt.dto.GzptSchPayConfigDTO;
+import com.miaxis.newgzpt.dto.GzptSchPayConfigUpDTO;
+import com.miaxis.newgzpt.service.IGzptSchPayConfigService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 【订单信息】Controller
+ *
+ * @author miaxis
+ * @date 2022-06-07
+ */
+@RestController
+@RequestMapping("/config/info")
+@Api(tags={"【PC-驾校配置】"})
+public class PcSchPayConfigController extends BaseController{
+
+
+    @Autowired
+    private IGzptSchPayConfigService schPayConfigService;
+
+
+    /**
+     * 查询订单信息列表
+     * @return
+     */
+    @GetMapping("/list")
+    @ApiOperation("查询驾校合作配置信息列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
+            @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
+    })
+    public ResponsePageInfo<GzptSchPayConfig> list(@ModelAttribute GzptSchPayConfigDTO spDTO){
+        startPage();
+        List<GzptSchPayConfig> list = schPayConfigService.selectSchPayConfigList(spDTO);
+        return toResponsePageInfo(list);
+    }
+
+    /**
+     * （测试专用）清除学员激活状态与会员信息接口
+     */
+    @GetMapping("/upSchPayConfig")
+    @ApiOperation("更新驾校合作配置")
+    public Response upSchPayConfig(GzptSchPayConfigUpDTO spDTO) throws Exception {
+        schPayConfigService.updateSchPayConfigByJxbh(spDTO);
+        return Response.success();
+    }
+
+
+
+
+
+
+
+
+
+}

jsjp-admin/src/main/resources/application.yml

@@ -180,6 +180,8 @@ pagehelper:
   reasonable: true
   supportMethodsArguments: true
   params: count=countSql
+  autoDialect: true
+  autoRuntimeDialect: true
 
 # Swagger配置
 swagger:

jsjp-framework/src/main/java/com/miaxis/framework/aspectj/LogFileAspect.java

@@ -2,7 +2,6 @@ package com.miaxis.framework.aspectj;
 
 import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSON;
-import com.miaxis.common.utils.ServletUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.ProceedingJoinPoint;
@@ -12,7 +11,6 @@ import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.Arrays;
 
 @Aspect
 @Component
@@ -45,7 +43,7 @@ public class LogFileAspect {
     @AfterReturning(returning = "ret", pointcut = "logPoint()")// returning的值和doAfterReturning的参数名一致
     public void doAfterReturning(Object ret) throws Throwable {
         // 处理完请求，返回内容
-        //log.info("返回值 : " + JSON.toJSONString(ret));
+        log.info("返回值 : " + JSON.toJSONString(ret));
     }
 
     @Around("logPoint()")

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

@@ -54,11 +54,11 @@ public class GzptSchPayConfig implements Serializable {
 
     @ApiModelProperty(value = "是否打开")
     @TableField("IS_OPEN")
-    private String isOpen;
+    private Integer isOpen;
 
     @ApiModelProperty(value = "同步计时平台状态 0 待同步 1 同步成功 ")
     @TableField("SYNC")
-    private String sync;
+    private Integer sync;
 
     @ApiModelProperty(value = "同步时间 ")
     @TableField("SYNC_TIME")

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

@@ -0,0 +1,34 @@
+package com.miaxis.newgzpt.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+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 GzptSchPayConfigDTO implements Serializable {
+
+
+    @ApiModelProperty(value = "驾校名称")
+    private String jxmc;
+
+    @ApiModelProperty(value = "0关闭 1开通 此字段将权限大于开通时间")
+    @TableField("IS_OPEN")
+    private Integer isOpen;
+
+
+
+}

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

@@ -0,0 +1,37 @@
+package com.miaxis.newgzpt.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+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 GzptSchPayConfigUpDTO implements Serializable {
+
+
+    @ApiModelProperty(value = "驾校编号")
+    private String jxbh;
+
+    @ApiModelProperty(value = "正式开通时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date openTime;
+
+    @ApiModelProperty(value = "0关闭 1开通 此字段将权限大于开通时间")
+    @TableField("IS_OPEN")
+    private Integer isOpen;
+
+
+}

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

@@ -4,6 +4,10 @@ package com.miaxis.newgzpt.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.miaxis.newgzpt.domain.GzptSchPayConfig;
 import com.miaxis.newgzpt.domain.GzptSchPayLog;
+import com.miaxis.newgzpt.dto.GzptSchPayConfigDTO;
+import com.miaxis.newgzpt.dto.GzptSchPayConfigUpDTO;
+
+import java.util.List;
 
 /**
  * <p>
@@ -17,4 +21,8 @@ public interface GzptSchPayConfigMapper extends BaseMapper<GzptSchPayConfig> {
 
     GzptSchPayConfig getSchPayConfigByJxbh(String jxbh);
 
+    List<GzptSchPayConfig> selectSchPayConfigList(GzptSchPayConfigDTO spDTO);
+
+    int updateSchPayConfigByJxbh(GzptSchPayConfigUpDTO spDTO);
+
 }

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

@@ -5,6 +5,10 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.miaxis.newgzpt.domain.GzptSchPayConfig;
 import com.miaxis.newgzpt.domain.GzptSchPayLog;
 import com.miaxis.newgzpt.domain.GzptUserInfo;
+import com.miaxis.newgzpt.dto.GzptSchPayConfigDTO;
+import com.miaxis.newgzpt.dto.GzptSchPayConfigUpDTO;
+
+import java.util.List;
 
 /**
  * <p>
@@ -16,5 +20,7 @@ public interface IGzptSchPayConfigService extends IService<GzptSchPayConfig> {
 
     int isSchPayConfigByUser(GzptUserInfo userInfo);
 
+    List<GzptSchPayConfig> selectSchPayConfigList(GzptSchPayConfigDTO spDTO);
 
+    int updateSchPayConfigByJxbh(GzptSchPayConfigUpDTO spDTO);
 }

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

@@ -5,12 +5,15 @@ import com.miaxis.common.annotation.DataSource;
 import com.miaxis.common.enums.DataSourceTypeEnum;
 import com.miaxis.newgzpt.domain.GzptSchPayConfig;
 import com.miaxis.newgzpt.domain.GzptUserInfo;
+import com.miaxis.newgzpt.dto.GzptSchPayConfigDTO;
+import com.miaxis.newgzpt.dto.GzptSchPayConfigUpDTO;
 import com.miaxis.newgzpt.mapper.GzptSchPayConfigMapper;
 import com.miaxis.newgzpt.service.IGzptSchPayConfigService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.Date;
+import java.util.List;
 
 
 /**
@@ -46,4 +49,14 @@ public class GzptSchPayConfigServiceImpl extends ServiceImpl<GzptSchPayConfigMap
         }
         return 0;
     }
+
+    @Override
+    public List<GzptSchPayConfig> selectSchPayConfigList(GzptSchPayConfigDTO spDTO) {
+        return mapper.selectSchPayConfigList(spDTO);
+    }
+
+    @Override
+    public int updateSchPayConfigByJxbh(GzptSchPayConfigUpDTO spDTO) {
+        return mapper.updateSchPayConfigByJxbh(spDTO);
+    }
 }

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

@@ -3,11 +3,37 @@
 <mapper namespace="com.miaxis.newgzpt.mapper.GzptSchPayConfigMapper">
 
 
+    <resultMap type="GzptSchPayConfig" id="GzptSchPayConfigResult">
+        <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="openTime"    column="open_time"    />
+        <result property="isOpen"    column="is_open"    />
+        <result property="sync"    column="sync"    />
+        <result property="syncTime"    column="sync_time"    />
+    </resultMap>
+
+
     <select id="getSchPayConfigByJxbh"  resultType="com.miaxis.newgzpt.domain.GzptSchPayConfig">
         select * from GZPT_SCH_PAY_CONFIG where jxbh =#{jxbh}
     </select>
 
+    <select id="selectSchPayConfigList"  parameterType="com.miaxis.newgzpt.dto.GzptSchPayConfigDTO" resultMap="GzptSchPayConfigResult">
+        select * from GZPT_SCH_PAY_CONFIG
+        <where>
+            <if test="isOpen != null"> and is_open = #{isOpen }</if>
+            <if test="jxmc != null  and jxmc != ''"> and jxmc like '%' ||  #{jxmc,jdbcType=VARCHAR} || '%'</if>
+        </where>
+    </select>
+
 
+    <update id="updateSchPayConfigByJxbh" parameterType="com.miaxis.newgzpt.dto.GzptSchPayConfigUpDTO">
+        update GZPT_SCH_PAY_CONFIG
+        set OPEN_TIME = #{openTime,jdbcType=DATE}, IS_OPEN = #{isOpen} , SYNC = 0
+        where jxbh =#{jxbh}
+    </update>
 
 
 </mapper>