update

application.pid

@@ -1 +1 @@
-12372
+21992

src/main/java/com/qtzl/alterSales/UserApplication.java

@@ -17,7 +17,7 @@ import org.springframework.web.client.RestTemplate;
 @SpringBootApplication
 @EnableAspectJAutoProxy(proxyTargetClass = true)
 @EnableTransactionManagement
-@EnableScheduling
+// @EnableScheduling
 public class UserApplication extends SpringBootServletInitializer {
 
     public static void main(String[] args) {

src/main/java/com/qtzl/alterSales/dao/entity/second/AflMchStatistics.java

@@ -39,26 +39,26 @@ public class AflMchStatistics extends AbstractInsertTimeEntity {
     private BigDecimal totalRefundFee;
 
     @ExcelExport("渠道编号")
-    private String agentId;
+    private String agencyId;
     @ExcelExport("渠道名称")
-    private String agentName;
+    private String agencyName;
 
-    @Column(name = "agent_id")
-    public String getAgentId() {
-        return agentId;
+    @Column(name = "AGENCY_ID")
+    public String getAgencyId() {
+        return agencyId;
     }
 
-    public void setAgentId(String agentId) {
-        this.agentId = agentId;
+    public void setAgencyId(String agencyId) {
+        this.agencyId = agencyId;
     }
 
-    @Column(name = "agent_name")
-    public String getAgentName() {
-        return agentName;
+    @Column(name = "AGENCY_NAME")
+    public String getAgencyName() {
+        return agencyName;
     }
 
-    public void setAgentName(String agentName) {
-        this.agentName = agentName;
+    public void setAgencyName(String agencyName) {
+        this.agencyName = agencyName;
     }
 
     /*** 统计日期 */

src/main/java/com/qtzl/alterSales/manager/handler/AflMchStatisticsPageHandler.java

@@ -84,12 +84,11 @@ public class AflMchStatisticsPageHandler extends AbstractAfterSalesManager<AflMc
             if (null != request.getEndDate()) {
                 list.add(cb.lessThanOrEqualTo(root.<Integer>get("statisticalDate"), request.getEndDate()));
             }
-
-            if (!StringUtils.isEmpty(request.getAgentId())) {
-                list.add(cb.equal(root.<String>get("agentId"), request.getAgentId()));
+            if (!StringUtils.isEmpty(request.getAgencyId())) {
+                list.add(cb.equal(root.<String>get("agencyId"), request.getAgencyId()));
             }
-            if (!StringUtils.isEmpty(request.getAgentName())) {
-                list.add(cb.equal(root.<String>get("agentName"), request.getAgentName()));
+            if (!StringUtils.isEmpty(request.getAgencyName())) {
+                list.add(cb.equal(root.<String>get("agencyName"), request.getAgencyName()));
             }
             Predicate[] p = new Predicate[list.size()];
             return cb.and(list.toArray(p));
@@ -98,7 +97,6 @@ public class AflMchStatisticsPageHandler extends AbstractAfterSalesManager<AflMc
         mchStatisticsRepoAll.getContent().forEach(desc -> {
             desc.setFeeType(formatFeeDescription(desc.getFeeType()));
         });
-        logger.info(mchStatisticsRepoAll.getContent().toString());
         return mchStatisticsRepoAll;
     }
 

src/main/java/com/qtzl/alterSales/manager/model/protocol/sales/AflMchStatisticsPageRequest.java

@@ -24,24 +24,24 @@ public class AflMchStatisticsPageRequest extends AbstractAfterSalesPageRequest<A
     private Integer endDate;
 
     //渠道编码
-    private String agentId;
+    private String agencyId;
     //渠道名称
-    private String agentName;
+    private String agencyName;
 
-    public String getAgentId() {
-        return agentId;
+    public String getAgencyId() {
+        return agencyId;
     }
 
-    public void setAgentId(String agentId) {
-        this.agentId = agentId;
+    public void setAgencyId(String agencyId) {
+        this.agencyId = agencyId;
     }
 
-    public String getAgentName() {
-        return agentName;
+    public String getAgencyName() {
+        return agencyName;
     }
 
-    public void setAgentName(String agentName) {
-        this.agentName = agentName;
+    public void setAgencyName(String agencyName) {
+        this.agencyName = agencyName;
     }
 
     public String getSubMchId() {

src/main/java/com/qtzl/alterSales/manager/service/AflMchStatisticsServiceImpl.java

@@ -100,11 +100,11 @@ public class AflMchStatisticsServiceImpl implements AflMchStatisticsService {
             }
 
 
-            if (!StringUtils.isEmpty(request.getAgentId())) {
-                list.add(cb.equal(root.<String>get("agentId"), request.getAgentId()));
+            if (!StringUtils.isEmpty(request.getAgencyId())) {
+                list.add(cb.equal(root.<String>get("agencyId"), request.getAgencyId()));
             }
-            if (!StringUtils.isEmpty(request.getAgentName())) {
-                list.add(cb.equal(root.<String>get("agentName"), request.getAgentName()));
+            if (!StringUtils.isEmpty(request.getAgencyName())) {
+                list.add(cb.equal(root.<String>get("agencyName"), request.getAgencyName()));
             }
             Predicate[] p = new Predicate[list.size()];
             return cb.and(list.toArray(p));