修复清算报表无法下载情况

master
taylor.dang 6 years ago
parent 02fd5da0cc
commit 72d1fe2f18

@ -420,7 +420,7 @@ public class SignInAccountServiceImpl implements SignInAccountService, Applicati
"company_phone", "suburb", "postcode", "state", "contact_person", "contact_phone", "contact_email", "short_name", "logo_url", "enable_refund",
"enable_refund_auth", "retail_surcharge", "require_custinfo", "require_remark", "logo_thumbnail", "creator", "create_time", "approver",
"approve_result", "approve_time", "timezone", "has_children", "source", "customer_surcharge_rate", "enable_alipay", "enable_wechat",
"enable_bestpay", "manual_settle", "skip_clearing" ,"mail_confirm"};
"enable_bestpay", "manual_settle", "skip_clearing" ,"mail_confirm","surcharge_mode"};
for (String col : columns) {
simpleClient.put(col, client.get(col));
}

@ -1302,6 +1302,7 @@ public class TradeLogServiceImpl implements TradeLogService {
JSONObject client = partner.getJSONObject("client");
String timezone = client.getString("timezone");
JSONObject params = query.toParams(timezone);
params.put("client_id",client.getString("client_id"));
List<JSONObject> clientOrderList = transactionMapper.getClientOrderByTransactionTime(params);
List<Integer> clientOrders = new ArrayList<>(clientOrderList.size());
clientOrderList.parallelStream().forEach(p->{

@ -1116,10 +1116,15 @@
SELECT t.clearing_order
FROM pmt_transactions t
WHERE t.channel='Settlement'
<if test="client_ids!=null">
AND t.client_id IN
<foreach collection="client_ids" open="(" close=")" separator="," item="clientId">
#{clientId}
<foreach collection="client_ids" open="(" close=")" separator="," item="client_id">
#{client_id}
</foreach>
</if>
<if test="client_ids==null">
and t.client_id=#{client_id}
</if>
<if test="from!=null">and t.transaction_time &gt;= #{from}</if>
<if test="to!=null">and t.transaction_time &lt; #{to}</if>
</select>

@ -899,7 +899,7 @@ margin-bottom: 10%;"/>
</li>
</ul>
</li>
<li ng-if="([1,2]|withRole)">
<li ng-if="([1,2]|withRole) &&(currentUser.client.surcharge_mode=='distributed')">
<ul>
<li>
<a ui-sref="surcharge_account">

@ -37,15 +37,6 @@ define(['angular', 'decimal', 'uiRouter', 'ngBootSwitch', 'ngFileUpload','uiBoot
return $http.get('/client/partner_info/compliance/files');
}]
}
}).state('payment_materials', {
url: '/payment_materials',
templateUrl: '/static/payment/partner/templates/client_payment_materials.html',
controller: 'clientPaymentMaterialCtrl',
resolve: {
partner: ['$http', function ($http) {
return $http.get('/client/partner_info');
}]
}
}).state('basic.clearing_config', {
url: '/clearing_config',
templateUrl: '/static/payment/partner/templates/client_bankaccounts.html',
@ -868,16 +859,6 @@ define(['angular', 'decimal', 'uiRouter', 'ngBootSwitch', 'ngFileUpload','uiBoot
};
}]);
app.controller('clientPaymentMaterialCtrl', ['$scope', '$http', 'partner', function ($scope, $http, partner) {
$scope.paymentInfo = partner.data;
$scope.qrConfig = {currency: 'AUD'};
$scope.reloadQRCode = function () {
$http.get('/client/partner_info/qrcode', {params: $scope.qrConfig}).then(function (resp) {
$scope.qrcode = resp.data;
});
};
$scope.reloadQRCode();
}]);
app.controller('clientParameterCtrl', ['$scope', '$http', 'commonDialog', 'timezone', function ($scope, $http, commonDialog, timezone) {
$scope.getClientConfig = function () {
$http.get('/client/partner_info').then(function (resp) {

Loading…
Cancel
Save