Merge branch 'develop'

pom.xml

@@ -5,11 +5,11 @@
     <parent>
         <groupId>au.com.royalpay.payment</groupId>
         <artifactId>payment-parent</artifactId>
-        <version>2.2.24</version>
+        <version>2.2.25</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>2.3.75</version>
+    <version>2.3.76-SNAPSHOT</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jib-maven-plugin.version>2.4.0</jib-maven-plugin.version>

src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/PlatformClearAnalysisServiceImpl.java

@@ -164,7 +164,7 @@ public class PlatformClearAnalysisServiceImpl implements PlatformClearService {
 
     @Transactional
     public void doVerifyAlipaySettleLog(Date dateStr) throws Exception {
-        JSONObject aliSettleLog = alipayClient.downloadRetailSettlements(dateStr);
+        JSONObject aliSettleLog = alipayClient.oldDownloadRetailSettlements(dateStr);
         saveAlipaySettleLog(dateStr, aliSettleLog, "Alipay");
     }
 

src/main/java/au/com/royalpay/payment/manage/management/channelreconciliationfile/ChannelReconciliationFile.java

@@ -0,0 +1,123 @@
+package au.com.royalpay.payment.manage.management.channelreconciliationfile;
+
+import au.com.royalpay.payment.core.ChannelBillValidator;
+import au.com.royalpay.payment.core.beans.ChannelBillPackage;
+import au.com.royalpay.payment.core.exceptions.ChannelNotSupportedException;
+import au.com.royalpay.payment.tools.defines.PayChannel;
+import com.github.miemiedev.mybatis.paginator.domain.PageList;
+import org.apache.commons.io.IOUtils;
+import org.springframework.stereotype.Component;
+import org.thymeleaf.util.ListUtils;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Collectors;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
+
+/**
+ * @Description
+ * @title: 渠道对账文件
+ * @Date 2020/11/5 15:06
+ * @author: zhangTao
+ */
+@Component
+public class ChannelReconciliationFile {
+
+    private ChannelReconciliationFileTunnel tunnel;
+    private final Map<PayChannel, ChannelBillValidator> validatorMap ;
+
+    public ChannelReconciliationFile(ChannelReconciliationFileTunnel tunnel ,ChannelBillValidator[] validators) {
+        this.tunnel = tunnel;
+        validatorMap = Arrays.stream(validators).collect(Collectors.toMap(ChannelBillValidator::payChannel,channelBillValidator -> channelBillValidator));
+    }
+
+    public PageList<ChannelReconciliationFileDTO> list(ChannelReconciliationFileQueryParameter channelReconciliationFileQueryParameter) {
+        return this.tunnel.list(channelReconciliationFileQueryParameter);
+    }
+
+
+    public ChannelReconciliationFileContent download(ChannelReconciliationFileDownloadParameter from) {
+        Optional<Map.Entry<PayChannel, ChannelBillValidator>> channel = findChannels(from.getChannel());
+
+        if (!channel.isPresent()) {
+            throw new ChannelNotSupportedException();
+        }
+
+        Map.Entry<PayChannel, ChannelBillValidator> channelChannelBillValidatorEntry = channel.get();
+
+        ChannelBillValidator channelBillValidator = channelChannelBillValidatorEntry.getValue();
+
+        List<ChannelBillPackage> channelBillPackageList = selectTypeDown(from ,channelBillValidator);
+
+          if (isNull(channelBillPackageList))   {
+            throw new ChannelReconciliationFileEmptyException();
+        }
+
+
+        if (isMultiFile(channelBillPackageList)) {
+            return genMultiFile(channelBillPackageList);
+        }
+
+        return genSingleFile(channelBillPackageList.get(0));
+    }
+
+    private List<ChannelBillPackage> selectTypeDown(ChannelReconciliationFileDownloadParameter from, ChannelBillValidator channelBillValidator) {
+
+       if (from.billType().equals("SETTLEMENT")){
+           return channelBillValidator
+                   .downloadRawSettlementFiles(from.pid(), from.billDate(), from.isUseCash());
+
+       }
+        return channelBillValidator.downloadRawTransactionFiles(from.pid(), from.billDate(), from.isUseCash());
+
+    }
+
+    private boolean isMultiFile(List<ChannelBillPackage> channelBillPackageList) {
+        return channelBillPackageList.size() > 1;
+    }
+
+    private boolean isNull(List<ChannelBillPackage> channelBillPackageList){
+        return ListUtils.isEmpty(channelBillPackageList);
+    }
+
+    private ChannelReconciliationFileContent genSingleFile(ChannelBillPackage channelBillPackage) {
+        return ChannelReconciliationFileContent.instance(channelBillPackage.getFilename(),
+                channelBillPackage.getBillContent());
+    }
+
+    private ChannelReconciliationFileContent genMultiFile(List<ChannelBillPackage> channelBillPackageList) {
+        try (ByteArrayOutputStream stream = new ByteArrayOutputStream(); ZipOutputStream zipOutputStream = new ZipOutputStream(stream)) {
+
+            channelBillPackageList.forEach(bill -> toZipOutputStream(bill, zipOutputStream));
+
+            zipOutputStream.close();
+            stream.close();
+            return ChannelReconciliationFileContent.instance("reconciliationFile.zip", stream.toByteArray());
+        } catch (IOException e) {
+            throw new MultiFileChannelReconciliationException();
+        }
+    }
+
+    private void toZipOutputStream(ChannelBillPackage channelBillPackage ,ZipOutputStream zipOutputStream){
+            try (ByteArrayInputStream fis = new ByteArrayInputStream(channelBillPackage.getBillContent())) {
+                ZipEntry zipEntryXtv = new ZipEntry(channelBillPackage.getFilename());
+                zipOutputStream.putNextEntry(zipEntryXtv);
+                IOUtils.copy(fis, zipOutputStream);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+    }
+
+
+    private Optional<Map.Entry<PayChannel, ChannelBillValidator>> findChannels(String channel) {
+              return validatorMap.entrySet().stream().filter(entry -> channel.equals(entry.getKey().getChannelCode())).findAny();
+    }
+
+
+}

src/main/java/au/com/royalpay/payment/manage/management/channelreconciliationfile/ChannelReconciliationFileContent.java

@@ -0,0 +1,66 @@
+package au.com.royalpay.payment.manage.management.channelreconciliationfile;
+
+
+import org.apache.commons.io.FilenameUtils;
+
+/**
+ * 渠道对账文件内容
+ * @Date 2020/11/5 17:21
+ * @author: zhangTao
+ */
+public class ChannelReconciliationFileContent {
+
+    private static String SUFFIX =".txt";
+    private final FileName fileName;
+    private final byte[] content;
+
+    private ChannelReconciliationFileContent(String fileName, byte[] content) {
+        this.fileName = new FileName(fileName) ;
+        this.content = content;
+    }
+
+    public String name() {
+        return this.fileName.getName();
+    }
+
+
+    public int length() {
+        return this.content.length;
+    }
+
+    public byte[] content() {
+        return this.content;
+    }
+
+    public static ChannelReconciliationFileContent instance(String fileName, byte[] billContent) {
+        if (!checkFileName(fileName)){
+            fileName = fileName+SUFFIX;
+           // throw new ChannelReconciliationFileNameSuffixException();
+        }
+        return new ChannelReconciliationFileContent(fileName, billContent);
+    }
+
+    private static boolean checkFileName(String fileName) {
+        return fileName.contains(".");
+    }
+
+    private class FileName {
+
+        private final String name;
+        private final String type;
+
+        public FileName(String name) {
+            this.name = name;
+            this.type = FilenameUtils.getExtension(name);
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public String getType() {
+            return type;
+        }
+    }
+
+}

src/main/java/au/com/royalpay/payment/manage/management/channelreconciliationfile/ChannelReconciliationFileDTO.java

@@ -0,0 +1,49 @@
+package au.com.royalpay.payment.manage.management.channelreconciliationfile;
+
+import lombok.Data;
+
+/**
+ * @Description
+ * @title:
+ * @Date 2020/11/4 16:40
+ * @author: zhangTao
+ */
+@Data
+public class ChannelReconciliationFileDTO {
+
+
+    private String batchId;
+    /**
+     *
+     */
+    private String channel;
+    /**
+     *
+     */
+    private String pid;
+    /**
+     *
+     */
+    private String billDate;
+    /**
+     *
+     */
+    private String billType;
+    /**
+     *
+     */
+    private String createTime;
+
+    private String fileId;
+
+    
+    private String filename;
+    
+    private String fileType;
+
+    private String attachId;
+    /**
+     *
+     */
+    private String attachUrl;
+}

src/main/java/au/com/royalpay/payment/manage/management/channelreconciliationfile/ChannelReconciliationFileDownloadParameter.java

@@ -0,0 +1,51 @@
+package au.com.royalpay.payment.manage.management.channelreconciliationfile;
+
+import java.util.Date;
+
+/**
+ * @Description
+ * @title:
+ * @Date 2020/11/16 14:42
+ * @author: zhangTao
+ */
+public class ChannelReconciliationFileDownloadParameter {
+    private DownloadParameter parameter;
+    private boolean useCashFlag;
+
+    public ChannelReconciliationFileDownloadParameter(String pid, Date billDate, String channel, boolean isUseCash,String billType) {
+        this.parameter = new DownloadParameter(pid, billDate, channel,billType);
+        this.useCashFlag = isUseCash;
+    }
+
+    public String getChannel() {
+        return this.parameter.channel;
+    }
+
+    public boolean isUseCash() {
+        return this.useCashFlag;
+    }
+
+    public String pid(){
+        return this.parameter.pid;
+    }
+    public Date billDate(){
+        return this.parameter.billDate;
+    }
+    public String billType(){
+        return this.parameter.billType;
+    }
+
+
+    private static class DownloadParameter {
+        private String pid;
+        private String channel;
+        private Date billDate;
+        private String billType;
+        public DownloadParameter(String pid, Date billDate, String channel,String billType) {
+            this.pid = pid;
+            this.billDate = billDate;
+            this.channel = channel;
+            this.billType = billType;
+        }
+    }
+}

src/main/java/au/com/royalpay/payment/manage/management/channelreconciliationfile/ChannelReconciliationFileEmptyException.java

@@ -0,0 +1,15 @@
+package au.com.royalpay.payment.manage.management.channelreconciliationfile;
+
+/**
+ * @Description
+ * @title:
+ * @Date 2020/11/12 11:27
+ * @author: zhangTao
+ */
+public class ChannelReconciliationFileEmptyException extends RuntimeException {
+
+    public ChannelReconciliationFileEmptyException() {
+        super("渠道对账文件查询为空");
+    }
+
+}

src/main/java/au/com/royalpay/payment/manage/management/channelreconciliationfile/ChannelReconciliationFileNameSuffixException.java

@@ -0,0 +1,12 @@
+package au.com.royalpay.payment.manage.management.channelreconciliationfile;
+
+/**
+ * @Description
+ * @title:
+ * @Date 2020/11/19 18:35
+ * @author: zhangTao
+ */
+public class ChannelReconciliationFileNameSuffixException extends RuntimeException {
+
+
+}

src/main/java/au/com/royalpay/payment/manage/management/channelreconciliationfile/ChannelReconciliationFileQueryParameter.java

@@ -0,0 +1,35 @@
+package au.com.royalpay.payment.manage.management.channelreconciliationfile;
+
+
+import au.com.royalpay.payment.manage.management.channelreconciliationfile.common.TimeRangeAndPageSizeQueryParameter;
+
+/**
+ * @Description
+ * @title: 渠道对账文件查询参数
+ * @Date 2020/11/16 11:54
+ * @author: zhangTao
+ */
+public class ChannelReconciliationFileQueryParameter {
+
+  private TimeRangeAndPageSizeQueryParameter timeRangeAndPageSizeQueryParameter;
+  private String channel;
+  private String billType;
+
+  public ChannelReconciliationFileQueryParameter(TimeRangeAndPageSizeQueryParameter timeRangeAndPageSizeQueryParameter, String channel ,String billType) {
+    this.timeRangeAndPageSizeQueryParameter = timeRangeAndPageSizeQueryParameter;
+    this.channel = channel;
+    this.billType = billType;
+  }
+
+  public String getChannel() {
+    return channel;
+  }
+
+  public String getBillType() {
+    return billType;
+  }
+
+  public TimeRangeAndPageSizeQueryParameter getTimeRangeAndPageSizeQueryParameter() {
+    return timeRangeAndPageSizeQueryParameter;
+  }
+}

src/main/java/au/com/royalpay/payment/manage/management/channelreconciliationfile/ChannelReconciliationFileTunnel.java

@@ -0,0 +1,15 @@
+package au.com.royalpay.payment.manage.management.channelreconciliationfile;
+
+import com.github.miemiedev.mybatis.paginator.domain.PageList;
+
+/**
+ * @Description
+ * @title:
+ * @Date 2020/11/5 16:50
+ * @author: zhangTao
+ */
+public interface ChannelReconciliationFileTunnel {
+
+    PageList<ChannelReconciliationFileDTO> list(ChannelReconciliationFileQueryParameter channelReconciliationFileQueryParameter);
+
+}

src/main/java/au/com/royalpay/payment/manage/management/channelreconciliationfile/FileDownloadException.java

@@ -0,0 +1,14 @@
+package au.com.royalpay.payment.manage.management.channelreconciliationfile;
+
+/**
+ * @Description
+ * @title:
+ * @Date 2020/11/6 11:24
+ * @author: zhangTao
+ */
+public class FileDownloadException extends RuntimeException {
+
+    public FileDownloadException() {
+        super("文件下载异常");
+    }
+}

src/main/java/au/com/royalpay/payment/manage/management/channelreconciliationfile/MultiFileChannelReconciliationException.java

@@ -0,0 +1,14 @@
+package au.com.royalpay.payment.manage.management.channelreconciliationfile;
+
+/**
+ * @Description
+ * @title:
+ * @Date 2020/11/6 11:24
+ * @author: zhangTao
+ */
+public class MultiFileChannelReconciliationException extends RuntimeException {
+
+    public MultiFileChannelReconciliationException() {
+        super("渠道多文件异常");
+    }
+}

src/main/java/au/com/royalpay/payment/manage/management/channelreconciliationfile/common/PageSize.java

@@ -0,0 +1,29 @@
+package au.com.royalpay.payment.manage.management.channelreconciliationfile.common;
+
+/**
+ * @Description
+ * @title:
+ * @Date 2020/11/16 13:36
+ * @author: zhangTao
+ */
+public class PageSize {
+
+    private int page;
+    protected int rows;
+
+    public PageSize(int page, int rows) {
+        this.page = page;
+        this.rows = rows;
+    }
+
+    public int getPage() {
+        if (page == 0) {
+            return 1;
+        }
+        return page;
+    }
+
+    public int getRows() {
+        return rows;
+    }
+}

src/main/java/au/com/royalpay/payment/manage/management/channelreconciliationfile/common/TimeRange.java

@@ -0,0 +1,26 @@
+package au.com.royalpay.payment.manage.management.channelreconciliationfile.common;
+
+/**
+ * @Description
+ * @title: 时间区间
+ * @Date 2020/11/16 11:59
+ * @author: zhangTao
+ */
+public class TimeRange {
+
+    private String startTime;
+    private String endTime;
+
+    public TimeRange(String startTime, String endTime) {
+        this.startTime = startTime;
+        this.endTime = endTime;
+    }
+
+    public String getStartTime() {
+        return startTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+}

src/main/java/au/com/royalpay/payment/manage/management/channelreconciliationfile/common/TimeRangeAndPageSizeQueryParameter.java

@@ -0,0 +1,26 @@
+package au.com.royalpay.payment.manage.management.channelreconciliationfile.common;
+
+/**
+ * @Description
+ * @title:
+ * @Date 2020/11/16 13:47
+ * @author: zhangTao
+ */
+public class TimeRangeAndPageSizeQueryParameter {
+
+    private TimeRange timeRange;
+    private PageSize pageSize;
+
+    public TimeRangeAndPageSizeQueryParameter(TimeRange timeRange, PageSize pageSize) {
+        this.timeRange = timeRange;
+        this.pageSize = pageSize;
+    }
+
+    public TimeRange getTimeRange() {
+        return timeRange;
+    }
+
+    public PageSize getPageSize() {
+        return pageSize;
+    }
+}

src/main/java/au/com/royalpay/payment/manage/management/clearing/beans/TransactionStatus.java

@@ -0,0 +1,60 @@
+package au.com.royalpay.payment.manage.management.clearing.beans;
+
+import com.alibaba.fastjson.annotation.JSONField;
+
+
+/**
+ * Create by Todking at 2020-12-28
+ */
+public class TransactionStatus {
+
+    @JSONField(name = "status")
+    private Integer status;
+
+    @JSONField(name = "time")
+    private String time;
+
+    private String statusInfo;
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public String getTime() {
+        return time;
+    }
+
+    public void setTime(String time) {
+        this.time = time;
+    }
+
+    public String getStatusInfo() {
+        return statusInfo;
+    }
+
+    public void setStatusInfo(String statusInfo) {
+        this.statusInfo = statusInfo;
+    }
+
+    public TransactionStatus toSet() {
+        TransactionStatus transactionStatus = new TransactionStatus();
+        switch (status) {
+            case 0:
+                transactionStatus.setStatusInfo("Ready To Clear");
+                break;
+            case 1:
+                transactionStatus.setStatusInfo("Cleared");
+                break;
+            case 2:
+                transactionStatus.setStatusInfo("Preauthorised");
+                break;
+        }
+        transactionStatus.setStatus(status);
+        transactionStatus.setTime(time);
+        return transactionStatus;
+    }
+}

src/main/java/au/com/royalpay/payment/manage/management/clearing/core/CleanService.java

@@ -1,5 +1,7 @@
 package au.com.royalpay.payment.manage.management.clearing.core;
 
+import au.com.royalpay.payment.manage.management.channelreconciliationfile.ChannelReconciliationFileContent;
+import au.com.royalpay.payment.manage.management.clearing.beans.TransactionStatus;
 import au.com.royalpay.payment.manage.support.abafile.ABAFile;
 import au.com.royalpay.payment.manage.tradelog.beans.ClearingLogQuery;
 import com.alibaba.fastjson.JSONObject;
@@ -109,4 +111,8 @@ public interface CleanService {
     JSONObject findSettleLog(int clearingId);
 
     JSONObject findClearingDetail(int clearingId, String clientMoniker);
+
+    ChannelReconciliationFileContent downloadChannelReconciliationFile(String pid, Date billDate, boolean noCache, String channel, String billType);
+
+    TransactionStatus getTransactionStatus(String transactionId);
 }

src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java

@@ -1,9 +1,17 @@
 package au.com.royalpay.payment.manage.management.clearing.core.impl;
 
 import au.com.royalpay.payment.core.PaymentApi;
+import au.com.royalpay.payment.core.beans.OrderValidationResult;
 import au.com.royalpay.payment.core.exceptions.InvalidShortIdException;
+import au.com.royalpay.payment.core.exceptions.ParamInvalidException;
+import au.com.royalpay.payment.core.impls.LogChannelValidationStorage;
 import au.com.royalpay.payment.core.tasksupport.SettlementSupport;
 import au.com.royalpay.payment.core.utils.ExtParamsUtils;
+import au.com.royalpay.payment.core.validation.domain.ChannelValidationTask;
+import au.com.royalpay.payment.manage.management.channelreconciliationfile.ChannelReconciliationFile;
+import au.com.royalpay.payment.manage.management.channelreconciliationfile.ChannelReconciliationFileContent;
+import au.com.royalpay.payment.manage.management.channelreconciliationfile.ChannelReconciliationFileDownloadParameter;
+import au.com.royalpay.payment.manage.management.clearing.beans.TransactionStatus;
 import au.com.royalpay.payment.manage.management.clearing.core.CleanService;
 import au.com.royalpay.payment.manage.mappers.log.*;
 import au.com.royalpay.payment.manage.mappers.payment.TaskManualSettleMapper;
@@ -147,6 +155,13 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider
     private Locker locker;
     @Resource
     private ClientIncrementalMapper clientIncrementalMapper;
+    @Resource
+    private ChannelReconciliationFile channelReconciliationFile;
+    @Resource
+    private ChannelValidationTask channelValidationTask;
+
+    @Resource
+    private LogChannelValidationStorage logChannelValidationStorage;
 
     @Resource
     private ClientDeviceMapper clientDeviceMapper;
@@ -159,11 +174,14 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider
 
     @Override
     public List<JSONObject> listValidatedDays(Date month) {
-        List<JSONObject> reports = validationLogMapper.listValidatedReports(month);
-        List<JSONObject> topReports = new ArrayList<>();
-        for (JSONObject report : reports) {
+        List<JSONObject> originOriginReports = validationLogMapper.listValidatedDates(month);
+        List<OrderValidationResult> newReports = logChannelValidationStorage.listMonthReports(month);
+        Map<String, JSONObject> reports = new TreeMap<>();
+        for (JSONObject report : originOriginReports) {
             JSONObject item = new JSONObject();
-            item.put("date", DateFormatUtils.format(report.getDate("valid_date"), "yyyy/MM/dd"));
+            String dateStr = DateFormatUtils.format(report.getDate("valid_date"), "yyyy/MM/dd");
+            item.put("date", dateStr);
+            item.put("isOld", true);
             JSONObject result = JSON.parseObject(report.getString("result"));
             int warningLevel = result.getBooleanValue("valid") ? 0 : 1;
             if (!result.getJSONArray("not_exists").isEmpty()) {
@@ -171,9 +189,18 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider
             }
             item.put("warning_level", warningLevel);
             item.put("success", result.getBooleanValue("valid"));
-            topReports.add(item);
+            reports.put(dateStr, item);
         }
-        return topReports;
+        for (OrderValidationResult res : newReports) {
+            JSONObject item = new JSONObject();
+            String dateStr = DateFormatUtils.format(res.getTransDate(), "yyyy/MM/dd");
+            item.put("date", dateStr);
+            item.put("isOld", false);
+            item.put("warning_level", res.getWarningLevel());
+            item.put("success", res.getWarningLevel() == OrderValidationResult.LEVEL_SUCCESS);
+            reports.put(dateStr, item);
+        }
+        return new ArrayList<>(reports.values());
     }
 
     @Override
@@ -1528,14 +1555,14 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider
                 return JSON.parseObject(reportItem.getString("result"));
             }
         }
-        JSONObject report = paymentApi.validTransactions(dt, fix);
+        OrderValidationResult report = channelValidationTask.validTransactions(dt);
         JSONObject log = new JSONObject();
         log.put("valid_date", dt);
         log.put("create_time", new Date());
-        log.put("result", report.toJSONString());
+        log.put("result", report.getReport().toJSONString());
         validationLogMapper.removeByDate(dt);
         validationLogMapper.save(log);
-        return report;
+        return JSON.parseObject(log.getString("result"));
     }
 
     @Override
@@ -1688,6 +1715,20 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider
                 .orElseThrow(() -> new NotFoundException("No clearing log found for " + clientMoniker));
     }
 
+    @Override
+    public ChannelReconciliationFileContent downloadChannelReconciliationFile(String pid, Date billDate, boolean noCache, String channel, String billType) {
+        return channelReconciliationFile.download(new ChannelReconciliationFileDownloadParameter(pid, billDate, channel, noCache, billType));
+    }
+
+    @Override
+    public TransactionStatus getTransactionStatus(String transactionId) {
+        TransactionStatus transactionStatus = transactionMapper.getTransactionStatusById(transactionId);
+        if (transactionStatus == null) {
+            throw new ParamInvalidException("date","The transaction was not found");
+        }
+        return transactionStatus.toSet();
+    }
+
     private void releaseDistributedSurcharge(JSONObject clearingDetail) {
         int clientId = clearingDetail.getIntValue("client_id");
         BigDecimal distributedSurcharge = clearingDetail.getBigDecimal("distributed_surcharge");

src/main/java/au/com/royalpay/payment/manage/management/clearing/web/FinancialController.java

@@ -1,23 +1,36 @@
 package au.com.royalpay.payment.manage.management.clearing.web;
 
+import au.com.royalpay.payment.core.beans.OrderValidationChannelResult;
 import au.com.royalpay.payment.core.exceptions.ParamInvalidException;
+import au.com.royalpay.payment.core.impls.LogChannelValidationStorage;
+import au.com.royalpay.payment.core.validation.domain.ChannelValidationTask;
+import au.com.royalpay.payment.manage.management.channelreconciliationfile.ChannelReconciliationFileContent;
+import au.com.royalpay.payment.manage.management.channelreconciliationfile.FileDownloadException;
+import au.com.royalpay.payment.manage.management.clearing.beans.TransactionStatus;
 import au.com.royalpay.payment.manage.management.clearing.core.CleanService;
 import au.com.royalpay.payment.manage.permission.manager.ManagerMapping;
 import au.com.royalpay.payment.tools.permission.enums.ManagerRole;
 import au.com.royalpay.payment.tools.CommonConsts;
 import com.alibaba.fastjson.JSONObject;
+import org.apache.commons.codec.Charsets;
 import org.apache.commons.lang3.time.DateFormatUtils;
 import org.apache.commons.lang3.time.DateUtils;
 import org.joda.time.DateTime;
+import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
+import java.io.ByteArrayInputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.OutputStream;
+import java.net.URLEncoder;
 import java.text.ParseException;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * Created by davep on 2016-09-02.
@@ -28,6 +41,12 @@ public class FinancialController {
     @Resource
     private CleanService cleanService;
 
+    @Resource
+    private LogChannelValidationStorage logChannelValidationStorage;
+
+    @Resource
+    private ChannelValidationTask channelValidationTask;
+
     @GetMapping("/validated_dates/{month}")
     public List<JSONObject> listMonthValidatedDays(@PathVariable String month) {
         try {
@@ -49,6 +68,70 @@ public class FinancialController {
         }
     }
 
+    @GetMapping("/order_validation_new/{date}")
+    public Map<String, List<OrderValidationChannelResult>> getCheckReportNew(@PathVariable String date) {
+        try {
+            Date dt = DateUtils.parseDate(date, "yyyyMMdd");
+            List<OrderValidationChannelResult> orderValidationChannelResults = logChannelValidationStorage.listDailyLogs(dt);
+            Map<String, List<OrderValidationChannelResult>> collect = orderValidationChannelResults.stream().collect(Collectors.groupingBy(e -> e.getChannel().getChannelCode()));
+            return collect;
+        } catch (ParseException e) {
+            throw new ParamInvalidException("date", "error.payment.valid.invalid_date_format");
+        }
+    }
+
+    @PostMapping("/mark/resolve/message")
+    public void markResolveMessage(@RequestBody JSONObject jsonObject) {
+        logChannelValidationStorage.markResolveMessage(jsonObject.getString("log_id"), jsonObject.getString("message"));
+    }
+
+    @PostMapping("/redo_channel_validation/{date}")
+    public void redoChannelValidation(@PathVariable String date, @RequestBody JSONObject jsonObject) {
+        try {
+            Date dt = DateUtils.parseDate(date, "yyyyMMdd");
+            channelValidationTask.redoChannelValidation(dt, jsonObject.getString("channel"), jsonObject.getBoolean("cache"));
+        } catch (ParseException e) {
+            throw new ParamInvalidException("date", "error.payment.valid.invalid_date_format");
+        }
+    }
+
+    @GetMapping("/get/transaction/status/{transactionId}")
+    public TransactionStatus getTransactionStatus(@PathVariable String transactionId) {
+        if(transactionId.isEmpty()){
+            throw new ParamInvalidException("date","Transaction flow is empty");
+        }
+        return cleanService.getTransactionStatus(transactionId);
+    }
+
+    @GetMapping("/downloadChannelReconciliationFile")
+    public JSONObject downloadChannelReconciliationFile(@RequestParam(value = "pid") String pid,
+                                                        @RequestParam(value = "billDate") String billDate,
+                                                        @RequestParam(value = "noCache") boolean noCache,
+                                                        @RequestParam(value = "billType", required = false) String billType,
+                                                        @RequestParam(value = "channel") String channel,
+                                                        HttpServletResponse response)  {
+        ChannelReconciliationFileContent file = cleanService.downloadChannelReconciliationFile(pid, au.com.royalpay.payment.tools.utils.DateUtils.parseDate(billDate)
+                , noCache, channel, billType);
+
+
+
+        try (InputStream in = new ByteArrayInputStream(file.content())) {
+            response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(file.name(), Charsets.UTF_8.name()));
+            response.setContentLength(file.length());
+            response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
+            OutputStream out = response.getOutputStream();
+            byte[] buff = new byte[1024];
+            int n;
+            while ((n = in.read(buff)) != -1) {
+                out.write(buff, 0, n);
+            }
+        } catch (IOException ex) {
+            throw new FileDownloadException();
+        }
+
+        return null;
+    }
+
     @GetMapping("/clean_logs")
     public JSONObject getDailyTransactions(@RequestParam String date, @ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager) {
         try {

src/main/java/au/com/royalpay/payment/manage/mappers/log/ChannelReconciliationFileTunnelMapper.java

@@ -0,0 +1,37 @@
+package au.com.royalpay.payment.manage.mappers.log;
+
+
+import au.com.royalpay.payment.manage.management.channelreconciliationfile.ChannelReconciliationFileDTO;
+import au.com.royalpay.payment.manage.management.channelreconciliationfile.ChannelReconciliationFileQueryParameter;
+import au.com.royalpay.payment.manage.management.channelreconciliationfile.ChannelReconciliationFileTunnel;
+import au.com.royalpay.payment.manage.management.channelreconciliationfile.common.PageSize;
+import au.com.royalpay.payment.manage.management.channelreconciliationfile.common.TimeRange;
+import au.com.royalpay.payment.manage.management.channelreconciliationfile.common.TimeRangeAndPageSizeQueryParameter;
+import com.github.miemiedev.mybatis.paginator.domain.PageBounds;
+import com.github.miemiedev.mybatis.paginator.domain.PageList;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
+
+
+/**
+ * @Description
+ * @title:
+ * @Date 2020/11/4 14:25
+ * @author: zhangTao
+ */
+@AutoMapper(tablename = "log_validation_attachment_batches", pkName = "batch_id")
+public interface ChannelReconciliationFileTunnelMapper extends ChannelReconciliationFileTunnel {
+
+
+    PageList<ChannelReconciliationFileDTO> queryChannelReconciliationFile(String billType, String channel, String startTime, String endTime, PageBounds pagination);
+
+    @Override
+    default PageList<ChannelReconciliationFileDTO> list(ChannelReconciliationFileQueryParameter channelReconciliationFileQueryParameter){
+        TimeRangeAndPageSizeQueryParameter timeRangeAndPageSizeQueryParameter = channelReconciliationFileQueryParameter.getTimeRangeAndPageSizeQueryParameter();
+        TimeRange timeRange = timeRangeAndPageSizeQueryParameter.getTimeRange();
+        PageSize pageSize = timeRangeAndPageSizeQueryParameter.getPageSize();
+
+        String channel = channelReconciliationFileQueryParameter.getChannel();
+        String billType = channelReconciliationFileQueryParameter.getBillType();
+        return this.queryChannelReconciliationFile(billType,channel, timeRange.getStartTime(), timeRange.getEndTime() , new PageBounds(pageSize.getPage(), pageSize.getRows()));
+    }
+}

src/main/java/au/com/royalpay/payment/manage/mappers/log/ValidationLogMapper.java

@@ -24,4 +24,6 @@ public interface ValidationLogMapper {
     JSONObject findByDate(@Param("valid_date") Date validDate);
 
     List<JSONObject> listValidatedReports(@Param("month") Date month);
+
+    List<JSONObject> listValidatedDates(Date month);
 }

src/main/java/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.java

@@ -1,5 +1,6 @@
 package au.com.royalpay.payment.manage.mappers.payment;
 
+import au.com.royalpay.payment.manage.management.clearing.beans.TransactionStatus;
 import com.alibaba.fastjson.JSONObject;
 import com.github.miemiedev.mybatis.paginator.domain.PageBounds;
 import com.github.miemiedev.mybatis.paginator.domain.PageList;
@@ -167,4 +168,6 @@ public interface TransactionMapper {
     List<JSONObject> getSettleDataDailyReport(@Param("beginTime") Date beginTime,@Param("endTime")Date endTime);
 
     List<JSONObject> analysisByChannels(@Param("from") Date from, @Param("to") Date to, @Param("channels") List<String> channels);
+
+    TransactionStatus getTransactionStatusById(String transactionId);
 }

src/main/resources/application.yml

@@ -18,6 +18,8 @@ jetty:
 multipart:
   max-file-size: 10Mb
 app:
+  active:
+    channels: Wechat,Alipay,AlipayOnline,Gmo,UnionPay,AlipayPlus
   crossapp:
     enable: true
   agreetemplate:
@@ -89,8 +91,9 @@ android:
 apple:
   message:
     apns:
-      file: ''
-      password: ''
+      file: src/main/resources/dev.p12
+      password: HQeYblIajOb0
+      saneboxMode: true
 customer:
   app:
     appid: customer

src/main/resources/au/com/royalpay/payment/manage/mappers/log/ChannelReconciliationFileTunnelMapper.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="au.com.royalpay.payment.manage.mappers.log.ChannelReconciliationFileTunnelMapper">
+    <select id="queryChannelReconciliationFile" resultType="au.com.royalpay.payment.manage.management.channelreconciliationfile.ChannelReconciliationFileDTO">
+        SELECT a.batch_id ,channel, pid,bill_date,bill_type,create_time, file_id, filename, file_type,attach_id,attach_url
+        FROM `log_validation_attachment_batches` a
+        LEFT JOIN `log_validation_attachment_files` b ON a.`batch_id` = b.`batch_id`
+        <where>
+            <if test="channel != null and channel != ''">
+            and channel = #{channel}
+        </if>
+        <if test="startTime != null and startTime != ''">
+            and date_format(`bill_date`,'%Y-%m-%d') <![CDATA[>= ]]>#{startTime,jdbcType=VARCHAR}
+        </if>
+        <if test="endTime != null and endTime != ''">
+            and date_format(`bill_date`,'%Y-%m-%d')<![CDATA[ <= ]]> #{endTime,jdbcType=VARCHAR}
+        </if>
+            <if test="billType != null and billType != ''">
+                and bill_type = #{billType}
+            </if>
+
+        </where>
+        ORDER BY bill_date DESC
+    </select>
+</mapper>

src/main/resources/au/com/royalpay/payment/manage/mappers/log/ValidationLogMapper.xml

@@ -10,4 +10,7 @@
     <select id="listValidatedReports" resultType="com.alibaba.fastjson.JSONObject">
         SELECT valid_date,result FROM log_order_validation WHERE month(valid_date)=month(#{month}) and year(valid_date)=year(#{month})
     </select>
+    <select id="listValidatedDates" resultType="com.alibaba.fastjson.JSONObject">
+        SELECT valid_date,result FROM log_order_validation WHERE month(valid_date)=month(#{month}) and year(valid_date)=year(#{month})
+    </select>
 </mapper>

src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml

@@ -1490,4 +1490,11 @@
         <foreach collection="channels" open="(" close=")" separator="," item="channel">#{channel}</foreach>
         group by o.merchant_id
     </select>
+    <select id="getTransactionStatusById" resultType="au.com.royalpay.payment.manage.management.clearing.beans.TransactionStatus">
+        select
+            t.clearing_status `status`,
+            t.clearing_time `time`
+        from pmt_transactions t
+        where t.transaction_id = #{transaction_id}
+    </select>
 </mapper>

src/main/ui/static/payment/partner/partner-manage.js

@@ -5431,24 +5431,65 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
             }
         }
     }]);
-    // Merchant Id Management
+    // MID Management
     app.controller('subMerchantIdApplicaitonsCtrl', ['$scope', '$http', '$uibModal', '$state', 'commonDialog', '$sce', function ($scope, $http, $uibModal, $state, commonDialog, $sce) {
+        // 初始化子商户
+        $scope.loadSubMerchantInfos = function () {
+            $http.get('/sys/partners/' + $scope.partner.client_moniker + '/list_sub_applices', { params: {} }).then(function (resp) {
+                $scope.subMerchantInfos = resp.data;
+            });
+            // $http.get('/sys/partners/' + $scope.partner.client_moniker + '/list_rpay_sub_applices', {params: {}}).then(function (resp) {
+            //     $scope.subRpayMerchantInfos = resp.data;
+            // });
+            //
+            // $http.get('/sys/partners/' + $scope.partner.client_moniker + '/list_yeepay_sub_applices', {params: {}}).then(function (resp) {
+            //     $scope.subYeepayMerchantInfos = resp.data;
+            // });
+            // $http.get('/sys/partners/' + $scope.partner.client_moniker + '/queryMWMerchantIdStatus').then(function (resp) {
+            //     $scope.partner.cardInfo = resp.data;
+            // });
+        };
+        $scope.loadSubMerchantInfos();
+        // 加载卡支付信息
+        $scope.loadCardInfos = function () {
+            $http.get('/sys/partners/' + $scope.partner.client_moniker + '/queryMWMerchantIdStatus').then(function (resp) {
+                $scope.cardInfo = resp.data;
+            });
+        }
+        $scope.loadCardInfos();
+        // 初始化信息
         $scope.loadPartnerInfo = function () {
             $http.get('/sys/partners/' + $scope.partner.client_moniker).then(function (resp) {
                 $scope.partnerInfo = resp.data;
                 $scope.doSwitchCommonSubMerchantId();
             })
         };
-        $scope.loadPartnerInfo()
+        $scope.loadPartnerInfo();
         // 编辑Wechat Sub Merchant Id
         $scope.saveSubMerchantId = function () {
             $http.put('/sys/partners/' + $scope.partner.client_moniker + '/payment_config', { sub_merchant_id: $scope.partnerInfo.sub_merchant_id }).then(function (resp) {
                 $scope.loadPartnerInfo();
-                $scope.ctrl.editSubMerchant = false;
             }, function (resp) {
                 commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' })
             });
         };
+        // Wechat-applay
+        $scope.applyWxSubMerchantId = function () {
+            $uibModal.open({
+                templateUrl: '/static/payment/partner/templates/new_apply_wx_sub_merchant_id.html',
+                controller: 'newApplyWxSubMerchantIdCtrl',
+                resolve: {
+                    subMerchantInfo: function () {
+                        return $scope.partner;
+                    },
+                    merchantIds: ['$http', '$stateParams', function ($http) {
+                        return $http.get('/sys/partners/' + $scope.partner.client_moniker + '/get_merchant_ids');
+                    }]
+                }
+            }).result.then(function () {
+                $scope.loadSubMerchantInfos();
+            })
+        };
         // 刷新Wechat Sub Merchant Id
         $scope.queryWechatSubMerchantIdStatus = function () {
             $http.get('/sys/partners/' + $scope.partner.client_moniker + '/get_merchant_ids/' + $scope.partnerInfo.sub_merchant_id + '/status').then(function (resp) {
@@ -5458,6 +5499,8 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
                     type: 'info'
                 })
                 $scope.loadPartnerInfo();
+            }, function (resp) {
+                commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' })
             })
         }
         // history
@@ -5476,7 +5519,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
         // 刷新Wechat Institution Merchant Id
         $scope.refreshWechatInstitutionMerchantId = function () {
             $http.put('/sys/partners/' + $scope.partner.client_moniker + '/wechat_institution_merchant_id', { wechat_institution_merchant_id: $scope.partnerInfo.wechat_institution_merchant_id }).then(function (resp) {
-                $scope.loadPartnerInfo()
+                $scope.loadPartnerInfo();
             }, function (resp) {
                 commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' })
             });
@@ -5542,6 +5585,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
                 }).then(function () {
                     $http.post('/sys/partners/' + $scope.partner.client_moniker + '/register/alipay_gms').then(function () {
                         commonDialog.alert({ title: 'Success', content: 'Alipay进件成功', type: 'success' });
+                        $scope.loadPartnerInfo();
                     }, function (resp) {
                         commonDialog.alert({ title: 'Error', content: "进件失败：" + resp.data.message, type: 'error' });
                     })
@@ -5559,6 +5603,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
                 }).then(function () {
                     $http.post('/sys/partners/' + $scope.partner.client_moniker + '/register/alipayOnline_gms').then(function () {
                         commonDialog.alert({ title: 'Success', content: '提示：AlipayOnline进件成功', type: 'success' });
+                        $scope.loadPartnerInfo();
                     }, function (resp) {
                         commonDialog.alert({ title: 'Error', content: "进件失败：" + resp.data.message, type: 'error' });
                     });
@@ -5573,7 +5618,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
                     content: 'Modify Wechat Sub Merchant ID successfully',
                     type: 'success'
                 });
-                $state.reload();
+                $scope.loadPartnerInfo();
             }, function (resp) {
                 commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' })
             });
@@ -5610,109 +5655,15 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
                     }
                 }
             }).result.then(function () {
-                $state.reload();
                 commonDialog.alert({
                     title: 'Success',
                     content: 'Modify successfully',
                     type: 'success'
                 });
+                $scope.loadPartnerInfo();
             })
         }
-
-        $scope.showMoreMerchantInfo = false;
-        $scope.hideMerchantInfo = function () {
-            $scope.showMoreMerchantInfo = !$scope.showMoreMerchantInfo;
-        };
-        $scope.loadSubMerchantInfos = function () {
-            $http.get('/sys/partners/' + $scope.partner.client_moniker + '/list_sub_applices', { params: {} }).then(function (resp) {
-                $scope.subMerchantInfos = resp.data;
-            });
-            // $http.get('/sys/partners/' + $scope.partner.client_moniker + '/list_rpay_sub_applices', {params: {}}).then(function (resp) {
-            //     $scope.subRpayMerchantInfos = resp.data;
-            // });
-            //
-            // $http.get('/sys/partners/' + $scope.partner.client_moniker + '/list_yeepay_sub_applices', {params: {}}).then(function (resp) {
-            //     $scope.subYeepayMerchantInfos = resp.data;
-            // });
-            $http.get('/sys/partners/' + $scope.partner.client_moniker + '/queryMWMerchantIdStatus').then(function (resp) {
-                $scope.partner.cardInfo = resp.data;
-            });
-        };
-        $scope.updateSubMerchantId = function (merchant_app_id) {
-            $uibModal.open({
-                templateUrl: '/static/payment/partner/templates/update_apply_wx_sub_merchant_id.html',
-                controller: 'updateApplyWxSubMerchantIdCtrl',
-                resolve: {
-                    merchantInfo: $scope.partner,
-                    merchantIds: ['$http', '$stateParams', function ($http) {
-                        return $http.get('/sys/partners/' + $scope.partner.client_moniker + '/get_merchant_ids');
-                    }],
-                    subMerchantInfo: ['$http', '$stateParams', function ($http) {
-                        return $http.get('/sys/partners/' + $scope.partner.client_moniker + '/get_merchant_ids/' + merchant_app_id);
-                    }]
-                }
-            }).result.then(function () {
-                $scope.loadSubMerchantInfos();
-            })
-        }
-        $scope.useRpaySubMerchantId = function (sub_merchant_id) {
-            $http.put('/sys/partners/' + $scope.partner.client_moniker + '/rpay_payment_config', { rpay_enterprise_id: sub_merchant_id }).then(function (resp) {
-                commonDialog.alert({
-                    title: 'Success',
-                    content: 'Modify Rpay+ Sub Merchant ID successfully',
-                    type: 'success'
-                });
-                $state.reload();
-            }, function (resp) {
-                commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' })
-            });
-        }
-        $scope.useYeepaySubMerchantId = function (sub_merchant_id) {
-            $http.put('/sys/partners/' + $scope.partner.client_moniker + '/yeepay_payment_config', { yeepay_sub_merchant_id: sub_merchant_id }).then(function (resp) {
-                commonDialog.alert({
-                    title: 'Success',
-                    content: 'Modify Yeepay Sub Merchant ID successfully',
-                    type: 'success'
-                });
-                $state.reload();
-            }, function (resp) {
-                commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' })
-            });
-        }
-        /*$scope.applyWxSubMerchantId = function () {
-            $uibModal.open({
-                templateUrl: '/static/payment/partner/templates/apply_wx_sub_merchant_id.html',
-                controller: 'applyWxSubMerchantIdCtrl',
-                resolve: {
-                    subMerchantInfo: function () {
-                        return $scope.partner;
-                    },
-                    merchantIds: ['$http', '$stateParams', function ($http) {
-                        return $http.get('/sys/partners/' + $scope.partner.client_moniker + '/get_merchant_ids');
-                    }]
-                }
-            }).result.then(function () {
-                $scope.loadSubMerchantInfos();
-            })
-        };*/
-
-        $scope.applyWxSubMerchantId = function () {
-            $uibModal.open({
-                templateUrl: '/static/payment/partner/templates/new_apply_wx_sub_merchant_id.html',
-                controller: 'newApplyWxSubMerchantIdCtrl',
-                resolve: {
-                    subMerchantInfo: function () {
-                        return $scope.partner;
-                    },
-                    merchantIds: ['$http', '$stateParams', function ($http) {
-                        return $http.get('/sys/partners/' + $scope.partner.client_moniker + '/get_merchant_ids');
-                    }]
-                }
-            }).result.then(function () {
-                $scope.loadSubMerchantInfos();
-            })
-        };
-
+        // 卡支付apply
         $scope.applyMWSubMerchantId = function () {
             $http.get('/sys/partners/' + $scope.partner.client_moniker + '/query/mw_info').then(function (resp) {
                 commonDialog.confirm({
@@ -5726,69 +5677,130 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
                             content: 'Apply Merchant Warrior Sub Merchant ID successfully',
                             type: 'success'
                         });
-                        $scope.partner.cardInfo = res.data;
+                        $scope.cardInfo = res.data;
                     }, function (resp) {
                         commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' });
                     })
                 })
             });
         };
-        $scope.applyRpaySubMerchantId = function () {
-            $uibModal.open({
-                templateUrl: '/static/payment/partner/templates/apply_rpay_sub_merchant_id.html',
-                controller: 'applyRpaySubMerchantIdCtrl',
-                resolve: {
-                    subMerchantInfo: function () {
-                        return $scope.partner;
-                    }
-                }
-            }).result.then(function () {
-                $scope.loadSubMerchantInfos();
-            })
-        };
-        $scope.applyYeepaySubMerchantId = function () {
-            $uibModal.open({
-                templateUrl: '/static/payment/partner/templates/apply_yeepay_sub_merchant_id.html',
-                controller: 'applyYeepaySubMerchantIdCtrl',
-                resolve: {
-                    subMerchantInfo: function () {
-                        return $scope.partner;
-                    }
-                }
-            }).result.then(function () {
-                $scope.loadSubMerchantInfos();
-            })
-        };
-        $scope.addYeepaySubMerchantId = function () {
-            $uibModal.open({
-                templateUrl: '/static/payment/partner/templates/add_yeepay_sub_merchant_id.html',
-                controller: 'addYeepaySubMerchantIdCtrl',
-                resolve: {
-                    subMerchantInfo: function () {
-                        return $scope.partner;
-                    }
-                }
-            }).result.then(function () {
-                $scope.loadSubMerchantInfos();
-            })
-        };
-        $scope.updateYeepaySubMerchantId = function (sub_merchant_id) {
-            $uibModal.open({
-                templateUrl: '/static/payment/partner/templates/update_yeepay_sub_merchant_id.html',
-                controller: 'updateYeepaySubMerchantIdCtrl',
-                resolve: {
-                    subMerchantInfo: function () {
-                        return $scope.partner;
-                    },
-                    subMerchantId: function () {
-                        return sub_merchant_id;
-                    }
-                }
-            }).result.then(function () {
-                $scope.loadSubMerchantInfos();
-            })
-        };
-        $scope.loadSubMerchantInfos();
+
+        // $scope.showMoreMerchantInfo = false;
+        // $scope.hideMerchantInfo = function () {
+        //     $scope.showMoreMerchantInfo = !$scope.showMoreMerchantInfo;
+        // };
+        // $scope.updateSubMerchantId = function (merchant_app_id) {
+        //     $uibModal.open({
+        //         templateUrl: '/static/payment/partner/templates/update_apply_wx_sub_merchant_id.html',
+        //         controller: 'updateApplyWxSubMerchantIdCtrl',
+        //         resolve: {
+        //             merchantInfo: $scope.partner,
+        //             merchantIds: ['$http', '$stateParams', function ($http) {
+        //                 return $http.get('/sys/partners/' + $scope.partner.client_moniker + '/get_merchant_ids');
+        //             }],
+        //             subMerchantInfo: ['$http', '$stateParams', function ($http) {
+        //                 return $http.get('/sys/partners/' + $scope.partner.client_moniker + '/get_merchant_ids/' + merchant_app_id);
+        //             }]
+        //         }
+        //     }).result.then(function () {
+        //         $scope.loadSubMerchantInfos();
+        //     })
+        // }
+        // $scope.useRpaySubMerchantId = function (sub_merchant_id) {
+        //     $http.put('/sys/partners/' + $scope.partner.client_moniker + '/rpay_payment_config', { rpay_enterprise_id: sub_merchant_id }).then(function (resp) {
+        //         commonDialog.alert({
+        //             title: 'Success',
+        //             content: 'Modify Rpay+ Sub Merchant ID successfully',
+        //             type: 'success'
+        //         });
+        //         $state.reload();
+        //     }, function (resp) {
+        //         commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' })
+        //     });
+        // }
+        // $scope.useYeepaySubMerchantId = function (sub_merchant_id) {
+        //     $http.put('/sys/partners/' + $scope.partner.client_moniker + '/yeepay_payment_config', { yeepay_sub_merchant_id: sub_merchant_id }).then(function (resp) {
+        //         commonDialog.alert({
+        //             title: 'Success',
+        //             content: 'Modify Yeepay Sub Merchant ID successfully',
+        //             type: 'success'
+        //         });
+        //         $state.reload();
+        //     }, function (resp) {
+        //         commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' })
+        //     });
+        // }
+        // $scope.applyWxSubMerchantId = function () {
+        //     $uibModal.open({
+        //         templateUrl: '/static/payment/partner/templates/apply_wx_sub_merchant_id.html',
+        //         controller: 'applyWxSubMerchantIdCtrl',
+        //         resolve: {
+        //             subMerchantInfo: function () {
+        //                 return $scope.partner;
+        //             },
+        //             merchantIds: ['$http', '$stateParams', function ($http) {
+        //                 return $http.get('/sys/partners/' + $scope.partner.client_moniker + '/get_merchant_ids');
+        //             }]
+        //         }
+        //     }).result.then(function () {
+        //         $scope.loadSubMerchantInfos();
+        //     })
+        // };
+        // $scope.applyRpaySubMerchantId = function () {
+        //     $uibModal.open({
+        //         templateUrl: '/static/payment/partner/templates/apply_rpay_sub_merchant_id.html',
+        //         controller: 'applyRpaySubMerchantIdCtrl',
+        //         resolve: {
+        //             subMerchantInfo: function () {
+        //                 return $scope.partner;
+        //             }
+        //         }
+        //     }).result.then(function () {
+        //         $scope.loadSubMerchantInfos();
+        //     })
+        // };
+        // $scope.applyYeepaySubMerchantId = function () {
+        //     $uibModal.open({
+        //         templateUrl: '/static/payment/partner/templates/apply_yeepay_sub_merchant_id.html',
+        //         controller: 'applyYeepaySubMerchantIdCtrl',
+        //         resolve: {
+        //             subMerchantInfo: function () {
+        //                 return $scope.partner;
+        //             }
+        //         }
+        //     }).result.then(function () {
+        //         $scope.loadSubMerchantInfos();
+        //     })
+        // };
+        // $scope.addYeepaySubMerchantId = function () {
+        //     $uibModal.open({
+        //         templateUrl: '/static/payment/partner/templates/add_yeepay_sub_merchant_id.html',
+        //         controller: 'addYeepaySubMerchantIdCtrl',
+        //         resolve: {
+        //             subMerchantInfo: function () {
+        //                 return $scope.partner;
+        //             }
+        //         }
+        //     }).result.then(function () {
+        //         $scope.loadSubMerchantInfos();
+        //     })
+        // };
+        // $scope.updateYeepaySubMerchantId = function (sub_merchant_id) {
+        //     $uibModal.open({
+        //         templateUrl: '/static/payment/partner/templates/update_yeepay_sub_merchant_id.html',
+        //         controller: 'updateYeepaySubMerchantIdCtrl',
+        //         resolve: {
+        //             subMerchantInfo: function () {
+        //                 return $scope.partner;
+        //             },
+        //             subMerchantId: function () {
+        //                 return sub_merchant_id;
+        //             }
+        //         }
+        //     }).result.then(function () {
+        //         $scope.loadSubMerchantInfos();
+        //     })
+        // };
     }]);
     app.controller('applyWxSubMerchantIdCtrl', ['$scope', '$http', '$uibModal', '$state', 'subMerchantInfo', '$filter', 'merchantIds', 'commonDialog', function ($scope, $http, $uibModal, $state, subMerchantInfo, $filter, merchantIds, commonDialog) {
         $scope.wxIndustries = angular.copy(wxMerchantIndustries);
@@ -5845,7 +5857,6 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
     }]);
     // 修改sub_merchant_id
     app.controller('ModifysubMerchantIdCtrl', ['$scope', '$http', '$uibModal', '$state', 'commonDialog', 'clientMoniker', 'merchantId', 'channel', function ($scope, $http, $uibModal, $state, commonDialog, clientMoniker, merchantId, channel) {
-        console.log(merchantId, channel);
         $scope.merchantId = merchantId
         $scope.flag = false
         $scope.confirm = function () {
@@ -5857,14 +5868,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
                     $scope.flag = false
                     commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' })
                 });
-            } else if (channel === 'Alipay') {
-                $http.put('/sys/partners/' + clientMoniker + '/ali_sub_merchant_id', { ali_sub_merchant_id: $scope.merchantId }).then(function (resp) {
-                    $scope.$close();
-                }, function (resp) {
-                    $scope.flag = false
-                    commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' })
-                });
-            } else if (channel = 'AlipayOnline') {
+            } else if (channel === 'Alipay' || channel === 'AlipayOnline') {
                 $http.put('/sys/partners/' + clientMoniker + '/ali_sub_merchant_id', { ali_sub_merchant_id: $scope.merchantId }).then(function (resp) {
                     $scope.$close();
                 }, function (resp) {

src/main/ui/static/payment/partner/templates/sub_merchant_detail.html

@@ -29,71 +29,71 @@
         <ul class="list-group" ng-if="channel === 'MerchantWarrior'">
             <li class="list-group-item flex-between">
                 <b>Sub Merchant Id</b>
-                <span>{{subMerchantInfo.cardInfo.rpMerchantId}}</span>
+                <span>{{subMerchantInfo.rpMerchantId}}</span>
             </li>
             <li class="list-group-item flex-between">
                 <b>Name</b>
-                <span ng-bind="subMerchantInfo.cardInfo.name"></span>
+                <span ng-bind="subMerchantInfo.name"></span>
             </li>
             <li class="list-group-item flex-between">
                 <b>Company Name</b>
-                <span>{{subMerchantInfo.cardInfo.company_name}}</span>
+                <span>{{subMerchantInfo.company_name}}</span>
             </li>
             <li class="list-group-item flex-between">
                 <b>Address</b>
-                <span>{{subMerchantInfo.cardInfo.address | newWxMerchants}}</span>
+                <span>{{subMerchantInfo.address | newWxMerchants}}</span>
             </li>
             <li class="list-group-item flex-between">
                 <b>Suburb</b>
-                <span>{{subMerchantInfo.cardInfo.suburb}}</span>
+                <span>{{subMerchantInfo.suburb}}</span>
             </li>
             <li class="list-group-item flex-between">
                 <b>Postcode</b>
-                <span ng-bind="subMerchantInfo.cardInfo.postcode"></span>
+                <span ng-bind="subMerchantInfo.postcode"></span>
             </li>
             <li class="list-group-item flex-between">
                 <b>State</b>
-                <span ng-bind="subMerchantInfo.cardInfo.state"></span>
+                <span ng-bind="subMerchantInfo.state"></span>
             </li>
             <li class="list-group-item flex-between">
                 <b>Abn</b>
-                <span ng-bind="subMerchantInfo.cardInfo.abn"></span>
+                <span ng-bind="subMerchantInfo.abn"></span>
             </li>
             <li class="list-group-item flex-between">
                 <b>Email</b>
-                <span ng-bind="subMerchantInfo.cardInfo.email"></span>
+                <span ng-bind="subMerchantInfo.email"></span>
             </li>
             <li class="list-group-item flex-between">
                 <b>Contact Name</b>
-                <span ng-bind="subMerchantInfo.cardInfo.contact_name"></span>
+                <span ng-bind="subMerchantInfo.contact_name"></span>
             </li>
             <li class="list-group-item flex-between">
                 <b>Phone</b>
-                <span ng-bind="subMerchantInfo.cardInfo.phone"></span>
+                <span ng-bind="subMerchantInfo.phone"></span>
             </li>
             <li class="list-group-item flex-between">
                 <b>BSB</b>
-                <span ng-bind="subMerchantInfo.cardInfo.bsb"></span>
+                <span ng-bind="subMerchantInfo.bsb"></span>
             </li>
             <li class="list-group-item flex-between">
                 <b>Account No</b>
-                <span ng-bind="subMerchantInfo.cardInfo.accountNo"></span>
+                <span ng-bind="subMerchantInfo.accountNo"></span>
             </li>
             <li class="list-group-item flex-between">
                 <b>Account Name</b>
-                <span ng-bind="subMerchantInfo.cardInfo.accountName"></span>
+                <span ng-bind="subMerchantInfo.accountName"></span>
             </li>
             <li class="list-group-item flex-between">
                 <b>Website</b>
-                <span ng-bind="subMerchantInfo.cardInfo.website"></span>
+                <span ng-bind="subMerchantInfo.website"></span>
             </li>
             <li class="list-group-item flex-between">
                 <b>Timezone</b>
-                <span ng-bind="subMerchantInfo.cardInfo.timezone"></span>
+                <span ng-bind="subMerchantInfo.timezone"></span>
             </li>
             <li class="list-group-item flex-between">
                 <b>Category</b>
-                <span ng-bind="subMerchantInfo.cardInfo.category|partner_royalpay_industry"></span>
+                <span ng-bind="subMerchantInfo.category|partner_royalpay_industry"></span>
             </li>
         </ul>
     </div>

src/main/ui/static/payment/partner/templates/sub_merchant_id_apply.html

@@ -45,8 +45,24 @@
         min-height: unset;
         margin: unset;
     }
+
+    .flex-container {
+        display: flex;
+        flex-wrap: wrap;
+    }
+
+    @media (max-width:1400px) {
+        .flex-container {
+            display: flex;
+            flex-direction: column;
+        }
+
+        .content-mine {
+            width: 100%;
+        }
+    }
 </style>
-<div style="display: flex;flex-wrap: wrap;">
+<div class="flex-container">
     <!-- Wechat -->
     <div class="content content-mine">
         <div class="row">
@@ -66,22 +82,6 @@
                                     <a role="button"
                                         ng-click="modifySubMerchantId(partnerInfo.sub_merchant_id,'Wechat')"
                                         style="margin-left: 5px;"><i class="fa fa-edit"></i></a>
-                                    <!-- <div class="input-group" ng-if="ctrl.editSubMerchant">
-                                        <input type="text" class="form-control" ng-model="partnerInfo.sub_merchant_id"
-                                            title="WeChat Sub Merchant Id">
-                                        <div class="input-group-btn">
-                                            <button class="btn btn-success" ng-click="saveSubMerchantId()">
-                                                <i class="fa fa-check"></i>
-                                            </button>
-                                        </div>
-                                        <div class="input-group-btn">
-                                            <button class="btn btn-danger" ng-click="ctrl.editSubMerchant=false">
-                                                <i class="fa fa-remove"></i>
-                                            </button>
-                                        </div>
-                                    </div>
-                                    <a role="button" ng-click="queryWechatSubMerchantIdStatus()"><i
-                                            class="fa fa-search"></i></a> -->
                                 </div>
 
                                 <div>
@@ -131,7 +131,7 @@
                             <ul class="list-group" style="margin-top: 20px;">
                                 <li class="list-group-item flex-between" ng-repeat="id_apply in subMerchantInfos">
                                     <b>Sub Merchant Id : {{id_apply.sub_merchant_id}}
-                                        <span ng-if="partner.sub_merchant_id == id_apply.sub_merchant_id"><small
+                                        <span ng-if="partnerInfo.sub_merchant_id == id_apply.sub_merchant_id"><small
                                                 class="text-red">(当前使用)</small>
                                     </b>
                                     <span>
@@ -141,46 +141,6 @@
                                     </span>
                                 </li>
                             </ul>
-                            <!-- <div class="box-body col-sm-6" ng-repeat="id_apply in subMerchantInfos">
-                                <ul class="list-group ui_desk">
-                                    <li class="list-group-item list-group-item-success">
-                                        <b>Sub Merchant Id</b>
-                                        <b style="float: right"><span
-                                                ng-if="partner.sub_merchant_id == id_apply.sub_merchant_id"><small
-                                                    class="text-red">(当前使用)</small></span>{{id_apply.sub_merchant_id}}</b>
-                                    </li>
-                                    <li class="list-group-item list-group-item-success">
-                                        Apply Time
-                                        <span style="float: right" ng-bind="id_apply.create_time"></span>
-                                    </li>
-                                    <li class="list-group-item list-group-item-success">
-                                        Merchant Short Name
-                                        <span style="float:right;">{{id_apply.merchant_shortname | cut:true:20:'
-                                            ...'}}</span>
-                                    </li>
-                                    <li class="list-group-item list-group-item-success">
-                                        Business Category
-                                        <span style="float: right">{{id_apply.business_category |
-                                            newWxMerchants}}</span>
-                                    </li>
-                                    <li class="list-group-item list-group-item-success">
-                                        Mcc Code
-                                        <span style="float: right;">{{id_apply.mcc_code | wechatMcc }}</span>
-                                    </li>
-                                    <li class="list-group-item list-group-item-success">
-                                        Operator
-                                        <span style="float: right" ng-bind="id_apply.operator"></span>
-                                    </li>
-                                </ul>
-                                <div class="box_desk">
-                                    <div class="content_button">
-                                        <button role="button" class="btn btn-info" title="use"
-                                            ng-click="useSubMerchantId(id_apply.sub_merchant_id)">
-                                            USE
-                                        </button>
-                                    </div>
-                                </div>
-                            </div> -->
                         </div>
                     </div>
                 </div>
@@ -204,22 +164,6 @@
                                     <a role="button"
                                         ng-click="modifySubMerchantId(partnerInfo.ali_sub_merchant_id,'Alipay')"
                                         style="margin-left: 5px;"><i class="fa fa-edit"></i></a>
-                                    <!-- <div class="input-group" ng-if="ctrl.editAliSubMerchant">
-                                        <input type="text" class="form-control"
-                                            ng-model="partnerInfo.ali_sub_merchant_id" title="Ali Sub Merchant Id">
-                                        <div class="input-group-btn">
-                                            <button class="btn btn-success" ng-click="saveAliSubMerchantId()">
-                                                <i class="fa fa-check"></i>
-                                            </button>
-                                        </div>
-                                        <div class="input-group-btn">
-                                            <button class="btn btn-danger" ng-click="ctrl.editAliSubMerchant=false">
-                                                <i class="fa fa-remove"></i>
-                                            </button>
-                                        </div>
-                                    </div>
-                                    <a role="button" ng-click="queryAlipayGms()"><i class="fa fa-search"
-                                            title="Alipay进件"></i></a> -->
                                 </div>
                                 <div>
                                     <button role="button" class="btn btn-info" title="Apply Sub Merchant Id"
@@ -229,9 +173,6 @@
                                     <button role="button" class="btn btn-info" ng-click="queryAlipayGms()">
                                         <i class="fa fa-search"></i> Result
                                     </button>
-                                    <button role="button" class="btn btn-info" title="modify Sub Merchant Id" disabled>
-                                        Modify
-                                    </button>
                                 </div>
                             </div>
                         </div>
@@ -263,22 +204,6 @@
                                     <a role="button"
                                         ng-click="modifySubMerchantId(partnerInfo.ali_sub_merchant_id,'AlipayOnline')"
                                         style="margin-left: 5px;"><i class="fa fa-edit"></i></a>
-                                    <!-- <div class="input-group" ng-if="ctrl.editAlipaySubMerchant">
-                                        <input type="text" class="form-control"
-                                            ng-model="partnerInfo.ali_sub_merchant_id" title="Ali Sub Merchant Id">
-                                        <div class="input-group-btn">
-                                            <button class="btn btn-success" ng-click="saveAliSubMerchantId()">
-                                                <i class="fa fa-check"></i>
-                                            </button>
-                                        </div>
-                                        <div class="input-group-btn">
-                                            <button class="btn btn-danger" ng-click="ctrl.editAlipaySubMerchant=false">
-                                                <i class="fa fa-remove"></i>
-                                            </button>
-                                        </div>
-                                    </div>
-                                    <a role="button" ng-click="queryAlipayOnlineGms()"><i class="fa fa-search"
-                                            title="AlipayOnline进件"></i></a> -->
                                 </div>
                                 <div>
 
@@ -289,9 +214,6 @@
                                     <button role="button" class="btn btn-info" ng-click="queryAlipayOnlineGms()">
                                         <i class="fa fa-search"></i> Result
                                     </button>
-                                    <button role="button" class="btn btn-info" title="modify Sub Merchant Id" disabled>
-                                        Modify
-                                    </button>
                                 </div>
                             </div>
                         </div>
@@ -313,8 +235,8 @@
                     <div class="panel panel-default">
                         <div class="panel-heading">
                             <h5>
-                                Rpay+ Institution Merchant Id : <span ng-bind="partner.rpay_enterprise_id"></span>
-                                <span ng-if="!partner.rpay_enterprise_id">none</span>
+                                Rpay+ Institution Merchant Id : <span ng-bind="partnerInfo.rpay_enterprise_id"></span>
+                                <span ng-if="!partnerInfo.rpay_enterprise_id">none</span>
                             </h5>
                         </div>
                         <div class="panel-body">
@@ -339,14 +261,14 @@
                                     <img src="/static/images/card_payment_sign.png" uib-tooltip="Card Payment" />
                                     <h5 style="margin-left: 5px;">
                                         Merchant Warrior :
-                                        <span ng-if="partner.cardInfo.rpMerchantId">
-                                            <span ng-if="partner.cardInfo.available" style="color:green;">审核通过</span>
-                                            <span ng-if="!partner.cardInfo.available && partner.cardInfo.pending"
+                                        <span ng-if="cardInfo.rpMerchantId">
+                                            <span ng-if="cardInfo.available" style="color:green;">审核通过</span>
+                                            <span ng-if="!cardInfo.available && cardInfo.pending"
                                                 style="color:#f39c12;">审核中</span>
-                                            <span ng-if="!partner.cardInfo.available && !partner.cardInfo.pending"
+                                            <span ng-if="!cardInfo.available && !cardInfo.pending"
                                                 style="color:red;">打回</span>
-                                            ({{partner.cardInfo.rpMerchantId}})</span>
-                                        <span ng-if="!partner.cardInfo">未申请</span>
+                                            ({{cardInfo.rpMerchantId}})</span>
+                                        <span ng-if="!cardInfo">未申请</span>
                                     </h5>
                                 </div>
                                 <button role="button" class="btn btn-info" title="Apply MW Sub Merchant Id"
@@ -357,112 +279,17 @@
                             </div>
                         </div>
                         <div class="panel-body">
-                            <div style="display: flex;justify-content: center;" ng-if="!partner.cardInfo.rpMerchantId">
+                            <div style="display: flex;justify-content: center;" ng-if="!cardInfo.rpMerchantId">
                                 <small style="color: rgba(0,0,0,.25);">No Data</small>
                             </div>
 
-                            <ul class="list-group" style="margin-top: 20px;" ng-if="partner.cardInfo.rpMerchantId">
+                            <ul class="list-group" style="margin-top: 20px;" ng-if="cardInfo.rpMerchantId">
                                 <li class="list-group-item flex-between">
-                                    <b>Sub Merchant Id : {{partner.cardInfo.rpMerchantId}}</b>
-                                    <a role="button" ng-click="checkDetail(partner,'MerchantWarrior')">detail</a>
+                                    <b>Sub Merchant Id : {{cardInfo.rpMerchantId}}</b>
+                                    <a role="button" ng-click="checkDetail(cardInfo,'MerchantWarrior')">detail</a>
                                 </li>
                             </ul>
 
-                            <!-- <div class="box">
-                                <div class="box-body col-sm-6">
-                                    <ul class="list-group ui_desk">
-                                        <li class="list-group-item list-group-item-success">
-                                            <b>Sub Merchant Id</b>
-                                            <b style="float: right">
-                                                {{partner.cardInfo.rpMerchantId}}</b>
-                                        </li>
-                                        <li class="list-group-item list-group-item-success">
-                                            Name
-                                            <span style="float: right" ng-bind="partner.cardInfo.name"></span>
-                                        </li>
-                                        <li class="list-group-item list-group-item-success">
-                                            Company Name
-                                            <span style="float:right;">{{partner.cardInfo.company_name}}</span>
-                                        </li>
-                                        <li class="list-group-item list-group-item-success">
-                                            Address
-                                            <span style="float: right">{{partner.cardInfo.address}}</span>
-                                        </li>
-                                        <li class="list-group-item list-group-item-success">
-                                            Suburb
-                                            <span style="float: right;">{{partner.cardInfo.suburb}}</span>
-                                        </li>
-                                        <li class="list-group-item list-group-item-success">
-                                            Postcode
-                                            <span style="float: right" ng-bind="partner.cardInfo.postcode"></span>
-                                        </li>
-                                        <li class="list-group-item list-group-item-success" style="text-align: center"
-                                            ng-if="!showMoreMerchantInfo" ng-click="hideMerchantInfo()">
-                                            <span> More.....</span>
-                                        </li>
-                                        <li class="list-group-item list-group-item-success"
-                                            ng-if="showMoreMerchantInfo">
-                                            State
-                                            <span style="float: right" ng-bind="partner.cardInfo.state"></span>
-                                        </li>
-                                        <li class="list-group-item list-group-item-success"
-                                            ng-if="showMoreMerchantInfo">
-                                            Abn
-                                            <span style="float: right" ng-bind="partner.cardInfo.abn"></span>
-                                        </li>
-                                        <li class="list-group-item list-group-item-success"
-                                            ng-if="showMoreMerchantInfo">
-                                            Email
-                                            <span style="float: right" ng-bind="partner.cardInfo.email"></span>
-                                        </li>
-                                        <li class="list-group-item list-group-item-success"
-                                            ng-if="showMoreMerchantInfo">
-                                            Contact Name
-                                            <span style="float: right" ng-bind="partner.cardInfo.contact_name"></span>
-                                        </li>
-                                        <li class="list-group-item list-group-item-success"
-                                            ng-if="showMoreMerchantInfo">
-                                            Phone
-                                            <span style="float: right" ng-bind="partner.cardInfo.phone"></span>
-                                        </li>
-                                        <li class="list-group-item list-group-item-success"
-                                            ng-if="showMoreMerchantInfo">
-                                            BSB
-                                            <span style="float: right" ng-bind="partner.cardInfo.bsb"></span>
-                                        </li>
-                                        <li class="list-group-item list-group-item-success"
-                                            ng-if="showMoreMerchantInfo">
-                                            Account No
-                                            <span style="float: right" ng-bind="partner.cardInfo.accountNo"></span>
-                                        </li>
-                                        <li class="list-group-item list-group-item-success"
-                                            ng-if="showMoreMerchantInfo">
-                                            Account Name
-                                            <span style="float: right" ng-bind="partner.cardInfo.accountName"></span>
-                                        </li>
-                                        <li class="list-group-item list-group-item-success"
-                                            ng-if="showMoreMerchantInfo">
-                                            Website
-                                            <span style="float: right" ng-bind="partner.cardInfo.website"></span>
-                                        </li>
-                                        <li class="list-group-item list-group-item-success"
-                                            ng-if="showMoreMerchantInfo">
-                                            Timezone
-                                            <span style="float: right" ng-bind="partner.cardInfo.timezone"></span>
-                                        </li>
-                                        <li class="list-group-item list-group-item-success"
-                                            ng-if="showMoreMerchantInfo">
-                                            Category
-                                            <span style="float: right"
-                                                ng-bind="partner.cardInfo.category|partner_royalpay_industry"></span>
-                                        </li>
-                                        <li class="list-group-item list-group-item-success" style="text-align: center"
-                                            ng-if="showMoreMerchantInfo" ng-click="hideMerchantInfo()">
-                                            <span> Hide.....</span>
-                                        </li>
-                                    </ul>
-                                </div>
-                            </div> -->
                         </div>
                     </div>
                 </div>

src/main/ui/static/payment/validation/order-validation.js

@@ -2,83 +2,297 @@
  * Created by davep on 2016-09-01.
  */
 define(['angular', 'uiRouter'], function () {
-    'use strict';
-    var app = angular.module('orderValidApp', ['ui.router']);
-    app.config(['$stateProvider', function ($stateProvider) {
-        $stateProvider.state('order_valid', {
-            url: '/order_validation',
-            templateUrl: '/static/payment/validation/templates/valid-calendar.html',
-            controller: 'orderValidCalendarCtrl'
-        }).state('order_valid.report', {
-            url: '/{date}',
-            templateUrl: '/static/payment/validation/templates/valid.html',
-            controller: 'orderValidationCtrl'
-        });
-    }]);
-    app.controller('orderValidCalendarCtrl', ['$scope', '$http', '$filter', function ($scope, $http, $filter) {
-        $scope.today = new Date();
-        $scope.loadValidatedDates = function (month) {
-            let monthStr = $filter('date')(month, 'yyyyMM');
-            $http.get('/sys/financial/validated_dates/' + monthStr).then(function (resp) {
-                $scope.validatedDates = resp.data;
+  'use strict'
+  var app = angular.module('orderValidApp', ['ui.router'])
+  app.config([
+    '$stateProvider',
+    function ($stateProvider) {
+      $stateProvider
+        .state('order_valid', {
+          url: '/order_validation',
+          templateUrl: '/static/payment/validation/templates/valid-calendar.html',
+          controller: 'orderValidCalendarCtrl',
+        })
+        .state('order_valid.report', {
+          url: '/{date}',
+          templateUrl: '/static/payment/validation/templates/valid.html',
+          controller: 'orderValidationCtrl',
+        })
+        .state('order_valid.report_new', {
+          url: '/new/{date}',
+          templateUrl: '/static/payment/validation/templates/valid_new.html',
+          controller: 'orderValidationNewCtrl',
+        })
+    },
+  ])
+  app.controller('orderValidCalendarCtrl', [
+    '$scope',
+    '$http',
+    '$filter',
+    '$state',
+    'commonDialog',
+    function ($scope, $http, $filter, $state, commonDialog) {
+      $scope.today = new Date()
+      $scope.loadValidatedDates = function (month) {
+        let monthStr = $filter('date')(month, 'yyyyMM')
+        $http.get('/sys/financial/validated_dates/' + monthStr).then(function (resp) {
+          $scope.validatedDates = resp.data
+        })
+      }
+      $scope.findReport = function (dateStr) {
+        if ($scope.validatedDates == null) {
+          return null
+        }
+        let filtered = $scope.validatedDates.filter(rp => rp.date === dateStr)
+        return filtered.length ? filtered[0] : null
+      }
+      $scope.checkDetail = function (date) {
+        const filterItem = $scope.validatedDates.filter(rp => rp.date === date)
+        const dateStr = date.replace(/\//g, '')
+        if (filterItem.length) {
+          if (filterItem[0].isOld) {
+            $state.go('order_valid.report', { date: dateStr })
+          } else {
+            sessionStorage.setItem('warningLevel', filterItem[0].warning_level)
+            $state.go('order_valid.report_new', { date: dateStr })
+          }
+        } else {
+          commonDialog
+            .confirm({
+              title: 'Confirm',
+              content: '是否确认重新执行对账？',
+            })
+            .then(function () {
+              $http
+                .get('/sys/financial/order_validations/' + dateStr, {
+                  params: {
+                    use_cache: false,
+                  },
+                  timeout: 300000,
+                })
+                .then(
+                  function () {
+                    $state.reload()
+                  },
+                  function (resp) {
+                    $state.reload()
+                  }
+                )
             })
-        };
-        $scope.findReport = function (dateStr) {
-            if ($scope.validatedDates == null) {
-                return null;
-            }
-            let filtered = $scope.validatedDates.filter(rp => rp.date === dateStr);
-            return filtered.length ? filtered[0] : null
         }
-    }]);
-    app.controller('orderValidationCtrl', ['$scope', '$http', '$filter', '$stateParams', 'commonDialog',
-        function ($scope, $http, $filter, $stateParams, commonDialog) {
-            $scope.date = $stateParams.date;
-            $scope.startValid = function (forceRebuild) {
-                $scope.report = {loading: true};
-                $http.get('/sys/financial/order_validations/' + $scope.date, {
-                    params: {
-                        use_cache: !forceRebuild
-                    },
-                    timeout: 300000
-                }).then(function (resp) {
-                    $scope.report = resp.data;
-                    $scope.notExistsKeys = [];
-                    $scope.notEqualsKeys = [];
-                    angular.forEach($scope.report.not_exists, function (item) {
-                        angular.forEach(item, function (val, key) {
-                            if ($scope.notExistsKeys.indexOf(key) < 0) {
-                                $scope.notExistsKeys.push(key);
-                            }
-                        })
-                    });
-                    angular.forEach($scope.report.not_equals, function (item) {
-                        angular.forEach(item, function (val, key) {
-                            if ($scope.notExistsKeys.indexOf(key) < 0) {
-                                $scope.notExistsKeys.push(key);
-                            }
-                        })
-                    });
-                }, function (resp) {
-                    commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'});
-                    $scope.report = null;
+      }
+    },
+  ])
+  // old
+  app.controller('orderValidationCtrl', [
+    '$scope',
+    '$http',
+    '$filter',
+    '$stateParams',
+    'commonDialog',
+    function ($scope, $http, $filter, $stateParams, commonDialog) {
+      $scope.date = $stateParams.date
+      $scope.startValid = function (forceRebuild) {
+        $scope.report = { loading: true }
+        $http
+          .get('/sys/financial/order_validations/' + $scope.date, {
+            params: {
+              use_cache: !forceRebuild,
+            },
+            timeout: 300000,
+          })
+          .then(
+            function (resp) {
+              $scope.report = resp.data
+              $scope.notExistsKeys = []
+              $scope.notEqualsKeys = []
+              angular.forEach($scope.report.not_exists, function (item) {
+                angular.forEach(item, function (val, key) {
+                  if ($scope.notExistsKeys.indexOf(key) < 0) {
+                    $scope.notExistsKeys.push(key)
+                  }
+                })
+              })
+              angular.forEach($scope.report.not_equals, function (item) {
+                angular.forEach(item, function (val, key) {
+                  if ($scope.notExistsKeys.indexOf(key) < 0) {
+                    $scope.notExistsKeys.push(key)
+                  }
                 })
-            };
-            $scope.startValid(false);
+              })
+            },
+            function (resp) {
+              commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' })
+              $scope.report = null
+            }
+          )
+      }
+      $scope.startValid(false)
 
-            $scope.fixReport = function () {
-                var datePattern = $filter('date')($scope.valid.date, 'yyyyMMdd');
-                $http.get('/sys/financial/order_validations', {
-                    params: {
-                        date: datePattern,
-                        fix: true
-                    }
-                }).then(function (resp) {
-                    commonDialog.alert({title: 'Success', content: '修复完毕', type: 'success'})
-                }, function (resp) {
-                    commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'})
+      $scope.fixReport = function () {
+        var datePattern = $filter('date')($scope.valid.date, 'yyyyMMdd')
+        $http
+          .get('/sys/financial/order_validations', {
+            params: {
+              date: datePattern,
+              fix: true,
+            },
+          })
+          .then(
+            function (resp) {
+              commonDialog.alert({ title: 'Success', content: '修复完毕', type: 'success' })
+            },
+            function (resp) {
+              commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' })
+            }
+          )
+      }
+    },
+  ])
+  // new
+  app.controller('orderValidationNewCtrl', [
+    '$scope',
+    '$http',
+    '$stateParams',
+    'commonDialog',
+    '$uibModal',
+    function ($scope, $http, $stateParams, commonDialog, $uibModal) {
+      // 清除sessionStorage
+      $scope.$on('$destroy', function () {
+        sessionStorage.clear()
+      })
+      $scope.date = angular.copy($stateParams.date)
+      $scope.date = $scope.date.substr(0, 4) + '-' + $scope.date.substr(4, 2) + '-' + $scope.date.substr(6)
+      $scope.warningLevel = JSON.parse(sessionStorage.getItem('warningLevel'))
+      // 加载渠道信息
+      $scope.startValid = function () {
+        $http
+          .get('/sys/financial/order_validation_new/' + $stateParams.date, {
+            timeout: 300000,
+          })
+          .then(
+            function (resp) {
+              $scope.channelList = []
+              for (let key in resp.data) {
+                const obj = {}
+                obj.key = key
+                obj.channel = resp.data[key]
+                obj.selected = false
+                $scope.channelList.push(obj)
+              }
+              $scope.channelList.map(item => {
+                const arr = item.channel.filter(f => {
+                  return f.success === false
+                })
+                item.status = arr.length ? 'FAILED' : 'SUCCESS'
+                item.success = arr.length ? false : true
+              })
+              if (sessionStorage.getItem('channel')) {
+                const channel = JSON.parse(sessionStorage.getItem('channel'))
+                channel.map(item => {
+                  $scope.channelList.filter(f => f.key === item.key)[0].selected = item.selected
                 })
+              } else {
+                $scope.channelList[0].selected = true
+              }
+              console.log($scope.channelList)
+            },
+            function (resp) {
+              commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' })
             }
-        }]);
-    return app;
-});
+          )
+      }
+      $scope.startValid()
+      // 受否折叠
+      $scope.fold = function (index) {
+        $scope.channelList[index].selected = !$scope.channelList[index].selected
+      }
+      // 是否清除缓存
+      $scope.clear = function (channelName, flag) {
+        $http.post('/sys/financial/redo_channel_validation/' + $stateParams.date, { channel: channelName, cache: flag }).then(
+          function () {
+            $scope.startValid()
+          },
+          function (resp) {
+            commonDialog.alert({ title: 'failed', content: resp.data.message, type: 'error' })
+          }
+        )
+      }
+      // 处理
+      $scope.handle = function (merchant) {
+        sessionStorage.setItem('channel', JSON.stringify($scope.channelList))
+        $uibModal
+          .open({
+            templateUrl: '/static/payment/validation/templates/handle_desc.html',
+            controller: [
+              '$scope',
+              '$http',
+              'commonDialog',
+              'merchantInfo',
+              function ($scope, $http, commonDialog, merchantInfo) {
+                if (merchantInfo.resolve_msg) {
+                  $scope.message = merchantInfo.resolve_msg
+                }
+                $scope.confirm = function () {
+                  $http.post('/sys/financial/mark/resolve/message', { log_id: merchantInfo.log_id, message: $scope.message }).then(
+                    function () {
+                      $scope.$close()
+                    },
+                    function (resp) {
+                      commonDialog.alert({ title: 'failed', content: resp.data.message, type: 'error' })
+                    }
+                  )
+                }
+              },
+            ],
+            resolve: {
+              merchantInfo: [
+                '$stateParams',
+                function () {
+                  return merchant
+                },
+              ],
+            },
+          })
+          .result.then(function () {
+            $scope.startValid()
+          })
+      }
+      // 下载
+      $scope.download = function (merchant, keyName) {
+        if (merchant != null) {
+          const params = {}
+          params.channel = keyName
+          params.pid = merchant.pid
+          params.billDate = merchant.bill_date
+          params.noCache = false
+          params.billType = ''
+          window.open(
+            '/sys/financial/downloadChannelReconciliationFile?billDate=' +
+              params.billDate +
+              '&channel=' +
+              params.channel +
+              '&noCache=' +
+              params.noCache +
+              '&pid=' +
+              params.pid +
+              '&billType=' +
+              params.billType
+          )
+        }
+      }
+      // 查看what
+      $scope.checkStatus = function (transactionId) {
+        $http.get('/sys/financial/get/transaction/status/' + transactionId, {}).then(
+          function (resp) {
+            commonDialog.alert({ title: resp.data.statusInfo, content: '', type: 'success' })
+          },
+          function (resp) {
+            commonDialog.alert({ title: 'failed', content: resp.data.message, type: 'error' })
+          }
+        )
+      }
+    },
+  ])
+  return app
+})

src/main/ui/static/payment/validation/templates/handle_desc.html

@@ -0,0 +1,25 @@
+<div class="modal-header" style="display: flex;border-bottom: none;">
+    <h4>Handle</h4>
+</div>
+<div class="modal-body">
+    <div class="row">
+        <div class="col-sm-12">
+            <form novalidate name="couponForm" class="form-horizontal">
+                <div class="form-group">
+                    <label class="control-label col-sm-3">Description</label>
+                    <div class="col-sm-7">
+                        <textarea class="form-control" ng-model="message" maxlength="2000"></textarea>
+                    </div>
+                </div>
+            </form>
+        </div>
+    </div>
+</div>
+<div class="modal-footer">
+    <div class="btn-group">
+        <button class="btn btn-success" type="button" ng-click="confirm()">OK</button>
+    </div>
+    <div class="btn-group">
+        <button class="btn btn-danger" type="button" ng-click="$dismiss()">Cancel</button>
+    </div>
+</div>

src/main/ui/static/payment/validation/templates/valid-calendar.html

@@ -7,19 +7,35 @@
         </ol>
     </section>
     <section class="content">
-
         <div class="box">
             <div class="box-body">
                 <div royal-calendar month-change="loadValidatedDates($month)">
-                    <a class="rc-full" role="button" ui-sref=".report({date:(day|date:'yyyyMMdd')})"
-                       style="font-size: 40px" ng-if="day<=today">
+                    <a class="rc-full" role="button" ng-click="checkDetail((day|date:'yyyy/MM/dd'))"
+                        style="font-size: 40px" ng-if="day<=today">
                         <i class="fa"
-                           ng-class="{'fa-check-circle text-green':findReport((day|date:'yyyy/MM/dd')).success,'fa-warning':!findReport((day|date:'yyyy/MM/dd')).success,'text-red':findReport((day|date:'yyyy/MM/dd')).warning_level==2,'text-yellow':findReport((day|date:'yyyy/MM/dd')).warning_level==1}"
-                           ng-if="findReport((day|date:'yyyy/MM/dd'))!=null"></i>
+                            ng-class="{'fa-check-circle text-green':findReport((day|date:'yyyy/MM/dd')).success,'fa-warning':!findReport((day|date:'yyyy/MM/dd')).success,'text-red':findReport((day|date:'yyyy/MM/dd')).warning_level==2,'text-yellow':findReport((day|date:'yyyy/MM/dd')).warning_level==1}"
+                            ng-if="findReport((day|date:'yyyy/MM/dd'))!=null"></i>
                     </a>
                 </div>
             </div>
+            <div style="padding: 20px 10px;">
+                <div>
+                    <i class="fa fa-check-circle text-green"></i>
+                    <span>&nbsp;All channel transactions are reconciled successfully. </span>
+                </div>
+                <div>
+                    <i class="fa fa-check-circle fa-warning text-yellow"></i>
+                    <span>Yellow warning: There are some abnormal orders in a channel in the transaction reconciliation
+                        result, such as the difference between the amount of an order in the system and the bill amount
+                        of the corresponding channel. </span>
+                </div>
+                <div>
+                    <i class="fa fa-check-circle fa-warning text-red"></i>
+                    <span>There are some missing orders in a channel in the result of the transaction reconciliation,
+                        for example, by comparing the statement of a channel, it is found that the payment order was not
+                        found in the system on the same day.</span>
+                </div>
+            </div>
         </div>
-
     </section>
 </div>

src/main/ui/static/payment/validation/templates/valid_new.html

@@ -0,0 +1,278 @@
+<section class="content-header">
+    <ol class="breadcrumb">
+        <li><i class="fa fa-balance-scale"></i>Payment & settlement</li>
+        <li class="active"><a ui-sref="^">Order Validation Calendar</a></li>
+        <li>Validate Result</li>
+    </ol>
+</section>
+<section class="header">
+    <h3>{{date}}</h3>
+    <i class="fa fa-check-circle text-green fa-2x" style="margin-left: 24px;" ng-if="warningLevel === 0"></i>
+    <i class="fa fa-exclamation-triangle text-yellow fa-2x" style="margin-left: 24px;" ng-if="warningLevel === 1"></i>
+    <i class="fa fa-exclamation-triangle text-red fa-2x" style="margin-left: 24px;" ng-if="warningLevel === 2"></i>
+</section>
+<section class="content">
+    <div ng-repeat="(index,item) in channelList">
+        <div class="panel" ng-class="{'panel-success':item.success,'panel-danger':!item.success}">
+            <div class="panel-heading panel-box" ng-click="fold(index)">
+                <div class="title-box">
+                    <img src="/static/images/wechatpay_sign.png" uib-tooltip="WechatPay" ng-if="item.key=='Wechat'" />
+                    <img src="/static/images/alipay_sign.png" uib-tooltip="Alipay" ng-if="item.key=='Alipay'" />
+                    <img src="/static/images/alipay_sign.png" uib-tooltip="AlipayOnline"
+                        ng-if="item.key=='AlipayOnline'" />
+                    <img src="/static/images/alipay_direct_sign.png" uib-tooltip="AlipayDirect"
+                        ng-if="item.key=='Alipay_Direct'" />
+                    <img src="/static/images/unionpay_sign.png" style="width: 16px;height: 16px;" uib-tooltip="UnionPay"
+                        ng-if="item.key=='UnionPay'" />
+                    <img src="/static/images/upop_sign.png" uib-tooltip="UnionPayOnline"
+                        ng-if="item.key=='UnionPayOnline'" />
+                    <img src="/static/images/alipay_sign.png" style="height: 20px" uib-tooltip="Alipay CN"
+                        ng-if="item.key=='AlipayPlus'" />
+
+                    <h4 style="margin-left: 16px;">{{item.key}}</h4>
+                </div>
+                <h5 style="width: 360px;">Status：&nbsp;{{item.status}}
+                    <small style="margin-left: 10px;white-space: nowrap;">
+                        (UpdateTime : {{item.channel[0].valid_time}})</small>
+                </h5>
+                <h5 style="position: relative;" ng-click="$event.stopPropagation();">
+                    <a role="button" ng-click="clear(item.key,false)">Revalidate</a>
+                    <i class="fa fa-sort-desc" style="cursor:pointer" ng-click="cacheFlag = !cacheFlag"></i>
+                    <a role="button" class="cache-style" ng-show="cacheFlag"
+                        ng-click="clear(item.key,true);cacheFlag = false">clear
+                        cache</a>
+                </h5>
+            </div>
+            <div ng-show="item.selected">
+                <div class="panel-body" ng-repeat="merchant in item.channel">
+                    <div style="display: flex;justify-content: space-between;">
+                        <h4 class="title-margin">{{merchant.pid}}:
+                            <small>(Transaction Time Range :
+                                {{merchant.valid_from_time}} ~ {{merchant.valid_to_time}})</small>
+                        </h4>
+                        <a role="button" ng-click="handle(merchant)">handle</a>
+                    </div>
+                    <div class="table-download">
+                        <table class="table table-bordered table-hover">
+                            <thead>
+                                <tr>
+                                    <th></th>
+                                    <th>Payment Amount in Local Currency</th>
+                                    <th>Payment Transactions Number</th>
+                                    <th>Refund Amount in Local Currency</th>
+                                    <th>Refund Transactions Number</th>
+                                    <th>Total Payment Number</th>
+                                    <th>Total Refund Number</th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                <tr>
+                                    <td><i class="fa fa-cloud fa-lg" uib-tooltip="Channel Data"></i>
+                                    </td>
+                                    <td>
+                                        {{merchant.channel_analysis.total_paid || merchant.channel_analysis.total_paid
+                                        === 0 ? merchant.channel_analysis.total_paid : '-'}}
+                                    </td>
+                                    <td>
+                                        {{merchant.channel_analysis.pay_count || merchant.channel_analysis.pay_count ===
+                                        0 ? merchant.channel_analysis.pay_count : '-'}}
+                                    </td>
+                                    <td>
+                                        {{merchant.channel_analysis.total_refund ||
+                                        merchant.channel_analysis.total_refund === 0 ?
+                                        merchant.channel_analysis.total_refund : '-'}}
+                                    </td>
+                                    <td>
+                                        {{merchant.channel_analysis.refund_count ||
+                                        merchant.channel_analysis.refund_count === 0 ?
+                                        merchant.channel_analysis.refund_count : '-'}}
+                                    </td>
+                                    <td>
+                                        {{merchant.channel_analysis.total_paid_number ||
+                                        merchant.channel_analysis.total_paid_number === 0 ?
+                                        merchant.channel_analysis.total_paid_number : '-'}}
+                                    </td>
+                                    <td>
+                                        {{merchant.channel_analysis.total_refund_number ||
+                                        merchant.channel_analysis.total_refund_number === 0 ?
+                                        merchant.channel_analysis.total_refund_number : '-'}}
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td><i class="fa fa-database fa-lg" uib-tooltip="System Data"></i></td>
+                                    <td
+                                        ng-style="{'color': merchant.channel_analysis.total_paid || merchant.channel_analysis.total_paid === 0 ? (merchant.db_analysis.total_paid === merchant.channel_analysis.total_paid ? 'green' : 'red') : ''}">
+                                        {{merchant.db_analysis.total_paid || merchant.db_analysis.total_paid === 0 ?
+                                        merchant.db_analysis.total_paid : '-'}}
+                                    </td>
+                                    <td
+                                        ng-style="{'color': merchant.channel_analysis.pay_count || merchant.channel_analysis.pay_count === 0 ? (merchant.db_analysis.pay_count === merchant.channel_analysis.pay_count ? 'green' : 'red') : ''}">
+                                        {{merchant.db_analysis.pay_count || merchant.db_analysis.pay_count === 0 ?
+                                        merchant.db_analysis.pay_count : '-'}}
+                                    </td>
+                                    <td
+                                        ng-style="{'color': merchant.channel_analysis.total_refund || merchant.channel_analysis.total_refund === 0 ? (merchant.db_analysis.total_refund === merchant.channel_analysis.total_refund ? 'green' : 'red') : ''}">
+                                        {{merchant.db_analysis.total_refund || merchant.db_analysis.total_refund === 0 ?
+                                        merchant.db_analysis.total_refund : '-'}}
+                                    </td>
+                                    <td
+                                        ng-style="{'color': merchant.channel_analysis.refund_count || merchant.channel_analysis.refund_count === 0 ? (merchant.db_analysis.refund_count === merchant.channel_analysis.refund_count ? 'green' : 'red') : ''}">
+                                        {{merchant.db_analysis.refund_count || merchant.db_analysis.refund_count === 0 ?
+                                        merchant.db_analysis.refund_count : '-'}}
+                                    </td>
+                                    <td
+                                        ng-style="{'color': item.key === 'Wechat' ? (merchant.db_analysis.total_paid_number === merchant.channel_analysis.total_paid_number ? 'green' : 'red') : ''}">
+                                        {{merchant.db_analysis.total_paid_number ||
+                                        merchant.db_analysis.total_paid_number === 0 ?
+                                        merchant.db_analysis.total_paid_number : '-'}}
+                                    </td>
+                                    <td
+                                        ng-style="{'color': item.key === 'Wechat' ? (merchant.db_analysis.total_refund_number === merchant.channel_analysis.total_refund_number ? 'green' : 'red') : ''}">
+                                        {{merchant.db_analysis.total_refund_number ||
+                                        merchant.db_analysis.total_refund_number === 0 ?
+                                        merchant.db_analysis.total_refund_number : '-'}}
+                                    </td>
+                                </tr>
+                            </tbody>
+                        </table>
+                        <a role="button" style="white-space: nowrap;margin-left: 20px;"
+                            ng-click="download(merchant,item.key)"><i class="fa fa-download"></i>download</a>
+                    </div>
+                    <div ng-if="merchant.not_exists.length">
+                        <h4 class="title-margin">Not Exists Transactions</h4>
+                        <div style="max-height: 500px;overflow: auto;">
+                            <table class="table table-bordered table-hover">
+                                <thead>
+                                    <tr>
+                                        <th>Missing Type</th>
+                                        <th>Transaction Time</th>
+                                        <th>Transaction ID</th>
+                                        <th>Order ID</th>
+                                        <th>Transaction Type</th>
+                                        <th>Transaction Amount</th>
+                                        <th>Operation</th>
+                                    </tr>
+                                </thead>
+                                <tbody>
+                                    <tr ng-repeat="notExist in merchant.not_exists">
+                                        <td>{{ notExist.missing_side ? notExist.missing_side : '-' }}</td>
+                                        <td>{{ notExist.transaction_time ? notExist.transaction_time : '-' }}
+                                        </td>
+                                        <td>{{ notExist.channel_trans_id ? notExist.channel_trans_id : '-' }}
+                                        </td>
+                                        <td>{{ notExist.order_id ? notExist.order_id : '-' }}</td>
+                                        <td>{{ notExist.trans_type ? notExist.trans_type : '-' }}</td>
+                                        <td>{{ notExist.amount || notExist.amount === 0 ? notExist.amount : '-'
+                                            }}
+                                        </td>
+                                        <td><a role="button" uib-tooltip="Clearing status"
+                                                ng-click="checkStatus(notExist.channel_trans_id)">
+                                                <i class="fa fa-eye" ng-if="notExist.channel_trans_id"></i>
+                                                <span ng-if="!notExist.channel_trans_id">-</span>
+                                            </a>
+                                        </td>
+                                    </tr>
+                                </tbody>
+                            </table>
+                        </div>
+                    </div>
+
+                    <div ng-if="merchant.not_equals.length">
+                        <h4 class="title-margin">Not Equals Transactions</h4>
+                        <div style="max-height: 500px;overflow: auto;">
+                            <table class="table table-bordered table-hover">
+                                <thead>
+                                    <tr>
+                                        <th>Transaction Time</th>
+                                        <th>Transaction ID</th>
+                                        <th>Order ID</th>
+                                        <th>Transaction Type</th>
+                                        <th>Transaction Amount</th>
+                                        <th>Operation</th>
+                                    </tr>
+                                </thead>
+                                <tbody>
+                                    <tr ng-repeat="notEqual in merchant.not_equals">
+                                        <td>{{notEqual.trans_time ? notEqual.trans_time : '-'}}</td>
+                                        <td>{{notEqual.transaction_id ? notEqual.transaction_id : '-'}}</td>
+                                        <td>{{notEqual.order_id ? notEqual.order_id : '-'}}</td>
+                                        <td>{{notEqual.trans_type ? notEqual.trans_type : '-'}}</td>
+                                        <td>{{notEqual.channel_amount || notEqual.channel_amount === 0 ?
+                                            notEqual.channel_amount : '-'}}</td>
+                                        <td><a role="button" uib-tooltip="Clearing status"
+                                                ng-click="checkStatus(notEqual.transaction_id)">
+                                                <i class="fa fa-eye" ng-if="notEqual.transaction_id"></i>
+                                                <span ng-if="!notEqual.transaction_id">-</span>
+                                            </a>
+                                        </td>
+                                    </tr>
+                                </tbody>
+                            </table>
+                        </div>
+                    </div>
+                    <div ng-if="merchant.resolve_msg">
+                        <div class="title-margin">Handle Description:</div>
+                        <div>{{ merchant.resolve_msg }}</div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+
+
+</section>
+<style>
+    h1,
+    h2,
+    h3,
+    h4,
+    h5 {
+        margin: unset;
+    }
+
+    .header {
+        display: flex;
+        align-items: center;
+        margin-top: 50px;
+        padding: 0 20px;
+    }
+
+    .panel-box {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        padding-right: 20px;
+        cursor: pointer;
+    }
+
+    .title-box {
+        display: flex;
+        align-items: center;
+        width: 180px;
+    }
+
+    .dropdown-menu {
+        min-width: unset;
+        left: unset;
+        right: 0;
+    }
+
+    .table-download {
+        display: flex;
+        align-items: center;
+    }
+
+    .title-margin {
+        margin: 10px 0;
+    }
+
+    .cache-style {
+        position: absolute;
+        right: 0;
+        top: 20px;
+        background: rgb(255, 255, 255);
+        padding: 10px 15px;
+        white-space: nowrap;
+        border-radius: 4px;
+    }
+</style>