111

k94314517

2025-03-20 3d3ed4872b5038a8cc72abc72f95fc2c134e7bc4

111

 server/services/src/main/java/com/doumee/dao/business/model/DiscountMember.java

@@ -56,7 +56,7 @@
    private String name;

    @ApiModelProperty(value = "类型 0期限卡 1次卡", example = "1")
    @ExcelColumn(name="套餐类型",index = 1,valueMapping = "0=期限卡；1=次卡；",width = 10)
    @ExcelColumn(name="套餐类型",index = 1,valueMapping = "0=期限卡;1=次卡;",width = 10)
    private Integer type;

    @ApiModelProperty(value = "每日骑行限制类型 0不限制 1限制", example = "1")

 server/services/src/main/java/com/doumee/service/business/impl/DiscountMemberServiceImpl.java

@@ -144,8 +144,8 @@
                .like(StringUtils.isNotBlank(model.getName()),DiscountMember::getName,model.getName())
                .like(StringUtils.isNotBlank(model.getOpenid()),Member::getOpenid,model.getOpenid())
                .eq(Objects.nonNull(model.getStatus()),DiscountMember::getStatus,model.getStatus())
                .ge(Objects.nonNull(model.getStartCreateDate()),DiscountMember::getCreateDate, Utils.Date.getStart(model.getStartCreateDate()))
                .le(Objects.nonNull(model.getEndCreateDate()),DiscountMember::getCreateDate, Utils.Date.getStart(model.getEndCreateDate()))
                .ge(Objects.nonNull(model.getStartCreateDate()),DiscountMember::getCreateDate, model.getStartCreateDate())
                .le(Objects.nonNull(model.getEndCreateDate()),DiscountMember::getCreateDate, model.getEndCreateDate())
                .ne(DiscountMember::getStatus,Constants.TWO)
                .orderByDesc(DiscountMember::getCode);
        return PageData.from(discountMemberJoinMapper.selectJoinPage(page, DiscountMember.class,queryWrapper));

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

@@ -252,7 +252,7 @@

        if (!CollectionUtils.isEmpty(goodsorderExportVOIPage.getRecords())){
            goodsorderExportVOIPage.getRecords().forEach(s->{
                s.setBikeType(s.getType()!=Constants.ZERO?s.getBikeType():Constants.ONE);
                s.setBikeType(s.getType()==Constants.ZERO?s.getBikeType():Constants.ONE);
                s.setMoney(Constants.translateMoney(s.getMoney()));
                s.setRefundMoney(Constants.translateMoney(s.getRefundMoney()));
                s.setCloseMoney(Constants.translateMoney(s.getCloseMoney()).compareTo(s.getMoney()) > 0 ? s.getMoney() : Constants.translateMoney(s.getCloseMoney()));
@@ -296,6 +296,7 @@
        }
        if (!CollectionUtils.isEmpty(goodsorderList)){
            goodsorderList.forEach(s->{
                s.setBikeType(s.getType()==Constants.ZERO?s.getBikeType():Constants.ONE);
                s.setMoney(Constants.translateMoney(s.getMoney()));
                s.setCloseMoney(Constants.translateMoney(s.getCloseMoney()).compareTo(s.getMoney()) > 0 ? s.getMoney() : Constants.translateMoney(s.getCloseMoney()));
                s.setRefundMoney(Constants.translateMoney(s.getRefundMoney()));
@@ -323,6 +324,7 @@
        if (Objects.nonNull(model.getEndDate())){
            queryWrapper.le( Goodsorder::getPayDate, Utils.Date.getEnd(model.getEndDate()));
        }
        queryWrapper.eq(Objects.nonNull(model.getBikeType()),BaseParam::getType,model.getBikeType());
        queryWrapper.eq(Constants.equalsInteger(model.getType(),Constants.ONE)&&model.getPayStatus() !=null,Goodsorder::getPayStatus,model.getPayStatus());
        queryWrapper.like(model.getCode() !=null,Goodsorder::getCode,model.getCode());
        queryWrapper.like(model.getId() !=null,Goodsorder::getId,model.getId());
@@ -1419,6 +1421,7 @@
    public void autoCloseOrder( ) {
        Goodsorder goodsorder = new Goodsorder();
        goodsorder.setIsdeleted(Constants.ZERO);
        goodsorder.setType(Constants.ZERO);
        goodsorder.setStatus(Constants.goodsorderStatus.pay);
        List<Goodsorder> list = findList(goodsorder);
        if (!CollectionUtils.isEmpty(list)){
@@ -1435,8 +1438,8 @@
                }
            });
        }

    }

    @Override
    public void goodsOrderSettlement(String memberId) {
        Goodsorder goodsorder = this.goodsorderMapper.selectOne(new QueryWrapper<Goodsorder>()
@@ -1713,7 +1716,7 @@
                BigDecimal amount = goodsorderList.stream()
                        .filter(i->StringUtils.isNotBlank(i.getParamId())&&DateUtil.getShortDateStr(date).equals(DateUtil.getShortDateStr(i.getCreateDate()))&&baseParam.getId().equals(i.getParamId()))
                        .map(i->i.getCloseMoney()).reduce(BigDecimal.ZERO,BigDecimal::add);
                dataChildList.add(amount.toString());
                dataChildList.add(amount.divide(new BigDecimal("100"),2,BigDecimal.ROUND_HALF_UP).toString());
                totalAmount  = amount.add(totalAmount);
            }
            BikeIncomeDetailReportVO detail = new BikeIncomeDetailReportVO();