修改余额为0的处理，

添加银行卡空指针问题

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

@@ -34,4 +34,6 @@ public interface CompanyMoneyDao extends BaseDao {
     Integer updateCompanyMoney(CompanyMoneyVo req);
 
     CompanyMoneyVo findLastInfo(CompanyMoneyReqVo req);
+
+    List<CompanyMoneyVo> findCompanyMoneyTotalMonthList(CompanyMoneyReqVo req);
 }

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

@@ -20,6 +20,8 @@ public class CompanyMoneyDaoImpl extends BaseDaoImpl implements CompanyMoneyDao
 
     public static final String LAST_INFO = "LAST_INFO";
 
+    public static final String QUERY_TOTAL_MONTH = "QUERY_TOTAL_MONTH";
+
     @Override
     protected void init() {
 
@@ -31,6 +33,15 @@ public class CompanyMoneyDaoImpl extends BaseDaoImpl implements CompanyMoneyDao
                 .add("endDate", " AND daily_date <= ?")
                 .add("companyName", " AND company_name like concat('%',?,'%') ");
 
+        table.add(QUERY_TOTAL_MONTH, "SELECT DATE_FORMAT(a.daily_date, '%Y-%m') AS daily_date," +
+                "IFNULL(SUM( a.in_money ),0)AS in_money, IFNULL(SUM( a.refund_money ),0)AS refund_money," +
+                "IFNULL(SUM( a.in_number ),0)AS in_number,IFNULL(SUM( a.refund_number ),0)AS refund_number " +
+                "FROM  pd_company_money a  WHERE 1=1 {WHERE} GROUP BY DATE_FORMAT(a.daily_date,'%Y-%m') order by daily_date ")
+                .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" +
@@ -80,4 +91,9 @@ public class CompanyMoneyDaoImpl extends BaseDaoImpl implements CompanyMoneyDao
         return this.queryFirst(CompanyMoneyVo.class, LAST_INFO, req);
     }
 
+    @Override
+    public List<CompanyMoneyVo> findCompanyMoneyTotalMonthList(CompanyMoneyReqVo req) {
+        return this.query(CompanyMoneyVo.class, QUERY_TOTAL_MONTH, req);
+    }
+
 }

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

@@ -15,4 +15,6 @@ public interface CompanyMoneyService {
     CompanyMoneyVo findLastInfo(CompanyMoneyReqVo req);
 
     CompanyMoneyVo findTotal(CompanyMoneyReqVo req);
+
+    List<CompanyMoneyVo> findCompanyMoneyTotalMonthList(CompanyMoneyReqVo req);
 }

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

@@ -264,7 +264,7 @@ public class AuthorityServiceImpl implements AuthorityService {
 //                if (!StringHelper.isEmpty(parent)) {
 //                    resVo.setParentName(parent.getName());
 //                } else {
-//                    System.out.println("id:" + authorityVo.getPid());
+//                    system.out.println("id:" + authorityVo.getPid());
 //                }
 //
 //            }

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

@@ -67,4 +67,9 @@ public class CompanyMoneyServiceImpl implements CompanyMoneyService {
     }
 
 
+    @Override
+    public List<CompanyMoneyVo> findCompanyMoneyTotalMonthList(CompanyMoneyReqVo req) {
+        return companyMoneyDao.findCompanyMoneyTotalMonthList(req);
+    }
+
 }

src/main/java/com/pangding/web/authority/util/ShareCodeUtil.java

@@ -46,12 +46,12 @@ public class ShareCodeUtil {
 
         while ((id / binLen) > 0) {
             int ind = (int) (id % binLen);
-            // System.out.println(num + "-->" + ind);
+            // system.out.println(num + "-->" + ind);
             buf[--charPos] = r[ind];
             id /= binLen;
         }
         buf[--charPos] = r[(int) (id % binLen)];
-        // System.out.println(num + "-->" + num % binLen);
+        // system.out.println(num + "-->" + num % binLen);
         String str = new String(buf, charPos, (32 - charPos));
         // 不够长度的自动随机补全
         if (str.length() < s) {

src/main/java/com/pangding/web/authority/util/UserTask.java

@@ -85,7 +85,7 @@ public class UserTask {
         for (int i = 0; i < companyResVoList.size(); i++) {
             CompanyResVo companyResVo = companyResVoList.get(i);
             double serviceCharge = financeService.getServiceCharge(companyResVo);
-//            System.out.println(companyResVo.getCompanyName() + "服务费" + serviceCharge );
+//            system.out.println(companyResVo.getCompanyName() + "服务费" + serviceCharge );
             if(serviceCharge > 0 ){
                 UpdateCompanyMoneyReqVo updateCompanyMoneyReqVo = new UpdateCompanyMoneyReqVo();
                 updateCompanyMoneyReqVo.setCompanyId(companyResVo.getId());

src/main/java/com/pangding/web/report/service/V2IndexService.java

@@ -11,4 +11,6 @@ public interface V2IndexService {
 
     DataAnalysisBaseResVo capitalAndOrderDay(DataAnalysisBaseReqVo req);
 
+    DataAnalysisBaseResVo capitalAndOrderMonth(DataAnalysisBaseReqVo req);
+
 }

src/main/java/com/pangding/web/report/web/V2IndexController.java

@@ -38,14 +38,22 @@ public class V2IndexController {
      */
     @RequestMapping(value = "/capitalAndOrderDay")
     @ApiOperation(value = "资金流水和交易订单数据", notes = "资金流水和交易订单数据")
-    public ResponseResult<DataAnalysisBaseResVo> capitalAndOrderMonth(@RequestBody DataAnalysisBaseReqVo req) {
+    public ResponseResult<DataAnalysisBaseResVo> capitalAndOrderDay(@RequestBody DataAnalysisBaseReqVo req) {
         CheckerHelper check = CheckerHelper.newInstance()
                 .notBlankCheck("companyId", req.getCompanyId())
                 .checkException();
-        if ("10001".equals(req.getCompanyId())) {
-            req.setCompanyId("");
-        }
         return ResponseResult.result(v2IndexService.capitalAndOrderDay(req));
     }
 
+    /**
+     * B端首页数据分析月(实际是该月中每一天)
+     */
+    @RequestMapping(value = "/capitalAndOrderMonth")
+    @ApiOperation(value = "资金流水和交易订单数据", notes = "资金流水和交易订单数据")
+    public ResponseResult<DataAnalysisBaseResVo> capitalAndOrderMonth(@RequestBody DataAnalysisBaseReqVo req) {
+        CheckerHelper check = CheckerHelper.newInstance()
+                .notBlankCheck("companyId", req.getCompanyId())
+                .checkException();
+        return ResponseResult.result(v2IndexService.capitalAndOrderMonth(req));
+    }
 }

src/main/java/com/pangding/web/V2/dao/SystemStopDao.java → src/main/java/com/pangding/web/system/dao/SystemStopDao.java

-package com.pangding.web.V2.dao;
+package com.pangding.web.system.dao;
 
 import com.yanzuoguang.dao.BaseDao;
 

src/main/java/com/pangding/web/system/dao/SystemWarnDao.java

+package com.pangding.web.system.dao;
+
+import com.pangding.web.vo.system.req.SystemWarnPageReqVo;
+import com.pangding.web.vo.system.res.SystemWarnResVo;
+import com.yanzuoguang.dao.BaseDao;
+import com.yanzuoguang.util.vo.PageSizeData;
+
+public interface SystemWarnDao extends BaseDao {
+
+    PageSizeData<SystemWarnResVo> findListPage(SystemWarnPageReqVo req);
+
+}

src/main/java/com/pangding/web/V2/dao/impl/SystemStopDaoImpl.java → src/main/java/com/pangding/web/system/dao/impl/SystemStopDaoImpl.java

-package com.pangding.web.V2.dao.impl;
+package com.pangding.web.system.dao.impl;
 
-import com.pangding.web.V2.dao.SystemStopDao;
+import com.pangding.web.system.dao.SystemStopDao;
 import com.pangding.web.vo.system.pd.SystemStopVo;
 import com.yanzuoguang.dao.impl.BaseDaoImpl;
 import org.springframework.stereotype.Component;

src/main/java/com/pangding/web/system/dao/impl/SystemWarnDaoImpl.java

+package com.pangding.web.system.dao.impl;
+
+import com.pangding.web.system.dao.SystemWarnDao;
+import com.pangding.web.vo.system.pd.SystemWarnVo;
+import com.pangding.web.vo.system.req.SystemWarnPageReqVo;
+import com.pangding.web.vo.system.res.SystemWarnResVo;
+import com.yanzuoguang.dao.impl.BaseDaoImpl;
+import com.yanzuoguang.util.vo.PageSizeData;
+import org.springframework.stereotype.Component;
+
+@Component
+public class SystemWarnDaoImpl extends BaseDaoImpl implements SystemWarnDao {
+
+    private final String QUERY_LIST = "QUERY_LIST";
+
+
+    @Override
+    protected void init() {
+        register(SystemWarnVo.class);
+
+        table.add(QUERY_LIST, " select * from pd_system_warning where 1=1 {WHERE}")
+                .add("startDate"," and create_date >= ? ")
+                .add("endDate"," and create_date <= ? ")
+                .add("systemWarningId"," and system_warning_id = ? ")
+                .add("warnType"," and warn_type = ? ")
+                .add("warnName"," and warnName LIKE concat('%', ?,'%') ")
+                .add("companyName"," and companyName LIKE concat('%', ?,'%')  ")
+                .add("merchantName"," and merchantName LIKE concat('%', ?,'%')  ")
+                .add("productName"," and productName LIKE concat('%', ?,'%')  ")
+                .add("channelTypeList"," and channelTypeList in ( ? ) ")
+                .add("warnStatusList"," and warnStatusList in ( ? ) ");
+
+    }
+
+    public PageSizeData<SystemWarnResVo> findListPage(SystemWarnPageReqVo req){
+        return this.queryPage(SystemWarnResVo.class, req, QUERY_LIST, req);
+
+    }
+}

src/main/java/com/pangding/web/V2/service/SystemStopService.java → src/main/java/com/pangding/web/system/service/SystemStopService.java

-package com.pangding.web.V2.service;
+package com.pangding.web.system.service;
 
 import com.pangding.web.vo.system.pd.SystemStopVo;
 import com.pangding.web.vo.system.req.SystemStopReqVo;

src/main/java/com/pangding/web/system/service/SystemWarnService.java

+package com.pangding.web.system.service;
+
+import com.pangding.web.vo.system.req.SystemWarnPageReqVo;
+import com.pangding.web.vo.system.req.SystemWarnReqVo;
+import com.pangding.web.vo.system.res.SystemWarnResVo;
+import com.yanzuoguang.util.vo.PageSizeData;
+
+public interface SystemWarnService {
+
+
+    PageSizeData<SystemWarnResVo> findListPage(SystemWarnPageReqVo req);
+
+    SystemWarnResVo find(SystemWarnReqVo req);
+
+    void save(SystemWarnReqVo req);
+
+}

src/main/java/com/pangding/web/V2/service/impl/SystemStopServiceImpl.java → src/main/java/com/pangding/web/system/service/impl/SystemStopServiceImpl.java

-package com.pangding.web.V2.service.impl;
+package com.pangding.web.system.service.impl;
 
-import com.pangding.web.V2.dao.SystemStopDao;
-import com.pangding.web.V2.service.SystemStopService;
+import com.pangding.web.system.dao.SystemStopDao;
+import com.pangding.web.system.service.SystemStopService;
 import com.pangding.web.vo.system.pd.SystemStopVo;
 import com.pangding.web.vo.system.req.SystemStopReqVo;
 import com.yanzuoguang.util.base.ObjectHelper;

src/main/java/com/pangding/web/system/service/impl/SystemWarnServiceImpl.java

+package com.pangding.web.system.service.impl;
+
+import com.pangding.web.system.dao.SystemWarnDao;
+import com.pangding.web.system.service.SystemWarnService;
+import com.pangding.web.vo.system.pd.SystemWarnVo;
+import com.pangding.web.vo.system.req.SystemWarnPageReqVo;
+import com.pangding.web.vo.system.req.SystemWarnReqVo;
+import com.pangding.web.vo.system.res.SystemWarnResVo;
+import com.yanzuoguang.util.base.ObjectHelper;
+import com.yanzuoguang.util.helper.StringHelper;
+import com.yanzuoguang.util.vo.PageSizeData;
+import org.springframework.stereotype.Service;
+
+@Service
+public class SystemWarnServiceImpl implements SystemWarnService {
+
+    private SystemWarnDao systemWarnDao;
+
+    public SystemWarnServiceImpl(SystemWarnDao systemWarnDao) {
+        this.systemWarnDao = systemWarnDao;
+    }
+
+    public PageSizeData<SystemWarnResVo> findListPage(SystemWarnPageReqVo req){
+        return systemWarnDao.findListPage(req);
+    }
+
+    public SystemWarnResVo find(SystemWarnReqVo req){
+        return systemWarnDao.load(req, SystemWarnResVo.class);
+    }
+
+    public void save(SystemWarnReqVo req){
+        SystemWarnReqVo sqlReq = new SystemWarnReqVo();
+        sqlReq.setCompanyName(req.getCompanyName());
+        sqlReq.setMerchantName(req.getMerchantName());
+        sqlReq.setProductName(req.getProductName());
+        sqlReq.setWarnName(req.getWarnName());
+        sqlReq.setWarnType(req.getWarnType());
+        sqlReq.setChannelType(req.getChannelType());
+        SystemWarnResVo systemWarnResVo = systemWarnDao.load(sqlReq, SystemWarnResVo.class);
+        if(StringHelper.isEmpty(systemWarnResVo)){
+            SystemWarnVo systemWarnVo = new SystemWarnVo();
+            ObjectHelper.writeWithFromClass(systemWarnVo, req);
+            systemWarnDao.create(systemWarnVo);
+        }else{
+            ObjectHelper.writeWithFromClass(systemWarnResVo, req);
+            systemWarnDao.update(systemWarnResVo);
+        }
+    }
+
+}

src/main/java/com/pangding/web/V2/web/SystemStopController.java → src/main/java/com/pangding/web/system/web/SystemStopController.java

-package com.pangding.web.V2.web;
+package com.pangding.web.system.web;
 
-import com.pangding.web.V2.service.SystemStopService;
+import com.pangding.web.system.service.SystemStopService;
 import com.pangding.web.vo.system.pd.SystemStopVo;
 import com.pangding.web.vo.system.req.SystemStopReqVo;
 import com.yanzuoguang.util.vo.ResponseResult;

src/main/java/com/pangding/web/system/web/SystemWarnController.java

+package com.pangding.web.system.web;
+
+import com.pangding.web.system.service.SystemWarnService;
+import com.pangding.web.vo.system.req.SystemWarnPageReqVo;
+import com.pangding.web.vo.system.req.SystemWarnReqVo;
+import com.pangding.web.vo.system.res.SystemWarnResVo;
+import com.yanzuoguang.util.vo.PageSizeData;
+import com.yanzuoguang.util.vo.ResponseResult;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping(value = "/systemWarn", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+@Api(value = "系统预警", description = "系统预警")
+public class SystemWarnController {
+
+    private SystemWarnService systemWarnService;
+
+    public SystemWarnController(SystemWarnService systemWarnService) {
+        this.systemWarnService = systemWarnService;
+    }
+
+    @RequestMapping(value = "/findSystemWarnList")
+    @ApiOperation(value = "查询预警信息", notes = "返回预警信息列表.")
+    public ResponseResult<PageSizeData<SystemWarnResVo>> findSystemWarnList(@RequestBody SystemWarnPageReqVo req) {
+        return ResponseResult.result(systemWarnService.findListPage(req));
+    }
+
+    @RequestMapping(value = "/findSystemWarn")
+    @ApiOperation(value = "查询预警信息详情", notes = "返回预警信息详情.")
+    public ResponseResult<SystemWarnResVo> findSystemWarn(@RequestBody SystemWarnReqVo req) {
+        return ResponseResult.result(systemWarnService.find(req));
+    }
+
+}