12.18

luodangjia

2025-01-14 4dc16eb5214bbfd2f75b0662761a30527a21bbe4

12.18

 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">