经销商管理

doum

13 小时以前 fbdbb67c9de7a99398b5776435abb69352a11845

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

@@ -483,7 +483,7 @@
            dealOrderDetailsBiz(idList,result);//查询订单明细
        }
        PageData<Goodsorder> rr =  PageData.from(result);
        if(pageWrap.getPage() == 1){
        if(pageWrap.getPage() == 1  && pageWrap.getModel().getNeedCount()!=null&& pageWrap.getModel().getNeedCount()){
            //如果查询第一页，做数据统计
            rr.setCountData(dealCountOrderNum(pageWrap));
        }
@@ -660,41 +660,42 @@


    @Override
    public List<Goodsorder> exportExcel(Goodsorder pageWrap) {

        MPJLambdaWrapper<Goodsorder> queryWrapper = new MPJLambdaWrapper<>();


        queryWrapper.selectAll(Goodsorder.class);
        queryWrapper.selectAs(GoodsorderDetail::getName,Goodsorder::getGoodsName);
        queryWrapper.selectAs(GoodsorderDetail::getSkuName,Goodsorder::getSkuName);
        queryWrapper.selectAs(GoodsorderDetail::getGoodsNum,Goodsorder::getGoodsNum);
        queryWrapper.selectAs(GoodsorderDetail::getPrice,Goodsorder::getGoodsPrice);
        queryWrapper.selectAs(Member::getNickname,Goodsorder::getNickName);
        queryWrapper.selectAs(Member::getPhone,Goodsorder::getPhone);
        queryWrapper.selectAs(Addr::getAddr,Goodsorder::getAddr);
        queryWrapper.select("(select CREATE_DATE  from order_urge where ORDER_ID=t.id and ISDELETED=0 ORDER BY CREATE_DATE desc limit 1) as urgeCreateDate ");
        queryWrapper.leftJoin(Member.class,Member::getId,Goodsorder::getMemberId);
        queryWrapper.leftJoin(Addr.class,Addr::getMemberId,Member::getId);
        queryWrapper.leftJoin(GoodsorderDetail.class,GoodsorderDetail::getOrderId,Goodsorder::getId);
        queryWrapper.eq(GoodsorderDetail::getIsdeleted,Constants.ZERO);
        queryWrapper.eq(Addr::getIsDefault,Constants.ONE);

        queryWrapper.eq(pageWrap.getCode()!=null,Goodsorder::getCode,pageWrap.getCode());
        queryWrapper.and(StringUtils.isNotBlank(pageWrap.getNickName()),ms->ms.like(Goodsorder::getLinkname,pageWrap.getNickName())
                .or().like(Goodsorder::getLinkphone,pageWrap.getNickName())
        );
        queryWrapper.ge(pageWrap.getStarttime()!=null,Goodsorder::getCreateDate,pageWrap.getStarttime());
        queryWrapper.le(pageWrap.getEndtime()!=null,Goodsorder::getCreateDate, pageWrap.getEndtime());

        queryWrapper.eq(pageWrap.getStatus()!=null,Goodsorder::getStatus,pageWrap.getStatus());
        queryWrapper.eq(pageWrap.getIsdeleted()==null,Goodsorder::getIsdeleted,Constants.ZERO);
        queryWrapper.eq(pageWrap.getIsdeleted()!=null,Goodsorder::getIsdeleted,pageWrap.getIsdeleted());
        queryWrapper.orderByDesc(Goodsorder::getCreateDate);

        List<Goodsorder> result = goodsorderJoinMapper.selectJoinList(Goodsorder.class, queryWrapper);


    public List<GoodsorderExport> exportExcel(PageWrap<Goodsorder> pageWrap) {
        pageWrap.getModel().setNeedCount(false);
        PageData<Goodsorder> list = findPage(pageWrap);
        List<GoodsorderExport> result = new ArrayList<>();
        if(list!=null && list.getRecords()!=null){
            for(Goodsorder order: list.getRecords()){
                GoodsorderExport param = new GoodsorderExport();
                param.setCode(order.getCode());
                String goodsInfo = "";
                int goodsNum= 0;
                if(order.getGoodsorderDetailList()!=null && order.getGoodsorderDetailList().size()>0){
                    for(GoodsorderDetail detail:order.getGoodsorderDetailList()){
                        goodsNum += Constants.formatIntegerNum(detail.getGoodsNum());
                        goodsInfo+= StringUtils.defaultString(detail.getName(),"")+"/"+Constants.formatBigdecimal(detail.getGoodsWeight())+"kg"
                                +"("+Constants.formatBigdecimal(detail.getPrice())+"  x  "+Constants.formatIntegerNum(detail.getGoodsNum())+")；\n";
                    }
                }
                param.setTotalNum(goodsNum);
                param.setGoodsName(goodsInfo);
                param.setTotalPrice(order.getTotalPrice());
                param.setIntegralPrice(order.getIntegral());
                param.setCouponPrice(order.getCouponPrice());
                param.setMailPrice(order.getMailPrice());
                param.setPrice(order.getPrice());
                param.setShopName(order.getShopName());
                param.setShopSettlement(order.getShopSettlement());
                param.setReceiveType(order.getReceiveType());
                param.setLinkname(order.getLinkname());
                param.setLinkphone(order.getLinkphone());
                param.setAddr(order.getLinkaddr());
                param.setKdInfo(StringUtils.defaultString(order.getKdName(),"")+StringUtils.defaultString(order.getKdCode(),""));
                param.setStatus(order.getStatus());
                param.setCreateDate(order.getCreateDate());
                result.add(param);
            }
        }
        return result;
    }

@@ -1366,8 +1367,7 @@
            throw new BusinessException(ResponseStatus.DATA_EMPTY);
        }
        if(!(Constants.equalsInteger(goodsorder.getStatus(),Constants.OrderStatus.WAIT_PAY.getKey())
            || Constants.equalsInteger(goodsorder.getStatus(),Constants.OrderStatus.PAY_DONE.getKey())
            || Constants.equalsInteger(goodsorder.getStatus(),Constants.OrderStatus.WAIT_RECEIVE.getKey()) )){
            || Constants.equalsInteger(goodsorder.getStatus(),Constants.OrderStatus.PAY_DONE.getKey()) )){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"订单取消失败：订单状态已流转！");
        }
        if(Constants.formatBigdecimal(goodsorder.getPrice()).compareTo(BigDecimal.ZERO)>Constants.ZERO
@@ -1388,7 +1388,9 @@
            fund.setNum(goodsorder.getPrice());
            fundMapper.insert(fund);
        }
        if(goodsorder.getIntegral().compareTo(BigDecimal.ZERO)>Constants.ZERO){
        //订单已支付状态 ， 使用了积分 且积分使用大于0
        if(goodsorder.getIntegral().compareTo(BigDecimal.ZERO)>Constants.ZERO
                &&Constants.equalsInteger(goodsorder.getStatus(),Constants.OrderStatus.PAY_DONE.getKey())){
            //更新余额信息 添加积分变动记录
            DealIntegralRequest dealIntegralRequest = new DealIntegralRequest();
            dealIntegralRequest.setIntegralNum(goodsorder.getIntegral());
@@ -1432,10 +1434,6 @@
            }
        }
    }





    public BigDecimal getDeductAmount(List<PayDetailRequest> requestList){
        List<MemberCoupon> memberCouponList = new ArrayList<>();
@@ -1949,6 +1947,7 @@
        }
    }


    @Override
    @Transactional(rollbackFor = Exception.class)
    public void orderComment(OrderCommentRequest orderCommentRequest){
@@ -2023,7 +2022,7 @@
        ));
        myPageResponse.setAfterOrders(aftersaleMapper.selectCount(new QueryWrapper<Aftersale>()
                .apply(" ID in ( select g.id from goodsorder g where g.MEMBER_ID = '"+memberId+"'  ) ")
                .notIn("STATUS",Constants.AftersaleStatus.DONE,Constants.AftersaleStatus.SHOP_REFUSE,Constants.AftersaleStatus.CANCEL)
                .notIn("STATUS",Constants.AftersaleStatus.DONE.getKey(),Constants.AftersaleStatus.SHOP_REFUSE.getKey(),Constants.AftersaleStatus.CANCEL.getKey())
        ));