# Conflicts: # src/main/ui/static/payment/partner/templates/sub_partners.htmlmaster
luoyang
5 years ago
commit
18ac2cdbab
@ -0,0 +1,47 @@
|
||||
package au.com.royalpay.payment.manage.merchants.enums;
|
||||
|
||||
/**
|
||||
* @Author: luoyang
|
||||
* @Date: 2019-05-29 10:30
|
||||
*/
|
||||
public enum paymentScenarioEnum {
|
||||
PC_WEB(1, "PC网站"),
|
||||
|
||||
MOBILE_WEB(2, "手机端网站"),
|
||||
|
||||
APP(3, "APP"),
|
||||
|
||||
WECHAT_ALIPAY_WEB(4, "微信内、支付宝内网站"),
|
||||
|
||||
MINIPROGRAM(5, "小程序"),
|
||||
|
||||
QRCODE_BOARD(6, "二维码立牌"),
|
||||
|
||||
ROYALPAY_POS(7,"Royalpay POS"),
|
||||
|
||||
CASHIER_POS(8,"收银系统"),
|
||||
|
||||
IPOS(9,"ipos"),
|
||||
|
||||
POSPAL(10,"pospal"),
|
||||
|
||||
AUPOS(11,"aupos"),
|
||||
|
||||
OTHER(12,"other"),
|
||||
|
||||
VENDING_MACHINE(13,"无人售货机");
|
||||
|
||||
private final int scenarioTypeId;
|
||||
private final String desc;
|
||||
|
||||
public int getScenarioTypeId() {
|
||||
return scenarioTypeId;
|
||||
}
|
||||
|
||||
public String getDesc() {
|
||||
return desc;
|
||||
}
|
||||
paymentScenarioEnum(int scenarioTypeId, String desc) {
|
||||
this.scenarioTypeId = scenarioTypeId;
|
||||
this.desc = desc;
|
||||
}}
|
||||
@ -0,0 +1,9 @@
|
||||
package au.com.royalpay.payment.manage.posters.core;
|
||||
|
||||
|
||||
/**
|
||||
* create by todking at 2019-6-3
|
||||
*/
|
||||
public interface PosterService {
|
||||
void updatePoster(String imgUrl);
|
||||
}
|
||||
@ -0,0 +1,44 @@
|
||||
package au.com.royalpay.payment.manage.posters.core.impls;
|
||||
|
||||
import au.com.royalpay.payment.manage.posters.core.PosterService;
|
||||
import cn.yixblog.platform.http.HttpRequestGenerator;
|
||||
import cn.yixblog.platform.http.HttpRequestResult;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.web.bind.annotation.RequestMethod;
|
||||
|
||||
import java.net.URISyntaxException;
|
||||
|
||||
|
||||
/**
|
||||
* create by todking at 2019-6-3
|
||||
*/
|
||||
|
||||
@Service
|
||||
public class PosterServiceImpl implements PosterService {
|
||||
private Logger logger = LoggerFactory.getLogger(getClass());
|
||||
|
||||
@Value("${app.cms.host}")
|
||||
private String cmsHost;
|
||||
|
||||
@Override
|
||||
public void updatePoster(String imgUrl) {
|
||||
String url = cmsHost + "/api/statistics/count";
|
||||
HttpRequestGenerator htg = new HttpRequestGenerator(url, RequestMethod.PUT);
|
||||
try {
|
||||
HttpRequestResult result = htg.addQueryString("imgUrl", imgUrl).execute();
|
||||
if (result.isSuccess()) {
|
||||
int statusCode = result.getStatusCode();
|
||||
if (statusCode == 200) {
|
||||
logger.info("CMS request succeeded");
|
||||
}
|
||||
}
|
||||
} catch (URISyntaxException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,25 @@
|
||||
package au.com.royalpay.payment.manage.posters.web;
|
||||
|
||||
|
||||
import au.com.royalpay.payment.manage.permission.manager.ManagerMapping;
|
||||
import au.com.royalpay.payment.manage.posters.core.PosterService;
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
/**
|
||||
* create by todking at 2019-6-3
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping(value = "/app/poster")
|
||||
public class posterController {
|
||||
|
||||
@Resource
|
||||
private PosterService posterService;
|
||||
|
||||
@RequestMapping(method = RequestMethod.PUT)
|
||||
public void updatePoster(@RequestBody JSONObject img ){
|
||||
posterService.updatePoster(img.getString("imgUrl"));
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,46 @@
|
||||
<section class="content-header">
|
||||
<h1>批量支付宝线上报备</h1>
|
||||
<ol class="breadcrumb">
|
||||
<li>
|
||||
<i class="fa fa-cog"></i> Basic Config
|
||||
</li>
|
||||
<li><a ui-sref="^">Dev Tools</a></li>
|
||||
<li class="active">批量支付宝线上报备</li>
|
||||
</ol>
|
||||
</section>
|
||||
<section class="content">
|
||||
<div class="box">
|
||||
<button class="btn btn-primary" ng-click="registerOnlineGMS()">register Online</button> <label ng-hide="selecttotal" style="padding-left: 30px">请稍后</label>
|
||||
</div>
|
||||
<div class="box">
|
||||
<button class="btn btn-primary" ng-click="getLessPartnerInfo()">缺少信息的商户(online)</button>
|
||||
</div>
|
||||
<div class="box">
|
||||
<button class="btn btn-primary" ng-click="registerGMS()">register offline</button> <label ng-hide="selecttotal" style="padding-left: 30px">请稍后</label>
|
||||
</div>
|
||||
<div class="row" ng-if="need_register_merchant">
|
||||
<span>需要报备的商户编码</span><p ng-bind="need_register_merchant"></p>
|
||||
</div>
|
||||
<div class="row" ng-if="success_register_merchant">
|
||||
<span>成功报备的商户编码</span><p ng-bind="success_register_merchant"></p>
|
||||
</div>
|
||||
<div class="box-body table-responsive" ng-if="fail_register_merchant">
|
||||
<span>注册失败的商户编码</span>
|
||||
<table class="table table-bordered table-hover table-striped">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>client_moniker</th>
|
||||
<th>失败原因</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr ng-repeat="client in fail_register_merchant">
|
||||
<td>
|
||||
{{client.client_moniker}}
|
||||
</td>
|
||||
<td ng-bind="client.return_msg"></td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</section>
|
||||
@ -0,0 +1,253 @@
|
||||
/***login***/
|
||||
|
||||
@media (min-width: 768px) {
|
||||
|
||||
.login-box-right {
|
||||
width: 42.2%;
|
||||
height: 100%;
|
||||
background-color: black;
|
||||
opacity: 0.8;
|
||||
position: relative;
|
||||
left: 57.8%
|
||||
}
|
||||
|
||||
.login-page-bg {
|
||||
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
background-color: #d2d6de;
|
||||
background: url(../images/bg2.png);
|
||||
/*background: url(../images/logonbg.jpg) ;*/
|
||||
position: relative;
|
||||
background-size: 100% 100%;
|
||||
}
|
||||
|
||||
.login-container {
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.ad {
|
||||
text-align: center;
|
||||
font-size: 20px;
|
||||
color: #FFFFFF;
|
||||
}
|
||||
|
||||
.qrdiv {
|
||||
width: 50%;
|
||||
margin-left: 26%;
|
||||
color: #FFFFFF;
|
||||
}
|
||||
|
||||
.form {
|
||||
padding: 4% 25%
|
||||
}
|
||||
|
||||
.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.8;*/
|
||||
|
||||
}
|
||||
.login-info{
|
||||
/*height: 45px;*/
|
||||
background-color: black;
|
||||
font-size: 18px;
|
||||
color: white;
|
||||
}
|
||||
|
||||
.captcha {
|
||||
width: 30%;
|
||||
display: inline;
|
||||
height: 34px;
|
||||
float: right
|
||||
}
|
||||
|
||||
.login-submit{
|
||||
background-color: #f06010;
|
||||
font-size: 18px;
|
||||
}
|
||||
|
||||
.login-submit-margin{
|
||||
margin-top: 10%;
|
||||
}
|
||||
|
||||
|
||||
.forget{
|
||||
color: #f06010;
|
||||
font-size: 18px;
|
||||
}
|
||||
|
||||
.download-app{
|
||||
color: #FFFFFF;
|
||||
font-size: 15px;
|
||||
}
|
||||
|
||||
.download-app img{
|
||||
width: 100px;
|
||||
}
|
||||
|
||||
.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: 35%
|
||||
}
|
||||
}
|
||||
|
||||
@-moz-keyframes loginbox {
|
||||
from {
|
||||
margin-right: -30%
|
||||
}
|
||||
to {
|
||||
margin-right: 35%
|
||||
}
|
||||
}
|
||||
|
||||
@-webkit-keyframes loginbox {
|
||||
from {
|
||||
margin-right: -30%
|
||||
}
|
||||
to {
|
||||
margin-right: 35%
|
||||
}
|
||||
}
|
||||
|
||||
@-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 {
|
||||
margin-top: 20%;
|
||||
margin: 7% auto;
|
||||
width: 90%;
|
||||
}
|
||||
|
||||
.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.7;
|
||||
|
||||
}
|
||||
|
||||
.login-container {
|
||||
text-align: center;
|
||||
background: #fff;
|
||||
padding: 20px;
|
||||
border-top: 0;
|
||||
color: #666;
|
||||
}
|
||||
|
||||
.ad {
|
||||
text-align: center;
|
||||
font-size: 20px;
|
||||
color: #000000;
|
||||
}
|
||||
|
||||
.qrdiv {
|
||||
width: 50%;
|
||||
margin-left: 26%;
|
||||
}
|
||||
|
||||
.form {
|
||||
}
|
||||
|
||||
.login-info{
|
||||
}
|
||||
|
||||
.captcha {
|
||||
width: 30%;
|
||||
display: inline;
|
||||
height: 34px;
|
||||
float: right
|
||||
}
|
||||
|
||||
.login-submit{
|
||||
background-color: #f06010;
|
||||
}
|
||||
|
||||
.login-submit-margin{
|
||||
margin-bottom: 20px;
|
||||
margin-top:20px;
|
||||
}
|
||||
|
||||
.forget{
|
||||
}
|
||||
|
||||
.download-app{
|
||||
color: #000000;
|
||||
font-size: 15px;
|
||||
}
|
||||
|
||||
.download-app img{
|
||||
width: 50px;
|
||||
}
|
||||
|
||||
.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%
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/***login***/
|
||||
@ -0,0 +1,215 @@
|
||||
/***login***/
|
||||
|
||||
@media (min-width: 768px) {
|
||||
.login-container {
|
||||
width: 800px;
|
||||
margin: 12% auto;
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
.login-info{
|
||||
background-color: black;
|
||||
opacity: 0.8;
|
||||
color: white;
|
||||
border-radius:4px
|
||||
}
|
||||
|
||||
.login-box-right {
|
||||
margin-right: 35%;
|
||||
}
|
||||
|
||||
.login-page-bg {
|
||||
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
background-color: #d2d6de;
|
||||
background: url(../images/bg3.png);
|
||||
/*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.8;
|
||||
|
||||
}
|
||||
|
||||
.ad {
|
||||
text-align: center;
|
||||
font-size: 20px;
|
||||
color: #FFFFFF;
|
||||
}
|
||||
|
||||
.login-submit{
|
||||
background-color: #54C7FF;
|
||||
border-color: #54C7FF;
|
||||
margin-top: 10%;
|
||||
color: white;
|
||||
}
|
||||
|
||||
.qrdiv {
|
||||
color: #FFFFFF;
|
||||
}
|
||||
|
||||
.login-submit-margin{
|
||||
margin-top: 45%;
|
||||
color: #FFFFFF;
|
||||
}
|
||||
|
||||
.download-app {
|
||||
font-size: 15px;
|
||||
}
|
||||
|
||||
.download-app img{
|
||||
width: 100px;
|
||||
}
|
||||
|
||||
.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: 35%
|
||||
}
|
||||
}
|
||||
|
||||
@-moz-keyframes loginbox {
|
||||
from {
|
||||
margin-right: -30%
|
||||
}
|
||||
to {
|
||||
margin-right: 35%
|
||||
}
|
||||
}
|
||||
|
||||
@-webkit-keyframes loginbox {
|
||||
from {
|
||||
margin-right: -30%
|
||||
}
|
||||
to {
|
||||
margin-right: 35%
|
||||
}
|
||||
}
|
||||
|
||||
@-o-keyframes loginbox {
|
||||
from {
|
||||
margin-right: -30%
|
||||
}
|
||||
to {
|
||||
margin-right: 35%
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@media (max-width: 768px) {
|
||||
.login-container {
|
||||
width: 90%;
|
||||
margin: 7% auto;
|
||||
}
|
||||
|
||||
.login-info{
|
||||
}
|
||||
|
||||
.login-page-bg {
|
||||
background: url('');
|
||||
background-color: #d2d6de;
|
||||
}
|
||||
|
||||
.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);
|
||||
filter: alpha(opacity=40);
|
||||
opacity: 0.7;
|
||||
background-color: white;
|
||||
|
||||
}
|
||||
|
||||
.login-submit{
|
||||
background-color: #e08e0b;
|
||||
border-color: #e08e0b;
|
||||
}
|
||||
|
||||
.ad {
|
||||
text-align: center;
|
||||
font-size: 20px;
|
||||
color: #000000;
|
||||
}
|
||||
|
||||
.qrdiv {
|
||||
color: #000000;
|
||||
}
|
||||
|
||||
.login-submit-margin{
|
||||
margin-top: 10%;
|
||||
}
|
||||
|
||||
.download-app {
|
||||
font-size: 15px;
|
||||
}
|
||||
|
||||
.download-app img{
|
||||
width: 50px;
|
||||
}
|
||||
|
||||
.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%
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/***login***/
|
||||
@ -1,54 +0,0 @@
|
||||
[
|
||||
{
|
||||
"children": [
|
||||
{
|
||||
"children": [],
|
||||
"label": "立牌",
|
||||
"value": "qrcode"
|
||||
},
|
||||
{
|
||||
"children": [],
|
||||
"label": "POS",
|
||||
"value": "pos"
|
||||
}
|
||||
],
|
||||
"label": "门店",
|
||||
"value": "1"
|
||||
},
|
||||
{
|
||||
"children": [
|
||||
{
|
||||
"children": [],
|
||||
"label": "ipos",
|
||||
"value": "ipos"
|
||||
},
|
||||
{
|
||||
"children": [],
|
||||
"label": "银豹",
|
||||
"value": "pospal"
|
||||
},
|
||||
{
|
||||
"children": [],
|
||||
"label": "aupos",
|
||||
"value": "aupos"
|
||||
},
|
||||
{
|
||||
"children": [],
|
||||
"label": "其他",
|
||||
"value": "other"
|
||||
}
|
||||
],
|
||||
"label": "收银系统",
|
||||
"value": "2"
|
||||
},{
|
||||
"children": [
|
||||
{
|
||||
"children": [],
|
||||
"label": "无门店",
|
||||
"value": "no-store"
|
||||
}
|
||||
],
|
||||
"label": "其他",
|
||||
"value": "3"
|
||||
}
|
||||
]
|
||||
|
After Width: | Height: | Size: 85 KiB |
|
After Width: | Height: | Size: 5.3 KiB |
|
After Width: | Height: | Size: 4.2 KiB |
|
After Width: | Height: | Size: 2.7 MiB |
|
After Width: | Height: | Size: 2.1 MiB |
|
After Width: | Height: | Size: 39 KiB |
|
After Width: | Height: | Size: 2.3 KiB |
|
After Width: | Height: | Size: 6.5 KiB |
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,45 @@
|
||||
<div class="content">
|
||||
<div class="row">
|
||||
<div class="col-sm-12">
|
||||
<div class="box-solid">
|
||||
<!--渠道方行业信息-->
|
||||
<div class="box-body col-sm-6" ng-repeat="good in mcc_goods">
|
||||
<ul class="list-group ui_desk">
|
||||
<li class="list-group-item list-group-item-info"
|
||||
style="height: 60px;text-align: center;display: block;">
|
||||
<span>
|
||||
<img ng-if="good.channel=='Wechat'" src="/static/images/wechatpay_sign_lg.png"
|
||||
class="channel-icon-mid">
|
||||
<img ng-if="good.channel=='Alipay'" src="/static/images/alipay_sign_lg.png"
|
||||
class="channel-icon-mid">
|
||||
<img ng-if="good.channel=='AlipayOnline'" src="/static/images/alipay_sign_lg.png"
|
||||
class="channel-icon-mid">
|
||||
<img ng-if="good.channel=='Bestpay'" src="/static/images/bestpay_sign_lg.png"
|
||||
class="channel-icon-mid">
|
||||
<img ng-if="good.channel=='jd'" src="/static/images/jd_sign_lg.png"
|
||||
class="channel-icon-mid">
|
||||
</span>
|
||||
</li>
|
||||
<li class="list-group-item list-group-item-text" style="height: 60px;">
|
||||
商品
|
||||
<select style="float: right;width: 50%;" ng-model="good.mc_code" id="wmi-select" name="wmi"
|
||||
class="form-control"
|
||||
ng-options="wmi.value as wmi.label for wmi in wechatMccIndustries" ng-change="updateMccInfo(good)">
|
||||
<option value="">请选择</option>
|
||||
</select>
|
||||
</li>
|
||||
<li class="list-group-item list-group-item-text">
|
||||
创建时间
|
||||
<span style="float: right" ng-bind="good.creation_date"></span>
|
||||
</li>
|
||||
<li class="list-group-item list-group-item-text">
|
||||
操作人
|
||||
<span style="float: right" ng-bind="good.creation_by"></span>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
Loading…
Reference in new issue