diff --git a/pom.xml b/pom.xml
index ec62ffe92..8c8d440ef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
4.0.0
manage
- 1.3.44
+ 1.3.49
UTF-8
1.8.0
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 9dd0c7eea..eac79d1fe 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
@@ -1578,17 +1578,14 @@ public class RetailAppServiceImp implements RetailAppService {
confirmNotice.put("type", "confirm_notice");
result.add(confirmNotice);
- JSONObject latestAct = appActService.getLatestWindowNotice();
- if (latestAct != null) {
+ JSONObject latestAct = appActService.getAppActPopup();
+ if (latestAct != null && clientId == 9) {
latestAct.put("id", latestAct.getString("act_id"));
- if (latestAct.getIntValue("show_type") == 0) {
- latestAct.put("url", latestAct.getString("act_url"));
- }
+ latestAct.put("url", latestAct.getString("act_url"));
latestAct.put("title", latestAct.getString("act_name"));
- latestAct.put("img", latestAct.getString("window_img"));
+ latestAct.put("img", latestAct.getString("act_img"));
latestAct.remove("act_id");
latestAct.remove("act_name");
- latestAct.remove("window_img");
latestAct.remove("act_url");
JSONObject act = new JSONObject();
act.put("data", latestAct);
diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailRSvcServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailRSvcServiceImpl.java
index 0b78d5ddf..2722522d1 100644
--- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailRSvcServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailRSvcServiceImpl.java
@@ -82,6 +82,7 @@ public class RetailRSvcServiceImpl implements RetailRSvcService {
|| StringUtils.isEmpty(svcInfo.getString("platform_pub_key")) || StringUtils.isEmpty("platform_pri_key")) {
throw new BadRequestException("this channel config is wrong");
}
+ logger.debug("{} new services apply :{}", params.getString("signClient"),params.toJSONString());
String signa = params.getString("sign");
params.remove("sign");
params = JSONObject.parseObject(JSON.toJSONString(params), Feature.OrderedField);
@@ -97,10 +98,14 @@ public class RetailRSvcServiceImpl implements RetailRSvcService {
String signPrice = "0";
String signRate = "0";
if (params.get("signPrice") != null) {
+ logger.debug("{} new services apply amount origin:{}", params.getString("signClient"),params.getString("signPrice"));
signPrice = decData(params.getString("signPrice"), key, svcInfo.getString("platform_pri_key"));
+ logger.debug("{} new services apply amount now:{}", params.getString("signClient"),signPrice);
}
if (params.get("signRate") != null) {
+ logger.debug("{} new services apply rate origin:{}", params.getString("signClient"),params.getString("signRate"));
signRate = decData(params.getString("signRate"), key, svcInfo.getString("platform_pri_key"));
+ logger.debug("{} new services apply rate origin:{}", params.getString("signClient"),signRate);
}
JSONObject serviceApply = new JSONObject();
serviceApply.put("apply_id", UUID.randomUUID().toString());
diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/act/ActAppMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/act/ActAppMapper.xml
index 2a8bc1e08..1e35cf676 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/mappers/act/ActAppMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/act/ActAppMapper.xml
@@ -16,7 +16,8 @@
select *
from act_app_list
where is_valid = 1
- and expire_date > #{now}
+ and active_date <=NOW()
+ and expire_date > NOW()
order by create_time desc
limit 1