msb_52843
/
dalong_mall
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop

Browse Source
master
wangning 7 years ago
parent 7cd32650b6 1efd1b604a
commit ab6c1dc34b
9 changed files with 109 additions and 11 deletions
Show Stats Download Patch File Download Diff File

8
src/db/modify.sql
Unescape View File

@ -336,4 +336,10 @@ PRIMARY key(`id`)
alter table act_app_list MODIFY column is_show_window tinyint(1) DEFAULT 0 COMMENT 'app是否弹框'
alter table sys_clients_contract add column confirm_time datetime DEFAULT null comment '合同确认时间';
alter table sys_clients_contract add column confirm_time datetime DEFAULT null comment '合同确认时间';
alter table act_app_list
add show_place smallint(3) default '111' not null comment '1:app顶部 10:banner 100:列表'
;

23
src/main/java/au/com/royalpay/payment/manage/activities/app_index/beans/ActAppShowPlaceEnum.java
Unescape View File

@ -0,0 +1,23 @@
package au.com.royalpay.payment.manage.activities.app_index.beans;
/**
* Created by yuan on 2018/3/23.
*/
public enum ActAppShowPlaceEnum {
App(1),
Banner(10),
List(100);
private int place;
private ActAppShowPlaceEnum(int placeValue) {
this.place = placeValue;
}
public int getPlace() {
return this.place;
}
public boolean hasPlace(int placeValue) {
return (this.place & placeValue) > 0;
}
}

39
src/main/java/au/com/royalpay/payment/manage/activities/app_index/beans/AppActBean.java
Unescape View File

@ -2,6 +2,7 @@ package au.com.royalpay.payment.manage.activities.app_index.beans;
import au.com.royalpay.payment.core.exceptions.ParamInvalidException;
import au.com.royalpay.payment.tools.permission.enums.ManagerRole;
import com.alibaba.fastjson.JSONObject;
import org.apache.commons.lang3.time.DateUtils;
@ -30,6 +31,9 @@ public class AppActBean {
private String msg_start_date;
private String msg_end_date;
private String msg_interval;
private boolean app;
private boolean banner;
private boolean list;
public JSONObject toJsonParam(){
@ -48,6 +52,17 @@ public class AppActBean {
params.put("is_valid",is_valid);
params.put("msg_start_date", msg_start_date);
params.put("msg_end_date", msg_end_date);
int show_place = 0;
if (app) {
show_place |= ActAppShowPlaceEnum.App.getPlace();
}
if (banner) {
show_place |= ActAppShowPlaceEnum.Banner.getPlace();
}
if (list) {
show_place |= ActAppShowPlaceEnum.List.getPlace();
}
params.put("show_place", show_place);
if (active_date != null) {
try {
Date fromDate = DateUtils.parseDate(active_date, DATE_PATTERNS);
@ -210,4 +225,28 @@ public class AppActBean {
public void setMsg_interval(String msg_interval) {
this.msg_interval = msg_interval;
}
public boolean isApp() {
return app;
}
public void setApp(boolean app) {
this.app = app;
}
public boolean isBanner() {
return banner;
}
public void setBanner(boolean banner) {
this.banner = banner;
}
public boolean isList() {
return list;
}
public void setList(boolean list) {
this.list = list;
}
}

8
src/main/java/au/com/royalpay/payment/manage/activities/app_index/core/impls/AppActServiceImp.java
Unescape View File

@ -1,5 +1,6 @@
package au.com.royalpay.payment.manage.activities.app_index.core.impls;
import au.com.royalpay.payment.manage.activities.app_index.beans.ActAppShowPlaceEnum;
import au.com.royalpay.payment.manage.activities.app_index.beans.AppActBean;
import au.com.royalpay.payment.manage.activities.app_index.beans.AppActQueryBean;
import au.com.royalpay.payment.manage.activities.app_index.core.AppActService;
@ -42,7 +43,12 @@ public class AppActServiceImp implements AppActService {
@Override
public JSONObject getActDetail(JSONObject manager, String act_id) {
return actAppMapper.getActDetail(act_id);
JSONObject appAct = actAppMapper.getActDetail(act_id);
int show_place = appAct.getIntValue("show_place");
appAct.put("app", ActAppShowPlaceEnum.App.hasPlace(show_place));
appAct.put("banner", ActAppShowPlaceEnum.Banner.hasPlace(show_place));
appAct.put("list", ActAppShowPlaceEnum.List.hasPlace(show_place));
return appAct;
}
@Override

2
src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java
Unescape View File

@ -320,7 +320,7 @@ public class SignInAccountServiceImpl implements SignInAccountService, Applicati
"company_name", "address","business_name","business_structure", "abn","acn","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"};
"has_children", "source", "customer_surcharge_rate", "enable_alipay", "enable_wechat", "enable_bestpay","manual_settle","skip_clearing"};
for (String col : columns) {
simpleClient.put(col, client.get(col));
}

10
src/main/resources/templates/activity/mondelay/mondelay.html
Unescape View File

@ -35,15 +35,19 @@
<ul>
<li>参与商户<b class="font_color">每周一</b>即可获得营销补贴</li>
<li>
营销补贴金额，<b class="font_color">以发放时账户余额为基数</b>，折算<b class="font_color">年化比率不低于15%，最高20%</b>
营销补贴金额，<b class="font_color">以发放时账户余额为基数</b>，折算<b class="font_color">年化比率不低于15%，最高20%，2000$封顶</b>
</li>
<li>
每周一15:00~16:00（GMT+10时区）发放营销补贴至商户营销账户。 参与商户周一暂停清算，进行补贴的计算和发放，周二恢复原有规则。
每周一15:00~16:00（GMT+10时区）发放营销补贴至商户营销账户。
</li>
<li>
参与活动商户系统不再自动清算，商户可以根据自己的需要自行提现，提现完第二天会清算到商户银行账户。
</li>
<li>
补贴活动周期：<b class="font_color">2018/3/20-2018/6/30</b>
</li>
<li>商户自愿参加，可以随时取消（除周一外，周一为补贴的计算和发放日，在此期间无法进行报名和取消操作，17：00之后恢复报名和取消报名）</li>
<li>商户一旦取消，则放弃活动补贴，第二天系统会恢复自动清算</li>
<li>本活动最终解释权归RoyalPay所有</li>
</ul>
</div>
@ -88,7 +92,7 @@
</div>
<div class="button_center cancel_posttion" th:if="${active && apply}" id="cancelButton">
<button class="button_position button_color" th:style="'background-image:' + @{(${operation_pause} ? 'linear-gradient(0deg, #eee 0%, #eee 100%)' )} + ''">
<span class="cancel" th:style="'color:' + @{(${operation_pause} ? '#999' )} + ''">放弃活动资格</span>
<span class="cancel" th:style="'color:' + @{(${operation_pause} ? '#999' )} + ''">退出活动</span>
</button>
</div>

20
src/main/ui/static/actapp/templates/act_app_detail.html
Unescape View File

@ -138,6 +138,26 @@
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-4 col-sm-2" for="actDetail.act_img">Show Place</label>
<div class="col-xs-8 col-sm-4">
<div class="input-group">
<p class="checkbox checkbox-inline">
<label>
<input type="checkbox" ng-model="actDetail.app" name="app">App
</label>
<label>
<input type="checkbox" ng-model="actDetail.banner" name="banner">Banner
</label>
<label>
<input type="checkbox" ng-model="actDetail.list" name="list">List
</label>
</p>
</div>
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-4 col-sm-2">Show
Type</label>

4
src/main/ui/static/actapp/templates/act_app_list.html
Unescape View File

@ -49,8 +49,8 @@
<tr ng-repeat="act in app_acts">
<td ng-bind="act.act_name"></td>
<td ng-bind="act.create_time"></td>
<td ng-bind="act.active_date | limitTo:10""></td>
<td ng-bind="act.expire_date | limitTo:10""></td>
<td ng-bind="act.active_date | limitTo:10"></td>
<td ng-bind="act.expire_date | limitTo:10"></td>
<td>
<span ng-click="publishedOrIsValid(act)">
<i class="text-success fa fa-check" ng-if="act.is_valid"></i>

6
src/main/ui/static/templates/activity/mondelay/mondelay.css
Unescape View File

@ -163,7 +163,7 @@ tbody tr:nth-child(odd){
}
.shape4_position{
position: absolute;
left: 0px;
left: -10px;
top: 460px;
}
.shape4_position img{
@ -172,8 +172,8 @@ tbody tr:nth-child(odd){
}
.shape5_position{
position: absolute;
right: 0px;
top: 550px;
right: -30px;
top: 620px;
}
.shape5_position img{
width: 95px;

Write Preview
Loading…
Cancel
Save