diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCashOutController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCashOutController.java index 274cada7b..9cdd9c3e6 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCashOutController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCashOutController.java @@ -109,13 +109,11 @@ public class WxCashOutController extends BaseController { WxPayAccount payAccount= wxPayAccountService.getByTenantId(mall.getTenantId()); if (payAccount.getShare().intValue() == EnumPayShare.YES.getCode().intValue()) { - //resultMap.put("cashOutSupport", 0); - return new ResultData(Result.ERROR,"当前商场未开通提现。"); + resultMap.put("cashOutSupport", 0); }else { CUser user = getCUser(); if (!currentWxBUserIsAdmin(user,merchant)) { - //resultMap.put("cashOutSupport", 0); - return new ResultData(Result.ERROR,"当前微信的手机号"+user.getPhone()+"不是商户的联系方式。"); + resultMap.put("cashOutSupport", 0); }else { //此处注销是为了满足一个联系手机存在于多个商户的情况。只用微信做验证 //if (!currentMerchantBUserIsAdmin(buser,merchant)) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/NeuPosOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/NeuPosOrderServiceImpl.java index f614d910e..480016e46 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/NeuPosOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/NeuPosOrderServiceImpl.java @@ -113,23 +113,23 @@ public class NeuPosOrderServiceImpl implements NeuPosOrderService { @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) public void updatePayStatus(NeuPosUpdatePayDto updatePay) { Integer payStatus = null; - if ("1".equals(updatePay.getPayStatus())) { + if (1 == updatePay.getPayStatus()) { payStatus = 1; - }else if ("2".equals(updatePay.getPayStatus())) { + }else if (2 == updatePay.getPayStatus()) { payStatus = 3; - }else if ("3".equals(updatePay.getPayStatus())) { + }else if (3 == updatePay.getPayStatus()) { payStatus = 1; - }else if ("4".equals(updatePay.getPayStatus())) { + }else if (4 == updatePay.getPayStatus()) { payStatus = 1; - }else if ("5".equals(updatePay.getPayStatus())) { + }else if (5 == updatePay.getPayStatus()) { payStatus = 2; - }else if ("6".equals(updatePay.getPayStatus())) { + }else if (6 == updatePay.getPayStatus()) { payStatus = 4; - }else if ("7".equals(updatePay.getPayStatus())) { + }else if (7 == updatePay.getPayStatus()) { payStatus = 4; - }else if ("8".equals(updatePay.getPayStatus())) { + }else if (8 == updatePay.getPayStatus()) { payStatus = 4; - }else if ("9".equals(updatePay.getPayStatus())) { + }else if (9 == updatePay.getPayStatus()) { payStatus = 5; } neuPosOrderMasterExtMapper.updateOrderMasterPayStatus(updatePay.getOrderNumber(), updatePay.getPayStatus());