commit

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

@@ -2,7 +2,7 @@ package com.jz.dm.mall.moduls.controller.finance;
 
 import com.jz.common.base.BaseController;
 import com.jz.common.utils.Result;
-import com.jz.dm.mall.moduls.controller.order.bean.OrderDto;
+import com.jz.dm.mall.moduls.controller.finance.bean.FinanceCustomerAssetsDto;
 import com.jz.dm.mall.moduls.service.FinanceTradeFlowService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -12,6 +12,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * 企业客户交易流水(TFinanceTradeFlow)表控制层
@@ -33,11 +35,19 @@ public class FinanceTradeFlowController extends BaseController {
      * 充值----获取企业账户余额
      *
      * @author Bellamy
+     * @since 2020-12-03
      */
     @GetMapping(value = "/getAccountMoney")
-    @ApiOperation(value = "充值----获取账户余额", notes = "获取账户余额")
-    public Result<OrderDto> getAccountMoney(HttpServletRequest req) throws Exception {
-        return new Result<>();
+    @ApiOperation(value = "充值----获取账户余额", notes = "获取账户余额，只有已审核（认证）企业才可以充值")
+    public Result<FinanceCustomerAssetsDto> getAccountMoney(HttpServletRequest requset) throws Exception {
+        Result<FinanceCustomerAssetsDto> result = new Result<>();
+        //requset.getSession().getAttribute(""); //从session中获取商城用户的 id,和企业资产账户id
+        Map map = new HashMap();
+        map.put("assetsId", 1); //企业资产账户id
+        map.put("departmentId", 1); //企业ID
+        FinanceCustomerAssetsDto dto = financeTradeFlowService.queryAccountMoneyByMap(map);
+        result.setResult(dto);
+        return result;
     }
 
 }
\ No newline at end of file

jz-dm-mall/src/main/java/com/jz/dm/mall/moduls/mapper/FinanceTradeFlowDao.java

 package com.jz.dm.mall.moduls.mapper;
 
 import com.jz.common.base.BaseMapper;
+import com.jz.dm.mall.moduls.controller.finance.bean.FinanceCustomerAssetsDto;
 import com.jz.dm.mall.moduls.entity.FinanceTradeFlow;
 
+import java.util.Map;
+
 /**
  * 企业客户交易流水(TFinanceTradeFlow)表数据库访问层
  *
@@ -13,4 +16,5 @@ import com.jz.dm.mall.moduls.entity.FinanceTradeFlow;
 public interface FinanceTradeFlowDao extends BaseMapper<FinanceTradeFlow> {
 
 
+    FinanceCustomerAssetsDto queryAccountMoneyByMap(Map map) throws Exception ;
 }
\ No newline at end of file

jz-dm-mall/src/main/java/com/jz/dm/mall/moduls/service/FinanceTradeFlowService.java

 package com.jz.dm.mall.moduls.service;
 
+import com.jz.dm.mall.moduls.controller.finance.bean.FinanceCustomerAssetsDto;
+
+import java.util.Map;
+
 /**
  * 企业客户交易流水(TFinanceTradeFlow)表服务接口
  *
@@ -9,4 +13,5 @@ package com.jz.dm.mall.moduls.service;
 public interface FinanceTradeFlowService {
 
 
+    FinanceCustomerAssetsDto queryAccountMoneyByMap(Map map) throws Exception ;
 }
\ No newline at end of file

jz-dm-mall/src/main/java/com/jz/dm/mall/moduls/service/impl/FinanceTradeFlowServiceImpl.java

 package com.jz.dm.mall.moduls.service.impl;
 
+import com.jz.dm.mall.moduls.controller.finance.bean.FinanceCustomerAssetsDto;
 import com.jz.dm.mall.moduls.mapper.FinanceTradeFlowDao;
 import com.jz.dm.mall.moduls.service.FinanceTradeFlowService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Map;
+
 /**
  * 企业客户交易流水(TFinanceTradeFlow)表服务实现类
  *
@@ -13,7 +16,12 @@ import org.springframework.stereotype.Service;
  */
 @Service("financeTradeFlowService")
 public class FinanceTradeFlowServiceImpl implements FinanceTradeFlowService {
+
     @Autowired
-    private FinanceTradeFlowDao tFinanceTradeFlowDao;
+    private FinanceTradeFlowDao financeTradeFlowDao;
 
+    @Override
+    public FinanceCustomerAssetsDto queryAccountMoneyByMap(Map map)  throws Exception {
+         return financeTradeFlowDao.queryAccountMoneyByMap(map);
+    }
 }
\ No newline at end of file

jz-dm-mall/src/main/resources/mapperconf/FinanceCustomerAssetsDao.xml

@@ -2,18 +2,18 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.jz.dm.mall.moduls.mapper.FinanceCustomerAssetsDao">
 
-<!--    <resultMap type="com.jz.manage.moduls.entity.FinanceCustomerAssets" id="TFinanceCustomerAssetsMap">-->
-<!--        <result property="assetsId" column="assets_id" jdbcType="INTEGER"/>-->
-<!--        <result property="departmentId" column="department_id" jdbcType="INTEGER"/>-->
-<!--        <result property="useMoney" column="use_money" jdbcType="NUMERIC"/>-->
-<!--        <result property="frozenMoney" column="frozen_money" jdbcType="NUMERIC"/>-->
-<!--        <result property="totalMoney" column="total_money" jdbcType="NUMERIC"/>-->
-<!--        <result property="creTime" column="cre_time" jdbcType="TIMESTAMP"/>-->
-<!--        <result property="crePerson" column="cre_person" jdbcType="VARCHAR"/>-->
-<!--        <result property="uptTime" column="upt_time" jdbcType="TIMESTAMP"/>-->
-<!--        <result property="uptPerson" column="upt_person" jdbcType="VARCHAR"/>-->
-<!--        <result property="delFlag" column="del_flag" jdbcType="VARCHAR"/>-->
-<!--    </resultMap>-->
+    <resultMap type="com.jz.dm.mall.moduls.entity.FinanceCustomerAssets" id="TFinanceCustomerAssetsMap">
+        <result property="assetsId" column="assets_id" jdbcType="INTEGER"/>
+        <result property="departmentId" column="department_id" jdbcType="INTEGER"/>
+        <result property="useMoney" column="use_money" jdbcType="NUMERIC"/>
+        <result property="frozenMoney" column="frozen_money" jdbcType="NUMERIC"/>
+        <result property="totalMoney" column="total_money" jdbcType="NUMERIC"/>
+        <result property="creTime" column="cre_time" jdbcType="TIMESTAMP"/>
+        <result property="crePerson" column="cre_person" jdbcType="VARCHAR"/>
+        <result property="uptTime" column="upt_time" jdbcType="TIMESTAMP"/>
+        <result property="uptPerson" column="upt_person" jdbcType="VARCHAR"/>
+        <result property="delFlag" column="del_flag" jdbcType="VARCHAR"/>
+    </resultMap>
 
     <!--查询单个-->
     <select id="queryById" resultMap="TFinanceCustomerAssetsMap">