Преглед изворни кода

fix cashout

release_toaliyun_real
xiaohanzi пре 5 година
родитељ
комит
2364863e75
2 измењених фајлова са 8 додато и 11 уклоњено
  1. +8
    -7
      mallinkBApi/src/main/java/com/iformall/controller/WxCashOutController.java
  2. +0
    -4
      mallinkService/src/main/java/com/iformall/service/impl/WxCashOutServiceImpl.java

+ 8
- 7
mallinkBApi/src/main/java/com/iformall/controller/WxCashOutController.java Прегледај датотеку

@@ -116,9 +116,10 @@ public class WxCashOutController extends BaseController {
if (!currentWxBUserIsAdmin(wxBUser,merchant)) { if (!currentWxBUserIsAdmin(wxBUser,merchant)) {
resultMap.put("cashOutSupport", 0); resultMap.put("cashOutSupport", 0);
}else { }else {
if (!currentMerchantBUserIsAdmin(buser,merchant)) {
resultMap.put("cashOutSupport", 0);
}else {
//此处注销是为了满足一个联系手机存在于多个商户的情况。只用微信做验证
//if (!currentMerchantBUserIsAdmin(buser,merchant)) {
// resultMap.put("cashOutSupport", 0);
//}else {
resultMap.put("cashOutSupport", mall.getCashOutSupport()); resultMap.put("cashOutSupport", mall.getCashOutSupport());
if (1 == mall.getCashOutSupport().intValue()) { if (1 == mall.getCashOutSupport().intValue()) {
WxCUser mUser = getCurrentCUser(buser); WxCUser mUser = getCurrentCUser(buser);
@@ -128,7 +129,7 @@ public class WxCashOutController extends BaseController {
resultMap.put("cashOutOpenNickName", mUser.getNickName()); resultMap.put("cashOutOpenNickName", mUser.getNickName());
resultMap.put("cashOutOpenHeadImg", mUser.getAvatarUrl()); resultMap.put("cashOutOpenHeadImg", mUser.getAvatarUrl());
} }
}
//}
} }
} }
resultMap.put("cashOutLimit", mall.getCashOutLimit()); resultMap.put("cashOutLimit", mall.getCashOutLimit());
@@ -170,9 +171,9 @@ public class WxCashOutController extends BaseController {
if (!currentWxBUserIsAdmin(wxBUser,merchant)) { if (!currentWxBUserIsAdmin(wxBUser,merchant)) {
return new ResultData(Result.ERROR,"当前微信绑定的手机号["+wxBUser.getPhone()+"]非商户的联系手机号"); return new ResultData(Result.ERROR,"当前微信绑定的手机号["+wxBUser.getPhone()+"]非商户的联系手机号");
} }
if (!currentMerchantBUserIsAdmin(buser,merchant)) {
return new ResultData(Result.ERROR,"当前登陆账号["+buser.getPhone()+"]非商户的联系手机号");
}
// if (!currentMerchantBUserIsAdmin(buser,merchant)) {
// return new ResultData(Result.ERROR,"当前登陆账号["+buser.getPhone()+"]非商户的联系手机号");
// }
//当前管理员的账户必须在c端授权了 //当前管理员的账户必须在c端授权了
try { try {
WxCUser mUser = getCurrentCUser(buser); WxCUser mUser = getCurrentCUser(buser);


+ 0
- 4
mallinkService/src/main/java/com/iformall/service/impl/WxCashOutServiceImpl.java Прегледај датотеку

@@ -98,10 +98,6 @@ public class WxCashOutServiceImpl implements WxCashOutService {
if (EnumCashOut.NO.getCode().intValue() == mall.getCashOutSupport().intValue()) { if (EnumCashOut.NO.getCode().intValue() == mall.getCashOutSupport().intValue()) {
return new ResultData(Result.ERROR,"当前租户不支持商户提现。"); return new ResultData(Result.ERROR,"当前租户不支持商户提现。");
} }
//只有商户管理员才能进行此操作
if (!(buser.getPhone().equals(merchant.getLinkPhone()))) {
return new ResultData(Result.ERROR,"当前账号不是商户的联系手机号,不能进行此操作。");
}
if(!hasCashCount(mall,merchant)) { if(!hasCashCount(mall,merchant)) {
return new ResultData(Result.ERROR,"当日提现次数已达限额。"); return new ResultData(Result.ERROR,"当日提现次数已达限额。");


Loading…
Откажи
Сачувај