jtt808初始化

jiangping

2025-03-18 34d668bf654e861b2c8b3eb8d1faa09e1ae6246a

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

@@ -1016,6 +1016,7 @@
            model.setPayMoney(new BigDecimal(0.00));
            model.setRefundMoney(new BigDecimal(0.00));
            model.setClosedMoney(new BigDecimal(0.00));
            model.setDiscountMoney(new BigDecimal(0.00));
            model.setUnClosedMoney(new BigDecimal(0.00));
            model.setClosedNum(0);
            model.setUnClosedNum(0);
@@ -1030,28 +1031,36 @@
            }
            queryWrapper.lambda().eq(Goodsorder::getPayStatus, Constants.ONE);//已支付
            queryWrapper.lambda().eq(Goodsorder::getIsdeleted, Constants.ZERO);
            queryWrapper.lambda().groupBy(Goodsorder::getStatus);
            queryWrapper.select( "status ","count(id) as count_num"
            queryWrapper.lambda().groupBy(Goodsorder::getStatus,Goodsorder::getType);
            queryWrapper.select( "type","status ","count(id) as count_num"
                    ,"sum(money) as money","sum(close_money) as close_money" );
            //按订单状态分组统计
            List<Goodsorder> detailList = goodsorderMapper.selectList(queryWrapper);
            for(Goodsorder goodsorder : detailList){
                if(Constants.formatIntegerNum(goodsorder.getStatus()) == Constants.GOODSORDER_STATUS.CLOSE.getKey()){
                    //已结算
                    model.setClosedNum(model.getClosedNum()+goodsorder.getCountNum());
                    //修改bug 结算收入 = 支付金额-退款-未结算
                if(Constants.equalsInteger(goodsorder.getType(),Constants.ZERO)){
                    //如果是骑行订单押金，计算骑行收入
                    if(Constants.formatIntegerNum(goodsorder.getStatus()) == Constants.GOODSORDER_STATUS.CLOSE.getKey()){
                        //已结算
                        model.setClosedNum(model.getClosedNum()+goodsorder.getCountNum());
                        //修改bug 结算收入 = 支付金额-退款-未结算
//                    model.setClosedMoney(model.getClosedMoney().add(Constants.translateMoney(goodsorder.getCloseMoney())));

                    model.setPayNum(model.getPayNum()+goodsorder.getCountNum());
                    model.setPayMoney(model.getPayMoney().add(Constants.translateMoney(goodsorder.getMoney())));
                }else  if(Constants.formatIntegerNum(goodsorder.getStatus()) == Constants.GOODSORDER_STATUS.HAVING_PAY.getKey()){
                    //已支付未结算
                    model.setUnClosedNum(model.getUnClosedNum()+goodsorder.getCountNum());
                    model.setUnClosedMoney(model.getUnClosedMoney().add(Constants.translateMoney(goodsorder.getMoney())));
                        model.setPayNum(model.getPayNum()+goodsorder.getCountNum());
                        model.setPayMoney(model.getPayMoney().add(Constants.translateMoney(goodsorder.getMoney())));
                    }else  if(Constants.formatIntegerNum(goodsorder.getStatus()) == Constants.GOODSORDER_STATUS.HAVING_PAY.getKey()){
                        //已支付未结算
                        model.setUnClosedNum(model.getUnClosedNum()+goodsorder.getCountNum());
                        model.setUnClosedMoney(model.getUnClosedMoney().add(Constants.translateMoney(goodsorder.getMoney())));

                    model.setPayNum(model.getPayNum()+goodsorder.getCountNum());
                    model.setPayMoney(model.getPayMoney().add(Constants.translateMoney(goodsorder.getMoney())));
                        model.setPayNum(model.getPayNum()+goodsorder.getCountNum());
                        model.setPayMoney(model.getPayMoney().add(Constants.translateMoney(goodsorder.getMoney())));
                    }
                }else{
                    //套餐卡收入累计 (交易笔数和交易金额）
                    model.setDiscountNum(model.getDiscountNum()+goodsorder.getCountNum());
                    model.setDiscountMoney(model.getDiscountMoney().add(Constants.translateMoney(goodsorder.getMoney())));
                }

            }
        QueryWrapper<Refund> queryWrapper2 = new QueryWrapper<>();
        if(Objects.nonNull(param.getStartDate())) {