经销商管理

doum

13 小时以前 c384e04f81caf681647c602d5896cc10b289582e

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

@@ -253,13 +253,13 @@
                 .or().like(Member::getName,pageWrap.getModel().getNickname())
                .or().like(Member::getPhone,pageWrap.getModel().getNickname())
        );
        queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getShopName()),Shop::getStatus,pageWrap.getModel().getShopName());
        queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getShopName()),Shop::getName,pageWrap.getModel().getShopName());
        queryWrapper.eq(pageWrap.getModel().getStatus()!=null,Member::getStatus,pageWrap.getModel().getStatus());
        queryWrapper.eq(Member::getIsdeleted,Constants.ZERO);
        queryWrapper.ge(pageWrap.getModel().getStarttime()!=null, Member::getCreateDate,pageWrap.getModel().getStarttime());
        queryWrapper.le(pageWrap.getModel().getEndtime()!=null,Member::getCreateDate, pageWrap.getModel().getEndtime());

        queryWrapper.orderByDesc(Member::getCreateDate);
        queryWrapper.orderByDesc(Member::getId);

        IPage<Member> result = memberJoinMapper.selectJoinPage(page, Member.class, queryWrapper);

@@ -269,6 +269,10 @@
            for(Member model:result.getRecords()){
                if(StringUtils.isNotBlank(model.getImgurl())){
                    model.setImgFullUrl(path);
                }
                model.setTotalReduceIntegral(Constants.formatBigdecimal(model.getTotalIntegral()).subtract(Constants.formatBigdecimal(model.getIntegral())));
                if(model.getTotalReduceIntegral().compareTo(new BigDecimal(0)) <=0){
                    model.setTotalReduceIntegral(new BigDecimal(0));
                }
            }
        }
@@ -425,7 +429,7 @@
            dealIntegralRequest.setDealType(Constants.ZERO);
            dealIntegralRequest.setMemberId(member.getId());
            dealIntegralRequest.setIntegralObjType(Constants.IntegralObjType.REGISTER);
            integralService.dealIntegral(dealIntegralRequest);
            integralService.dealIntegral(dealIntegralRequest,null);
        }
        //开启注册送优惠券
        if(Constants.equalsInteger(platformConfigDTO.getRegCouponRewardStatus(),Constants.ZERO)){
@@ -480,7 +484,7 @@
            dealIntegralRequest.setMemberId(member.getRecId());
            dealIntegralRequest.setIntegralObjType(Constants.IntegralObjType.INVITENEWUSER);
            dealIntegralRequest.setParam1(member.getNickname());
            integralService.dealIntegral(dealIntegralRequest);
            integralService.dealIntegral(dealIntegralRequest,null);
        }
    }

@@ -735,7 +739,7 @@
                dealIntegralRequest.setObjId(s.getId());
                dealIntegralRequest.setOrderCode(null);
                dealIntegralRequest.setDealType(memberRechargeDTO.getIntegralType());
                integralService.dealIntegral(dealIntegralRequest);
                integralService.dealIntegral(dealIntegralRequest,null);
            });
//            integralService.dealIntegral()
        } catch (Exception e) {
@@ -769,7 +773,7 @@
        dealIntegralRequest.setObjId(memberRechargeDTO.getMemberId());
        dealIntegralRequest.setOrderCode(null);
        dealIntegralRequest.setDealType(memberRechargeDTO.getIntegralType());
        Integer integer = integralService.dealIntegral(dealIntegralRequest);
        Integer integer = integralService.dealIntegral(dealIntegralRequest,null);
        return integer;
    }