修改注册判断银行卡

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

@@ -11,6 +11,7 @@ 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.helper.CheckerHelper;
+import com.yanzuoguang.util.helper.StringHelper;
 import com.yanzuoguang.util.vo.ResponseResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -46,6 +47,19 @@ public class FinanceController {
         if("10001".equals(req.getCompanyId())){
             req.setCompanyId("");
         }
+        if (!StringHelper.isEmpty(req.getDateType()) && 1 == req.getDateType()) {
+            req.setStartPlayDate(req.getStartDate().substring(0, 10) + " 00:00:00");
+            req.setEndPlayDate(req.getEndDate().substring(0, 10) + " 23:59:59");
+            req.setStartDate("");
+            req.setEndDate("");
+        }
+        if (!StringHelper.isEmpty(req.getDateType()) && 0 == req.getDateType()) {
+            /*入参添加年月日*/
+            req.setStartOrderTime(req.getStartDate().substring(0, 10) + " 00:00:00");
+            req.setEndOrderTime(req.getEndDate().substring(0, 10) + " 23:59:59");
+            req.setStartDate("");
+            req.setEndDate("");
+        }
         CapitalFlowListResVo capitalFlowListResVo = financeService.findCapitalFlowList(req);
         return ResponseResult.result(capitalFlowListResVo);
     }

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

@@ -21,6 +21,10 @@ public class CapitalFlowDaoImpl extends BaseDaoImpl implements CapitalFlowDao {
         table.add(QUERY_LIST, "SELECT * FROM pd_capital_flow  where  1=1 {WHERE} order by time desc")
                 .add("companyId"," AND company_id = ? ")
                 .add("companyName"," AND company_name LIKE concat(?,'%') ")
+                .add("startOrderTime", " AND order_time >= ? ")
+                .add("endOrderTime", " AND order_time <= ? ")
+                .add("startPlayDate", " AND play_date >= ? ")
+                .add("endPlayDate", " AND play_date <= ? ")
                 .add("startDate", " AND time >= ? ")
                 .add("endDate", " AND time <= ? ")
                 .add("orderId", " AND order_id = ? ")
@@ -28,10 +32,19 @@ public class CapitalFlowDaoImpl extends BaseDaoImpl implements CapitalFlowDao {
                 .add("categoryList", " AND category in (?) ")
                 .add("status"," AND status = ? ");
 
-        table.add(QUERY_LIST_TOTAL, "SELECT count(id) as num,sum(order_money) as order_money,sum(order_fee) as order_fee," +
-                "sum(actual_money) as actual_money FROM pd_capital_flow  where  1=1 {WHERE} order by time desc")
+        table.add(QUERY_LIST_TOTAL, "SELECT SUM(CASE WHEN category = 0 THEN order_money ELSE 0 END) AS orderMoney," +
+                "SUM(CASE WHEN category = 0 THEN order_fee ELSE 0 END) AS orderFee," +
+                "SUM(CASE WHEN category = 0 THEN actual_money ELSE 0 END) AS actualMoney," +
+                "SUM(CASE WHEN category = 1 THEN order_money ELSE 0 END) AS withdrawalAmount," +
+                "SUM(CASE WHEN category = 3 THEN actual_money ELSE 0 END) AS refundMoney," +
+                "SUM(CASE WHEN category <> 3 THEN actual_money ELSE 0 END) - SUM(CASE WHEN category = 1 THEN order_money ELSE 0 END) as realMoney" +
+                " FROM pd_capital_flow  where  1=1 {WHERE} order by time desc")
                 .add("companyId"," AND company_id = ? ")
                 .add("companyName"," AND company_name LIKE concat(?,'%')")
+                .add("startOrderTime", " AND order_time >= ? ")
+                .add("endOrderTime", " AND order_time <= ? ")
+                .add("startPlayDate", " AND play_date >= ? ")
+                .add("endPlayDate", " AND play_date <= ? ")
                 .add("startDate", " AND time >= ? ")
                 .add("endDate", " AND time <= ? ")
                 .add("orderId", " AND order_id = ? ")

src/main/java/com/pangding/web/authority/feign/PayFeign.java

@@ -54,7 +54,7 @@ public interface PayFeign {
      * @throws IOException
      */
     @RequestMapping(value = "/sign")
-    ResponseResult<CompanySaveReqVo> sign(@RequestBody CompanySaveReqVo req) throws IOException;
+    ResponseResult<CompanySaveReqVo> sign11(@RequestBody CompanySaveReqVo req) throws IOException;
 
     /**
      * 绑定设备编号

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

@@ -76,7 +76,7 @@ public class UserTask {
     /**
      * 服务费
      */
-    @Scheduled(cron = "0 10 0 * * ?")
+//    @Scheduled(cron = "0 10 0 * * ?")
     public void serviceCharge() {
         CompanyReqVo companyReqVo = new CompanyReqVo();
         companyReqVo.setServiceChargeStatus(1);