经销商管理

doum

9 小时以前 666a942f5f2b59209cf422bb202f6548fbbe212e

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

@@ -317,14 +317,14 @@
        Utils.MP.blankToNull(pageWrap.getModel());

        queryWrapper.selectAll(Integral.class);
        queryWrapper.selectAs(Member::getNickname, Fund::getNickName);
        queryWrapper.selectAs(Member::getImgurl, Fund::getImgurl);
        queryWrapper.selectAs(Member::getPhone, Fund::getPhone);

        queryWrapper.selectAs(Member::getNickname, Integral::getNickName);
        queryWrapper.selectAs(Member::getImgurl, Integral::getImgurl);
        queryWrapper.selectAs(Member::getPhone, Integral::getPhone);
        queryWrapper.leftJoin(Member.class, Member::getId, Integral::getMemberId);

        queryWrapper.eq(pageWrap.getModel().getMemberId() != null, Integral::getMemberId, pageWrap.getModel().getMemberId());
        queryWrapper.eq(pageWrap.getModel().getType() != null, Integral::getType, pageWrap.getModel().getType());
        queryWrapper.eq(pageWrap.getModel().getUserType() != null, Integral::getUserType, pageWrap.getModel().getUserType());
        queryWrapper.eq(  pageWrap.getModel().getObjType() !=null, Integral::getObjType, pageWrap.getModel().getObjType());
        queryWrapper.and(StringUtils.isNotBlank(pageWrap.getModel().getNickName()), ms -> ms.like(Member::getNickname, pageWrap.getModel().getNickName())
                .or().like(Member::getPhone, pageWrap.getModel().getNickName())
        );
@@ -416,7 +416,7 @@

        if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(result.getRecords())){
            for (Integral integral:result.getRecords()) {
                integral.setStrType(Constants.IntegralObjType.getName(integral.getObjType()));
                integral.setStrObjType(Constants.IntegralObjType.getName(integral.getObjType()));
            }
        }
        return PageData.from(result);
@@ -436,7 +436,7 @@
        Date date = new Date();
        Integral integral = new Integral();
        Constants.IntegralObjType integralObjType =null;
        if(Constants.equalsInteger(param.getUserType(), Constants.ZERO)){
        if(Constants.equalsInteger(param.getUserType(), Constants.ZERO)){//用户账号
            MPJLambdaWrapper<Member> queryWrapper =new MPJLambdaWrapper<>();
            queryWrapper.selectAll(Member.class);
            queryWrapper.selectAs(Shop::getName,Member::getShopName);
@@ -463,8 +463,9 @@
                    .setSql(param.getType() == 1,"integral = ifnull(integral,0)-" + param.getNum()));

            integralObjType = param.getType()==0?Constants.IntegralObjType.SYSTEM_RECHARGE:Constants.IntegralObjType.SYSTEM_DEDUCT;
            integral.setTotalNum(param.getType() == 0? Constants.formatBigdecimal(model.getIntegral()).add(integral.getNum()):Constants.formatBigdecimal(model.getIntegral()).subtract(integral.getNum()));
        }else{
            integral.setTotalNum(param.getType() == 0? Constants.formatBigdecimal(model.getIntegral()).add(param.getNum()):Constants.formatBigdecimal(model.getIntegral()).subtract(param.getNum()));
            integral.setUserType(Constants.ZERO);
        }else{//经销商账户
            Shop model = shopMapper.selectById(param.getMemberId());
            if(model == null ||Constants.equalsObject(model.getIsdeleted(),Constants.ONE)){
                throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"经销商信息查询无效！");
@@ -483,9 +484,9 @@
                    .setSql(param.getType() == 0,"total_integral = ifnull(total_integral,0)+" + num)//累计增加
                    .setSql(param.getType() == 0,"integral = ifnull(integral,0)+" + param.getNum())
                    .setSql(param.getType() == 1,"integral = ifnull(integral,0)-" + param.getNum()));

             integralObjType = param.getType()==0?Constants.IntegralObjType.SHOP_SYSTEM_RECHARGE:Constants.IntegralObjType.SHOP_SYSTEM_DEDUCT;
            integral.setTotalNum(param.getType() == 0? Constants.formatBigdecimal(model.getIntegral()).add(integral.getNum()):Constants.formatBigdecimal(model.getIntegral()).subtract(integral.getNum()));
            integralObjType = param.getType()==0?Constants.IntegralObjType.SHOP_SYSTEM_RECHARGE:Constants.IntegralObjType.SHOP_SYSTEM_DEDUCT;
            integral.setTotalNum(param.getType() == 0? Constants.formatBigdecimal(model.getIntegral()).add(param.getNum()):Constants.formatBigdecimal(model.getIntegral()).subtract(param.getNum()));
            integral.setUserType(Constants.ONE);
        }
        integral.setCreateDate(new Date());
        integral.setCreator(user.getId());
@@ -499,7 +500,6 @@
        integral.setType(param.getType());
        integral.setRemark(param.getRemark());
        integral.setOrderCode(null);
        integral.setUserType(Constants.ZERO);
        integralMapper.insert(integral);
    }
    @Override