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

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
master
eason 6 years ago
parent 2c87ffffcb 448aa422f0
commit 93137aae5e
15 changed files with 90 additions and 53 deletions
Show Stats Download Patch File Download Diff File

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

@ -72,6 +72,6 @@ public class PaymentManageApplication {
@Bean
public MongoClientOptions mongoOptions() {
return MongoClientOptions.builder().maxConnectionIdleTime(6000).build();
return MongoClientOptions.builder().maxConnectionIdleTime(6000).socketTimeout(3000).maxWaitTime(3000).serverSelectionTimeout(3000).build();
}
}

4
src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java
Unescape View File

@ -432,7 +432,9 @@ public class RetailAppServiceImp implements RetailAppService {
public JSONObject getRefunds(JSONObject device, AppQueryBean appQueryBean) {
JSONObject appParam = appQueryBean.toParams();
JSONObject param = new JSONObject();
param.put("client_id",device.getIntValue("client_id"));
if(appParam.get("client_ids")==null) {
param.put("client_id", device.getIntValue("client_id"));
}
param.put("start_time",appParam.getDate("begin"));
param.put("end_time",appParam.getDate("end"));
return refundService.listUnionAllApply(param, new PageBounds(appQueryBean.getPage(), appQueryBean.getLimit()));

5
src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailAppController.java
Unescape View File

@ -549,4 +549,9 @@ public class RetailAppController {
return retailAppService.openimCheck(device);
}
@RequestMapping(value = "/openim/chat",method = RequestMethod.POST)
public void openimChat(@ModelAttribute(RETAIL_DEVICE) JSONObject device,@RequestBody JSONObject param) {
retailAppService.addUnreadMsg(device,param);
}
}

8
src/main/java/au/com/royalpay/payment/manage/custom/core/CustomService.java
Unescape View File

@ -0,0 +1,8 @@
package au.com.royalpay.payment.manage.custom.core;
/**
* @author kira
* @date 2018/7/27
*/
public interface CustomService {
}

10
src/main/java/au/com/royalpay/payment/manage/custom/core/impl/CustomServiceImpl.java
Unescape View File

@ -0,0 +1,10 @@
package au.com.royalpay.payment.manage.custom.core.impl;
import au.com.royalpay.payment.manage.custom.core.CustomService;
/**
* @author kira
* @date 2018/7/27
*/
public class CustomServiceImpl implements CustomService {
}

5
src/main/java/au/com/royalpay/payment/manage/custom/package-info.java
Unescape View File

@ -0,0 +1,5 @@
/**
* @author kira
* @date 2018/7/27
*/
package au.com.royalpay.payment.manage.custom;

1
src/main/java/au/com/royalpay/payment/manage/merchants/entity/ClientConfigModify.java
Unescape View File

@ -35,7 +35,6 @@ public abstract class ClientConfigModify {
protected abstract JSONObject getModifyResult();
@Transactional
public int doModify(MerchantInfoProvider merchantInfoProvider, ClientConfigMapper clientConfigMapper, ClientMapper clientMapper, MongoTemplate mongoTemplate) {
JSONObject client = merchantInfoProvider.getClientInfoByMoniker(clientMoniker);
JSONObject modifyResult = getModifyResult();

2
src/main/java/au/com/royalpay/payment/manage/openim/core/impl/CustomerServiceServiceImpl.java
Unescape View File

@ -69,7 +69,7 @@ public class CustomerServiceServiceImpl implements CustomerServiceService {
JSONObject userInfo = clientAccountMapper.findById(account.getString("account_id"));
JSONObject checkRecord = new JSONObject();
checkRecord.put("nick", userInfo.getString("username") + "_" + client.getString("client_moniker"));
checkRecord.put("user_id", userInfo.getString("username"));
checkRecord.put("user_id", userInfo.getString("username") + "_" + client.getString("client_moniker"));
checkRecord.put("password", DigestUtils.md5Hex("uid"));
checkRecord.put("icon_url",client.getString("logo_thumbnail"));
openimApi.addUser(checkRecord);

2
src/main/java/au/com/royalpay/payment/manage/tradelog/refund/impls/RefundServiceImpl.java
Unescape View File

@ -435,7 +435,7 @@ public class RefundServiceImpl implements RefundService, ApplicationEventPublish
@Override
public JSONObject listUnionAllApply(JSONObject params, PageBounds pagination) {
if(params.get("cleint_id")==null && params.get("client_ids")==null){
if(params.get("client_id")==null && params.get("client_ids")==null){
return null;
}
return PageListUtils.buildPageListResult(refundMapper.listUnionAllApply(params, pagination));

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

@ -112,8 +112,8 @@ mail.mailgun.default.merchantlist=merchants@mail.royalpay.com.au
royalpay.sms.appid=1400094878
royalpay.sms.appkey=43390d81e20c5191c278fbf4cd275be2
im.openim.appkey=24980715
im.openim.secret=60b1ba680a6f27ffc701f10b6d5be00e
im.openim.appkey=24986533
im.openim.secret=96e28e7be21a874177211c31834b5174
#清算银行配置

28
src/main/resources/au/com/royalpay/payment/manage/mappers/payment/RefundMapper.xml
Unescape View File

@ -77,6 +77,7 @@
confirm_time confirm_time,
operator_name operator_name,
`status` `status` ,
amount amount,
1 type
FROM
pmt_refunds
@ -85,10 +86,10 @@
and client_id = #{client_id}
</if>
<if test="start_time!=null">
and create_time &lt;= #{start_time}
and create_time &gt;= #{start_time}
</if>
<if test="start_time!=null">
and create_time &gt;= #{end_time}
and create_time &lt;= #{end_time}
</if>
<if test="client_ids!=null">
client_id in
@ -99,27 +100,28 @@
</where>
UNION ALL
SELECT
order_id order_id,
client_id client_id,
applytime create_time,
audittime confirm_time,
auditorname operator_name,
audit_result `status` ,
ra.order_id order_id,
ra.client_id client_id,
ra.applytime create_time,
ra.audittime confirm_time,
ra.auditorname operator_name,
ra.audit_result `status` ,
r.amount amount,
2 type
FROM
pmt_refund_applies
pmt_refund_applies ra left join pmt_refunds r on ra.refund_id = r.refund_id
<where>
<if test="client_id!=null">
and client_id = #{client_id}
and ra.client_id = #{client_id}
</if>
<if test="start_time!=null">
and applytime &lt;= #{start_time}
and ra.applytime &gt;= #{start_time}
</if>
<if test="start_time!=null">
and applytime &gt;= #{end_time}
and ra.applytime &lt;= #{end_time}
</if>
<if test="client_ids!=null">
client_id in
ra.client_id in
<foreach collection="client_ids" open="(" close=")" separator="," item="item">
#{item}
</foreach>

51
src/main/ui/service_client.html
Unescape View File

@ -22,7 +22,7 @@
uid: window.uid,
appkey: window.appKey,
credential: window.password,
touid: window.touid,
touid: window.uid,
pluginUrl: '/service_contact_list.html?uid='
+ window.uid,
onLoginSuccess: function (data) {
@ -38,12 +38,16 @@
}
function switchTouid(touid) {
window.uid = touid;
window.touid = touid;
var low_touid = WKIT.Conn.sdk.Base.getNick(touid).toLowerCase();
WKIT.switchTouid({
touid: touid
touid: low_touid,
logo: 'https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1531805782509&di=98f7fa48980696f8eddf7eb617a834a3&imgtype=0&src=http%3A%2F%2Fi2.hdslb.com%2Fbfs%2Fface%2F98dbd049061292bca8625caf91cff1b41ee999cd.jpg',
Avatar: 'https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1531805782509&di=98f7fa48980696f8eddf7eb617a834a3&imgtype=0&src=http%3A%2F%2Fi2.hdslb.com%2Fbfs%2Fface%2F98dbd049061292bca8625caf91cff1b41ee999cd.jpg',
toAvatar: 'https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1531805782509&di=98f7fa48980696f8eddf7eb617a834a3&imgtype=0&src=http%3A%2F%2Fi2.hdslb.com%2Fbfs%2Fface%2F98dbd049061292bca8625caf91cff1b41ee999cd.jpg'
});
WKIT.Conn.sdk.Chat.setReadState({
touid: touid,
touid: low_touid,
timestamp: Math.floor((+new Date()) / 1000),
success: function (data) {
},
@ -82,20 +86,12 @@
var unreads = data.data;
var uids = "";
for (var i = unreads.length - 1; i >= 0; i--) {
window.sdk.unreadMap[getName(
WKIT.Conn.sdk.Base.getNick(
unreads[i].contact))].msgCount =
unreads[i].msgCount;
var nick = getName(
WKIT.Conn.sdk.Base.getNick(
unreads[i].contact));
if (nick.length <= 6) {
window.sdk.unreadMap[getName(WKIT.Conn.sdk.Base.getNick(unreads[i].contact))].msgCount = unreads[i].msgCount;
var nick = getName(WKIT.Conn.sdk.Base.getNick(unreads[i].contact));
if (nick.substring(nick.length - 5, nick.length - 4) == '_') {
uids += nick + ",";
} else {
uids +=
nick.substring(0, uid.length - 5)
+ ",";
uids += nick.substring(0, uid.length - 5) + ",";
}
}
window.sdk.loadContactList(uids);
@ -108,10 +104,11 @@
function updateContractList(data) {
var msg = data.msgs[0];
var msg_uid = getName(WKIT.Conn.sdk.Base.getNick(msg.from))
if (window.uid = msg_uid) {
var low_msg_uid = WKIT.Conn.sdk.Base.getNick(msg.from);
var msg_uid = getName(low_msg_uid);
if (window.uid == msg_uid) {
WKIT.Conn.sdk.Chat.setReadState({
touid: msg_uid,
touid: low_msg_uid,
timestamp: Math.floor((+new Date()) / 1000),
success: function (data) {
},
@ -119,15 +116,15 @@
console.log('set read state fail', error);
}
});
}else {
if (window.sdk.unreadMap[msg_uid]) {
window.sdk.unreadMap[msg_uid].msgCount = window.sdk.unreadMap[msg_uid].msgCount + 1;
} else {
var unreadMapEle = {msgCount: 1}
window.sdk.unreadMap[msg_uid] = unreadMapEle;
}
window.sdk.loadContactList(msg_uid.substr(0, msg_uid - 6));
}
if (window.sdk.unreadMap[msg_uid]) {
window.sdk.unreadMap[msg_uid].msgCount = window.sdk.unreadMap[msg_uid].msgCount + 1;
} else {
var unreadMapEle = {msgCount: 1}
window.sdk.unreadMap[msg_uid] = unreadMapEle;
}
window.sdk.loadContactList(msg_uid.substr(0, msg_uid - 6));
}
function initLayout() {

13
src/main/ui/service_contact_list.html
Unescape View File

@ -164,13 +164,14 @@
function showContactList(map) {
var contact_list = '';
for (var key in map) {
var ele= map[key];
var css = 'hover';
if (key == parent.window.uid) {
if (key == parent.window.touid) {
css = 'active';
}
var headImUrl = '';
if (map[key].headimg) {
headImUrl = map[key].headimg;
if (ele.headimg) {
headImUrl = ele.headimg;
} else {
headImUrl = "/static/images/act/encourage_money/default_headimg.png";
}
@ -179,8 +180,10 @@
+ "')>"
+ "<div class=\"headimg\" style='background-image:url(" + headImUrl
+ "')>"
+ "<div class=\"notice\">" + map[key].msgCount + "</div>"
+ "</div>"
if(ele.msgCount>0){
contact_list+="<div class=\"notice\">" + ele.msgCount + "</div>";
}
contact_list += "</div>"
+ "<div class=\"avatar\">" + key + "</div>"
+ "</li>"
}

2
src/main/ui/service_customer.html
Unescape View File

@ -15,7 +15,7 @@
uid: 'kira3_PINE',
appkey: 24980715,
credential: 'xxxxxx',
touid: 'kiraservant2',
touid: 'kiraservanttest1',
logo: 'http://img.alicdn.com/tps/i3/TB12LD9IFXXXXb3XpXXSyFWJXXX-82-82.png',
});
}

6
src/main/ui/static/config/sysconfigs/sysconfigs.js
Unescape View File

@ -77,6 +77,9 @@ define(['angular', 'uiRouter'], function (angular) {
$scope.onoff = function (servant) {
var param = {onoff:servant.onoff};
$http.put('/sys/openim/servant/'+servant.manager_id+'/onoff',param).then(function (resp) {
if(!servant.password){
$scope.loadServants();
}
},function (resp) {
commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'});
});
@ -86,6 +89,9 @@ define(['angular', 'uiRouter'], function (angular) {
var param = {nick:servant.nick};
$http.put('/sys/openim/servant/'+servant.manager_id+'/nick',param).then(function (resp) {
$scope.ctrl.nick[servant.display_name] = false;
if(!servant.password){
$scope.loadServants();
}
},function (resp) {
commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'});
});

Write Preview
Loading…
Cancel
Save