修改商户余额资金流水

src/main/java/com/pangding/web/authority/controller/CompanyController.java

@@ -2,10 +2,13 @@ package com.pangding.web.authority.controller;
 
 
 import com.pangding.web.authority.service.CompanyAgreementService;
+import com.pangding.web.authority.service.CompanyMoneyService;
 import com.pangding.web.authority.service.CompanyService;
 import com.pangding.web.vo.system.req.company.CompanyAgreementReqVo;
+import com.pangding.web.vo.system.req.company.CompanyMoneyReqVo;
 import com.pangding.web.vo.system.req.company.CompanyReqVo;
 import com.pangding.web.vo.system.req.company.SaveCompanyReqVo;
+import com.pangding.web.vo.system.res.company.CompanyMoneyTotalResVo;
 import com.yanzuoguang.util.helper.CheckerHelper;
 import com.yanzuoguang.util.vo.ResponseResult;
 import io.swagger.annotations.ApiOperation;
@@ -25,6 +28,7 @@ public class CompanyController {
     @Autowired
     private CompanyAgreementService companyAgreementService;
 
+
     /**
      * 找到公司余额
      *
@@ -71,4 +75,6 @@ public class CompanyController {
         return ResponseResult.result(companyService.findCompanyById(req));
     }
 
+
+
 }

src/main/java/com/pangding/web/authority/controller/FinanceController.java

 package com.pangding.web.authority.controller;
 
+import com.pangding.web.authority.service.CompanyMoneyService;
 import com.pangding.web.authority.service.FinanceService;
 import com.pangding.web.authority.vo.reqvo.WithdrawalReqVo;
 import com.pangding.web.authority.vo.resvo.WithdrawalResVo;
 import com.pangding.web.vo.order.req.CapitalFlowReqVo;
 import com.pangding.web.vo.order.req.back.CashWithdrawalBackReqVo;
 import com.pangding.web.vo.order.res.CapitalFlowListResVo;
+import com.pangding.web.vo.system.req.company.CompanyMoneyReqVo;
+import com.pangding.web.vo.system.res.company.CompanyMoneyTotalResVo;
 import com.yanzuoguang.util.helper.CheckerHelper;
 import com.yanzuoguang.util.vo.ResponseResult;
 import io.swagger.annotations.Api;
@@ -25,6 +28,8 @@ import org.springframework.web.bind.annotation.*;
 public class FinanceController {
     @Autowired
     private FinanceService financeService;
+    @Autowired
+    private CompanyMoneyService companyMoneyService;
 
     /**
      * 查询订单列表PageSizeData<CapitalFlowResVo>
@@ -79,4 +84,10 @@ public class FinanceController {
         return financeService.withdrawalBack(req);
     }
 
+    @RequestMapping(value = "findCompanyMoneyList")
+    @ApiOperation(value = "找到公司资金汇总列表", notes = "返回公司资金汇总列表")
+    public ResponseResult<CompanyMoneyTotalResVo> findCompanyMoneyList(@RequestBody CompanyMoneyReqVo req){
+        return ResponseResult.result(companyMoneyService.findCompanyMoney(req));
+    }
+
 }

src/main/java/com/pangding/web/authority/dao/CompanyMoneyDao.java

 package com.pangding.web.authority.dao;
 
+import com.pangding.web.vo.system.pd.company.CompanyMoneyVo;
+import com.pangding.web.vo.system.req.company.CompanyMoneyReqVo;
 import com.yanzuoguang.dao.BaseDao;
+import com.yanzuoguang.util.vo.PageSizeData;
 
 public interface CompanyMoneyDao extends BaseDao {
 
+    /**
+     * 查询公司资金每日汇总数据（分页）
+     * @param req
+     * @return
+     */
+    PageSizeData<CompanyMoneyVo> findCompanyMoneyPage(CompanyMoneyReqVo req);
 
+    /**
+     * 找到汇总数据
+     * @param req
+     * @return
+     */
+    CompanyMoneyVo findReport(CompanyMoneyReqVo req);
 
 }

src/main/java/com/pangding/web/authority/dao/impl/CompanyMoneyDaoImpl.java

@@ -2,17 +2,48 @@ package com.pangding.web.authority.dao.impl;
 
 import com.pangding.web.authority.dao.CompanyMoneyDao;
 import com.pangding.web.vo.system.pd.company.CompanyMoneyVo;
+import com.pangding.web.vo.system.req.company.CompanyMoneyReqVo;
 import com.yanzuoguang.dao.impl.BaseDaoImpl;
+import com.yanzuoguang.util.vo.PageSizeData;
 import org.springframework.stereotype.Component;
 
 @Component
 public class CompanyMoneyDaoImpl extends BaseDaoImpl implements CompanyMoneyDao {
 
+    private final static String QUERY_LIST = "QUERY_LIST";
+
+    private final static String QUERT_REPORT = "QUERT_REPORT";
+
     @Override
     protected void init() {
 
         register(CompanyMoneyVo.class);
 
+        table.add(QUERY_LIST, "SELECT * FROM pd_company_money WHERE 1=1 {WHERE}")
+                .add("companyId", " AND company_id = ? ")
+                .add("startDate", " AND daily_date >= ?")
+                .add("endDate", " AND daily_date <= ?")
+                .add("companyName", " AND company_name like concat('%',?,'%') ");
+
+        table.add(QUERT_REPORT, "SELECT SUM(init_money) as init_money,SUM(in_money) as in_money,SUM(out_money) as out_money," +
+                "SUM(refund_money) as refund_money,SUM(final_money) as final_money,SUM(in_number) as in_number," +
+                "SUM(out_number) as out_number,SUM(refund_number) as refund_number" +
+                " FROM pd_company_money WHERE 1=1 {WHERE}")
+                .add("companyId", " AND company_id = ? ")
+                .add("startDate", " AND daily_date >= ?")
+                .add("endDate", " AND daily_date <= ?")
+                .add("companyName", " AND company_name like concat('%', ?, '%')");
+
+    }
+
+    @Override
+    public PageSizeData<CompanyMoneyVo> findCompanyMoneyPage(CompanyMoneyReqVo req) {
+        return this.queryPage(CompanyMoneyVo.class, req, QUERY_LIST, req);
+    }
+
+    @Override
+    public CompanyMoneyVo findReport(CompanyMoneyReqVo req) {
+        return this.queryFirst(CompanyMoneyVo.class, QUERT_REPORT, req);
     }
 
 }

src/main/java/com/pangding/web/authority/service/CompanyMoneyService.java

+package com.pangding.web.authority.service;
+
+import com.pangding.web.vo.system.req.company.CompanyMoneyReqVo;
+import com.pangding.web.vo.system.res.company.CompanyMoneyTotalResVo;
+
+public interface CompanyMoneyService {
+
+    CompanyMoneyTotalResVo findCompanyMoney(CompanyMoneyReqVo req);
+
+
+}

src/main/java/com/pangding/web/authority/service/impl/CompanyMoneyServiceImpl.java

+package com.pangding.web.authority.service.impl;
+
+import com.pangding.web.authority.dao.CompanyMoneyDao;
+import com.pangding.web.authority.service.CompanyMoneyService;
+import com.pangding.web.vo.system.pd.company.CompanyMoneyVo;
+import com.pangding.web.vo.system.req.company.CompanyMoneyReqVo;
+import com.pangding.web.vo.system.res.company.CompanyMoneyTotalResVo;
+import com.yanzuoguang.util.vo.PageSizeData;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class CompanyMoneyServiceImpl implements CompanyMoneyService {
+
+    @Autowired
+    private CompanyMoneyDao companyMoneyDao;
+
+    /**
+     * 找到列表
+     * @param req
+     * @return
+     */
+    public CompanyMoneyTotalResVo findCompanyMoney(CompanyMoneyReqVo req){
+        CompanyMoneyTotalResVo companyMoneyTotalResVo = new CompanyMoneyTotalResVo();
+
+        PageSizeData<CompanyMoneyVo> companyMoneyVoPageSizeData = companyMoneyDao.findCompanyMoneyPage(req);
+        companyMoneyTotalResVo.setCompanyMoneyVoPageSizeData(companyMoneyVoPageSizeData);
+
+        CompanyMoneyVo companyMoneyVo = companyMoneyDao.findReport(req);
+        companyMoneyTotalResVo.setCompanyMoneyVo(companyMoneyVo);
+
+        return companyMoneyTotalResVo;
+    }
+
+
+}

src/main/java/com/pangding/web/authority/service/impl/CompanyServiceImpl.java

@@ -28,6 +28,7 @@ import com.pangding.web.vo.system.pd.authority.UserRoleVo;
 import com.pangding.web.vo.system.pd.authority.UserVo;
 import com.pangding.web.vo.system.pd.company.*;
 import com.pangding.web.vo.system.req.CompanyMsgReqVo;
+import com.pangding.web.vo.system.req.authority.RoleReqVo;
 import com.pangding.web.vo.system.req.authority.UserRoleReqVo;
 import com.pangding.web.vo.system.req.company.*;
 import com.pangding.web.vo.system.res.company.*;
@@ -134,16 +135,22 @@ public class CompanyServiceImpl implements CompanyService {
         userGetReqVo.setIsFirst(1);
         userGetReqVo.setCompanyId(reqVo.getId());
         UserVo userVo = userDao.load(userGetReqVo, UserVo.class);
-        if (null != userVo) {
+        if (!StringHelper.isEmpty(userVo)) {
             userVo.setPassword("");
             userVo.setRemark("");
             resVo.setUserVo(userVo);
         } else {
             UserGetReqVo userGetReqVo1 = new UserGetReqVo();
             userGetReqVo1.setCompanyId(reqVo.getId());
-            UserVo userVo1 = userDao.load(userGetReqVo1, UserVo.class);
-            resVo.setUserVo(userVo1);
+            userVo = userDao.load(userGetReqVo1, UserVo.class);
+            resVo.setUserVo(userVo);
         }
+
+        RoleReqVo roleReqVo = new RoleReqVo();
+        roleReqVo.setCompanyId(reqVo.getId());
+        RoleVo roleVo = roleDao.load(roleReqVo, RoleVo.class);
+        resVo.setRoleVo(roleVo);
+
         /*获取没有公司id的角色数组*/
         GetEmptyRolesReqVo getEmptyRolesReqVo = new GetEmptyRolesReqVo();
         List<RoleVo> roleVoList = roleDao.getEmptyRoles(getEmptyRolesReqVo);
@@ -159,9 +166,8 @@ public class CompanyServiceImpl implements CompanyService {
         CompanyLoginResVo resVo = new CompanyLoginResVo();
         /*获取公司表信息*/
         CompanyVo companyVo = companyDao.load(reqVo, CompanyVo.class);
-        if (null != companyVo) {
+        if (!StringHelper.isEmpty(companyVo)) {
             resVo.setCompanyVo(companyVo);
-        }
 
         /*此处需要根据公司id和productOrInterface获取商户信息*/
             CompanyScenicInfoReqVo companyScenicInfoReqVo = new CompanyScenicInfoReqVo();
@@ -178,18 +184,13 @@ public class CompanyServiceImpl implements CompanyService {
             }
 
         /*获取公司扩展表信息*/
-        CompanyExtendGetReqVo companyExtendGetReqVo = new CompanyExtendGetReqVo();
-        companyExtendGetReqVo.setId(reqVo.getId());
-        CompanyExtendVo companyExtendVo = companyExtendDao.load(companyExtendGetReqVo, CompanyExtendVo.class);
-        if (null != companyExtendVo) {
+            CompanyExtendVo companyExtendVo = companyExtendDao.load(reqVo.getId(), CompanyExtendVo.class);
             resVo.setCompanyExtendVo(companyExtendVo);
-        }
         /*获取公司银行卡列表*/
             CompanyBankCardGetReqVo companyBankCardGetReqVo = new CompanyBankCardGetReqVo();
             companyBankCardGetReqVo.setCompanyId(reqVo.getId());
             companyBankCardGetReqVo.setIsDefault(CompanyBankCardConstant.IS_DEFAULT);
             CompanyBankCardVo companyBankCardVo = companyBankCardDao.load(companyBankCardGetReqVo, CompanyBankCardVo.class);
-        if (null != companyBankCardVo) {
             resVo.setBankCardVo(companyBankCardVo);
         }
         return resVo;
@@ -940,14 +941,14 @@ public class CompanyServiceImpl implements CompanyService {
                     getCompanyReqVo = new GetCompanyReqVo();
                     getCompanyReqVo.setCompanyId(companyDivideResVo.getInvitationCompanyId());
                     GetCompanyDivideResVo companyDivideResVo1 = companyDivideRuleDao.findCompanyDivideInfo(getCompanyReqVo);
-                    if (!StringHelper.isEmpty(companyDivideResVo1) ) {
+                    if (!StringHelper.isEmpty(companyDivideResVo1)) {
                         companyDivideResVo1.setCompanyChannelType(CompanyConstant.COMPANY_TYPE_BONUS);
                         companyDivideResVoList.add(companyDivideResVo1);
                         if (!StringHelper.isEmpty(companyDivideResVo1.getPid())) {
                             getCompanyReqVo = new GetCompanyReqVo();
                             getCompanyReqVo.setCompanyId(companyDivideResVo1.getPid());
                             GetCompanyDivideResVo companyDivideResVo2 = companyDivideRuleDao.findCompanyDivideInfo(getCompanyReqVo);
-                            if (!StringHelper.isEmpty(companyDivideResVo2) ) {
+                            if (!StringHelper.isEmpty(companyDivideResVo2)) {
                                 companyDivideResVo2.setCompanyChannelType(CompanyConstant.COMPANY_TYPE_SUPER);
                                 companyDivideResVoList.add(companyDivideResVo2);
                             }
@@ -1054,9 +1055,6 @@ public class CompanyServiceImpl implements CompanyService {
     }
 
 
-
-
-
     @Override
     public FindCompanyBalanceResVo findCompanyBalance(com.pangding.web.vo.system.req.company.CompanyReqVo req) {
 

src/main/java/com/pangding/web/authority/service/impl/DeviceServiceImpl.java

@@ -3,6 +3,7 @@ package com.pangding.web.authority.service.impl;
 import com.pangding.web.authority.dao.DeviceDao;
 import com.pangding.web.authority.feign.PayFeign;
 import com.pangding.web.authority.service.DeviceService;
+import com.pangding.web.constant.CompanyConstant;
 import com.pangding.web.vo.system.pd.device.DeviceVo;
 import com.pangding.web.vo.system.req.DeviceReqVo;
 import com.pangding.web.vo.system.res.DeviceResVo;
@@ -46,6 +47,7 @@ public class DeviceServiceImpl implements DeviceService {
         ObjectHelper.writeWithFrom(deviceVo, req);
         deviceVo.setDeviceId(StringHelper.getNewID());
         deviceVo.setCreateTime(DateHelper.getNow());
+        if(CompanyConstant.DEVICE_REVERSE_SWEEP == req.getDeviceType()){
             ResponseResult<Boolean> responseResult = payFeign.vspTermidService(req);
             boolean flag = responseResult.getData();
             if(flag){
@@ -53,6 +55,7 @@ public class DeviceServiceImpl implements DeviceService {
             }else{
                 deviceVo.setDeviceStatus(4);
             }
+        }
         deviceDao.create(deviceVo);
         return ResponseResult.result(deviceVo);
     }

src/main/java/com/pangding/web/authority/vo/resvo/CompanyLoginResVo.java

 package com.pangding.web.authority.vo.resvo;
 
-import com.pangding.web.authority.vo.*;
 import com.pangding.web.vo.product.pd.merchant.MerchantVo;
 import com.pangding.web.vo.system.pd.authority.RoleVo;
 import com.pangding.web.vo.system.pd.authority.UserVo;
@@ -25,6 +24,8 @@ public class CompanyLoginResVo {
 
     private CompanyBankCardVo bankCardVo;
 
+    private RoleVo roleVo;
+
     private List<RoleVo> roleVoList;
 
     public List<RoleVo> getRoleVoList() {
@@ -74,4 +75,12 @@ public class CompanyLoginResVo {
     public void setCompanyExtendVo(CompanyExtendVo companyExtendVo) {
         this.companyExtendVo = companyExtendVo;
     }
+
+    public RoleVo getRoleVo() {
+        return roleVo;
+    }
+
+    public void setRoleVo(RoleVo roleVo) {
+        this.roleVo = roleVo;
+    }
 }