商户号分类新增功能 修改

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

@@ -28,6 +28,17 @@ public class AflMchAmountCategory extends AbstractInsertTimeEntity {
     /*** 类别 */
     private String category;
 
+    //渠道名称
+    private String agencyName;
+    @Column(name = "agency_name")
+    public String getAgencyName() {
+        return agencyName;
+    }
+
+    public void setAgencyName(String agencyName) {
+        this.agencyName = agencyName;
+    }
+
     /*** 主键ID */
     @Column(name = "ID")
     public String getId() {

src/main/java/com/qtzl/alterSales/manager/service/wechat/WechatMchServiceImpl.java

@@ -107,7 +107,12 @@ public class WechatMchServiceImpl implements WechatMchService {
             totalAmount = new BigDecimal("0");
             totalRefundFee = new BigDecimal("0");
             totalServiceFee = new BigDecimal("0");
-            statisticsVo.setType(amountCategory.getCategory());
+            //替换
+            statisticsVo.setType(formatFeeDescription(amountCategory.getCategory()));
+            //设置渠道编号 名称
+            statisticsVo.setAgencyId(amountCategory.getAgencyId());
+            statisticsVo.setAgencyName(amountCategory.getAgencyName());
+
             //
             final String[] split = amountCategory.getOutTradeNoPrefix().split("[,，]");
             final boolean channelCondition = amountCategory.getAgencyId().contains("52010188930") || amountCategory.getAgencyId().contains("52010188999");
@@ -212,6 +217,13 @@ public class WechatMchServiceImpl implements WechatMchService {
         return wechatStatisticsVos;
     }
 
+    public String formatFeeDescription(String desc) {
+        if (desc.equals("其他")) return desc;
+        if (desc.contains("服务费")) return "服务费";
+        if (desc.contains("通行费")) return "通行费";
+        return desc;
+    }
+
     private boolean verifyOutTradeNo(String[] prefix, String outTradeNo) {
         for (String pre : prefix) {
             if (outTradeNo.startsWith(pre)) {

src/main/java/com/qtzl/alterSales/manager/vo/WechatStatisticsVo.java

@@ -19,6 +19,25 @@ public class WechatStatisticsVo {
 
     private BigDecimal totalRefundFee;
 
+    private String agencyId;
+    private String agencyName;
+
+    public String getAgencyId() {
+        return agencyId;
+    }
+
+    public void setAgencyId(String agencyId) {
+        this.agencyId = agencyId;
+    }
+
+    public String getAgencyName() {
+        return agencyName;
+    }
+
+    public void setAgencyName(String agencyName) {
+        this.agencyName = agencyName;
+    }
+
     public String getType() {
         return type;
     }