Merge remote-tracking branch 'origin/develop' into develop

master
liuxinxin 5 years ago
commit f663749d51

@ -9,7 +9,7 @@
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>manage</artifactId> <artifactId>manage</artifactId>
<version>1.3.72</version> <version>1.3.75</version>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jib-maven-plugin.version>1.8.0</jib-maven-plugin.version> <jib-maven-plugin.version>1.8.0</jib-maven-plugin.version>

@ -71,7 +71,7 @@ public class AppActServiceImp implements AppActService {
public JSONObject getAppActPopup(){ public JSONObject getAppActPopup(){
JSONObject appActPopup = actAppMapper.getAppActPopup(); JSONObject appActPopup = actAppMapper.getAppActPopup();
if (appActPopup == null) { if (appActPopup == null) {
return new JSONObject(); return null;
} }
int appLinkType = appActPopup.getIntValue("show_type"); int appLinkType = appActPopup.getIntValue("show_type");
switch (appLinkType) { switch (appLinkType) {

@ -985,6 +985,7 @@ public class RetailAppServiceImp implements RetailAppService {
TimeZoneUtils.switchTimeZone(orders, query.getTimezone(), "create_time", "transaction_time", "confirm_time"); TimeZoneUtils.switchTimeZone(orders, query.getTimezone(), "create_time", "transaction_time", "confirm_time");
ArrayList<String> dateContains = new ArrayList<>(); ArrayList<String> dateContains = new ArrayList<>();
for (JSONObject order : orders) { for (JSONObject order : orders) {
order.put("geek_apply_deduction", order.getBooleanValue("geek_apply_deduction"));
Calendar calendar = (Calendar) order.get("transaction_time"); Calendar calendar = (Calendar) order.get("transaction_time");
if (timezone != null) { if (timezone != null) {
calendar.setTimeZone(TimeZone.getTimeZone(timezone)); calendar.setTimeZone(TimeZone.getTimeZone(timezone));

@ -920,7 +920,8 @@
t.exchange_rate, t.exchange_rate,
t.clearing_status, t.clearing_status,
t.settle_amount, t.settle_amount,
t.clearing_status = 2 pre_auth t.clearing_status = 2 pre_auth,
IF( t.remark like '%RYCBSM%',TRUE,FALSE) as geek_apply_deduction
from pmt_orders o from pmt_orders o
left join pmt_transactions t on t.order_id=o.order_id and t.channel!='Settlement' left join pmt_transactions t on t.order_id=o.order_id and t.channel!='Settlement'
AND (t.system_generate = 0 or (t.system_generate = 1 and t.remark like '%RYCBSM%')) AND (t.system_generate = 0 or (t.system_generate = 1 and t.remark like '%RYCBSM%'))

Loading…
Cancel
Save