Merge branch 'master' of ssh://1.15.26.233:10022/miaxis/jsjp

# Conflicts:
#	jsjp-admin/src/test/java/com/miaxis/test/NormalTest2.java

jsjp-admin/src/main/java/com/miaxis/code/CodeGenerator.java

@@ -0,0 +1,181 @@
+package com.miaxis.code;
+
+
+import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException;
+import com.baomidou.mybatisplus.core.toolkit.StringPool;
+import com.baomidou.mybatisplus.generator.AutoGenerator;
+import com.baomidou.mybatisplus.generator.config.*;
+import com.baomidou.mybatisplus.generator.config.builder.ConfigBuilder;
+import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
+import com.baomidou.mybatisplus.generator.engine.VelocityTemplateEngine;
+import org.apache.commons.lang3.StringUtils;
+
+import java.io.File;
+import java.lang.reflect.Field;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Scanner;
+
+public class CodeGenerator {
+    /**
+     * <p>
+     * 读取控制台内容
+     * </p>
+     */
+    public static String scanner(String tip) {
+        Scanner scanner = new Scanner(System.in);
+
+        StringBuilder help = new StringBuilder();
+        help.append("请输入" + tip + "：");
+        System.out.println(help.toString());
+        if (scanner.hasNext()) {
+            String ipt = scanner.next();
+            if (StringUtils.isNotEmpty(ipt)) {
+                return ipt;
+            }
+        }
+        throw new MybatisPlusException("请输入正确的" + tip + "！");
+    }
+
+    public static void main(String[] args) throws NoSuchFieldException, IllegalAccessException {
+        // 代码生成器
+        AutoGenerator mpg = new AutoGenerator();
+
+        // 全局配置
+        GlobalConfig gc = new GlobalConfig();
+        String projectPath = System.getProperty("user.dir");
+        gc.setOutputDir(projectPath + "/jsjp-service/src/main/java2");
+//        gc.setAuthor("jobob");
+        gc.setOpen(false);
+        gc.setSwagger2(true);// 实体属性 Swagger2 注解
+        mpg.setGlobalConfig(gc);
+
+        // 数据源配置
+        DataSourceConfig dsc = new DataSourceConfig();
+
+        //local
+//        dsc.setUrl("jdbc:mysql://localhost:3306/engine?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true");
+//        dsc.setDriverName("com.mysql.cj.jdbc.Driver");
+//        dsc.setUsername("root");
+//        dsc.setPassword("cj1234");
+
+
+        dsc.setUrl("jdbc:oracle:thin:@121.46.4.43:12121:orcl");
+        // dsc.setSchemaName("public");
+        dsc.setDriverName("oracle.jdbc.driver.OracleDriver");
+        dsc.setUsername("newgzpt");
+        dsc.setPassword("newgzpt2016");
+        //master
+//        dsc.setUrl("jdbc:mysql://172.16.18.112:3306/xiaodao?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true");
+//        dsc.setDriverName("com.mysql.cj.jdbc.Driver");
+//        dsc.setUsername("admin");
+//        dsc.setPassword("admin");
+
+        //yb
+//        dsc.setUrl("jdbc:mysql://172.16.2.233:33071/ims?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true");
+//        dsc.setDriverName("com.mysql.cj.jdbc.Driver");
+//        dsc.setUsername("root");
+//        dsc.setPassword("root");
+        mpg.setDataSource(dsc);
+
+        // 包配置
+        PackageConfig pc = new PackageConfig();
+        pc.setModuleName(scanner("模块名"));
+        pc.setParent("com.miaxis");
+        mpg.setPackageInfo(pc);
+        // 配置模板
+        TemplateConfig templateConfig = new TemplateConfig();
+        // 配置自定义输出模板
+        //指定自定义模板路径，注意不要带上.ftl/.vm, 会根据使用的模板引擎自动识别
+        // templateConfig.setEntity("templates/entity2.java");
+        // templateConfig.setService();
+        // templateConfig.setController();
+        // templateConfig.setXml(null);
+        mpg.setTemplate(templateConfig);
+
+        // 策略配置
+        StrategyConfig strategy = new StrategyConfig();
+        strategy.setNaming(NamingStrategy.underline_to_camel);
+        strategy.setColumnNaming(NamingStrategy.underline_to_camel);
+        //   strategy.setSuperEntityClass("com.baomidou.ant.common.BaseEntity");
+        strategy.setEntityLombokModel(true);
+        strategy.setRestControllerStyle(true);
+        // 公共父类
+//        strategy.setSuperEntityClass("com.ylzinfo.brt.engine.entity.BaseEntity");
+        // 写于父类中的公共字段
+//        strategy.setSuperEntityColumns("create_time","update_time");
+        strategy.setInclude(scanner("表名，多个英文逗号分割").split(","));
+        strategy.setControllerMappingHyphenStyle(true);
+        strategy.setTablePrefix(pc.getModuleName() + "_");
+        strategy.setEntityTableFieldAnnotationEnable(true);
+        mpg.setStrategy(strategy);
+        mpg.setTemplateEngine(new VelocityTemplateEngine());
+        //如果不调用该方法、就会使用MyBatis-Plus默认的文件生成路径和包路径生成文件、但可以使用上面的PackageConfig做一些简单的配置
+        customPackagePath(pc,mpg);
+        mpg.execute();
+    }
+
+
+
+    /**
+     * 自定义包路径，文件生成路径，这边配置更灵活
+     * 虽然也可以使用InjectionConfig设置FileOutConfig的方式设置路径
+     * 这里直接使用Map方式注入ConfigBuilder配置对象更加直观
+     * @param pc
+     * @param mpg
+     * @throws NoSuchFieldException
+     * @throws IllegalAccessException
+     */
+    public static void customPackagePath(PackageConfig pc,AutoGenerator mpg) throws NoSuchFieldException, IllegalAccessException {
+
+        String projectPath = System.getProperty("user.dir");
+        String mavenPath = "\\jsjp-service\\src\\main\\java\\";
+        String srcPath = projectPath+mavenPath;
+
+        String moduleName = pc.getModuleName();
+
+        /**
+         * packageInfo配置controller、service、serviceImpl、entity、mapper等文件的包路径
+         * 这里包路径可以根据实际情况灵活配置
+         */
+        Map<String,String> packageInfo = new HashMap<>();
+        packageInfo.put(ConstVal.CONTROLLER, pc.getParent()+".controller");
+        packageInfo.put(ConstVal.SERVICE,pc.getParent()+".service");
+        packageInfo.put(ConstVal.SERVICE_IMPL,pc.getParent()+".service.impl");
+        packageInfo.put(ConstVal.ENTITY, pc.getParent()+".domain");
+        packageInfo.put(ConstVal.MAPPER, pc.getParent()+".mapper");
+
+        /**
+         * pathInfo配置controller、service、serviceImpl、entity、mapper、mapper.xml等文件的生成路径
+         * srcPath也可以更具实际情况灵活配置
+         * 后面部分的路径是和上面packageInfo包路径对应的源码文件夹路径
+         * 这里你可以选择注释其中某些路径，可忽略生成该类型的文件，例如:注释掉下面pathInfo中Controller的路径，就不会生成Controller文件
+         */
+        Map pathInfo = new HashMap<>();
+        pathInfo.put(ConstVal.CONTROLLER_PATH, srcPath + packageInfo.get(ConstVal.CONTROLLER).replaceAll("\\.", StringPool.BACK_SLASH + File.separator));
+        pathInfo.put(ConstVal.SERVICE_PATH, srcPath + packageInfo.get(ConstVal.SERVICE).replaceAll("\\.", StringPool.BACK_SLASH + File.separator));
+        pathInfo.put(ConstVal.SERVICE_IMPL_PATH, srcPath + packageInfo.get(ConstVal.SERVICE_IMPL).replaceAll("\\.", StringPool.BACK_SLASH + File.separator));
+        pathInfo.put(ConstVal.ENTITY_PATH, srcPath + packageInfo.get(ConstVal.ENTITY).replaceAll("\\.", StringPool.BACK_SLASH + File.separator));
+        pathInfo.put(ConstVal.MAPPER_PATH, srcPath + packageInfo.get(ConstVal.MAPPER).replaceAll("\\.", StringPool.BACK_SLASH + File.separator));
+        pathInfo.put(ConstVal.XML_PATH, projectPath+"\\src\\main\\resources\\mapper\\");
+        pc.setPathInfo(pathInfo);
+
+        /**
+         * 创建configBuilder对象，传入必要的参数
+         * 将以上的定义的包路径packageInfo配置到赋值到configBuilder对象的packageInfo属性上
+         * 因为packageInfo是私有成员变量，也没有提交提供公共的方法，所以使用反射注入
+         * 为啥要这么干，看源码去吧
+         */
+        ConfigBuilder configBuilder = new ConfigBuilder(mpg.getPackageInfo(), mpg.getDataSource(), mpg.getStrategy(), mpg.getTemplate(), mpg.getGlobalConfig());
+        Field packageInfoField = configBuilder.getClass().getDeclaredField("packageInfo");
+        packageInfoField.setAccessible(true);
+        packageInfoField.set(configBuilder,packageInfo);
+
+        /**
+         * 设置配置对象
+         */
+        mpg.setConfig(configBuilder);
+    }
+
+
+}

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

@@ -135,13 +135,7 @@ wxpay:
     notifyUrlRefund: https://jsjp-admin.zzxcx.net/prod-api/open-api/wx/notify/refund
 
 
-# 电影
-film:
-    appKey: 10294472736
-    appSecret: n8qV2tsBKN6JQ4nMtycPa8e7
-    notifyUrl: http://admin.zzxcx.net/prod-api/open-api/film/notify/filmOrder
-    v1Url: http://movieapi.pintoto.cn/
-    v2Url: http://movieapi2.pintoto.cn/
+
 
 # 拼多多
 pdd:
@@ -163,12 +157,7 @@ wai:
     secret: "cce08fcab10ff96a863892bb6e396a9e"
 
 
-# 福禄平台
-fulu:
-    appKey: "qxTK3W/RNleYH5tygePOu52hoFHpaqCi0eR5yKhHVgYQanIcua5edOG2rgrldHnL"
-    appSecret: "a1be19d04c724c05971942305ea97489"
-    url: "http://openapi.fulu.com"
-    notifyUrl: "http://admin.zzxcx.net/prod-api/open-api/fulu/notify/fuluOrder"
+
 
 
 # 苹果支付

jsjp-admin/src/test/java/com/miaxis/test/NormalTest2.java

@@ -2,8 +2,6 @@ package com.miaxis.test;
 
 import com.miaxis.JsjpApplication;
 import com.miaxis.common.sms.MD5Utils;
-import com.miaxis.feign.dto.Film;
-import com.miaxis.feign.service.IFilmService;
 import com.miaxis.feign.service.IWxService;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -12,10 +10,7 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
 import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.TreeMap;
+import java.util.*;
 
 @SpringBootTest(classes = JsjpApplication.class)
 @RunWith(SpringRunner.class)
@@ -23,8 +18,6 @@ public class NormalTest2 {
     @Autowired
     private IWxService ixService;
 
-    @Autowired
-    private IFilmService filmService;
 
     private static String appKey = "10000000000";
 
@@ -33,13 +26,6 @@ public class NormalTest2 {
     private static String appSecret2 = "&appSecret=25f9e794323b453885f5181f1b624d0b";
 
 
-
-
-    @Test
-    public void test3() throws Exception {
-
-    }
-
     public static String getSign(Map<String, Object> params,String appSecret2) {
         Map<String, Object> sortMap = new TreeMap<String, Object>();
         sortMap.putAll(params);
@@ -57,29 +43,6 @@ public class NormalTest2 {
         return builder.toString();
     }
 
-    @Test
-    public void test2() throws Exception {
-        long timeLong = System.currentTimeMillis();
-        String time = String.valueOf(timeLong/1000);
-
-        Map<String,Object> param = new HashMap<String,Object>();
-        param.put("appKey",appKey);
-        param.put("time",time);
-        String sign = getSign(param,appSecret2);
-        System.out.println(sign);
-        String md5 = MD5Utils.MD5Encode(sign);
-        System.out.println(md5);
-
-        Film film = new Film();
-        film.setAppKey(appKey);
-        film.setTime(time);
-        film.setSign(md5);
-        String result = filmService.geFilmInfo(film);
-
-
-
-        System.out.println(result);
-    }
 
 
 

jsjp-admin/src/test/java/com/miaxis/test/Test03.java

@@ -2,28 +2,32 @@ package com.miaxis.test;
 
 import org.apache.commons.io.IOUtils;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
+import java.io.*;
 import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLEncoder;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
 
 public class Test03 {
 
 
     public static void main(String[] args) throws IOException {
-        //test1();
+       // test1();
 
-        String token = "eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6ImIzZjQ2MjgwLTA0OTAtNGI5Zi1iNGI1LTE3NzU5OTJlYTQ1YiJ9.5-Ho3p7WH2LOVLo5KVquos26obPQMf3xtMGYAm60jSAelg4QibTWbhfReppL-RrG4M3NLunlCy9WXMjZn8ePjQ";
-
-
-        test2("12023021514503529883838685788487",token);
+        String token = "eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6Ijc1MzRjZGI3LTcyZGMtNGExZi1hYTc1LWFhYjlmYmYzMGI5YyJ9.iKl7-pr-mrkKNf-YRoSC86uRoZHCapTtM94PMvOz7mQAaSV32FsPqBdusA73p0jkn6HZMrZDcXTmKFmY-_9PAg";
+        test4();
 
     }
 
+    /**
+     * 登录接口
+     * @throws IOException
+     */
     public static void test1() throws IOException {
         URL url = new URL("https://jsjp-admin1.zzxcx.net/jsjp-admin/login/noCode");
         HttpURLConnection conn = (HttpURLConnection) url.openConnection();
@@ -80,4 +84,78 @@ public class Test03 {
 
     }
 
+
+    public static void test3(String token) throws IOException {
+
+        Map<String,Object> param = new HashMap<String,Object>();
+        param.put("dqbh", URLEncoder.encode(String.valueOf(3501), "UTF-8"));
+        param.put("startTime", URLEncoder.encode(String.valueOf("2023-02-01 00:00:00"), "UTF-8"));
+        param.put("endTime", URLEncoder.encode(String.valueOf("2023-02-28 23:59:59"), "UTF-8"));
+        param.put("isShare", 1);
+        param.put("tradeType", 1);
+
+
+        String urls = "https://jsjp-admin1.zzxcx.net/jsjp-admin/order/info/school/list";
+        StringBuffer paramBuffer = new StringBuffer();
+
+        if(param!=null) {
+            int i = 0;
+            for (String key : param.keySet()) {
+                if (i == 0) {
+                    paramBuffer.append("?");
+                } else {
+                    paramBuffer.append("&");
+                }
+                paramBuffer.append(key).append("=").append(param.get(key));
+                i++;
+            }
+            urls += paramBuffer;
+        }
+
+
+        URL url = new URL(urls);
+        System.out.println(url.toString());
+        HttpURLConnection conn = (HttpURLConnection) url.openConnection();
+        conn.setRequestMethod("GET");
+        conn.setRequestProperty("Authorization", token);
+        conn.connect();
+        int responseCode = conn.getResponseCode();
+        System.out.println("Response Code: " + responseCode);
+
+
+
+        BufferedReader in = new BufferedReader(new InputStreamReader(conn.getInputStream()));
+        String inputLine;
+        StringBuilder response = new StringBuilder();
+        while ((inputLine = in.readLine()) != null) {
+            response.append(inputLine);
+        }
+        in.close();
+
+        System.out.println("Response Body: " + response.toString());
+
+
+    }
+
+
+    public static void test4() {
+        Calendar calendar = Calendar.getInstance();
+        calendar.add(Calendar.MONTH, -1);
+        calendar.set(Calendar.DAY_OF_MONTH, calendar.getActualMinimum(Calendar.DAY_OF_MONTH));
+        calendar.set(Calendar.HOUR_OF_DAY, 0);
+        calendar.set(Calendar.MINUTE, 0);
+        calendar.set(Calendar.SECOND, 0);
+        Date startOfMonth = calendar.getTime();
+
+        calendar.set(Calendar.DAY_OF_MONTH, calendar.getActualMaximum(Calendar.DAY_OF_MONTH));
+        calendar.set(Calendar.HOUR_OF_DAY, 23);
+        calendar.set(Calendar.MINUTE, 59);
+        calendar.set(Calendar.SECOND, 59);
+        Date endOfMonth = calendar.getTime();
+
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        System.out.println("Start of Month: " + sdf.format(startOfMonth));
+        System.out.println("End of Month: " + sdf.format(endOfMonth));
+    }
+
 }

jsjp-admin/src/test/java/com/miaxis/test/Test4.java

@@ -0,0 +1,68 @@
+package com.miaxis.test;
+
+import com.miaxis.JsjpApplication;
+import com.miaxis.newgzpt.domain.GzptSchActivation;
+import com.miaxis.newgzpt.domain.GzptSchPayLog;
+import com.miaxis.newgzpt.domain.GzptUserInfo;
+import com.miaxis.newgzpt.service.IGzptSchActivationService;
+import com.miaxis.newgzpt.service.IGzptSchPayLogService;
+import com.miaxis.newgzpt.service.IGzptUserInfoService;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import java.util.Date;
+
+@SpringBootTest(classes = JsjpApplication.class)
+@RunWith(SpringRunner.class)
+public class Test4 {
+
+
+    @Autowired
+    private IGzptSchActivationService schActivationService;
+
+    @Autowired
+    private IGzptSchPayLogService schPayLogService;
+
+    @Autowired
+    private IGzptUserInfoService userInfoService;
+
+
+    @Test
+    public void test() throws Exception {
+//        GzptSchActivation schActivation = new GzptSchActivation();
+//        schActivation.setDqbh("9999");
+//        schActivation.setDqmc("天堂");
+//        schActivation.setJxbh("99999");
+//        schActivation.setJxmc("天堂驾校");
+//        schActivation.setUserId(996098008l);
+//        schActivation.setStuId(996098008l);
+//        schActivation.setCrtime(new Date());
+//        schActivation.setSync(0);
+//        schActivation.setSynctime(null);
+//        schActivation.setIsDel(0);
+//        schActivationService.saveSchActivation(schActivation);
+//
+//        GzptSchPayLog schPayLog = new GzptSchPayLog();
+//        schPayLog.setStuId(996098008l);
+//        schPayLog.setDqbh("9999");
+//        schPayLog.setPrice(999);
+//        schPayLog.setJxbh("99999");
+//        schPayLog.setCrtime(new Date());
+//        schPayLog.setState(1); // 1充值  2退款
+//        schPayLog.setGoodsName("天堂美女");
+//        schPayLog.setOutTradeNo("69696969696");
+//        schPayLogService.saveSchPayLog(schPayLog);
+
+
+        GzptUserInfo userInfo = userInfoService.getInfoById(1l);
+        System.out.println(userInfo);
+
+
+    }
+
+
+
+}

jsjp-service/src/main/java/com/miaxis/feign/dto/Film.java

@@ -1,11 +0,0 @@
-package com.miaxis.feign.dto;
-
-import lombok.Data;
-import org.springframework.web.bind.annotation.RequestBody;
-@Data
-public class Film {
-    String appKey;
-    String time;
-    String sign;
-
-}

jsjp-service/src/main/java/com/miaxis/feign/dto/FilmDTO.java

@@ -1,13 +0,0 @@
-package com.miaxis.feign.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@Data
-public class FilmDTO {
-    @ApiModelProperty("请求url")
-    String url;
-    @ApiModelProperty("请求参数,key1=value1&key2=value2...的格式")
-    String paramData;
-
-}

jsjp-service/src/main/java/com/miaxis/feign/dto/FilmMcpData.java

@@ -1,17 +0,0 @@
-package com.miaxis.feign.dto;
-
-
-import lombok.Data;
-
-/**
- * 电影秒出票数据类型
- */
-
-@Data
-public class FilmMcpData {
-    String third_order_id;
-    String ticket;
-    Integer ticketStatus;
-    String order_id;
-
-}

jsjp-service/src/main/java/com/miaxis/feign/dto/FilmResult.java

@@ -1,11 +0,0 @@
-package com.miaxis.feign.dto;
-
-
-import lombok.Data;
-
-@Data
-public class FilmResult {
-     int cityId;
-     String pinYin;
-     String regionName;
-}

jsjp-service/src/main/java/com/miaxis/feign/dto/FilmXdResult.java

@@ -1,16 +0,0 @@
-package com.miaxis.feign.dto;
-
-
-import lombok.Data;
-
-/**
- * 电影下单返回类型
- */
-
-@Data
-public class FilmXdResult {
-    Boolean success;
-    String message;
-    int code;
-    FilmMcpData data;
-}

jsjp-service/src/main/java/com/miaxis/feign/service/IFilmService.java

@@ -1,24 +0,0 @@
-package com.miaxis.feign.service;
-
-
-import com.miaxis.common.config.FeignConfig;
-import com.miaxis.feign.dto.Film;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.http.MediaType;
-import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.PostMapping;
-
-/**
- *
- * 电影接口测试
- */
-@FeignClient(name="filmService",
-        url = "http://movieapi2-test.taototo.cn",configuration = FeignConfig.class)
-@Component
-public interface IFilmService {
-    @PostMapping(value = "/movieapi/movie-info/get-city-list",
-            consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE)
-    String geFilmInfo(Film film);
-
-
-}

jsjp-service/src/main/java/com/miaxis/feign/service/IWaService.java

@@ -2,9 +2,7 @@ package com.miaxis.feign.service;
 
 
 import com.miaxis.common.config.FeignConfig;
-import com.miaxis.feign.dto.Film;
 import com.miaxis.feign.dto.Wa;
-import com.miaxis.feign.dto.WaResult;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
 import org.springframework.stereotype.Component;

jsjp-service/src/main/java/com/miaxis/generator/CodeGenerator.java

@@ -60,7 +60,7 @@ public class CodeGenerator {
 //        dsc.setPassword("cj1234");
 
 
-        dsc.setUrl("jdbc:oracle:thin:@47.99.70.145:1521:orcl");
+        dsc.setUrl("jdbc:oracle:thin:@121.46.4.43:12121:orcl");
         // dsc.setSchemaName("public");
         dsc.setDriverName("oracle.jdbc.driver.OracleDriver");
         dsc.setUsername("newgzpt");

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

@@ -1,20 +1,21 @@
 package com.miaxis.newgzpt.domain;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.type.JdbcType;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
  * <p>
- * 视频VIP表
+ * 激活记录表
  * </p>
  *
  * @author ${author}
@@ -22,13 +23,12 @@ import java.util.Date;
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-@TableName("GZPT_SCH_Activation")
-@ApiModel(value="GzptSchActivation对象", description="激活记录表")
+@TableName("GZPT_SCH_ACTIVATION")
+@ApiModel(value="GzptSchActivation对象", description="合作驾校激活表")
 public class GzptSchActivation implements Serializable {
 
     private static final long serialVersionUID = 1L;
-
-    @TableId("ID")
+    @TableId(value = "ID", type = IdType.INPUT)
     private Long id;
 
     @ApiModelProperty(value = "地区编号")
@@ -73,4 +73,7 @@ public class GzptSchActivation implements Serializable {
     @TableField("IS_DEL")
     private Integer isDel;
 
+
+
+
 }

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

@@ -3,7 +3,6 @@ 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;

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

@@ -1,17 +1,13 @@
 package com.miaxis.newgzpt.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.miaxis.common.annotation.DataSource;
 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;
@@ -34,7 +30,6 @@ public class GzptSchActivationServiceImpl extends ServiceImpl<GzptSchActivationM
     @Resource
     private GzptSchActivationMapper mapper;
 
-
     @Override
     public void saveSchActivation(GzptSchActivation schActivation) {
         mapper.saveSchActivation(schActivation);

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

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

jsjp-service/src/main/java/com/miaxis/wx/dto/FilmWxOrderJsonData.java

@@ -1,28 +0,0 @@
-package com.miaxis.wx.dto;
-
-import com.miaxis.feign.dto.FilmMcpData;
-import lombok.Data;
-
-/**
- * 电影数据
- */
-@Data
-public class FilmWxOrderJsonData {
-    private static final long serialVersionUID = 1L;
-    //电影下单信息
-    private  WxOrderCreateDTO wxOrderCreateDTO;
-    //电影排场信息
-    private CinemaData cinemaData;
-    //电影订单回调信息
-    private WxOrderNotifyDTO wxOrderNotifyDTO ;
-    //快速出票
-    private FilmMcpData filmMcpData;
-
-
-
-
-
-
-
-
-}

jsjp-service/src/main/java/com/miaxis/wx/dto/FuluWxOrderJsonData.java

@@ -1,23 +0,0 @@
-package com.miaxis.wx.dto;
-
-import com.miaxis.feign.dto.FilmMcpData;
-import com.miaxis.feign.dto.fulu.FuluGoodsInfo;
-import lombok.Data;
-
-/**
- * 电影数据
- */
-@Data
-public class FuluWxOrderJsonData {
-    private static final long serialVersionUID = 1L;
-    //视频会员下单信息
-    private  WxOrderCreateFuluDTO wxOrderCreateDTO;
-
-    //Fulu商品信息
-    private FuluGoodsInfo fuluGoodsInfo;
-
-
-    //Fulu订单详情
-    private WxFuluOrderDetailDTO wxFuluOrderDetailDTO;
-
-}

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

@@ -18,15 +18,17 @@
 
 
     <insert id="saveSchActivation" parameterType="com.miaxis.newgzpt.domain.GzptSchActivation">
-
+        <selectKey keyProperty="id" resultType="java.lang.Long" order="BEFORE">
+            SELECT SEQ_GZPT_SCH_ACTIVATION.NEXTVAL FROM DUAL
+        </selectKey>
         insert into gzpt_sch_activation (ID, DQBH, DQMC, JXBH, JXMC, USER_ID, STU_ID, CRTIME,SYNC,IS_DEL)
-        VALUES (seq_gzpt_sch_activation.nextval,
+        VALUES (#{id,jdbcType=NUMERIC},
                                              #{dqbh,jdbcType=VARCHAR},
                                              #{dqmc,jdbcType=VARCHAR},
                                              #{jxbh,jdbcType=VARCHAR},
                                              #{jxmc,jdbcType=VARCHAR},
-                                             #{userId},
-                                             #{stuId},
+                                             #{userId,jdbcType=NUMERIC},
+                                             #{stuId,jdbcType=NUMERIC},
                                              sysdate,
                                              0,
                                              0)
@@ -35,8 +37,8 @@
 
     <update id="upDelSchActivationByUserId" >
         update gzpt_sch_activation
-        set SYNC = 0, IS_DEL = #{state}
-        where user_id = #{userId}
+        set SYNC = 0, IS_DEL = #{state,jdbcType=NUMERIC}
+        where user_id = #{userId,jdbcType=NUMERIC}
     </update>
 
 
@@ -57,12 +59,12 @@
                  join gzpt_user_info u
                       on g.user_id = u.id
         <where>
-            <if test="userId!=null"> and g.user_id = #{userId} </if>
+            <if test="userId!=null"> and g.user_id = #{userId,jdbcType=NUMERIC} </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>
+            <if test="isDel!= null"> and g.is_del =#{isDel,jdbcType=NUMERIC} </if>
         </where>
 
     </select>
@@ -70,12 +72,12 @@
 
 
     <select id="getSchActivation" resultType="com.miaxis.newgzpt.domain.GzptSchActivation">
-        select * from GZPT_SCH_ACTIVATION where user_id = #{userId}
+        select * from GZPT_SCH_ACTIVATION where user_id = #{userId,jdbcType=NUMERIC}
     </select>
 
 
     <delete id="delSchActivationByUserId" parameterType="Long">
-        delete GZPT_SCH_ACTIVATION where user_id = #{userId}
+        delete GZPT_SCH_ACTIVATION where user_id = #{userId,jdbcType=NUMERIC}
     </delete>
 
 

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

@@ -4,15 +4,19 @@
 
 
     <insert id="saveSchPayLog" parameterType="com.miaxis.newgzpt.domain.GzptSchPayLog">
-        insert into GZPT_SCH_PAY_LOG (ID, STU_ID, DQBH, PRICE, JXBH, CRTIME, SYNC, SYNCTIME, STATE, GOODS_NAME, OUT_TRADE_NO) VALUES (SEQ_GZPT_SCH_PAY_LOG.nextval,
-                                                 #{stuId},
+
+        <selectKey keyProperty="id" resultType="java.lang.Long" order="BEFORE">
+            SELECT SEQ_GZPT_SCH_PAY_LOG.NEXTVAL FROM DUAL
+        </selectKey>
+        insert into GZPT_SCH_PAY_LOG (ID, STU_ID, DQBH, PRICE, JXBH, CRTIME, SYNC, SYNCTIME, STATE, GOODS_NAME, OUT_TRADE_NO) VALUES (#{id,jdbcType=NUMERIC},
+                                                 #{stuId,jdbcType=NUMERIC},
                                                  #{dqbh,jdbcType=VARCHAR},
-                                                 #{price},
+                                                 #{price,jdbcType=NUMERIC},
                                                  #{jxbh,jdbcType=VARCHAR},
                                                  sysdate,
                                                  0,
                                                  null,
-                                                 #{state},
+                                                 #{state,jdbcType=NUMERIC},
                                                  #{goodsName,jdbcType=VARCHAR},
                                                  #{outTradeNo,jdbcType=VARCHAR})
     </insert>

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

@@ -16,7 +16,7 @@
 
 
     <select id="getInfoById"  resultType="com.miaxis.newgzpt.domain.GzptUserInfo">
-        select * from GZPT_USER_INFO where id =#{id}
+        select * from GZPT_USER_INFO where id =#{id,jdbcType=NUMERIC}
     </select>