Merge branch 'dm_dev' of gitlab.ioubuy.cn:yaobenzhang/dm_project into dm_dev

 Conflicts:
	jz-dm-mall/src/main/resources/application-test.yml

jz-dm-common/pom.xml

@@ -74,6 +74,11 @@
             <version>RELEASE</version>
             <scope>compile</scope>
         </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
         <!--阿里云服务器短信平台-->
         <dependency>
             <groupId>com.aliyun</groupId>

jz-dm-common/src/main/java/com/jz/common/utils/SessionUtils.java

+package com.jz.common.utils;
+
+
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * @ClassName:
+ * @Author: Carl
+ * @Date: 2020/12/3
+ * @Version:
+ */
+public class SessionUtils {
+
+    /**
+     * 把数据存储到session中
+     * @param objName 存储到session中的对象的变量名
+     * @param o 存储的任意数据
+     */
+    public static void push(String objName, Object o) {
+        HttpServletRequest request =
+                ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+        request.getSession().setAttribute(objName, o);
+    }
+
+    /**
+     * 从session中获取数据
+     * @param objName 存储到session中的对象的变量名
+     */
+    public static Object pop(String objName) {
+        HttpServletRequest request =
+                ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+        return request.getSession().getAttribute(objName);
+    }
+}

jz-dm-mall/pom.xml

@@ -74,10 +74,10 @@
 		</dependency>
 		
 		<!-- spring boot 和mybatis -->
-		<dependency>
+		<!--<dependency>
 			<groupId>org.mybatis.spring.boot</groupId>
 			<artifactId>mybatis-spring-boot-starter</artifactId>
-		</dependency>
+		</dependency>-->
 		
 		<!-- mybatis plus -->
 		<dependency>

jz-dm-mall/src/main/java/com/jz/dm/mall/moduls/controller/finance/FinanceTradeFlowController.java

@@ -37,7 +37,6 @@ public class FinanceTradeFlowController extends BaseController {
     @GetMapping(value = "/getAccountMoney")
     @ApiOperation(value = "充值----获取账户余额", notes = "获取账户余额")
     public Result<OrderDto> getAccountMoney(HttpServletRequest req) throws Exception {
-
         return new Result<>();
     }
 

jz-dm-mall/src/main/java/com/jz/dm/mall/moduls/entity/FinanceTradeFlow.java

 package com.jz.dm.mall.moduls.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 
@@ -20,6 +22,7 @@ public class FinanceTradeFlow implements Serializable {
     /**
      * 交易流水id
      */
+    @TableId(value = "trade_flow_id",type = IdType.AUTO)
     private Long tradeFlowId;
     /**
      * 订单id

jz-dm-mall/src/main/resources/application-test.yml

@@ -56,6 +56,14 @@ spring:
         - 192.168.31.167:6382
         - 192.168.31.167:6383
         - 192.168.31.167:6384
+
+#mybatis的配置
+mybatis:
+  #配置mapper.xml文件所在路径
+  mapper-locations: classpath:mapperconf/*.xml
+  #配置映射类所在的包名
+  type-aliases-package: com.jz.dm.mall.moduls.entity
+
 logging:
   level:
     com.jz.manage: debug