wangning
7 years ago
commit
05ef9e47ca
@ -0,0 +1,20 @@
|
||||
package au.com.royalpay.payment.manage.mappers.log;
|
||||
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.github.miemiedev.mybatis.paginator.domain.PageBounds;
|
||||
import com.github.miemiedev.mybatis.paginator.domain.PageList;
|
||||
|
||||
import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
|
||||
import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
|
||||
import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
|
||||
|
||||
/**
|
||||
* Created by yixian on 2016-10-14.
|
||||
*/
|
||||
@AutoMapper(tablename = "log_client_config", pkName = "id")
|
||||
public interface ClientConfigLogMapper {
|
||||
@AutoSql(type = SqlType.INSERT)
|
||||
void saveLog(JSONObject log);
|
||||
}
|
||||
@ -0,0 +1,30 @@
|
||||
package au.com.royalpay.payment.manage.mappers.system;
|
||||
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.github.miemiedev.mybatis.paginator.domain.PageBounds;
|
||||
import com.github.miemiedev.mybatis.paginator.domain.PageList;
|
||||
|
||||
import cn.yixblog.support.mybatis.autosql.annotations.AdvanceSelect;
|
||||
import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
|
||||
import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
|
||||
import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
|
||||
|
||||
/**
|
||||
* Created by wangning on 2018-04-08.
|
||||
*/
|
||||
@AutoMapper(tablename = "sys_client_config", pkName = "client_id")
|
||||
public interface ClientConfigMapper {
|
||||
@AutoSql(type = SqlType.INSERT)
|
||||
void save(JSONObject partner);
|
||||
|
||||
@AutoSql(type = SqlType.UPDATE)
|
||||
int update(JSONObject partner);
|
||||
|
||||
@AutoSql(type = SqlType.SELECT)
|
||||
JSONObject find(@Param("client_id") int client_id);
|
||||
}
|
||||
@ -0,0 +1,91 @@
|
||||
package au.com.royalpay.payment.manage.merchants.beans.mongo;
|
||||
|
||||
import org.springframework.data.mongodb.core.mapping.Document;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
@Document(collection = "client_config_log")
|
||||
public class ClientConfigLog {
|
||||
|
||||
private long id;
|
||||
private int clientId;
|
||||
private String business;
|
||||
private String userType;
|
||||
private String userId;
|
||||
private String userName;
|
||||
private String originData;
|
||||
private String newData;
|
||||
private Date createTime;
|
||||
|
||||
public long getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setId(long id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public int getClientId() {
|
||||
return clientId;
|
||||
}
|
||||
|
||||
public void setClientId(int clientId) {
|
||||
this.clientId = clientId;
|
||||
}
|
||||
|
||||
public String getBusiness() {
|
||||
return business;
|
||||
}
|
||||
|
||||
public void setBusiness(String business) {
|
||||
this.business = business;
|
||||
}
|
||||
|
||||
public String getUserType() {
|
||||
return userType;
|
||||
}
|
||||
|
||||
public void setUserType(String userType) {
|
||||
this.userType = userType;
|
||||
}
|
||||
|
||||
public String getUserId() {
|
||||
return userId;
|
||||
}
|
||||
|
||||
public void setUserId(String userId) {
|
||||
this.userId = userId;
|
||||
}
|
||||
|
||||
public String getUserName() {
|
||||
return userName;
|
||||
}
|
||||
|
||||
public void setUserName(String userName) {
|
||||
this.userName = userName;
|
||||
}
|
||||
|
||||
public String getOriginData() {
|
||||
return originData;
|
||||
}
|
||||
|
||||
public void setOriginData(String originData) {
|
||||
this.originData = originData;
|
||||
}
|
||||
|
||||
public String getNewData() {
|
||||
return newData;
|
||||
}
|
||||
|
||||
public void setNewData(String newData) {
|
||||
this.newData = newData;
|
||||
}
|
||||
|
||||
public Date getCreateTime() {
|
||||
return createTime;
|
||||
}
|
||||
|
||||
public void setCreateTime(Date createTime) {
|
||||
this.createTime = createTime;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,16 @@
|
||||
package au.com.royalpay.payment.manage.merchants.core;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
|
||||
/**
|
||||
* Created by yixian on 2016-06-25.
|
||||
*/
|
||||
public interface ClientConfigService {
|
||||
|
||||
void update(JSONObject record);
|
||||
|
||||
JSONObject find(int client_id);
|
||||
|
||||
JSONObject save(JSONObject record);
|
||||
|
||||
}
|
||||
@ -0,0 +1,14 @@
|
||||
package au.com.royalpay.payment.manage.merchants.core;
|
||||
|
||||
import au.com.royalpay.payment.manage.merchants.entity.ClientConfigModify;
|
||||
import au.com.royalpay.payment.manage.merchants.entity.ClientModify;
|
||||
|
||||
/**
|
||||
* Create by yixian at 2018-04-12 16:24
|
||||
*/
|
||||
public interface ClientModifySupport {
|
||||
|
||||
void processClientModify(ClientModify clientModify);
|
||||
|
||||
void processClientConfigModify(ClientConfigModify clientConfigModify);
|
||||
}
|
||||
@ -0,0 +1,35 @@
|
||||
package au.com.royalpay.payment.manage.merchants.core.impls;
|
||||
|
||||
import au.com.royalpay.payment.manage.mappers.system.ClientConfigMapper;
|
||||
import au.com.royalpay.payment.manage.merchants.core.ClientConfigService;
|
||||
import au.com.royalpay.payment.tools.exceptions.ServerErrorException;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
@Service
|
||||
public class ClientConfigServiceImpl implements ClientConfigService {
|
||||
@Resource
|
||||
private ClientConfigMapper clientConfigMapper;
|
||||
@Override
|
||||
public void update(JSONObject record) {
|
||||
|
||||
}
|
||||
@Override
|
||||
public JSONObject find(int client_id) {
|
||||
return clientConfigMapper.find(client_id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public JSONObject save(JSONObject record) {
|
||||
JSONObject clientConfig= clientConfigMapper.find(record.getIntValue("Client_id"));
|
||||
if(clientConfig!=null){
|
||||
throw new ServerErrorException("client config is repeated");
|
||||
}
|
||||
clientConfigMapper.save(record);
|
||||
return record;
|
||||
}
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,42 @@
|
||||
package au.com.royalpay.payment.manage.merchants.core.impls;
|
||||
|
||||
import au.com.royalpay.payment.manage.mappers.system.ClientConfigMapper;
|
||||
import au.com.royalpay.payment.manage.mappers.system.ClientMapper;
|
||||
import au.com.royalpay.payment.manage.merchants.core.ClientInfoCacheSupport;
|
||||
import au.com.royalpay.payment.manage.merchants.core.ClientModifySupport;
|
||||
import au.com.royalpay.payment.manage.merchants.entity.ClientConfigModify;
|
||||
import au.com.royalpay.payment.manage.merchants.entity.ClientModify;
|
||||
import au.com.royalpay.payment.tools.merchants.core.MerchantInfoProvider;
|
||||
|
||||
import org.springframework.data.mongodb.core.MongoTemplate;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
/**
|
||||
* Create by yixian at 2018-04-12 16:25
|
||||
*/
|
||||
@Service
|
||||
public class ClientModifySupportImpl implements ClientModifySupport {
|
||||
@Resource
|
||||
private MerchantInfoProvider merchantInfoProvider;
|
||||
@Resource
|
||||
private ClientInfoCacheSupport clientInfoCacheSupport;
|
||||
@Resource
|
||||
private ClientMapper clientMapper;
|
||||
@Resource
|
||||
private ClientConfigMapper clientConfigMapper;
|
||||
@Resource
|
||||
private MongoTemplate mongoTemplate;
|
||||
|
||||
@Override
|
||||
public void processClientModify(ClientModify modify) {
|
||||
int clientId = modify.doModify(merchantInfoProvider, clientMapper,mongoTemplate);
|
||||
clientInfoCacheSupport.clearClientCache(clientId);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void processClientConfigModify(ClientConfigModify clientConfigModify) {
|
||||
clientConfigModify.doModify(merchantInfoProvider, clientConfigMapper,clientMapper,mongoTemplate);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,79 @@
|
||||
package au.com.royalpay.payment.manage.merchants.entity;
|
||||
|
||||
import au.com.royalpay.payment.manage.mappers.system.ClientConfigMapper;
|
||||
import au.com.royalpay.payment.manage.mappers.system.ClientMapper;
|
||||
import au.com.royalpay.payment.manage.merchants.beans.mongo.ClientConfigLog;
|
||||
import au.com.royalpay.payment.tools.merchants.core.MerchantInfoProvider;
|
||||
import au.com.royalpay.payment.tools.utils.id.IdUtil;
|
||||
|
||||
import com.alibaba.fastjson.JSON;
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.springframework.data.mongodb.core.MongoTemplate;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.util.Date;
|
||||
import java.util.Map;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* Create by yixian at 2018-04-12 16:19
|
||||
*/
|
||||
public abstract class ClientConfigModify {
|
||||
|
||||
private JSONObject account;
|
||||
|
||||
private String clientMoniker;
|
||||
|
||||
public ClientConfigModify(JSONObject account, String clientMoniker) {
|
||||
this.account = account;
|
||||
this.clientMoniker = clientMoniker;
|
||||
}
|
||||
|
||||
protected abstract String business();
|
||||
|
||||
protected abstract JSONObject getModifyResult();
|
||||
|
||||
@Transactional
|
||||
public int doModify(MerchantInfoProvider merchantInfoProvider, ClientConfigMapper clientConfigMapper, ClientMapper clientMapper, MongoTemplate mongoTemplate) {
|
||||
JSONObject client = merchantInfoProvider.getClientInfoByMoniker(clientMoniker);
|
||||
JSONObject modifyResult = getModifyResult();
|
||||
try {
|
||||
saveModifyHistory(client, modifyResult, mongoTemplate);
|
||||
}catch (Exception e){
|
||||
|
||||
}
|
||||
int clientId = client.getIntValue("client_id");
|
||||
modifyResult.put("client_id", clientId);
|
||||
clientConfigMapper.update(modifyResult);
|
||||
clientMapper.update(modifyResult);
|
||||
return clientId;
|
||||
}
|
||||
|
||||
private void saveModifyHistory(JSONObject client, JSONObject modifyResult,MongoTemplate mongoTemplate) {
|
||||
if (account == null) {
|
||||
return;
|
||||
}
|
||||
ClientConfigLog clientConfigLog = new ClientConfigLog();
|
||||
clientConfigLog.setId(IdUtil.getId());
|
||||
clientConfigLog.setBusiness(business());
|
||||
clientConfigLog.setClientId(client.getIntValue("client_id"));
|
||||
|
||||
boolean isPartner = true;
|
||||
if (StringUtils.isNotEmpty(account.getString("account_id"))) {
|
||||
isPartner = true;
|
||||
}
|
||||
if (StringUtils.isNotEmpty(account.getString("manager_id"))) {
|
||||
isPartner = false;
|
||||
}
|
||||
clientConfigLog.setUserType(isPartner ? "Merchant" : "Manager");
|
||||
clientConfigLog.setCreateTime(new Date());
|
||||
clientConfigLog.setNewData(modifyResult.toJSONString());
|
||||
clientConfigLog.setUserId(isPartner ? account.getString("account_id") : account.getString("manager_id"));
|
||||
Map<String, Object> beforeModify = modifyResult.keySet().stream().collect(Collectors.toMap(key -> key, client::get));
|
||||
clientConfigLog.setOriginData(JSON.toJSONString(beforeModify));
|
||||
clientConfigLog.setUserName(isPartner ? account.getString("display_name") : account.getString("display_name"));
|
||||
mongoTemplate.insert(clientConfigLog);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,77 @@
|
||||
package au.com.royalpay.payment.manage.merchants.entity;
|
||||
|
||||
import au.com.royalpay.payment.manage.mappers.system.ClientMapper;
|
||||
import au.com.royalpay.payment.manage.merchants.beans.mongo.ClientConfigLog;
|
||||
import au.com.royalpay.payment.tools.merchants.core.MerchantInfoProvider;
|
||||
import au.com.royalpay.payment.tools.utils.id.IdUtil;
|
||||
|
||||
import com.alibaba.fastjson.JSON;
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.springframework.data.mongodb.core.MongoTemplate;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.util.Date;
|
||||
import java.util.Map;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* Create by yixian at 2018-04-12 16:19
|
||||
*/
|
||||
public abstract class ClientModify {
|
||||
|
||||
private JSONObject account;
|
||||
|
||||
private String clientMoniker;
|
||||
|
||||
public ClientModify(JSONObject account, String clientMoniker) {
|
||||
this.account = account;
|
||||
this.clientMoniker = clientMoniker;
|
||||
}
|
||||
|
||||
protected abstract String business();
|
||||
|
||||
protected abstract JSONObject getModifyResult();
|
||||
|
||||
@Transactional
|
||||
public int doModify(MerchantInfoProvider merchantInfoProvider, ClientMapper clientMapper, MongoTemplate mongoTemplate) {
|
||||
JSONObject client = merchantInfoProvider.getClientInfoByMoniker(clientMoniker);
|
||||
JSONObject modifyResult = getModifyResult();
|
||||
try {
|
||||
saveModifyHistory(client, modifyResult, mongoTemplate);
|
||||
}catch (Exception e){
|
||||
|
||||
}
|
||||
int clientId = client.getIntValue("client_id");
|
||||
modifyResult.put("client_id", clientId);
|
||||
clientMapper.update(modifyResult);
|
||||
return clientId;
|
||||
}
|
||||
|
||||
private void saveModifyHistory(JSONObject client, JSONObject modifyResult, MongoTemplate mongoTemplate) {
|
||||
if (account == null) {
|
||||
return;
|
||||
}
|
||||
ClientConfigLog clientConfigLog = new ClientConfigLog();
|
||||
clientConfigLog.setId(IdUtil.getId());
|
||||
clientConfigLog.setBusiness(business());
|
||||
clientConfigLog.setClientId(client.getIntValue("client_id"));
|
||||
|
||||
boolean isPartner = true;
|
||||
if (StringUtils.isNotEmpty(account.getString("account_id"))) {
|
||||
isPartner = true;
|
||||
}
|
||||
if (StringUtils.isNotEmpty(account.getString("manager_id"))) {
|
||||
isPartner = false;
|
||||
}
|
||||
clientConfigLog.setUserType(isPartner ? "Merchant" : "Manager");
|
||||
clientConfigLog.setCreateTime(new Date());
|
||||
clientConfigLog.setNewData(modifyResult.toJSONString());
|
||||
clientConfigLog.setUserId(isPartner ? account.getString("account_id") : account.getString("manager_id"));
|
||||
Map<String, Object> beforeModify = modifyResult.keySet().stream().collect(Collectors.toMap(key -> key, client::get));
|
||||
clientConfigLog.setOriginData(JSON.toJSONString(beforeModify));
|
||||
clientConfigLog.setUserName(isPartner ? account.getString("display_name") : account.getString("display_name"));
|
||||
mongoTemplate.save(clientConfigLog);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,30 @@
|
||||
package au.com.royalpay.payment.manage.merchants.entity.impls;
|
||||
|
||||
import au.com.royalpay.payment.manage.merchants.entity.ClientModify;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
|
||||
/**
|
||||
* Create by yixian at 2018-04-12 16:43
|
||||
*/
|
||||
public class ApproveEmailModify extends ClientModify {
|
||||
private int approve_email_send;
|
||||
|
||||
public ApproveEmailModify(JSONObject account, String clientMoniker, int approve_email_send) {
|
||||
super(account, clientMoniker);
|
||||
this.approve_email_send = approve_email_send;
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
protected String business() {
|
||||
return "开启绿色通道";
|
||||
}
|
||||
|
||||
@Override
|
||||
protected JSONObject getModifyResult() {
|
||||
JSONObject modify = new JSONObject();
|
||||
modify.put("approve_email_send", approve_email_send);
|
||||
return modify;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,69 @@
|
||||
package au.com.royalpay.payment.manage.merchants.entity.impls;
|
||||
|
||||
import au.com.royalpay.payment.manage.merchants.entity.ClientModify;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* Create by yixian at 2018-04-12 16:43
|
||||
*/
|
||||
public class AuditModify extends ClientModify {
|
||||
private Integer source;
|
||||
private Integer open_status;
|
||||
private Integer approve_result;
|
||||
private String approver;
|
||||
private Date approve_time;
|
||||
private String refuse_remark;
|
||||
|
||||
|
||||
public AuditModify(JSONObject account, String clientMoniker, Integer approve_result, String approver, Date approve_time) {
|
||||
super(account, clientMoniker);
|
||||
this.approve_result = approve_result;
|
||||
this.approver = approver;
|
||||
this.approve_time = approve_time;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected String business() {
|
||||
return "修改商户source状态为:" + source;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected JSONObject getModifyResult() {
|
||||
JSONObject modify = new JSONObject();
|
||||
modify.put("approve_result",approve_result);
|
||||
modify.put("approver",approver);
|
||||
modify.put("approve_time",approve_time);
|
||||
if(source!=null){
|
||||
modify.put("source",source);
|
||||
}
|
||||
if(open_status!=null){
|
||||
modify.put("open_status",open_status);
|
||||
}
|
||||
if(StringUtils.isNotEmpty(refuse_remark)){
|
||||
modify.put("refuse_remark",refuse_remark);
|
||||
}
|
||||
return modify;
|
||||
}
|
||||
|
||||
public void setSource(Integer source) {
|
||||
this.source = source;
|
||||
}
|
||||
|
||||
public void setOpen_status(Integer open_status) {
|
||||
this.open_status = open_status;
|
||||
}
|
||||
|
||||
public void setRefuse_remark(String refuse_remark) {
|
||||
this.refuse_remark = refuse_remark;
|
||||
}
|
||||
|
||||
public void setApprove_result(Integer approve_result) {
|
||||
this.approve_result = approve_result;
|
||||
}
|
||||
}
|
||||
|
||||
@ -0,0 +1,30 @@
|
||||
package au.com.royalpay.payment.manage.merchants.entity.impls;
|
||||
|
||||
import au.com.royalpay.payment.manage.merchants.entity.ClientConfigModify;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
|
||||
/**
|
||||
* Create by yixian at 2018-04-12 16:43
|
||||
*/
|
||||
public class ClearDaysModify extends ClientConfigModify {
|
||||
private int settle_hour;
|
||||
|
||||
public ClearDaysModify(JSONObject account, String clientMoniker, int settle_hour) {
|
||||
super(account, clientMoniker);
|
||||
this.settle_hour = settle_hour;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected String business() {
|
||||
|
||||
return "修改商户清算截止时间为："+settle_hour;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected JSONObject getModifyResult() {
|
||||
JSONObject modify = new JSONObject();
|
||||
modify.put("settle_hour", settle_hour);
|
||||
return modify;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,30 @@
|
||||
package au.com.royalpay.payment.manage.merchants.entity.impls;
|
||||
|
||||
import au.com.royalpay.payment.manage.merchants.entity.ClientConfigModify;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
|
||||
/**
|
||||
* Create by yixian at 2018-04-12 16:43
|
||||
*/
|
||||
public class CredentialCodeModify extends ClientConfigModify {
|
||||
private String credential_code;
|
||||
|
||||
|
||||
public CredentialCodeModify(JSONObject account, String clientMoniker, String credential_code) {
|
||||
super(account, clientMoniker);
|
||||
this.credential_code = credential_code;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected String business() {
|
||||
return "重置商户secret";
|
||||
}
|
||||
|
||||
@Override
|
||||
protected JSONObject getModifyResult() {
|
||||
JSONObject modify = new JSONObject();
|
||||
modify.put("credential_code", credential_code);
|
||||
return modify;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,32 @@
|
||||
package au.com.royalpay.payment.manage.merchants.entity.impls;
|
||||
|
||||
import au.com.royalpay.payment.manage.merchants.entity.ClientConfigModify;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
||||
/**
|
||||
* Create by yixian at 2018-04-12 16:43
|
||||
*/
|
||||
public class CustomerSurchargeRateModify extends ClientConfigModify {
|
||||
private BigDecimal customer_surcharge_rate;
|
||||
|
||||
public CustomerSurchargeRateModify(JSONObject account, String clientMoniker, BigDecimal customer_surcharge_rate) {
|
||||
super(account, clientMoniker);
|
||||
this.customer_surcharge_rate = customer_surcharge_rate;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected String business() {
|
||||
|
||||
return "修改商户客户手续费率为："+customer_surcharge_rate;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected JSONObject getModifyResult() {
|
||||
JSONObject modify = new JSONObject();
|
||||
modify.put("customer_surcharge_rate", customer_surcharge_rate);
|
||||
return modify;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,30 @@
|
||||
package au.com.royalpay.payment.manage.merchants.entity.impls;
|
||||
|
||||
import au.com.royalpay.payment.manage.merchants.entity.ClientModify;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
|
||||
/**
|
||||
* Create by yixian at 2018-04-12 16:43
|
||||
*/
|
||||
public class DisableModify extends ClientModify {
|
||||
private boolean is_valid;
|
||||
|
||||
|
||||
public DisableModify(JSONObject account, String clientMoniker, boolean is_valid) {
|
||||
super(account, clientMoniker);
|
||||
this.is_valid = is_valid;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected String business() {
|
||||
return is_valid?"开启":"禁用";
|
||||
}
|
||||
|
||||
@Override
|
||||
protected JSONObject getModifyResult() {
|
||||
JSONObject modify = new JSONObject();
|
||||
modify.put("is_valid", is_valid);
|
||||
return modify;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,32 @@
|
||||
package au.com.royalpay.payment.manage.merchants.entity.impls;
|
||||
|
||||
import au.com.royalpay.payment.manage.merchants.entity.ClientConfigModify;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
|
||||
/**
|
||||
* Create by yixian at 2018-04-12 16:43
|
||||
*/
|
||||
public class EmailModify extends ClientConfigModify {
|
||||
private int approve_email_send;
|
||||
private String approve_email_id;
|
||||
|
||||
public EmailModify(JSONObject account, String clientMoniker, int approve_email_send, String approve_email_id) {
|
||||
super(account, clientMoniker);
|
||||
this.approve_email_send = approve_email_send;
|
||||
this.approve_email_id = approve_email_id;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected String business() {
|
||||
return "修改商户邮件发送状态为准备发送";
|
||||
}
|
||||
|
||||
@Override
|
||||
protected JSONObject getModifyResult() {
|
||||
JSONObject modify = new JSONObject();
|
||||
modify.put("approve_email_send", 4);
|
||||
modify.put("approve_email_id", null);
|
||||
return modify;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,32 @@
|
||||
package au.com.royalpay.payment.manage.merchants.entity.impls;
|
||||
|
||||
import au.com.royalpay.payment.manage.merchants.entity.ClientConfigModify;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
||||
/**
|
||||
* Create by yixian at 2018-04-12 16:43
|
||||
*/
|
||||
public class EmailSendStandByModify extends ClientConfigModify {
|
||||
private BigDecimal max_order_amount;
|
||||
|
||||
|
||||
public EmailSendStandByModify(JSONObject account, String clientMoniker, BigDecimal max_order_amount) {
|
||||
super(account, clientMoniker);
|
||||
this.max_order_amount = max_order_amount;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected String business() {
|
||||
return "修改商户最大订单额为:"+max_order_amount;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected JSONObject getModifyResult() {
|
||||
JSONObject modify = new JSONObject();
|
||||
modify.put("max_order_amount", max_order_amount);
|
||||
return modify;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,36 @@
|
||||
package au.com.royalpay.payment.manage.merchants.entity.impls;
|
||||
|
||||
import au.com.royalpay.payment.manage.merchants.entity.ClientModify;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* Create by yixian at 2018-04-12 16:43
|
||||
*/
|
||||
public class GreenChannelModify extends ClientModify {
|
||||
private String manager_id;
|
||||
|
||||
public GreenChannelModify(JSONObject account, String clientMoniker, String manager_id) {
|
||||
super(account, clientMoniker);
|
||||
this.manager_id = manager_id;
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
protected String business() {
|
||||
return "开启绿色通道";
|
||||
}
|
||||
|
||||
@Override
|
||||
protected JSONObject getModifyResult() {
|
||||
JSONObject modify = new JSONObject();
|
||||
modify.put("approver", manager_id);
|
||||
modify.put("approve_result", 2);
|
||||
modify.put("approve_time", new Date());
|
||||
modify.put("skip_clearing", 0);
|
||||
modify.put("open_status", 1);
|
||||
return modify;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,32 @@
|
||||
package au.com.royalpay.payment.manage.merchants.entity.impls;
|
||||
|
||||
import au.com.royalpay.payment.manage.merchants.entity.ClientConfigModify;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
||||
/**
|
||||
* Create by yixian at 2018-04-12 16:43
|
||||
*/
|
||||
public class MaxOrderAmountModify extends ClientConfigModify {
|
||||
private BigDecimal max_order_amount;
|
||||
|
||||
|
||||
public MaxOrderAmountModify(JSONObject account, String clientMoniker, BigDecimal max_order_amount) {
|
||||
super(account, clientMoniker);
|
||||
this.max_order_amount = max_order_amount;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected String business() {
|
||||
return "修改商户最大订单额为:"+max_order_amount;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected JSONObject getModifyResult() {
|
||||
JSONObject modify = new JSONObject();
|
||||
modify.put("max_order_amount", max_order_amount);
|
||||
return modify;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,33 @@
|
||||
package au.com.royalpay.payment.manage.merchants.entity.impls;
|
||||
|
||||
import au.com.royalpay.payment.manage.merchants.entity.ClientModify;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
|
||||
/**
|
||||
* Create by yixian at 2018-04-12 16:43
|
||||
*/
|
||||
public class MerchantIdModify extends ClientModify {
|
||||
private String sub_merchant_id;
|
||||
private String merchant_id;
|
||||
|
||||
public MerchantIdModify(JSONObject account, String clientMoniker, String sub_merchant_id, String merchant_id) {
|
||||
super(account, clientMoniker);
|
||||
this.sub_merchant_id = sub_merchant_id;
|
||||
this.merchant_id = merchant_id;
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
protected String business() {
|
||||
return "修改商户号:sub_merchant_id:"+ sub_merchant_id +" merchant_id:"+merchant_id;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected JSONObject getModifyResult() {
|
||||
JSONObject modify = new JSONObject();
|
||||
modify.put("sub_merchant_id", sub_merchant_id);
|
||||
modify.put("merchant_id", merchant_id);
|
||||
return modify;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,47 @@
|
||||
package au.com.royalpay.payment.manage.merchants.entity.impls;
|
||||
|
||||
import au.com.royalpay.payment.manage.merchants.entity.ClientModify;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* Create by yixian at 2018-04-12 16:43
|
||||
*/
|
||||
public class OpenStatusModify extends ClientModify {
|
||||
private int open_status;
|
||||
private Date approve_time;
|
||||
private Integer approve_result;
|
||||
|
||||
public OpenStatusModify(JSONObject account, String clientMoniker, int open_status) {
|
||||
super(account, clientMoniker);
|
||||
this.open_status = open_status;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected String business() {
|
||||
return "修改商户状态为:" + open_status;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected JSONObject getModifyResult() {
|
||||
JSONObject modify = new JSONObject();
|
||||
modify.put("open_status", open_status);
|
||||
if(approve_time != null){
|
||||
modify.put("approve_time", approve_time);
|
||||
}
|
||||
if(approve_result != null){
|
||||
modify.put("approve_result", approve_result);
|
||||
}
|
||||
return modify;
|
||||
}
|
||||
|
||||
public void setApprove_time(Date approve_time) {
|
||||
this.approve_time = approve_time;
|
||||
}
|
||||
|
||||
public void setApprove_result(Integer approve_result) {
|
||||
this.approve_result = approve_result;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,30 @@
|
||||
package au.com.royalpay.payment.manage.merchants.entity.impls;
|
||||
|
||||
import au.com.royalpay.payment.manage.merchants.entity.ClientConfigModify;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
|
||||
/**
|
||||
* Create by yixian at 2018-04-12 16:43
|
||||
*/
|
||||
public class OrderExpiryModify extends ClientConfigModify {
|
||||
private String order_expiry_config;
|
||||
|
||||
|
||||
public OrderExpiryModify(JSONObject account, String clientMoniker, String order_expiry_config) {
|
||||
super(account, clientMoniker);
|
||||
this.order_expiry_config = order_expiry_config;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected String business() {
|
||||
return "重新设置商户订单有效期";
|
||||
}
|
||||
|
||||
@Override
|
||||
protected JSONObject getModifyResult() {
|
||||
JSONObject modify = new JSONObject();
|
||||
modify.put("order_expiry_config", order_expiry_config);
|
||||
return modify;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,33 @@
|
||||
package au.com.royalpay.payment.manage.merchants.entity.impls;
|
||||
|
||||
import au.com.royalpay.payment.manage.merchants.entity.ClientModify;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
|
||||
/**
|
||||
* Create by yixian at 2018-04-12 16:43
|
||||
*/
|
||||
public class ParentIdModify extends ClientModify {
|
||||
private Integer parent_client_id;
|
||||
|
||||
public void setParent_client_id(int parent_client_id) {
|
||||
this.parent_client_id = parent_client_id;
|
||||
}
|
||||
|
||||
public ParentIdModify(JSONObject account, String clientMoniker, Integer parent_client_id) {
|
||||
super(account, clientMoniker);
|
||||
this.parent_client_id = parent_client_id;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected String business() {
|
||||
return "修改商户父id为:"+parent_client_id;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected JSONObject getModifyResult() {
|
||||
JSONObject modify = new JSONObject();
|
||||
modify.put("parent_client_id", parent_client_id);
|
||||
return modify;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,30 @@
|
||||
package au.com.royalpay.payment.manage.merchants.entity.impls;
|
||||
|
||||
import au.com.royalpay.payment.manage.merchants.entity.ClientConfigModify;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
|
||||
/**
|
||||
* Create by yixian at 2018-04-12 16:43
|
||||
*/
|
||||
public class PaypadVersionModify extends ClientConfigModify {
|
||||
private String paypad_version;
|
||||
|
||||
public PaypadVersionModify(JSONObject account, String clientMoniker, String paypad_version) {
|
||||
super(account, clientMoniker);
|
||||
this.paypad_version = paypad_version;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected String business() {
|
||||
|
||||
return "";
|
||||
}
|
||||
|
||||
@Override
|
||||
protected JSONObject getModifyResult() {
|
||||
JSONObject modify = new JSONObject();
|
||||
modify.put("paypad_version", paypad_version);
|
||||
return modify;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,29 @@
|
||||
package au.com.royalpay.payment.manage.merchants.entity.impls;
|
||||
|
||||
import au.com.royalpay.payment.manage.merchants.entity.ClientConfigModify;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
|
||||
/**
|
||||
* Create by yixian at 2018-04-12 16:43
|
||||
*/
|
||||
public class RefundAuditModify extends ClientConfigModify {
|
||||
private boolean enable;
|
||||
|
||||
public RefundAuditModify(JSONObject account, String clientMoniker, boolean enable) {
|
||||
super( account, clientMoniker);
|
||||
this.enable = enable;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected String business() {
|
||||
return (enable?"打开":"关闭")+"refund_audit";
|
||||
}
|
||||
|
||||
@Override
|
||||
protected JSONObject getModifyResult() {
|
||||
JSONObject modify = new JSONObject();
|
||||
modify.put("enable_refund_auth", enable);
|
||||
return modify;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,33 @@
|
||||
package au.com.royalpay.payment.manage.merchants.entity.impls;
|
||||
|
||||
import au.com.royalpay.payment.manage.merchants.entity.ClientConfigModify;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
|
||||
/**
|
||||
* Create by yixian at 2018-04-12 16:43
|
||||
*/
|
||||
public class RefundPWDModify extends ClientConfigModify {
|
||||
private String refund_pwd;
|
||||
private String refund_pwd_salt;
|
||||
|
||||
public RefundPWDModify(JSONObject account, String clientMoniker, String refund_pwd, String refund_pwd_salt) {
|
||||
super(account, clientMoniker);
|
||||
this.refund_pwd = refund_pwd;
|
||||
this.refund_pwd_salt = refund_pwd_salt;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected String business() {
|
||||
|
||||
return "修改退款密码为："+refund_pwd;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected JSONObject getModifyResult() {
|
||||
JSONObject modify = new JSONObject();
|
||||
modify.put("refund_pwd", refund_pwd);
|
||||
modify.put("refund_pwd_salt", refund_pwd_salt);
|
||||
return modify;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,30 @@
|
||||
package au.com.royalpay.payment.manage.merchants.entity.impls;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
|
||||
import au.com.royalpay.payment.manage.merchants.entity.ClientModify;
|
||||
|
||||
/**
|
||||
* Create by yixian at 2018-04-12 16:43
|
||||
*/
|
||||
public class RefuseModify extends ClientModify {
|
||||
private int source;
|
||||
|
||||
public RefuseModify(JSONObject account, String clientMoniker, int source) {
|
||||
super(account, clientMoniker);
|
||||
this.source = source;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected String business() {
|
||||
return "修改商户source状态为:" + source;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected JSONObject getModifyResult() {
|
||||
JSONObject modify = new JSONObject();
|
||||
modify.put("source", source);
|
||||
return modify;
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,30 @@
|
||||
package au.com.royalpay.payment.manage.merchants.entity.impls;
|
||||
|
||||
import au.com.royalpay.payment.manage.merchants.entity.ClientConfigModify;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
|
||||
/**
|
||||
* Create by yixian at 2018-04-12 16:43
|
||||
*/
|
||||
public class SettleHourModify extends ClientConfigModify {
|
||||
private int settle_hour;
|
||||
|
||||
public SettleHourModify(JSONObject account, String clientMoniker, int settle_hour) {
|
||||
super(account, clientMoniker);
|
||||
this.settle_hour = settle_hour;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected String business() {
|
||||
|
||||
return "修改商户清算截止时间为："+settle_hour;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected JSONObject getModifyResult() {
|
||||
JSONObject modify = new JSONObject();
|
||||
modify.put("settle_hour", settle_hour);
|
||||
return modify;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,30 @@
|
||||
package au.com.royalpay.payment.manage.merchants.entity.impls;
|
||||
|
||||
import au.com.royalpay.payment.manage.merchants.entity.ClientModify;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
|
||||
/**
|
||||
* Create by yixian at 2018-04-12 16:43
|
||||
*/
|
||||
public class SourceModify extends ClientModify {
|
||||
private int source;
|
||||
|
||||
public SourceModify(JSONObject account, String clientMoniker, int source) {
|
||||
super(account, clientMoniker);
|
||||
this.source = source;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected String business() {
|
||||
return "修改商户source状态为:" + source;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected JSONObject getModifyResult() {
|
||||
JSONObject modify = new JSONObject();
|
||||
modify.put("source", source);
|
||||
return modify;
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,32 @@
|
||||
package au.com.royalpay.payment.manage.merchants.entity.impls;
|
||||
|
||||
import au.com.royalpay.payment.manage.merchants.entity.ClientConfigModify;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
|
||||
/**
|
||||
* Create by yixian at 2018-04-12 16:43
|
||||
*/
|
||||
public class SwitchPermissionModify extends ClientConfigModify {
|
||||
private String key;
|
||||
private boolean value;
|
||||
|
||||
public SwitchPermissionModify(JSONObject account, String clientMoniker, String key, boolean value) {
|
||||
super(account, clientMoniker);
|
||||
this.key = key;
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected String business() {
|
||||
|
||||
return (value?"开启 ":"关闭 ")+key;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected JSONObject getModifyResult() {
|
||||
JSONObject modify = new JSONObject();
|
||||
modify.put(key, value);
|
||||
return modify;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,29 @@
|
||||
package au.com.royalpay.payment.manage.merchants.entity.impls;
|
||||
|
||||
import au.com.royalpay.payment.manage.merchants.entity.ClientModify;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
|
||||
/**
|
||||
* Create by yixian at 2018-04-12 16:43
|
||||
*/
|
||||
public class TimeZoneModify extends ClientModify {
|
||||
private String timezone;
|
||||
|
||||
public TimeZoneModify(JSONObject account, String clientMoniker, String timezone) {
|
||||
super(account, clientMoniker);
|
||||
this.timezone = timezone;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected String business() {
|
||||
return "修改商户时区为:"+timezone;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected JSONObject getModifyResult() {
|
||||
JSONObject modify = new JSONObject();
|
||||
modify.put("timezone", timezone);
|
||||
return modify;
|
||||
}
|
||||
}
|
||||
@ -1,6 +1,6 @@
|
||||
spring.datasource.driver-class-name=com.mysql.jdbc.Driver
|
||||
spring.datasource.schema-name=royalpay_production
|
||||
spring.datasource.host=192.168.0.49:3306
|
||||
spring.datasource.host=192.168.99.103:3306
|
||||
spring.datasource.url=jdbc:mysql://${spring.datasource.host}/${spring.datasource.schema-name}?useUnicode=true&characterEncoding=utf8&useSSL=false
|
||||
spring.datasource.username=root
|
||||
spring.datasource.password=root
|
||||
@ -0,0 +1,51 @@
|
||||
<!doctype html>
|
||||
<html>
|
||||
<head>
|
||||
<title>Payment Notice</title>
|
||||
<meta name="viewport" content="width=device-width,initial-scale=1,user-scalable=0">
|
||||
<link rel="stylesheet" type="text/css" href="/static/lib/weui1/weui.min.css">
|
||||
<script type="text/javascript" src="//res.wx.qq.com/open/js/jweixin-1.0.0.js"></script>
|
||||
<script type="text/javascript" src="/static/lib/jquery/jquery-2.1.4.min.js"></script>
|
||||
<script type="text/javascript" src="/static/templates/disable_wechat_menu.js?t=201607070231"></script>
|
||||
<style type="text/css">
|
||||
.weui_cell_ft {
|
||||
max-width: 60%;
|
||||
white-space: normal
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<div class="weui_panel">
|
||||
<div class="weui_panel_bd">
|
||||
<div class="weui_media_box weui_media_appmsg">
|
||||
<div class="weui_media_hd">
|
||||
<img class="weui_media_appmsg_thumb" data-th-src="${client.logo_url}" alt="">
|
||||
</div>
|
||||
<div class="weui_media_bd">
|
||||
<h4 class="weui_media_title" data-th-text="${client.company_name}"></h4>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div data-th-if="${auditions.size()==0}">
|
||||
<p> There is no refund applies at the moment! </p>
|
||||
</div>
|
||||
<div data-th-if="${auditions.size()>0}">
|
||||
asdlkjasd
|
||||
<div class="weui_panel">
|
||||
<div class="weui_panel_bd">
|
||||
<div class="weui_cells weui_cells_access">
|
||||
<div th-each="apply: ${audition}}">
|
||||
<a class="weui_cell" th-href="/api/payment/v1.0/refund/auditions/ + @{apply.id}">
|
||||
<div class="weui_cell_bd weui_cell_primary">
|
||||
<p th-text="${apply.currency}+ ${#numbers.formatDecimal($apply.refund_fee,1,2)}"></p>
|
||||
</div>
|
||||
<div class="weui_cell_ft" th-text="${apply.order_id}}"></div>
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
@ -1,26 +1,3 @@
|
||||
<style>
|
||||
.padding-size{
|
||||
padding-top: 5px;
|
||||
padding-right: 5px;
|
||||
padding-bottom: 5px;
|
||||
padding-left: 15px;
|
||||
}
|
||||
.padding-top-size{
|
||||
padding-top: 10px;
|
||||
}
|
||||
</style>
|
||||
<div class="modal-header padding-size">
|
||||
<h5>Clients</h5>
|
||||
</div>
|
||||
<div class="modal-body" padding-top-size>
|
||||
<div>
|
||||
<a ng-repeat="client in clients track by $index" ng-show="$index<clients.length-1"
|
||||
ui-sref="partners.detail({clientMoniker:client.client_moniker})">
|
||||
{{client.client_moniker}}<span class="text-black">,</span>
|
||||
</a>
|
||||
<a ng-repeat="client in clients" ng-if="$last"
|
||||
ui-sref="partners.detail({clientMoniker:client.client_moniker})">
|
||||
{{client.client_moniker}}
|
||||
</a>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<img ng-src="{{qrJson.qrcode_img}}" class="img-responsive">
|
||||
</div>
|
||||
|
||||
@ -0,0 +1,43 @@
|
||||
<div class="row">
|
||||
<div class="box-body">
|
||||
<div class="col-sm-12 col-xs-12" style="padding-right: 30px;margin-bottom: 5px">
|
||||
<div class="pull-right">
|
||||
<span ng-if="refresh_time">
|
||||
<span>上次刷新时间:</span><span><em><b>{{refresh_time}}</b></em></span>
|
||||
</span>
|
||||
<a role="button" class="btn btn-primary" title="refresh" ng-click="refresh()" ng-class="{disabled:disable_button}">
|
||||
<i class="glyphicon glyphicon-refresh"
|
||||
title="refresh"></i>
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-sm-12 col-xs-12">
|
||||
<loadingbar ng-if="disable_button"></loadingbar>
|
||||
<div>
|
||||
<div class="list-group col-sm-12 col-xs-12"
|
||||
ng-repeat="(key,clients) in notTradeClientsMap">
|
||||
<a class="list-group-item active col-sm-12 col-xs-12">
|
||||
{{key|choose_merchant_id}}
|
||||
<span ng-show="clients.length>59" class="small-box-footer cursor pull-right" ng-click="isCollapsed = !isCollapsed">更多 <i class="fa fa-arrow-circle-right" ng-class="{'i-rotate_90':!isCollapsed}"></i></span>
|
||||
</a>
|
||||
<a class="list-group-item col-sm-2 col-xs-6 cursor"
|
||||
ng-repeat="client in clients | orderBy:'client_count':true"
|
||||
ng-click="showClient(client.sub_merchant_id)" ng-if="$index<60">
|
||||
<span>{{client.sub_merchant_id}} <i class="fa fa-clock-o text-danger"
|
||||
title="Temp Sub Merchant ID"
|
||||
ng-if="client.temp_sub_merchant"></i></span>
|
||||
<span class="badge" aria-hidden="true" title="show detail">{{client.client_count}}</span>
|
||||
</a>
|
||||
<a class="list-group-item col-sm-2 col-xs-6 cursor" ng-hide="isCollapsed"
|
||||
ng-repeat="client in clients | orderBy:'client_count':true"
|
||||
ng-click="showClient(client.sub_merchant_id)" ng-if="$index>59">
|
||||
<span>{{client.sub_merchant_id}} <i class="fa fa-clock-o text-danger"
|
||||
title="Temp Sub Merchant ID"
|
||||
ng-if="client.temp_sub_merchant"></i></span>
|
||||
<span class="badge" aria-hidden="true" title="show detail">{{client.client_count}}</span>
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@ -0,0 +1,38 @@
|
||||
<div class="row">
|
||||
<div class="box-body table-responsive">
|
||||
<div class="col-sm-12 col-xs-6">
|
||||
<a role="button" class="btn btn-primary pull-right" title="Add Sub Merchant Id"
|
||||
ng-click="save()">
|
||||
<i class="fa fa-plus"></i>
|
||||
Add
|
||||
</a>
|
||||
</div>
|
||||
<table class="table table-striped">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Merchant Id</th>
|
||||
<th>Sub Merchant Id</th>
|
||||
<th>Operator</th>
|
||||
<th>Create Time</th>
|
||||
<th>Operation</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr ng-repeat="client in subMerchantIdList">
|
||||
<td ng-bind="client.merchant_id"></td>
|
||||
<td>
|
||||
{{client.sub_merchant_id}}
|
||||
<i class="fa fa-clock-o text-danger"
|
||||
title="Temp Sub Merchant ID"></i>
|
||||
</td>
|
||||
<td ng-bind="client.operator"></td>
|
||||
<td ng-bind="client.create_time"></td>
|
||||
<td>
|
||||
<a class="text-bold text-danger" role="button"
|
||||
ng-click="disable(client.sub_merchant_id)">Disable</a>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
Loading…
Reference in new issue