msb_52843
/
dalong_mall
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'hotfix' into develop

Browse Source
master
wangning 6 years ago
parent 103ca68c2d 33c477a30c
commit dfdb0bcac2
3 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File

1
src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java
Unescape View File

@ -323,6 +323,7 @@ public class RetailAppServiceImp implements RetailAppService {
TradeLogQuery tradeLogQuery = new TradeLogQuery(); TradeLogQuery tradeLogQuery = new TradeLogQuery();
tradeLogQuery.setDatefrom(appQueryBean.getBegin()); tradeLogQuery.setDatefrom(appQueryBean.getBegin());
tradeLogQuery.setDateto(appQueryBean.getEnd()); tradeLogQuery.setDateto(appQueryBean.getEnd());
tradeLogQuery.setClearing_status(appQueryBean.getClearing_status());
if (appQueryBean.getApp_client_ids() == null) { if (appQueryBean.getApp_client_ids() == null) {
appQueryBean.setApp_client_ids(String.valueOf(client_id)); appQueryBean.setApp_client_ids(String.valueOf(client_id));
} }

36
src/main/java/au/com/royalpay/payment/manage/ofei/core/impl/OfeiClientImpl.java
Unescape View File

@ -1,14 +1,15 @@
package au.com.royalpay.payment.manage.ofei.core.impl; package au.com.royalpay.payment.manage.ofei.core.impl;
import java.io.IOException; import au.com.royalpay.payment.core.exceptions.ChannelNetworkException;
import java.net.URISyntaxException; import au.com.royalpay.payment.manage.mappers.ofei.TopUpOrderMapper;
import java.util.ArrayList; import au.com.royalpay.payment.manage.ofei.core.OfeiClient;
import java.util.Date; import au.com.royalpay.payment.manage.ofei.enums.OfeiType;
import java.util.HashMap; import au.com.royalpay.payment.tools.codec.MD5Hash;
import java.util.List; import au.com.royalpay.payment.tools.exceptions.BadRequestException;
import java.util.Map; import au.com.royalpay.payment.tools.exceptions.ServerErrorException;
import au.com.royalpay.payment.tools.fixing.FixedDocumentHelper;
import javax.annotation.Resource; import com.alibaba.fastjson.JSONObject;
import org.apache.commons.lang3.RandomStringUtils; import org.apache.commons.lang3.RandomStringUtils;
import org.apache.commons.lang3.time.DateFormatUtils; import org.apache.commons.lang3.time.DateFormatUtils;
@ -16,7 +17,6 @@ import org.apache.http.NameValuePair;
import org.apache.http.message.BasicNameValuePair; import org.apache.http.message.BasicNameValuePair;
import org.dom4j.Document; import org.dom4j.Document;
import org.dom4j.DocumentException; import org.dom4j.DocumentException;
import org.dom4j.DocumentHelper;
import org.dom4j.Element; import org.dom4j.Element;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -24,15 +24,15 @@ import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestMethod;
import com.alibaba.fastjson.JSONObject; import java.io.IOException;
import java.net.URISyntaxException;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import au.com.royalpay.payment.core.exceptions.ChannelNetworkException; import javax.annotation.Resource;
import au.com.royalpay.payment.manage.mappers.ofei.TopUpOrderMapper;
import au.com.royalpay.payment.manage.ofei.core.OfeiClient;
import au.com.royalpay.payment.manage.ofei.enums.OfeiType;
import au.com.royalpay.payment.tools.codec.MD5Hash;
import au.com.royalpay.payment.tools.exceptions.BadRequestException;
import au.com.royalpay.payment.tools.exceptions.ServerErrorException;
import cn.yixblog.platform.http.HttpRequestGenerator; import cn.yixblog.platform.http.HttpRequestGenerator;
import cn.yixblog.platform.http.HttpRequestResult; import cn.yixblog.platform.http.HttpRequestResult;
@ -259,7 +259,7 @@ public class OfeiClientImpl implements OfeiClient {
byte[] respArr = res.getResponseContentBytes(); byte[] respArr = res.getResponseContentBytes();
String respStr = new String(respArr, "GB2312"); String respStr = new String(respArr, "GB2312");
logger.debug("ofei server response:" + respStr); logger.debug("ofei server response:" + respStr);
Document respXml = DocumentHelper.parseText(respStr); Document respXml = FixedDocumentHelper.parseText(respStr);
Element respRoot = respXml.getRootElement(); Element respRoot = respXml.getRootElement();
return respRoot; return respRoot;
} else { } else {

2
src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/CustomerAndOrdersStatisticsMapper.xml
Unescape View File

@ -316,7 +316,7 @@
ifnull(sum(CASE WHEN s.channel = 'AlipayOnline' THEN s.total ELSE 0 END),0) alipayonlineamount, ifnull(sum(CASE WHEN s.channel = 'AlipayOnline' THEN s.total ELSE 0 END),0) alipayonlineamount,
ifnull(sum(CASE WHEN s.channel = 'AlipayOnline' THEN s.orders ELSE 0 END),0) alipayonline_order_count, ifnull(sum(CASE WHEN s.channel = 'AlipayOnline' THEN s.orders ELSE 0 END),0) alipayonline_order_count,
ifnull(sum(CASE WHEN s.channel = 'hf' THEN s.total ELSE 0 END),0) hfamount, ifnull(sum(CASE WHEN s.channel = 'hf' THEN s.total ELSE 0 END),0) hfamount,
ifnull(sum(CASE WHEN s.channel = 'hf' THEN s.orders ELSE 0 END),0) hf_order_count, ifnull(sum(CASE WHEN s.channel = 'hf' THEN s.orders ELSE 0 END),0) hf_order_count
FROM statistics_customer_order s FROM statistics_customer_order s
LEFT JOIN sys_clients c ON c.client_id = s.client_id and c.is_valid=1 LEFT JOIN sys_clients c ON c.client_id = s.client_id and c.is_valid=1
]]> ]]>

Write Preview
Loading…
Cancel
Save