diff --git a/CreateName-api/pom.xml b/CreateName-api/pom.xml
index dab38f1..c684d82 100644
--- a/CreateName-api/pom.xml
+++ b/CreateName-api/pom.xml
@@ -100,11 +100,10 @@
-
+
- com.alibaba
- fastjson
- 1.2.59
+ com.google.code.gson
+ gson
diff --git a/CreateName-api/src/main/java/top/weimumu/loginapi/LoginApiApplication.java b/CreateName-api/src/main/java/top/weimumu/loginapi/LoginApiApplication.java
index 27427bb..34a1810 100644
--- a/CreateName-api/src/main/java/top/weimumu/loginapi/LoginApiApplication.java
+++ b/CreateName-api/src/main/java/top/weimumu/loginapi/LoginApiApplication.java
@@ -5,7 +5,7 @@ import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
@SpringBootApplication
-@MapperScan("top.weimumu.loginapi.dao")
+@MapperScan("top.weimumu.loginapi.mapper")
public class LoginApiApplication {
public static void main(String[] args) {
diff --git a/CreateName-api/src/main/java/top/weimumu/loginapi/VO/ResultVO.java b/CreateName-api/src/main/java/top/weimumu/loginapi/VO/ResultVO.java
new file mode 100644
index 0000000..55958c3
--- /dev/null
+++ b/CreateName-api/src/main/java/top/weimumu/loginapi/VO/ResultVO.java
@@ -0,0 +1,20 @@
+package top.weimumu.loginapi.VO;
+
+import lombok.Data;
+
+/**
+ * @author: create by calvin wong
+ * @date:2020/3/31
+ **/
+@Data
+public class ResultVO {
+
+ /** 错误码. */
+ private Integer code;
+
+ /** 提示信息. */
+ private String msg;
+
+ /** 具体内容. */
+ private T data;
+}
\ No newline at end of file
diff --git a/CreateName-api/src/main/java/top/weimumu/loginapi/common/GlobalResult.java b/CreateName-api/src/main/java/top/weimumu/loginapi/common/GlobalResult.java
index 84c638a..8d2d328 100644
--- a/CreateName-api/src/main/java/top/weimumu/loginapi/common/GlobalResult.java
+++ b/CreateName-api/src/main/java/top/weimumu/loginapi/common/GlobalResult.java
@@ -1,9 +1,11 @@
package top.weimumu.loginapi.common;
+
/**
* @author: create by calvin wong
* @date:2019/12/10
**/
+
public class GlobalResult {
// 响应业务状态
private Integer status;
diff --git a/CreateName-api/src/main/java/top/weimumu/loginapi/common/KeyUtil.java b/CreateName-api/src/main/java/top/weimumu/loginapi/common/KeyUtil.java
new file mode 100644
index 0000000..0903855
--- /dev/null
+++ b/CreateName-api/src/main/java/top/weimumu/loginapi/common/KeyUtil.java
@@ -0,0 +1,21 @@
+package top.weimumu.loginapi.common;
+
+import java.util.Random;
+/**
+ * calvin wong
+ * */
+
+public class KeyUtil {
+
+ /**
+ * 生成唯一的主键
+ * 格式: 时间+随机数
+ * @return
+ */
+ public static synchronized String genUniqueKey() {
+ Random random = new Random();
+ Integer number = random.nextInt(900000) + 100000;
+
+ return System.currentTimeMillis() + String.valueOf(number);
+ }
+}
\ No newline at end of file
diff --git a/CreateName-api/src/main/java/top/weimumu/loginapi/common/ResultVOUtils.java b/CreateName-api/src/main/java/top/weimumu/loginapi/common/ResultVOUtils.java
new file mode 100644
index 0000000..ebfb313
--- /dev/null
+++ b/CreateName-api/src/main/java/top/weimumu/loginapi/common/ResultVOUtils.java
@@ -0,0 +1,29 @@
+package top.weimumu.loginapi.common;
+
+import top.weimumu.loginapi.VO.ResultVO;
+
+/**
+ * @author: create by calvin wong
+ * @date:2020/4/1
+ **/
+public class ResultVOUtils {
+
+ public static ResultVO success(Object object) {
+ ResultVO resultVO = new ResultVO();
+ resultVO.setData(object);
+ resultVO.setCode(0);
+ resultVO.setMsg("成功");
+ return resultVO;
+ }
+
+ public static ResultVO success() {
+ return success(null);
+ }
+
+ public static ResultVO error(Integer code, String msg) {
+ ResultVO resultVO = new ResultVO();
+ resultVO.setCode(code);
+ resultVO.setMsg(msg);
+ return resultVO;
+ }
+}
\ No newline at end of file
diff --git a/CreateName-api/src/main/java/top/weimumu/loginapi/controller/BaziInfoController.java b/CreateName-api/src/main/java/top/weimumu/loginapi/controller/BaziInfoController.java
new file mode 100644
index 0000000..fa5e9b6
--- /dev/null
+++ b/CreateName-api/src/main/java/top/weimumu/loginapi/controller/BaziInfoController.java
@@ -0,0 +1,22 @@
+package top.weimumu.loginapi.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+
+
+/**
+ *
+ * 八字表 前端控制器
+ *
+ *
+ * @author calvin
+ * @since 2020-03-30
+ */
+@RestController
+@RequestMapping("/sys/bazi-info")
+public class BaziInfoController{
+
+}
diff --git a/CreateName-api/src/main/java/top/weimumu/loginapi/controller/NameDetailController.java b/CreateName-api/src/main/java/top/weimumu/loginapi/controller/NameDetailController.java
new file mode 100644
index 0000000..09ff280
--- /dev/null
+++ b/CreateName-api/src/main/java/top/weimumu/loginapi/controller/NameDetailController.java
@@ -0,0 +1,20 @@
+package top.weimumu.loginapi.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+/**
+ *
+ * 名字推荐表 前端控制器
+ *
+ *
+ * @author calvin
+ * @since 2020-03-30
+ */
+@RestController
+@RequestMapping("/sys/name-detail")
+public class NameDetailController{
+
+}
diff --git a/CreateName-api/src/main/java/top/weimumu/loginapi/controller/NameInfoController.java b/CreateName-api/src/main/java/top/weimumu/loginapi/controller/NameInfoController.java
new file mode 100644
index 0000000..205b3e6
--- /dev/null
+++ b/CreateName-api/src/main/java/top/weimumu/loginapi/controller/NameInfoController.java
@@ -0,0 +1,19 @@
+package top.weimumu.loginapi.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ *
+ * 前端控制器
+ *
+ *
+ * @author calvin
+ * @since 2020-03-30
+ */
+@RestController
+@RequestMapping("/sys/name-info")
+public class NameInfoController{
+
+}
diff --git a/CreateName-api/src/main/java/top/weimumu/loginapi/controller/OrderController.java b/CreateName-api/src/main/java/top/weimumu/loginapi/controller/OrderController.java
deleted file mode 100644
index 1940c6e..0000000
--- a/CreateName-api/src/main/java/top/weimumu/loginapi/controller/OrderController.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package top.weimumu.loginapi.controller;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import top.weimumu.loginapi.common.GlobalResult;
-import top.weimumu.loginapi.dao.OrderMasterMapper;
-import top.weimumu.loginapi.form.OrderForm;
-
-import javax.validation.Valid;
-
-/**
- * @author: create by calvin wong
- * @date:2020/3/25
- **/
-
-@RestController
-@RequestMapping("/order")
-public class OrderController {
- @Autowired
- private OrderMasterMapper orderMasterMapper;
-
- @PostMapping("/create")
- public GlobalResult create(@Valid OrderForm orderForm,
- BindingResult bindingResult
- ){
- if (bindingResult.hasErrors())
- }
-}
diff --git a/CreateName-api/src/main/java/top/weimumu/loginapi/controller/OrderMasterController.java b/CreateName-api/src/main/java/top/weimumu/loginapi/controller/OrderMasterController.java
new file mode 100644
index 0000000..a044397
--- /dev/null
+++ b/CreateName-api/src/main/java/top/weimumu/loginapi/controller/OrderMasterController.java
@@ -0,0 +1,59 @@
+package top.weimumu.loginapi.controller;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import top.weimumu.loginapi.VO.ResultVO;
+import top.weimumu.loginapi.common.ResultVOUtils;
+import top.weimumu.loginapi.converter.OrderForm2OrderDTOConverter;
+import top.weimumu.loginapi.dto.OrderDTO;
+import top.weimumu.loginapi.enums.ResultEnum;
+import top.weimumu.loginapi.exception.NameException;
+import top.weimumu.loginapi.form.OrderForm;
+import top.weimumu.loginapi.service.IOrderMasterService;
+import top.weimumu.loginapi.service.IUserService;
+
+import javax.validation.Valid;
+import java.util.HashMap;
+import java.util.Map;
+
+
+/**
+ *
+ * 订单表 前端控制器
+ *
+ *
+ * @author calvin
+ * @since 2020-03-30
+ */
+@RestController
+@RequestMapping("/order")
+@Slf4j
+public class OrderMasterController{
+
+ @Autowired
+ private IOrderMasterService iOrderMasterService;
+
+ @Autowired
+ private IUserService iUserService;
+
+ //创建订单
+ @PostMapping("/create")
+ public ResultVO