diff --git a/src/db/modify.sql b/src/db/modify.sql index 41c6cf7c8..38eeb394e 100644 --- a/src/db/modify.sql +++ b/src/db/modify.sql @@ -185,3 +185,25 @@ CREATE TABLE `financial_agent_commission_detail` ( alter table financial_partner_commission add column commission_type smallint(1) DEFAULT 1 COMMENT '提成类型 1:渠道计算法 2:总交易额比例 3:收益比例'; alter table financial_partner_commission_detail add column commission_type smallint(1) DEFAULT 1 COMMENT '提成类型 1:渠道计算法 2:总交易额比例 3:收益比例'; +INSERT INTO `royalpay_production`.`sys_configs`(`config_key` , `config_value`) + + +VALUES + ( + 'android_version_content' , + '近期更新:\n\n1、修复了付款二维码的保存可能会失败的错误\n2、新增多种渠道订单及清算\n3、修复清算记录显示错误' + ); + +INSERT INTO `royalpay_production`.`sys_configs`(`config_key` , `config_value`) +VALUES + ( + 'android_version' , + '2.8.1' + ); + +INSERT INTO `royalpay_production`.`sys_configs`(`config_key` , `config_value`) +VALUES + ( + 'android_update' , + 'true' + ); diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java index f01490ced..35cc8f890 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java @@ -777,6 +777,7 @@ public class RetailAppServiceImp implements RetailAppService { String clientType = device.getString("client_type"); deviceSupport.findRegister(clientType); JSONObject res = noticeManage.getNoticeById(noticeId); + res.remove("status"); Document doc = Jsoup.parse(res.getString("content")); String father = "
"; String html = doc.body().children().wrap(father).html(); @@ -953,9 +954,9 @@ public class RetailAppServiceImp implements RetailAppService { String version = device.getString("version"); String clientType = device.getString("client_type"); deviceSupport.findRegister(clientType); - String newAppVersion = PlatformEnvironment.getEnv().getNewVersion(); - Boolean isUpdate = PlatformEnvironment.getEnv().isAppUpdate(); - String updateContent = PlatformEnvironment.getEnv().getAppUpdateContent(); + String newAppVersion = PlatformEnvironment.getEnv().getNewVersion(clientType); + Boolean isUpdate = PlatformEnvironment.getEnv().isAppUpdate(clientType); + String updateContent = PlatformEnvironment.getEnv().getAppUpdateContent(clientType); int update_type = 0;// 0:不更新 1:更新 2:强制更新 if (newAppVersion.compareToIgnoreCase(version) > 0) { update_type = 1; diff --git a/src/main/java/au/com/royalpay/payment/manage/cashback/core/CashbackService.java b/src/main/java/au/com/royalpay/payment/manage/cashback/core/CashbackService.java index 52ba05f10..faa58ad37 100644 --- a/src/main/java/au/com/royalpay/payment/manage/cashback/core/CashbackService.java +++ b/src/main/java/au/com/royalpay/payment/manage/cashback/core/CashbackService.java @@ -6,6 +6,7 @@ import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import com.github.miemiedev.mybatis.paginator.domain.PageList; import java.math.BigDecimal; +import java.util.Date; import java.util.List; /** @@ -32,4 +33,6 @@ public interface CashbackService { JSONObject analysisCashback(JSONObject params); void drawDeposits(BigDecimal drawAmount, int clientId, JSONObject operator); + + void saveSurchargeDiscountCashback(int clientId, String clientMoniker, String transactionOrderId, BigDecimal cashbackAmount, Date date, String remark); } \ No newline at end of file diff --git a/src/main/java/au/com/royalpay/payment/manage/cashback/core/impl/CashbackServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/cashback/core/impl/CashbackServiceImp.java index f93ed8d3a..4cd24c53e 100644 --- a/src/main/java/au/com/royalpay/payment/manage/cashback/core/impl/CashbackServiceImp.java +++ b/src/main/java/au/com/royalpay/payment/manage/cashback/core/impl/CashbackServiceImp.java @@ -1,11 +1,14 @@ package au.com.royalpay.payment.manage.cashback.core.impl; import java.math.BigDecimal; +import java.util.Date; import java.util.List; import javax.annotation.Resource; import au.com.royalpay.payment.core.PmtCashbackService; +import org.apache.commons.lang3.RandomStringUtils; +import org.apache.commons.lang3.time.DateFormatUtils; import org.springframework.stereotype.Service; import com.alibaba.fastjson.JSONObject; @@ -111,7 +114,25 @@ public class CashbackServiceImp implements CashbackService { @Override public void drawDeposits(BigDecimal drawAmount, int clientId, JSONObject operator) { - pmtCashbackService.drawDeposits(drawAmount,clientId,operator); + pmtCashbackService.drawDeposits(drawAmount, clientId, operator); + } + + @Override + public void saveSurchargeDiscountCashback(int clientId, String clientMoniker, String transactionOrderId, BigDecimal cashbackAmount, Date date, String remark) { + if (!cashbackRecordsMapper.findBySurchargeDiscountLog(clientId, date).isEmpty()) { + return; + } + String cashback_id = 'R' + clientMoniker + "-" + DateFormatUtils.format(date, "yyyyMMddHHmmssSSS") + "-" + RandomStringUtils.random(3, true, false).toUpperCase(); + //营销账户 + JSONObject cashback = new JSONObject(); + cashback.put("cashback_id", cashback_id); + cashback.put("client_id", clientId); + cashback.put("cashback_amount", cashbackAmount); + cashback.put("order_id", transactionOrderId); + cashback.put("cashback_type", 2); + cashback.put("remark", remark); + cashback.put("create_time", date); + cashbackRecordsMapper.save(cashback); } } diff --git a/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/SettleDelayConfigurer.java b/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/SettleDelayConfigurer.java index 38be7a244..f5e4e0235 100644 --- a/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/SettleDelayConfigurer.java +++ b/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/SettleDelayConfigurer.java @@ -3,7 +3,9 @@ package au.com.royalpay.payment.manage.management.clearing.core; import au.com.royalpay.payment.manage.management.clearing.beans.SettleDelayConfig; import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.PageList; +import org.springframework.transaction.annotation.Transactional; +import java.util.Date; import java.util.List; /** @@ -20,4 +22,6 @@ public interface SettleDelayConfigurer { PageListRepresentative of AFS Licensee 448066
------------------------------
Lv.11,15 William Street, Melbourne 3000
-Lv.7, 50 Bridge Street, Sydney, NSW 2000
+Lv.14, 383 Kent Street, Sydney, NSW 2000
P: 1300 1077 50
E: settlement@royalpay.com.au
www.royalpay.com.au
diff --git a/src/main/resources/templates/reports/week_report.html b/src/main/resources/templates/reports/week_report.html index e3bcd0070..77151318c 100644 --- a/src/main/resources/templates/reports/week_report.html +++ b/src/main/resources/templates/reports/week_report.html @@ -151,8 +151,6 @@ - #end - @@ -167,12 +165,12 @@