小程序 接口开发

rk

2 天以前 7a38456f48d541d737fb46d19f49484b67a806d0

小程序   接口开发

 server/dmmall_service/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java

@@ -1586,7 +1586,8 @@
                integralBack = payAmount.divide(platformConfigDTO.getReturnShopIntegral(),2,BigDecimal.ROUND_DOWN);
            }
        }
        return integralBack;
        //积分获取向下取整
        return integralBack.setScale(0, BigDecimal.ROUND_DOWN);
    }


@@ -1642,8 +1643,9 @@
        }
        //剩余积分值
        orderPayConfirmResponse.setSurplusIntegral(totalIntegral);
        //实际抵扣使用积分
        orderPayConfirmResponse.setDeductIntegral(totalIntegral.compareTo(maxDeductionIntegral)<=Constants.ZERO?totalIntegral:maxDeductionIntegral);
        //实际抵扣使用积分（向上取整）
        BigDecimal deductIntegralValue = totalIntegral.compareTo(maxDeductionIntegral)<=Constants.ZERO?totalIntegral:maxDeductionIntegral;
        orderPayConfirmResponse.setDeductIntegral(deductIntegralValue.setScale(0, BigDecimal.ROUND_UP));
        return realDeductionCash;

    }

 server/dmmall_service/src/main/java/com/doumee/service/business/impl/IntegralServiceImpl.java

@@ -150,6 +150,14 @@
    @Override
    @Transactional(rollbackFor = {Exception.class, BusinessException.class})
    public Integer dealIntegral(DealIntegralRequest dealIntegralRequest,Member member) {
        // 积分取整：获取向下取整，消耗向上取整
        if(dealIntegralRequest.getIntegralNum() != null){
            if(Constants.equalsInteger(dealIntegralRequest.getDealType(),Constants.ZERO)){
                dealIntegralRequest.setIntegralNum(dealIntegralRequest.getIntegralNum().setScale(0, BigDecimal.ROUND_DOWN));
            }else{
                dealIntegralRequest.setIntegralNum(dealIntegralRequest.getIntegralNum().setScale(0, BigDecimal.ROUND_UP));
            }
        }
        if(member == null){
              member = memberMapper.selectById(dealIntegralRequest.getMemberId());
        }
@@ -163,7 +171,7 @@
        integral.setIsdeleted(Constants.ZERO);
        integral.setTitle(dealIntegralRequest.getIntegralObjType().getName());
        String info = dealIntegralRequest.getIntegralObjType().getNoteinfo();
        info = info.replace("${param}",dealIntegralRequest.getIntegralNum()+"");
        info = info.replace("${param}",dealIntegralRequest.getIntegralNum().toBigInteger().toString());
        if(StringUtils.isNotBlank(dealIntegralRequest.getParam1())){
            info = info .replace("${param1}",dealIntegralRequest.getParam1());
        }
@@ -196,6 +204,14 @@

    @Override
    public Integer dealShopIntegral(DealIntegralRequest dealIntegralRequest,Shop shop) {
        // 积分取整：获取向下取整，消耗向上取整
        if(dealIntegralRequest.getIntegralNum() != null){
            if(Constants.equalsInteger(dealIntegralRequest.getDealType(),Constants.ZERO)){
                dealIntegralRequest.setIntegralNum(dealIntegralRequest.getIntegralNum().setScale(0, BigDecimal.ROUND_DOWN));
            }else{
                dealIntegralRequest.setIntegralNum(dealIntegralRequest.getIntegralNum().setScale(0, BigDecimal.ROUND_UP));
            }
        }
        if(shop ==null){
            shop = shopMapper.selectById(dealIntegralRequest.getMemberId());
        }
@@ -208,7 +224,7 @@
        integral.setIsdeleted(Constants.ZERO);
        integral.setTitle( dealIntegralRequest.getIntegralObjType()!=null?dealIntegralRequest.getIntegralObjType().getName():"");
        String info = dealIntegralRequest.getIntegralObjType().getNoteinfo();
        info = info.replace("${param}",dealIntegralRequest.getIntegralNum().toString());
        info = info.replace("${param}",dealIntegralRequest.getIntegralNum().toBigInteger().toString());
        if(StringUtils.isNotBlank(dealIntegralRequest.getParam1())){
            info = info .replace("${param1}",dealIntegralRequest.getParam1());
        }