From 0ea54d7191ed997ef70b909c7352a84e449aa974 Mon Sep 17 00:00:00 2001 From: "eason.qian" Date: Mon, 12 Mar 2018 18:03:56 +0800 Subject: [PATCH] fix --- src/db/modify.sql | 23 +++++++- .../core/impls/AppActServiceImp.java | 11 ++-- .../appclient/web/RetailAppController.java | 12 +++- .../templates/activity/mondelay/mondelay.html | 56 ++++++++++++------- 4 files changed, 73 insertions(+), 29 deletions(-) diff --git a/src/db/modify.sql b/src/db/modify.sql index 5c9e26a8b..16c6b9440 100644 --- a/src/db/modify.sql +++ b/src/db/modify.sql @@ -238,7 +238,28 @@ alter table statistics_customer_order add column refund_amount DECIMAL(20,2) DEF ALTER TABLE `financial_bd_prize_log` MODIFY COLUMN `manager_id` varchar(50) NOT NULL COMMENT 'bd user id' AFTER `record_id`; - +CREATE TABLE act_mon_delay_settle +( + id VARCHAR(50) PRIMARY KEY NOT NULL, + client_id INT(11) NOT NULL, + account_id VARCHAR(50) NOT NULL, + account_name VARCHAR(100) COMMENT '商户账户名称', + create_time DATETIME NOT NULL COMMENT '参与开始时间(若在周一，下周生效)', + expire_time DATETIME COMMENT '结束时间', + is_valid TINYINT DEFAULT 1, + rate DECIMAL(4,2) COMMENT '年化收益率' +); + +CREATE TABLE act_mon_delay_settle_redpack +( + id VARCHAR(50) PRIMARY KEY NOT NULL, + client_id INT(11) NOT NULL, + settle_amount DECIMAL(10,2) NOT NULL, + rate DECIMAL(4,2) COMMENT '收益率', + redpack_amount DECIMAL(10,2) COMMENT '奖励金额', + create_time DATETIME NOT NULL, + send_time DATETIME COMMENT '奖励发放时间' +); CREATE TABLE `act_app_list` ( `act_id` varchar(50) NOT NULL, `act_name` varchar(100) NOT NULL COMMENT '活动名称', diff --git a/src/main/java/au/com/royalpay/payment/manage/activities/app_index/core/impls/AppActServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/activities/app_index/core/impls/AppActServiceImp.java index 652f45e6c..38042b283 100644 --- a/src/main/java/au/com/royalpay/payment/manage/activities/app_index/core/impls/AppActServiceImp.java +++ b/src/main/java/au/com/royalpay/payment/manage/activities/app_index/core/impls/AppActServiceImp.java @@ -2,7 +2,6 @@ package au.com.royalpay.payment.manage.activities.app_index.core.impls; import au.com.royalpay.payment.manage.activities.app_index.core.AppActService; import au.com.royalpay.payment.manage.mappers.act.ActAppMapper; -import au.com.royalpay.payment.tools.env.PlatformEnvironment; import com.alibaba.fastjson.JSONObject; import org.springframework.stereotype.Service; @@ -17,11 +16,11 @@ public class AppActServiceImp implements AppActService { @Override public List listAppActs(){ - List list = actAppMapper.listActs(); - for (JSONObject act:list){ - String url = act.getString("act_url"); - act.put("act_url", PlatformEnvironment.getEnv().concatUrl(url)); - } +// List list = actAppMapper.listActs(); +// for (JSONObject act:list){ +// String url = act.getString("act_url"); +// act.put("act_url", PlatformEnvironment.getEnv().concatUrl(url)); +// } return actAppMapper.listActs(); } } diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailAppController.java b/src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailAppController.java index cd79f0aec..3df389b91 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailAppController.java +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailAppController.java @@ -331,7 +331,7 @@ public class RetailAppController { } - @RequestMapping(value = "/act",method = RequestMethod.GET) + @RequestMapping(value = "/acts",method = RequestMethod.GET) public List getIndexAct(@ModelAttribute(CommonConsts.RETAIL_DEVICE) JSONObject device){ return appActService.listAppActs(); } @@ -343,4 +343,14 @@ public class RetailAppController { return mav; } + @RequestMapping(value = "/act/mondelay/apply", method = RequestMethod.POST) + public void apply(@ModelAttribute(CommonConsts.RETAIL_DEVICE) JSONObject device) { + actMonDelaySettleService.actApply(device); + } + + @RequestMapping(value = "/act/mondelay/cancel", method = RequestMethod.PUT) + public void cancel(@ModelAttribute(CommonConsts.RETAIL_DEVICE) JSONObject device) { + actMonDelaySettleService.cancelAct(device); + } + } diff --git a/src/main/resources/templates/activity/mondelay/mondelay.html b/src/main/resources/templates/activity/mondelay/mondelay.html index b22b730d0..e6bc4ee8d 100644 --- a/src/main/resources/templates/activity/mondelay/mondelay.html +++ b/src/main/resources/templates/activity/mondelay/mondelay.html @@ -11,7 +11,7 @@ - 跨境电商优选补贴计划 + 余额增值，周一专享活动 @@ -39,12 +39,12 @@
  • 本活动最终解释权归RoyalPay所有
    • -
    +
    -
    +

    补贴金额记录

    @@ -59,7 +59,7 @@ - + >04-01 12:00 $5.00 @@ -75,35 +75,49 @@
    - +
    \ No newline at end of file