更新用户端功能

Pu Zhibing

3 天以前 33632d86bbf74e922ce406d9032fadc90f6bba5e

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java

@@ -777,12 +777,12 @@
            if(userInfo.getBalance() == null || userInfo.getBalance() < orderMoney){
                return ResultUtil.error("余额不足，无法完成支付");
            }
            if(orderMoney>0) {
                resultUtil = appOrderController.moneyPay(orderId, userInfo.getId(), orderMoney);
                if (resultUtil.getCode() == 500) {
                    return ResultUtil.error("电子余额不足，无法完成支付");
                }
            }
//            if(orderMoney>0) {
//                resultUtil = appOrderController.moneyPay(orderId, userInfo.getId(), orderMoney);
//                if (resultUtil.getCode() == 500) {
//                    return ResultUtil.error("电子余额不足，无法完成支付");
//                }
//            }
            userInfo.setBalance(new BigDecimal(userInfo.getBalance()).subtract(new BigDecimal(orderMoney)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());

            SysIntegral query1 = sysIntegralMapper.query(orderLogistics.getCompanyId());
@@ -867,10 +867,10 @@
            if(userInfo.getBalance() == null || userInfo.getBalance() < orderMoney){
                return ResultUtil.error("余额不足，无法完成支付");
            }
            resultUtil= appOrderController.moneyPay(orderId,userInfo.getId(),orderMoney);
            if(resultUtil.getCode()==500){
                return ResultUtil.error("电子余额不足，无法完成支付");
            }
//            resultUtil= appOrderController.moneyPay(orderId,userInfo.getId(),orderMoney);
//            if(resultUtil.getCode()==500){
//                return ResultUtil.error("电子余额不足，无法完成支付");
//            }

            userInfo.setBalance(new BigDecimal(userInfo.getBalance()).subtract(new BigDecimal(orderMoney)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());

@@ -1618,10 +1618,10 @@
            if(userInfo.getBalance() == null || userInfo.getBalance() < money){
                return ResultUtil.error("余额不足，无法完成支付");
            }
            resultUtil= appOrderController.moneyPay(orderId,userInfo.getId(),money);
            if(resultUtil.getCode()==500){
                return ResultUtil.error("电子余额不足，无法完成支付");
            }
//            resultUtil= appOrderController.moneyPay(orderId,userInfo.getId(),money);
//            if(resultUtil.getCode()==500){
//                return ResultUtil.error("电子余额不足，无法完成支付");
//            }

            userInfo.setBalance(new BigDecimal(userInfo.getBalance()).subtract(new BigDecimal(money)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());