Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng

无关风月

2025-01-14 07d470e55405cbfab1a7d38eeeb8907e741401df

Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -441,7 +441,6 @@
     * @return 结果
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public int deleteUserByIds(Long[] userIds) {
        Long userid = tokenService.getLoginUser().getUserid();
        SysUser sysUser = this.getById(userid);

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java

@@ -301,8 +301,12 @@
                .orderByAsc(Order::getCreateTime));


        Map<String, List<Order>> map = orderList.stream().collect(Collectors.groupingBy(item -> item.getCreateTime()
                .format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))));
        Map<String, List<Order>> map = orderList.stream()
                .collect(Collectors.groupingBy(
                        item -> item.getCreateTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")),
                        TreeMap::new, // 使用 TreeMap 按键排序
                        Collectors.toList()
                ));

        List<OrderStatisticsDetail> orderStatisticsDetails = new ArrayList<>();
        map.forEach((key, value) -> {

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java

@@ -330,8 +330,19 @@
            }
//            RefundPass one = refundPassService.getOne(new LambdaQueryWrapper<RefundPass>().eq(RefundPass::getOrderId, orderPageListVo.getId()).eq(RefundPass::getDelFlag, 0).last(" order by create_time desc limit 0,1"));
            RefundPass one = refundPassService.lambdaQuery().eq(RefundPass::getOrderId, orderPageListVo.getId()).one();

            orderPageListVo.setRefundPassId(null != one ? one.getId().toString() : null);

            List<OrderGood> orderGoods = orderGoodMapper.selectList(new LambdaQueryWrapper<OrderGood>()
                    .eq(OrderGood::getOrderId, orderPageListVo.getId()));
            BigDecimal servuceShopCharges = BigDecimal.ZERO;
            BigDecimal boundShopCharges = BigDecimal.ZERO;
            for (OrderGood orderGood : orderGoods) {
                if(orderPageListVo.getShopId().equals(orderPageList.getShopId())){
                    servuceShopCharges = servuceShopCharges.add(orderGood.getServuceShopCharges());
                }
                boundShopCharges = boundShopCharges.add(orderGood.getBoundShopCharges());
            }
            orderPageListVo.setGetCommission(servuceShopCharges.add(boundShopCharges));
        }
        return pageInfo.setRecords(list);
    }

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderPageListVo.java

@@ -37,6 +37,8 @@
    private Integer status;
    @ApiModelProperty("配送方式（1=自提，2=快递）")
    private Integer distributionMode;
    @ApiModelProperty("获得分佣")
    private BigDecimal getCommission;
    /**
     * 用户id
     */
@@ -44,6 +46,8 @@
    @ApiModelProperty("售后订单id")
    private String refundPassId;

    private Integer shopId;

    public BigDecimal getGetPoint(){
        return point;
    }

 ruoyi-service/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml

@@ -61,6 +61,7 @@
            total_amount as orderMoney,
            point,
            order_status as status,
            shop_id,
            distribution_mode as distributionMode
        from t_order where del_flag = 0 and pay_status = 2
        <if test="null != item.code and '' != item.code">