Merge remote-tracking branch 'origin/dev0.0.1' into dev-lingfeng

# Conflicts:
#	game-module/game-sdk/src/main/java/com/zanxiang/sdk/service/IUserService.java
#	game-module/game-sdk/src/main/java/com/zanxiang/sdk/service/Impl/UserServiceImpl.java

game-module/game-manage/pom.xml

@@ -12,9 +12,9 @@
 
     <dependencies>
         <dependency>
+            <artifactId>game-mybatis</artifactId>
             <groupId>com.zanxiang.game</groupId>
-            <artifactId>game-common</artifactId>
-            <version>${game-common.vertion}</version>
+            <version>0.0.1-SNAPSHOT</version>
         </dependency>
     </dependencies>
 

game-module/game-manage/src/main/java/com/zanxiang/manage/ManageApplication.java

@@ -1,6 +1,7 @@
 package com.zanxiang.manage;
 
 import lombok.extern.slf4j.Slf4j;
+import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
@@ -9,18 +10,19 @@ import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 @Slf4j
 @EnableDiscoveryClient
 @SpringBootApplication
+@MapperScan("com.zanxiang.mybatis.mapper")
 public class ManageApplication {
 
-	public static void main(String[] args) {
-		SpringApplication.run(ManageApplication.class, args);
-		System.out.println("赞象Manage服务启动成功 ( ´･･)ﾉ(._.`) \n" +
-				" ______  __     __     \n" +
-				"/_____/\\/__/\\ /__/\\    \n" +
-				"\\:::__\\/\\ \\::\\\\:.\\ \\   \n" +
-				"   /: /  \\_\\::_\\:_\\/   \n" +
-				"  /::/___  _\\/__\\_\\_/\\ \n" +
-				" /_:/____/\\\\ \\ \\ \\::\\ \\\n" +
-				" \\_______\\/ \\_\\/  \\__\\/\n");
-	}
+    public static void main(String[] args) {
+        SpringApplication.run(ManageApplication.class, args);
+        System.out.println("赞象Manage服务启动成功 ( ´･･)ﾉ(._.`) \n" +
+                " ______  __     __     \n" +
+                "/_____/\\/__/\\ /__/\\    \n" +
+                "\\:::__\\/\\ \\::\\\\:.\\ \\   \n" +
+                "   /: /  \\_\\::_\\:_\\/   \n" +
+                "  /::/___  _\\/__\\_\\_/\\ \n" +
+                " /_:/____/\\\\ \\ \\ \\::\\ \\\n" +
+                " \\_______\\/ \\_\\/  \\__\\/\n");
+    }
 
 }

game-module/game-manage/src/main/java/com/zanxiang/manage/controller/DemoController.java

@@ -1,45 +0,0 @@
-package com.zanxiang.manage.controller;
-
-import com.zanxiang.common.domain.ResultVo;
-import com.zanxiang.common.utils.bean.BeanUtils;
-import com.zanxiang.manage.domain.entity.Demo;
-import com.zanxiang.manage.domain.vo.DemoVO;
-import com.zanxiang.manage.service.DemoService;
-import io.swagger.annotations.Api;
-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.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * demo示例
- *
- * @author xufeng
- * @date 2022-05-31 17:06
- */
-@Api(tags = "demo示例")
-@RestController
-@RequestMapping("/demo")
-public class DemoController {
-
-    @Autowired
-    private DemoService demoService;
-
-//    @GetMapping("/info")
-//    @ApiOperation("/info")
-//    public ResultVo<DemoVO> getDemo(@RequestParam(name = "id", defaultValue = "1", required = false) String id) {
-//        Demo demo = demoService.getById(id);
-//        return ResultVo.ok(BeanUtils.copy(demo, DemoVO.class));
-//    }
-//
-//    @GetMapping("/add")
-//    @ApiOperation("/add")
-//    public ResultVo<Boolean> addDemo(@RequestParam("name") String name, @RequestParam("content") String content) {
-//        Demo demo = new Demo();
-//        demo.setContent(content);
-//        demo.setName(name);
-//        return ResultVo.ok(demoService.save(demo));
-//    }
-}

game-module/game-manage/src/main/java/com/zanxiang/manage/controller/TestController.java

@@ -1,11 +1,14 @@
 package com.zanxiang.manage.controller;
 
+import com.zanxiang.mybatis.entity.Order;
+import com.zanxiang.mybatis.mapper.OrderMapper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.tomcat.jni.Time;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -15,14 +18,18 @@ import org.springframework.web.bind.annotation.RestController;
 @Api(tags = {"示例接口"})
 @RestController
 @RequestMapping("/game/test/")
-@Slf4j
-@Component
 public class TestController {
 
+    @Autowired
+    private OrderMapper orderMapper;
+
     @ApiOperation(value = "根据id获取")
     @GetMapping("/index")
     @ApiResponses(value = {@ApiResponse(code = 200, message = "成功")})
+
     public String index() {
+        Order order = orderMapper.selectByPrimaryKey(1L);
+        System.out.println(order);
         return "game-manage service" + new Time();
     }
 }

game-module/game-manage/src/main/java/com/zanxiang/manage/domain/entity/Demo.java

@@ -1,45 +0,0 @@
-package com.zanxiang.manage.domain.entity;
-
-import java.io.Serializable;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import lombok.Data;
-import lombok.Builder;
-import lombok.NoArgsConstructor;
-import lombok.AllArgsConstructor;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.IdType;
-
-/**
- * 注释
- *
- * @author xufeng
- * @date 2022-05-31 17:06
- */
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-
-public class Demo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "id", type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 名称
-     */
-    private String name;
-
-    /**
-     * 是否启用
-     */
-    private Integer isEnable;
-
-    /**
-     * 内容
-     */
-    private String content;
-}

game-module/game-manage/src/main/java/com/zanxiang/manage/domain/vo/DemoVO.java

@@ -1,33 +0,0 @@
-package com.zanxiang.manage.domain.vo;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import lombok.Data;
-
-@Data
-public class DemoVO {
-
-    private static final long serialVersionUID = 1L;
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long id;
-
-    /**
-     * 名称
-     */
-    private String name;
-
-    /**
-     * 是否启用
-     */
-    private Integer isEnable;
-
-    /**
-     * 内容
-     */
-    private String content;
-
-}

game-module/game-manage/src/main/java/com/zanxiang/manage/mapper/DemoMapper.java

@@ -1,62 +0,0 @@
-package com.zanxiang.manage.mapper;
-
-import org.apache.ibatis.annotations.Mapper;
-import com.zanxiang.manage.domain.entity.Demo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * 注释 Mapper
- *
- * @author xufeng
- * @date 2022-05-31 17:06
- */
-@Mapper
-public interface DemoMapper extends BaseMapper<Demo> {
-
-    /**
-     * 根据主键id查询
-     *
-     * @param id
-     * @return 记录信息
-     */
-    Demo selectByPrimaryKey(Long id);
-
-    /**
-     * 根据主键删除数据
-     *
-     * @param id
-     * @return 数量
-     */
-    int deleteByPrimaryKey(Long id);
-
-    /**
-     * 插入数据库记录（不建议使用）
-     *
-     * @param record
-     */
-    int insert(Demo record);
-
-    /**
-     * 插入数据库记录（建议使用）
-     *
-     * @param record 插入数据
-     * @return 插入数量
-     */
-    int insertSelective(Demo record);
-
-    /**
-     * 修改数据(推荐使用)
-     *
-     * @param record 更新值
-     * @return 更新数量
-     */
-    int updateByPrimaryKeySelective(Demo record);
-
-    /**
-     * 根据主键更新数据
-     *
-     * @param record 更新值
-     * @return 更新数量
-     */
-    int updateByPrimaryKey(Demo record);
-}

game-module/game-manage/src/main/java/com/zanxiang/manage/service/DemoService.java

@@ -1,14 +0,0 @@
-package com.zanxiang.manage.service;
-
-import com.zanxiang.manage.domain.entity.Demo;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * 服务类接口
- *
- * @author xufeng
- * @date 2022-05-31 17:06
- */
-public interface DemoService extends IService<Demo> {
-
-}

game-module/game-manage/src/main/java/com/zanxiang/manage/service/Impl/DemoServiceImpl.java

@@ -1,18 +0,0 @@
-package com.zanxiang.manage.service.Impl;
-
-import com.zanxiang.manage.service.DemoService;
-import com.zanxiang.manage.domain.entity.Demo;
-import com.zanxiang.manage.mapper.DemoMapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * 服务实现类
- *
- * @author xufeng
- * @date 2022-05-31 17:06
- */
-@Service
-public class DemoServiceImpl extends ServiceImpl<DemoMapper, Demo> implements DemoService {
-
-}

game-module/game-manage/src/main/resources/bootstrap.yml

@@ -40,6 +40,6 @@ logging:
   level:
     root: warn
     com.zanxiang.manage: warn
-    com.zanxiang.manage.mapper: debug
+    com.zanxiang.mybatis.mapper: debug
 
 

game-module/game-manage/src/main/resources/mapper/DemoMapper.xml

@@ -1,88 +0,0 @@
-<?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.zanxiang.manage.mapper.DemoMapper">
-    <resultMap id="BaseResultMap" type="com.zanxiang.manage.domain.entity.Demo">
-        <id column="id" jdbcType="BIGINT" property="id"/>
-        <result column="name" jdbcType="VARCHAR" property="name"/>
-        <result column="is_enable" jdbcType="TINYINT" property="isEnable"/>
-        <result column="content" jdbcType="VARCHAR" property="content"/>
-    </resultMap>
-    <sql id="Base_Column_List">
-        id
-        , name, is_enable, content
-    </sql>
-
-    <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
-        select
-        <include refid="Base_Column_List"/>
-        from demo
-        where id = #{id,jdbcType=BIGINT}
-    </select>
-
-    <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
-        delete
-        from demo
-        where id = #{id,jdbcType=BIGINT}
-    </delete>
-
-    <insert id="insert" parameterType="com.zanxiang.manage.domain.entity.Demo">
-        <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-            SELECT LAST_INSERT_ID()
-        </selectKey>
-        insert into demo(name, is_enable, content)
-        values (#{name,jdbcType=VARCHAR}, #{isEnable,jdbcType=TINYINT}, #{content,jdbcType=VARCHAR})
-    </insert>
-
-    <insert id="insertSelective" parameterType="com.zanxiang.manage.domain.entity.Demo">
-        <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-            SELECT LAST_INSERT_ID()
-        </selectKey>
-        insert into demo
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="name != null">
-                name,
-            </if>
-            <if test="isEnable != null">
-                is_enable,
-            </if>
-            <if test="content != null">
-                content,
-            </if>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="name != null">
-                #{name,jdbcType=VARCHAR},
-            </if>
-            <if test="isEnable != null">
-                #{isEnable,jdbcType=TINYINT},
-            </if>
-            <if test="content != null">
-                #{content,jdbcType=VARCHAR},
-            </if>
-        </trim>
-    </insert>
-
-    <update id="updateByPrimaryKeySelective" parameterType="com.zanxiang.manage.domain.entity.Demo">
-        update demo
-        <set>
-            <if test="name != null">
-                name = #{name,jdbcType=VARCHAR},
-            </if>
-            <if test="isEnable != null">
-                is_enable = #{isEnable,jdbcType=TINYINT},
-            </if>
-            <if test="content != null">
-                content = #{content,jdbcType=VARCHAR},
-            </if>
-        </set>
-        where id = #{id,jdbcType=BIGINT}
-    </update>
-
-    <update id="updateByPrimaryKey" parameterType="com.zanxiang.manage.domain.entity.Demo">
-        update demo
-        set name      = #{name,jdbcType=VARCHAR},
-            is_enable = #{isEnable,jdbcType=TINYINT},
-            content   = #{content,jdbcType=VARCHAR}
-        where id = #{id,jdbcType=BIGINT}
-    </update>
-</mapper>

game-module/game-sdk/src/main/java/com/zanxiang/sdk/domain/entity/Channel.java → game-module/game-mybatis/src/main/java/com/zanxiang/mybatis/entity/Channel.java

@@ -1,4 +1,4 @@
-package com.zanxiang.sdk.domain.entity;
+package com.zanxiang.mybatis.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -9,7 +9,6 @@ import lombok.NoArgsConstructor;
 import lombok.ToString;
 
 import java.time.LocalDateTime;
-import java.util.Date;
 
 /**
  * @author : lingfeng

game-module/game-sdk/src/main/java/com/zanxiang/sdk/domain/entity/Cp.java → game-module/game-mybatis/src/main/java/com/zanxiang/mybatis/entity/Cp.java

@@ -1,4 +1,4 @@
-package com.zanxiang.sdk.domain.entity;
+package com.zanxiang.mybatis.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -9,7 +9,6 @@ import lombok.NoArgsConstructor;
 import lombok.ToString;
 
 import java.time.LocalDateTime;
-import java.util.Date;
 
 /**
  * @author : lingfeng

game-module/game-sdk/src/main/java/com/zanxiang/sdk/domain/entity/Game.java → game-module/game-mybatis/src/main/java/com/zanxiang/mybatis/entity/Game.java

@@ -1,4 +1,4 @@
-package com.zanxiang.sdk.domain.entity;
+package com.zanxiang.mybatis.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -9,7 +9,6 @@ import lombok.NoArgsConstructor;
 import lombok.ToString;
 
 import java.time.LocalDateTime;
-import java.util.Date;
 
 /**
  * @author : lingfeng

game-module/game-sdk/src/main/java/com/zanxiang/sdk/domain/entity/GameCategory.java → game-module/game-mybatis/src/main/java/com/zanxiang/mybatis/entity/GameCategory.java

@@ -1,4 +1,4 @@
-package com.zanxiang.sdk.domain.entity;
+package com.zanxiang.mybatis.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -9,7 +9,6 @@ import lombok.NoArgsConstructor;
 import lombok.ToString;
 
 import java.time.LocalDateTime;
-import java.util.Date;
 
 /**
  * @author : lingfeng

game-module/game-sdk/src/main/java/com/zanxiang/sdk/domain/entity/GamePayWay.java → game-module/game-mybatis/src/main/java/com/zanxiang/mybatis/entity/GamePayWay.java

@@ -1,4 +1,4 @@
-package com.zanxiang.sdk.domain.entity;
+package com.zanxiang.mybatis.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -10,7 +10,6 @@ import lombok.ToString;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
-import java.util.Date;
 
 /**
  * @author : lingfeng

game-module/game-sdk/src/main/java/com/zanxiang/sdk/domain/entity/GameServer.java → game-module/game-mybatis/src/main/java/com/zanxiang/mybatis/entity/GameServer.java

@@ -1,4 +1,4 @@
-package com.zanxiang.sdk.domain.entity;
+package com.zanxiang.mybatis.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

game-module/game-sdk/src/main/java/com/zanxiang/sdk/domain/entity/GameUser.java → game-module/game-mybatis/src/main/java/com/zanxiang/mybatis/entity/GameUser.java

@@ -1,4 +1,4 @@
-package com.zanxiang.sdk.domain.entity;
+package com.zanxiang.mybatis.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -10,7 +10,6 @@ import lombok.ToString;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
-import java.util.Date;
 
 /**
  * @author : lingfeng

game-module/game-sdk/src/main/java/com/zanxiang/sdk/domain/entity/GameVersion.java → game-module/game-mybatis/src/main/java/com/zanxiang/mybatis/entity/GameVersion.java

@@ -1,4 +1,4 @@
-package com.zanxiang.sdk.domain.entity;
+package com.zanxiang.mybatis.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

game-module/game-sdk/src/main/java/com/zanxiang/sdk/domain/entity/Order.java → game-module/game-mybatis/src/main/java/com/zanxiang/mybatis/entity/Order.java

@@ -1,4 +1,4 @@
-package com.zanxiang.sdk.domain.entity;
+package com.zanxiang.mybatis.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -6,11 +6,9 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import lombok.ToString;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
-import java.time.LocalDateTime;
 import java.util.Date;
 
 /**

game-module/game-sdk/src/main/java/com/zanxiang/sdk/domain/entity/PayWay.java → game-module/game-mybatis/src/main/java/com/zanxiang/mybatis/entity/PayWay.java

@@ -1,4 +1,4 @@
-package com.zanxiang.sdk.domain.entity;
+package com.zanxiang.mybatis.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

game-module/game-sdk/src/main/java/com/zanxiang/sdk/domain/entity/User.java → game-module/game-mybatis/src/main/java/com/zanxiang/mybatis/entity/User.java

@@ -1,4 +1,4 @@
-package com.zanxiang.sdk.domain.entity;
+package com.zanxiang.mybatis.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

game-module/game-sdk/src/main/java/com/zanxiang/sdk/domain/entity/UserExt.java → game-module/game-mybatis/src/main/java/com/zanxiang/mybatis/entity/UserExt.java

@@ -1,4 +1,4 @@
-package com.zanxiang.sdk.domain.entity;
+package com.zanxiang.mybatis.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -8,7 +8,6 @@ import lombok.NoArgsConstructor;
 import lombok.ToString;
 
 import java.time.LocalDateTime;
-import java.util.Date;
 
 /**
  * @author : lingfeng

game-module/game-sdk/src/main/java/com/zanxiang/sdk/domain/entity/UserLoginLog.java → game-module/game-mybatis/src/main/java/com/zanxiang/mybatis/entity/UserLoginLog.java

@@ -1,4 +1,4 @@
-package com.zanxiang.sdk.domain.entity;
+package com.zanxiang.mybatis.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

game-module/game-sdk/src/main/java/com/zanxiang/sdk/domain/entity/UserOauth.java → game-module/game-mybatis/src/main/java/com/zanxiang/mybatis/entity/UserOauth.java

@@ -1,4 +1,4 @@
-package com.zanxiang.sdk.domain.entity;
+package com.zanxiang.mybatis.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

game-module/game-sdk/src/main/java/com/zanxiang/sdk/domain/entity/UserToken.java → game-module/game-mybatis/src/main/java/com/zanxiang/mybatis/entity/UserToken.java

@@ -1,4 +1,4 @@
-package com.zanxiang.sdk.domain.entity;
+package com.zanxiang.mybatis.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

game-module/game-sdk/src/main/java/com/zanxiang/sdk/mapper/ChannelMapper.java → game-module/game-mybatis/src/main/java/com/zanxiang/mybatis/mapper/ChannelMapper.java

@@ -1,7 +1,7 @@
-package com.zanxiang.sdk.mapper;
+package com.zanxiang.mybatis.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zanxiang.sdk.domain.entity.Channel;
+import com.zanxiang.mybatis.entity.Channel;
 
 /**
  * @author : lingfeng

game-module/game-sdk/src/main/java/com/zanxiang/sdk/mapper/CpMapper.java → game-module/game-mybatis/src/main/java/com/zanxiang/mybatis/mapper/CpMapper.java

@@ -1,7 +1,7 @@
-package com.zanxiang.sdk.mapper;
+package com.zanxiang.mybatis.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zanxiang.sdk.domain.entity.Cp;
+import com.zanxiang.mybatis.entity.Cp;
 
 /**
  * @author : lingfeng

game-module/game-sdk/src/main/java/com/zanxiang/sdk/mapper/GameCategoryMapper.java → game-module/game-mybatis/src/main/java/com/zanxiang/mybatis/mapper/GameCategoryMapper.java

@@ -1,7 +1,7 @@
-package com.zanxiang.sdk.mapper;
+package com.zanxiang.mybatis.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zanxiang.sdk.domain.entity.GameCategory;
+import com.zanxiang.mybatis.entity.GameCategory;
 
 /**
  * @author : lingfeng

game-module/game-sdk/src/main/java/com/zanxiang/sdk/mapper/GameMapper.java → game-module/game-mybatis/src/main/java/com/zanxiang/mybatis/mapper/GameMapper.java

@@ -1,7 +1,7 @@
-package com.zanxiang.sdk.mapper;
+package com.zanxiang.mybatis.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zanxiang.sdk.domain.entity.Game;
+import com.zanxiang.mybatis.entity.Game;
 
 /**
  * @author : lingfeng

game-module/game-sdk/src/main/java/com/zanxiang/sdk/mapper/GamePayWayMapper.java → game-module/game-mybatis/src/main/java/com/zanxiang/mybatis/mapper/GamePayWayMapper.java

@@ -1,7 +1,7 @@
-package com.zanxiang.sdk.mapper;
+package com.zanxiang.mybatis.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zanxiang.sdk.domain.entity.GamePayWay;
+import com.zanxiang.mybatis.entity.GamePayWay;
 
 /**
  * @author : lingfeng

game-module/game-sdk/src/main/java/com/zanxiang/sdk/mapper/GameServerMapper.java → game-module/game-mybatis/src/main/java/com/zanxiang/mybatis/mapper/GameServerMapper.java

@@ -1,7 +1,7 @@
-package com.zanxiang.sdk.mapper;
+package com.zanxiang.mybatis.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zanxiang.sdk.domain.entity.GameServer;
+import com.zanxiang.mybatis.entity.GameServer;
 
 /**
  * @author : lingfeng

game-module/game-sdk/src/main/java/com/zanxiang/sdk/mapper/GameUserMapper.java → game-module/game-mybatis/src/main/java/com/zanxiang/mybatis/mapper/GameUserMapper.java

@@ -1,7 +1,7 @@
-package com.zanxiang.sdk.mapper;
+package com.zanxiang.mybatis.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zanxiang.sdk.domain.entity.GameUser;
+import com.zanxiang.mybatis.entity.GameUser;
 
 /**
  * @author : lingfeng

game-module/game-sdk/src/main/java/com/zanxiang/sdk/mapper/GameVersionMapper.java → game-module/game-mybatis/src/main/java/com/zanxiang/mybatis/mapper/GameVersionMapper.java

@@ -1,7 +1,7 @@
-package com.zanxiang.sdk.mapper;
+package com.zanxiang.mybatis.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zanxiang.sdk.domain.entity.GameVersion;
+import com.zanxiang.mybatis.entity.GameVersion;
 
 /**
  * @author : lingfeng

game-module/game-sdk/src/main/java/com/zanxiang/sdk/mapper/OrderMapper.java → game-module/game-mybatis/src/main/java/com/zanxiang/mybatis/mapper/OrderMapper.java

@@ -1,7 +1,7 @@
-package com.zanxiang.sdk.mapper;
+package com.zanxiang.mybatis.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zanxiang.sdk.domain.entity.Order;
+import com.zanxiang.mybatis.entity.Order;
 import org.springframework.transaction.annotation.Transactional;
 
 /**
@@ -11,4 +11,11 @@ import org.springframework.transaction.annotation.Transactional;
  */
 @Transactional
 public interface OrderMapper extends BaseMapper<Order> {
+    /**
+     * 根据主键id查询
+     *
+     * @param id
+     * @return 记录信息
+     */
+    Order selectByPrimaryKey(Long id);
 }

game-module/game-sdk/src/main/java/com/zanxiang/sdk/mapper/PayWayMapper.java → game-module/game-mybatis/src/main/java/com/zanxiang/mybatis/mapper/PayWayMapper.java

@@ -1,7 +1,7 @@
-package com.zanxiang.sdk.mapper;
+package com.zanxiang.mybatis.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zanxiang.sdk.domain.entity.PayWay;
+import com.zanxiang.mybatis.entity.PayWay;
 
 /**
  * @author : lingfeng

game-module/game-sdk/src/main/java/com/zanxiang/sdk/mapper/UserExtMapper.java → game-module/game-mybatis/src/main/java/com/zanxiang/mybatis/mapper/UserExtMapper.java

@@ -1,7 +1,7 @@
-package com.zanxiang.sdk.mapper;
+package com.zanxiang.mybatis.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zanxiang.sdk.domain.entity.UserExt;
+import com.zanxiang.mybatis.entity.UserExt;
 
 /**
  * @author : lingfeng

game-module/game-sdk/src/main/java/com/zanxiang/sdk/mapper/UserLoginLogMapper.java → game-module/game-mybatis/src/main/java/com/zanxiang/mybatis/mapper/UserLoginLogMapper.java

@@ -1,7 +1,7 @@
-package com.zanxiang.sdk.mapper;
+package com.zanxiang.mybatis.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zanxiang.sdk.domain.entity.UserLoginLog;
+import com.zanxiang.mybatis.entity.UserLoginLog;
 
 /**
  * @author : lingfeng

game-module/game-sdk/src/main/java/com/zanxiang/sdk/mapper/UserMapper.java → game-module/game-mybatis/src/main/java/com/zanxiang/mybatis/mapper/UserMapper.java

@@ -1,7 +1,7 @@
-package com.zanxiang.sdk.mapper;
+package com.zanxiang.mybatis.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zanxiang.sdk.domain.entity.User;
+import com.zanxiang.mybatis.entity.User;
 
 /**
  * @author : lingfeng

game-module/game-sdk/src/main/java/com/zanxiang/sdk/mapper/UserOauthMapper.java → game-module/game-mybatis/src/main/java/com/zanxiang/mybatis/mapper/UserOauthMapper.java

@@ -1,7 +1,7 @@
-package com.zanxiang.sdk.mapper;
+package com.zanxiang.mybatis.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zanxiang.sdk.domain.entity.UserOauth;
+import com.zanxiang.mybatis.entity.UserOauth;
 
 /**
  * @author : lingfeng

game-module/game-sdk/src/main/java/com/zanxiang/sdk/mapper/UserTokenMapper.java → game-module/game-mybatis/src/main/java/com/zanxiang/mybatis/mapper/UserTokenMapper.java

@@ -1,7 +1,7 @@
-package com.zanxiang.sdk.mapper;
+package com.zanxiang.mybatis.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zanxiang.sdk.domain.entity.UserToken;
+import com.zanxiang.mybatis.entity.UserToken;
 
 /**
  * @author : lingfeng

game-module/game-sdk/src/main/resources/mapper/ChannelMapper.xml → game-module/game-mybatis/src/main/resources/mapper/ChannelMapper.xml

@@ -1,4 +1,4 @@
 <?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.zanxiang.sdk.mapper.ChannelMapper">
+<mapper namespace="com.zanxiang.mybatis.mapper.ChannelMapper">
 </mapper>

game-module/game-sdk/src/main/resources/mapper/CpMapper.xml → game-module/game-mybatis/src/main/resources/mapper/CpMapper.xml

@@ -1,4 +1,4 @@
 <?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.zanxiang.sdk.mapper.CpMapper">
+<mapper namespace="com.zanxiang.mybatis.mapper.CpMapper">
 </mapper>

game-module/game-sdk/src/main/resources/mapper/GameCategoryMapper.xml → game-module/game-mybatis/src/main/resources/mapper/GameCategoryMapper.xml

@@ -1,4 +1,4 @@
 <?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.zanxiang.sdk.mapper.GameCategoryMapper">
+<mapper namespace="com.zanxiang.mybatis.mapper.GameCategoryMapper">
 </mapper>

game-module/game-sdk/src/main/resources/mapper/GameMapper.xml → game-module/game-mybatis/src/main/resources/mapper/GameMapper.xml

@@ -1,4 +1,4 @@
 <?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.zanxiang.sdk.mapper.GameMapper">
+<mapper namespace="com.zanxiang.mybatis.mapper.GameMapper">
 </mapper>

game-module/game-sdk/src/main/resources/mapper/GamePayWayMapper.xml → game-module/game-mybatis/src/main/resources/mapper/GamePayWayMapper.xml

@@ -1,4 +1,4 @@
 <?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.zanxiang.sdk.mapper.GamePayWayMapper">
+<mapper namespace="com.zanxiang.mybatis.mapper.GamePayWayMapper">
 </mapper>

game-module/game-sdk/src/main/resources/mapper/GameServerMapper.xml → game-module/game-mybatis/src/main/resources/mapper/GameServerMapper.xml

@@ -1,4 +1,4 @@
 <?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.zanxiang.sdk.mapper.GameServerMapper">
+<mapper namespace="com.zanxiang.mybatis.mapper.GameServerMapper">
 </mapper>

game-module/game-sdk/src/main/resources/mapper/GameUserMapper.xml → game-module/game-mybatis/src/main/resources/mapper/GameUserMapper.xml

@@ -1,4 +1,4 @@
 <?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.zanxiang.sdk.mapper.GameUserMapper">
+<mapper namespace="com.zanxiang.mybatis.mapper.GameUserMapper">
 </mapper>

game-module/game-sdk/src/main/resources/mapper/GameVersionMapper.xml → game-module/game-mybatis/src/main/resources/mapper/GameVersionMapper.xml

@@ -1,4 +1,4 @@
 <?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.zanxiang.sdk.mapper.GameVersionMapper">
+<mapper namespace="com.zanxiang.mybatis.mapper.GameVersionMapper">
 </mapper>

game-module/game-mybatis/src/main/resources/mapper/OrderMapper.xml

@@ -0,0 +1,52 @@
+<?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.zanxiang.mybatis.mapper.OrderMapper">
+    <resultMap id="BaseResultMap" type="com.zanxiang.mybatis.entity.Order">
+        <id column="id" jdbcType="BIGINT" property="id"/>
+        <result column="cp_id" jdbcType="BIGINT" property="cpId"/>
+        <result column="cp_order_id" jdbcType="VARCHAR" property="cpOrderId"/>
+        <result column="user_id" jdbcType="BIGINT" property="userId"/>
+        <result column="mg_user_id" jdbcType="BIGINT" property="mgUserId"/>
+        <result column="game_id" jdbcType="BIGINT" property="gameId"/>
+        <result column="amount" jdbcType="DECIMAL" property="amount"/>
+        <result column="real_amount" jdbcType="DECIMAL" property="realAmount"/>
+        <result column="product_id" jdbcType="VARCHAR" property="productId"/>
+        <result column="product_cnt" jdbcType="INTEGER" property="productCnt"/>
+        <result column="product_name" jdbcType="VARCHAR" property="productName"/>
+        <result column="coupon_amount" jdbcType="DECIMAL" property="couponAmount"/>
+        <result column="ptb_amount" jdbcType="DECIMAL" property="ptbAmount"/>
+        <result column="gm_amount" jdbcType="DECIMAL" property="gmAmount"/>
+        <result column="integral" jdbcType="INTEGER" property="integral"/>
+        <result column="integral_money" jdbcType="DECIMAL" property="integralMoney"/>
+        <result column="rebate_amount" jdbcType="DECIMAL" property="rebateAmount"/>
+        <result column="merchant_order_no" jdbcType="VARCHAR" property="merchantOrderNo"/>
+        <result column="status" jdbcType="TINYINT" property="status"/>
+        <result column="game_payway_id" jdbcType="VARCHAR" property="gamePaywayId"/>
+        <result column="pay_time" jdbcType="TIMESTAMP" property="payTime"/>
+        <result column="cp_notify_cnt" jdbcType="INTEGER" property="cpNotifyCnt"/>
+        <result column="last_cp_notify_time" jdbcType="BIGINT" property="lastCpNotifyTime"/>
+        <result column="is_handle" jdbcType="TINYINT" property="isHandle"/>
+        <result column="is_distribute" jdbcType="TINYINT" property="isDistribute"/>
+        <result column="cp_status" jdbcType="TINYINT" property="cpStatus"/>
+        <result column="ext" jdbcType="VARCHAR" property="ext"/>
+        <result column="mem_note" jdbcType="VARCHAR" property="memNote"/>
+        <result column="admin_note" jdbcType="VARCHAR" property="adminNote"/>
+        <result column="remark" jdbcType="VARCHAR" property="remark"/>
+        <result column="channel" jdbcType="BIGINT" property="channel"/>
+    </resultMap>
+    <sql id="Base_Column_List">
+        id
+        , cp_id, cp_order_id, user_id, mg_user_id, game_id, amount,
+	real_amount, product_id, product_cnt, product_name, coupon_amount, ptb_amount, gm_amount,
+	integral, integral_money, rebate_amount, merchant_order_no, status, game_payway_id, pay_time,
+	cp_notify_cnt, last_cp_notify_time, is_handle, is_distribute, cp_status, ext, mem_note,
+	admin_note, remark, channel, create_time, update_time
+    </sql>
+
+    <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>
+        from h_order
+        where id = #{id,jdbcType=BIGINT}
+    </select>
+</mapper>

game-module/game-sdk/src/main/resources/mapper/PayWayMapper.xml → game-module/game-mybatis/src/main/resources/mapper/PayWayMapper.xml

@@ -1,4 +1,4 @@
 <?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.zanxiang.sdk.mapper.PayWayMapper">
+<mapper namespace="com.zanxiang.mybatis.mapper.PayWayMapper">
 </mapper>

game-module/game-sdk/src/main/resources/mapper/UserExtMapper.xml → game-module/game-mybatis/src/main/resources/mapper/UserExtMapper.xml

@@ -1,4 +1,4 @@
 <?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.zanxiang.sdk.mapper.UserExtMapper">
+<mapper namespace="com.zanxiang.mybatis.mapper.UserExtMapper">
 </mapper>

game-module/game-sdk/src/main/resources/mapper/UserLoginLogMapper.xml → game-module/game-mybatis/src/main/resources/mapper/UserLoginLogMapper.xml

@@ -1,4 +1,4 @@
 <?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.zanxiang.sdk.mapper.UserLoginLogMapper">
+<mapper namespace="com.zanxiang.mybatis.mapper.UserLoginLogMapper">
 </mapper>

game-module/game-sdk/src/main/resources/mapper/UserMapper.xml → game-module/game-mybatis/src/main/resources/mapper/UserMapper.xml

@@ -1,4 +1,4 @@
 <?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.zanxiang.sdk.mapper.UserMapper">
+<mapper namespace="com.zanxiang.mybatis.mapper.UserMapper">
 </mapper>

game-module/game-sdk/src/main/resources/mapper/UserOauthMapper.xml → game-module/game-mybatis/src/main/resources/mapper/UserOauthMapper.xml

@@ -1,4 +1,4 @@
 <?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.zanxiang.sdk.mapper.UserOauthMapper">
+<mapper namespace="com.zanxiang.mybatis.mapper.UserOauthMapper">
 </mapper>

game-module/game-sdk/src/main/resources/mapper/UserTokenMapper.xml → game-module/game-mybatis/src/main/resources/mapper/UserTokenMapper.xml

@@ -1,4 +1,4 @@
 <?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.zanxiang.sdk.mapper.UserTokenMapper">
+<mapper namespace="com.zanxiang.mybatis.mapper.UserTokenMapper">
 </mapper>

game-module/game-sdk/pom.xml

@@ -12,9 +12,9 @@
 
     <dependencies>
         <dependency>
+            <artifactId>game-mybatis</artifactId>
             <groupId>com.zanxiang.game</groupId>
-            <artifactId>game-common</artifactId>
-            <version>${game-common.vertion}</version>
+            <version>0.0.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.zanxiang.game</groupId>

game-module/game-sdk/src/main/java/com/zanxiang/sdk/SDKApplication.java

@@ -11,7 +11,7 @@ import org.springframework.context.annotation.Configuration;
 @Slf4j
 @EnableDiscoveryClient
 @SpringBootApplication
-@MapperScan("com.zanxiang.sdk.mapper")
+@MapperScan("com.zanxiang.mybatis.mapper")
 @Configuration
 public class SDKApplication {
 

game-module/game-sdk/src/main/java/com/zanxiang/sdk/config/MybatisPlusConfig.java

@@ -28,7 +28,7 @@ import java.sql.SQLException;
  */
 @Configuration
 @EnableTransactionManagement
-@MapperScan("com.zanxiang.sdk.mapper")
+@MapperScan("com.zanxiang.mybatis.mapper")
 public class MybatisPlusConfig {
 
     /**

game-module/game-sdk/src/main/java/com/zanxiang/sdk/controller/PayController.java

@@ -4,11 +4,14 @@ import com.alibaba.nacos.common.utils.IPUtil;
 import com.zanxiang.common.domain.ResultMap;
 import com.zanxiang.common.enums.PayWayEnum;
 import com.zanxiang.sdk.domain.bo.ProductPayParamBO;
+import com.zanxiang.sdk.domain.dto.PlatformOrderDTO;
 import com.zanxiang.sdk.domain.params.ProductPayParam;
 import com.zanxiang.sdk.service.Impl.pay.PayService;
+import com.zanxiang.sdk.service.PlatformOrderService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.jdom.JDOMException;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -29,10 +32,14 @@ public class PayController {
 
     @Resource
     private PayService payService;
+    @Autowired
+    private PlatformOrderService platformOrderService;
 
     @ApiOperation(value = "支付参数生成")
     @GetMapping(value = "/create")
     public ResultMap create(@RequestBody ProductPayParam product) {
+        PlatformOrderDTO info = platformOrderService.info("1", "1");
+        System.out.println(info);
         String userId = "1";
         ProductPayParamBO bo = new ProductPayParamBO();
         bo.setUserId(userId);

game-module/game-sdk/src/main/java/com/zanxiang/sdk/service/GamePayWayService.java

@@ -1,7 +1,7 @@
 package com.zanxiang.sdk.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.zanxiang.sdk.domain.entity.GamePayWay;
+import com.zanxiang.mybatis.entity.GamePayWay;
 
 /**
  * @author xufeng

game-module/game-sdk/src/main/java/com/zanxiang/sdk/service/IUserLoginLogService.java

@@ -1,6 +1,6 @@
 package com.zanxiang.sdk.service;
 
-import com.zanxiang.sdk.domain.entity.User;
+import com.zanxiang.mybatis.entity.User;
 
 /**
  * @author : lingfeng
@@ -11,7 +11,8 @@ public interface IUserLoginLogService {
 
     /**
      * 添加用户登录日志
-     *  @param user   : 用户信息
+     *
+     * @param user   : 用户信息
      * @param gameId : 游戏id
      */
     void addUserLoginLog(String realIp, User user, String gameId);

game-module/game-sdk/src/main/java/com/zanxiang/sdk/service/IUserService.java

@@ -5,6 +5,9 @@ import com.zanxiang.common.domain.ResultVo;
 import com.zanxiang.sdk.domain.dto.UserDTO;
 import com.zanxiang.sdk.domain.entity.User;
 import com.zanxiang.sdk.domain.params.*;
+import com.zanxiang.mybatis.entity.User;
+import com.zanxiang.sdk.domain.params.LoginMobileParam;
+import com.zanxiang.sdk.domain.params.LoginPasswordParam;
 import com.zanxiang.sdk.domain.vo.UserLoginVO;
 
 import javax.servlet.http.HttpServletRequest;

game-module/game-sdk/src/main/java/com/zanxiang/sdk/service/IUserTokenService.java

@@ -2,7 +2,7 @@ package com.zanxiang.sdk.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.zanxiang.sdk.domain.dto.UserTokenDTO;
-import com.zanxiang.sdk.domain.entity.UserToken;
+import com.zanxiang.mybatis.entity.UserToken;
 
 /**
  * @author : lingfeng

game-module/game-sdk/src/main/java/com/zanxiang/sdk/service/Impl/GamePayWayServiceImpl.java

@@ -5,8 +5,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zanxiang.common.enums.DeleteEnum;
 import com.zanxiang.common.enums.MaxPayLock;
 import com.zanxiang.common.utils.StringUtils;
-import com.zanxiang.sdk.domain.entity.GamePayWay;
-import com.zanxiang.sdk.mapper.GamePayWayMapper;
+import com.zanxiang.mybatis.entity.GamePayWay;
+import com.zanxiang.mybatis.mapper.GamePayWayMapper;
 import com.zanxiang.sdk.service.GamePayWayService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;

game-module/game-sdk/src/main/java/com/zanxiang/sdk/service/Impl/PlatformOrderServiceImpl.java

@@ -7,13 +7,14 @@ import com.zanxiang.common.utils.StringUtils;
 import com.zanxiang.common.utils.bean.BeanUtils;
 import com.zanxiang.sdk.domain.bo.PlatformOrderBO;
 import com.zanxiang.sdk.domain.dto.PlatformOrderDTO;
-import com.zanxiang.sdk.domain.entity.Order;
-import com.zanxiang.sdk.mapper.OrderMapper;
+import com.zanxiang.mybatis.entity.Order;
+import com.zanxiang.mybatis.mapper.OrderMapper;
 import com.zanxiang.sdk.service.PlatformOrderService;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.jupiter.api.extension.ParameterResolutionException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -33,6 +34,9 @@ import java.util.Date;
 public class PlatformOrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements PlatformOrderService {
     protected final Logger logger = LoggerFactory.getLogger(PlatformOrderServiceImpl.class);
 
+    @Autowired
+    private OrderMapper orderMapper;
+
     @Transactional(rollbackFor = Exception.class)
     @Override
     public String create(PlatformOrderBO platformOrderBO) {
@@ -104,7 +108,8 @@ public class PlatformOrderServiceImpl extends ServiceImpl<OrderMapper, Order> im
 
     @Override
     public PlatformOrderDTO info(String id, String userId) {
-        Order order = getOne(new LambdaQueryWrapper<Order>().eq(Order::getId, id).eq(Order::getUserId, userId));
+        Order order = orderMapper.selectByPrimaryKey(Long.valueOf(id));
+//        Order order = getOne(new LambdaQueryWrapper<Order>().eq(Order::getId, id).eq(Order::getUserId, userId));
         return BeanUtils.copy(order, PlatformOrderDTO.class);
     }
 

game-module/game-sdk/src/main/java/com/zanxiang/sdk/service/Impl/UserLoginLogServiceImpl.java

@@ -1,9 +1,9 @@
 package com.zanxiang.sdk.service.Impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zanxiang.sdk.domain.entity.User;
-import com.zanxiang.sdk.domain.entity.UserLoginLog;
-import com.zanxiang.sdk.mapper.UserLoginLogMapper;
+import com.zanxiang.mybatis.entity.User;
+import com.zanxiang.mybatis.entity.UserLoginLog;
+import com.zanxiang.mybatis.mapper.UserLoginLogMapper;
 import com.zanxiang.sdk.service.IUserLoginLogService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

game-module/game-sdk/src/main/java/com/zanxiang/sdk/service/Impl/UserServiceImpl.java

@@ -11,11 +11,16 @@ import com.zanxiang.common.utils.IpUtils;
 import com.zanxiang.common.utils.StringUtils;
 import com.zanxiang.common.utils.bean.BeanUtils;
 import com.zanxiang.sdk.domain.dto.UserDTO;
-import com.zanxiang.sdk.domain.entity.User;
+import com.zanxiang.mybatis.entity.User;
 import com.zanxiang.sdk.domain.enums.AccountStatusEnum;
 import com.zanxiang.sdk.domain.enums.CmfSaltEnum;
 import com.zanxiang.sdk.domain.params.*;
 import com.zanxiang.sdk.domain.vo.UserLoginVO;
+import com.zanxiang.mybatis.mapper.UserMapper;
+import com.zanxiang.sdk.service.ISmsService;
+import com.zanxiang.sdk.service.IUserLoginLogService;
+import com.zanxiang.sdk.service.IUserService;
+import com.zanxiang.sdk.service.IUserTokenService;
 import com.zanxiang.sdk.mapper.UserMapper;
 import com.zanxiang.sdk.service.*;
 import lombok.extern.slf4j.Slf4j;

game-module/game-sdk/src/main/java/com/zanxiang/sdk/service/Impl/UserTokenServiceImpl.java

@@ -11,8 +11,8 @@ import com.zanxiang.common.text.UUID;
 import com.zanxiang.common.utils.bean.BeanUtils;
 import com.zanxiang.sdk.common.constant.RedisKeyConstant;
 import com.zanxiang.sdk.domain.dto.UserTokenDTO;
-import com.zanxiang.sdk.domain.entity.UserToken;
-import com.zanxiang.sdk.mapper.UserTokenMapper;
+import com.zanxiang.mybatis.entity.UserToken;
+import com.zanxiang.mybatis.mapper.UserTokenMapper;
 import com.zanxiang.sdk.service.IUserTokenService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

game-module/game-sdk/src/main/java/com/zanxiang/sdk/service/Impl/pay/PayService.java

@@ -6,7 +6,7 @@ import com.zanxiang.common.exception.BaseException;
 import com.zanxiang.sdk.domain.bo.ProductPayAttachParamBO;
 import com.zanxiang.sdk.domain.bo.ProductPayParamBO;
 import com.zanxiang.sdk.domain.dto.PlatformOrderDTO;
-import com.zanxiang.sdk.domain.entity.GamePayWay;
+import com.zanxiang.mybatis.entity.GamePayWay;
 import com.zanxiang.sdk.service.GamePayWayService;
 import com.zanxiang.sdk.service.OrderPayService;
 import com.zanxiang.sdk.service.PlatformOrderService;

game-module/game-sdk/src/main/java/com/zanxiang/sdk/service/Impl/pay/WxpayServiceImpl.java

@@ -10,7 +10,7 @@ import com.zanxiang.sdk.domain.bo.PlatformOrderBO;
 import com.zanxiang.sdk.domain.bo.ProductPayAttachParamBO;
 import com.zanxiang.sdk.domain.bo.ProductPayParamBO;
 import com.zanxiang.sdk.domain.bo.WxPayConfigBO;
-import com.zanxiang.sdk.domain.entity.GamePayWay;
+import com.zanxiang.mybatis.entity.GamePayWay;
 import com.zanxiang.sdk.service.GamePayWayService;
 import com.zanxiang.sdk.service.OrderPayService;
 import lombok.extern.slf4j.Slf4j;

game-module/game-sdk/src/main/java/com/zanxiang/sdk/service/PlatformOrderService.java

@@ -3,7 +3,7 @@ package com.zanxiang.sdk.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.zanxiang.sdk.domain.bo.PlatformOrderBO;
 import com.zanxiang.sdk.domain.dto.PlatformOrderDTO;
-import com.zanxiang.sdk.domain.entity.Order;
+import com.zanxiang.mybatis.entity.Order;
 
 /**
  * 平台订单逻辑开发

game-module/game-sdk/src/main/resources/bootstrap.yml

@@ -53,4 +53,4 @@ logging:
   level:
     root: warn
     com.zanxiang.sdk: debug
-    com.zanxiang.sdk.mapper: debug
+    com.zanxiang.mybatis.mapper: debug

game-module/game-sdk/src/main/resources/mapper/OrderMapper.xml

@@ -1,4 +0,0 @@
-<?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.zanxiang.sdk.mapper.OrderMapper">
-</mapper>

game-module/game-sdk/src/test/java/com/zanxiang/sdk/SDKApplicationTests.java

@@ -12,7 +12,7 @@ import org.springframework.boot.test.context.SpringBootTest;
  */
 
 @SpringBootTest(classes = SDKApplication.class)
-@MapperScan("com.zanxiang.sdk.mapper")
+@MapperScan("com.zanxiang.mybatis.mapper")
 public class SDKApplicationTests {
 
     @Test

game-module/pom.xml

@@ -16,6 +16,7 @@
         <module>game-sdk</module>
         <module>game-common</module>
         <module>game-common-redis</module>
+        <module>game-mybatis</module>
     </modules>
 
     <dependencies>