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

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

Browse Source
master
wangning 7 years ago
parent 8021bc2293 c6bd5aeea3
commit bb9c239184
12 changed files with 90 additions and 100 deletions
Show Stats Download Patch File Download Diff File

2
src/db/modify.sql
Unescape View File

@ -58,7 +58,7 @@ ALTER TABLE `log_manager_login`
MODIFY COLUMN `manager_id` varchar(50) NOT NULL AFTER `id`;
ALTER TABLE `financial_bd_commission_config`
MODIFY COLUMN `bd_id` varchar(50) NOT NULL DEFAULT 0 COMMENT 'bd id' AFTER `bd_name`;
MODIFY COLUMN `bd_id` varchar(50) NOT NULL DEFAULT 0 COMMENT 'bd id';
ALTER TABLE `financial_bd_config`
MODIFY COLUMN `bd_group` varchar(50) NULL DEFAULT NULL COMMENT 'BD Leader manger_id' AFTER `get_prize`;

40
src/main/java/au/com/royalpay/payment/manage/dev/web/StatusCheckController.java
Unescape View File

@ -1,40 +0,0 @@
package au.com.royalpay.payment.manage.dev.web;
import au.com.royalpay.payment.manage.support.wechatclients.KangaLandWechatApiImpl;
import au.com.royalpay.payment.manage.support.wechatclients.RedpackWechatApiImpl;
import au.com.royalpay.payment.tools.connections.mpsupport.beans.WxOauthType;
import au.com.royalpay.payment.tools.env.PlatformEnvironment;
import au.com.royalpay.payment.tools.env.RequestEnvironment;
import au.com.royalpay.payment.tools.exceptions.ForbiddenException;
import au.com.royalpay.payment.tools.permission.wechat.WechatMapping;
import com.alibaba.fastjson.JSONObject;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
/**
* Created by davep on 2016-09-04.
*/
@RestController
@RequestMapping("/dev/status")
public class StatusCheckController {
@RequestMapping(method = RequestMethod.GET)
public JSONObject checkSystemStatus(){
return new JSONObject();
}
@WechatMapping(value = "wx_test",method = RequestMethod.GET,oauthType = WxOauthType.USERINFO,addonMp = {RedpackWechatApiImpl.class,KangaLandWechatApiImpl.class})
public void checkWxTest(){
}
@RequestMapping(value = "/stopping",method = RequestMethod.PUT)
public void beforeStop(){
if (RequestEnvironment.getClientIp().equals("127.0.0.1")){
PlatformEnvironment.getEnv().taskEnabled(false);
}else{
throw new ForbiddenException();
}
}
}

2
src/main/java/au/com/royalpay/payment/manage/task/CheckPartnerAuthStatusAndSendMessageTask.java
Unescape View File

@ -2,6 +2,7 @@ package au.com.royalpay.payment.manage.task;
import au.com.royalpay.payment.manage.application.core.SimpleClientService;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
@ -11,6 +12,7 @@ import javax.annotation.Resource;
* Created by yishuqian on 12/03/2017.
*/
@Component
@ConditionalOnProperty(value = "app.run-tasks", havingValue = "true")
public class CheckPartnerAuthStatusAndSendMessageTask {
@Resource
private SimpleClientService simpleClientService;

2
src/main/java/au/com/royalpay/payment/manage/task/DailyReportGenerationTask.java
Unescape View File

@ -4,6 +4,7 @@ import au.com.royalpay.payment.manage.analysis.core.DailyReport;
import org.apache.commons.lang.time.DateFormatUtils;
import org.apache.commons.lang.time.DateUtils;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
@ -15,6 +16,7 @@ import javax.annotation.Resource;
* Created by yixian on 2017-03-07.
*/
@Component
@ConditionalOnProperty(value = "app.run-tasks", havingValue = "true")
public class DailyReportGenerationTask {
@Resource

2
src/main/java/au/com/royalpay/payment/manage/task/DashboardTaskManager.java
Unescape View File

@ -3,6 +3,7 @@ package au.com.royalpay.payment.manage.task;
import au.com.royalpay.payment.manage.analysis.core.DashboardService;
import org.apache.commons.lang.time.DateUtils;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
@ -14,6 +15,7 @@ import javax.annotation.Resource;
* Created by yixian on 2016-11-14.
*/
@Component
@ConditionalOnProperty(value = "app.run-tasks", havingValue = "true")
public class DashboardTaskManager {
@Resource
private DashboardService dashboardService;

2
src/main/java/au/com/royalpay/payment/manage/task/PartnerTransactionsDailyMsgTaskManager.java
Unescape View File

@ -3,6 +3,7 @@ package au.com.royalpay.payment.manage.task;
import au.com.royalpay.payment.manage.analysis.core.CustomersAnalysisService;
import org.apache.commons.lang.time.DateUtils;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
@ -14,6 +15,7 @@ import javax.annotation.Resource;
* Created by yixian on 2016-11-14.
*/
@Component
@ConditionalOnProperty(value = "app.run-tasks", havingValue = "true")
public class PartnerTransactionsDailyMsgTaskManager {
@Resource
private CustomersAnalysisService customersAnalysisService;

2
src/main/resources/application.properties
Unescape View File

@ -75,7 +75,7 @@ app.settlement.email-cc=leo.huang@royalpay.com.au
app.mpsupport.appid=royalpay
app.mpsupport.auth_code=W3xucYnbmbE6rZDmA2V9BsKmagTrVIny
app.run-tasks=false
app.run-tasks=true
app.allow-clearing-generation=false
app.mail.appid=1

11
src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.xml
Unescape View File

@ -188,6 +188,8 @@
THEN 'Third Party Gateway'
WHEN 10
THEN 'APP'
WHEN 11
THEN 'Share Code'
END AS gateway_label,
ifnull(sum(if(l.transaction_type='Credit',l.clearing_amount,-l.clearing_amount)), 0) aud_fee
FROM pmt_transactions l
@ -414,6 +416,8 @@
THEN 'Third Party Gateway'
WHEN 10
THEN 'APP'
WHEN 11
THEN 'Share Code'
END AS gateway_label,
ifnull(COUNT(DISTINCT l.client_id), 0) partner_count
FROM pmt_transactions l
@ -462,10 +466,12 @@
<if test="trade_type=='Third Party Gateway'">
and o.gateway=9
</if>
<if test="trade_type=='APP'">
and o.gateway=10
</if>
<if test="trade_type=='Share Code'">
and o.gateway=11
</if>
<if test="org_id!=null">and l.org_id=#{org_id}</if>
<if test="bd_group!=null">and l.client_id in
(SELECT b.client_id FROM sys_client_bd b
@ -543,6 +549,9 @@
<if test="trade_type=='APP'">
and o.gateway=10
</if>
<if test="trade_type=='Share Code'">
and o.gateway=11
</if>
<if test="org_id!=null">and ptran.org_id=#{org_id}</if>
</select>
<select id="listExchangeRates" resultType="com.alibaba.fastjson.JSONObject">

2
src/main/resources/logback_cfg.xml
Unescape View File

@ -11,7 +11,7 @@
<!-- daily rollover -->
<maxHistory>30</maxHistory>
<fileNamePattern>/var/log/payment/%d{yyyy-MM}/payment.%d{yyyy-MM-dd}.%i.log</fileNamePattern>
<fileNamePattern>/var/log/payment/%d{yyyy-MM}/manage.%d{yyyy-MM-dd}.%i.log</fileNamePattern>
<maxFileSize>200MB</maxFileSize>
</rollingPolicy>
<encoder>

124
src/main/ui/static/css/main.css
Unescape View File

@ -2,8 +2,8 @@
@media (min-width: 768px) {
.login-box-right{
margin-right: 10%;
.login-box-right {
margin-right: 35%;
}
.login-page-bg {
@ -11,73 +11,76 @@
width: 100%;
height: 100%;
background-color: #d2d6de;
background: url(../images/bg.jpg) ;
background: url(../images/bg.jpg);
/*background: url(../images/logonbg.jpg) ;*/
position: relative;
background-size: 100% 100%;
}
.login-box-bg {
/*background-color: rgba(255,255,255,0.5);*/
box-shadow: 0px 2px 20px 2px rgba(0, 0, 0, 0.3);
filter: alpha(opacity=40);
opacity: 0.9;
opacity: 0.8;
}
.divloginbox
{
.divloginbox {
animation: loginbox 1s;
-moz-animation: loginbox 1s;
-webkit-animation: loginbox 1s;
-o-animation: loginbox 1s;
}
@keyframes loginbox
{
from {margin-right: -30%}
to {margin-right:10%}
@keyframes loginbox {
from {
margin-right: -30%
}
to {
margin-right: 35%
}
}
@-moz-keyframes loginbox
{
from {margin-right: -30%}
to {margin-right:10%}
@-moz-keyframes loginbox {
from {
margin-right: -30%
}
to {
margin-right: 35%
}
}
@-webkit-keyframes loginbox
{
from {margin-right: -30%}
to {margin-right:10%}
@-webkit-keyframes loginbox {
from {
margin-right: -30%
}
to {
margin-right: 35%
}
}
@-o-keyframes loginbox
{
from {margin-right: -30%}
to {margin-right:10%}
@-o-keyframes loginbox {
from {
margin-right: -30%
}
to {
margin-right: 35%
}
}
}
@media (max-width: 768px) {
.login-page-bg {
background: url('');
background-color: #d2d6de;
}
.login-box-right{
.login-box-right {
margin-top: 20%;
margin-right: auto;
}
.login-box-bg {
/*background-color: rgba(255,255,255,0.5);*/
box-shadow: 0px 2px 20px 2px rgba(0, 0, 0, 0.3);
@ -86,36 +89,47 @@
}
.divloginbox
{
.divloginbox {
animation: loginboxtop 1s;
-moz-animation: loginboxtop 1s;
-webkit-animation: loginboxtop 1s;
-o-animation: loginboxtop 1s;
}
@keyframes loginboxtop
{
from {margin-top: 0}
to {margin-top:20%}
}
@-moz-keyframes loginboxtop
{
from {margin-top: 0}
to {margin-top:20%}
}
@-webkit-keyframes loginboxtop
{
from {margin-top: 0}
to {margin-top:20%}
}
@-o-keyframes loginboxtop
{
from {margin-top: 0}
to {margin-top:20%}
@keyframes loginboxtop {
from {
margin-top: 0
}
to {
margin-top: 20%
}
}
@-moz-keyframes loginboxtop {
from {
margin-top: 0
}
to {
margin-top: 20%
}
}
@-webkit-keyframes loginboxtop {
from {
margin-top: 0
}
to {
margin-top: 20%
}
}
@-o-keyframes loginboxtop {
from {
margin-top: 0
}
to {
margin-top: 20%
}
}
}

BIN
src/main/ui/static/images/bg.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 191 KiB

After

Width:  |  Height:  |  Size: 133 KiB

1
src/main/ui/static/templates/cashier_aggregate_payment.js
Unescape View File

@ -174,7 +174,6 @@ $(function () {
data.customerrate = true;
}
data.coupons = dataCache.coupons;
data.price = data.price*100;
$.ajax({
url: '/partner/cashiers/payment/'+ window.client_moniker +'/'+window.cashier_id+'/orders/',
method: 'post',

Write Preview
Loading…
Cancel
Save