合并代码

puzhibing

2024-12-23 f242052d9726908a1ae7ebe97e76c237e5ce3fba

合并代码

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java

@@ -687,8 +687,11 @@
                    commissionDate.setDiamondCommission(dailyCommissions.getOrDefault(3, BigDecimal.ZERO));
                    commissionDate.setAgentCommission(dailyCommissions.getOrDefault(4, BigDecimal.ZERO));
                    commissionDate.setSuperAgentCommission(dailyCommissions.getOrDefault(5, BigDecimal.ZERO));
                    commissionDate.setPartnerCommission(dailyCommissions.getOrDefault(6, BigDecimal.ZERO));
                    commissionDate.setTopAgentCommission(dailyCommissions.getOrDefault(6, BigDecimal.ZERO));
                    commissionDate.setPartnerCommission(dailyCommissions.getOrDefault(7, BigDecimal.ZERO));
                    BigDecimal add = commissionDate.getNormalCommission().add(commissionDate.getGoldCommission()).add(commissionDate.getDiamondCommission()).add(commissionDate.getAgentCommission())
                            .add(commissionDate.getSuperAgentCommission()).add(commissionDate.getTopAgentCommission()).add(commissionDate.getPartnerCommission());
                    commissionDate.setTotalCommission(add);
                    return commissionDate;
                })
                .collect(Collectors.toList());

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/vo/CommissionDate.java

@@ -37,6 +37,11 @@
    private BigDecimal superAgentCommission;

    /**
     * 总代分佣
     */
    private BigDecimal topAgentCommission;

    /**
     * 合伙人分佣
     */
    private BigDecimal partnerCommission;

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

@@ -281,7 +281,7 @@
                                                 @RequestParam("endTime") String endTime){

        List<Order> orderList = orderService.list(new LambdaQueryWrapper<Order>()
                .between(Order::getCreateTime, LocalDateTime.parse(startTime), LocalDateTime.parse(endTime)));
                .between(Order::getCreateTime, LocalDateTime.parse(startTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")), LocalDateTime.parse(endTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))));


        Map<String, List<Order>> map = orderList.stream().collect(Collectors.groupingBy(item -> item.getCreateTime()
@@ -313,8 +313,10 @@
            orderStatisticsDetail.setTotal(total);
            orderStatisticsDetails.add(orderStatisticsDetail);
        });
        OrderStatistics orderStatistics = orderMapper.getOrderStatistics(LocalDateTime.parse(startTime), LocalDateTime.parse(endTime));
        orderStatistics.setOrderStatisticsDetailList(orderStatisticsDetails);
        OrderStatistics orderStatistics = orderMapper.getOrderStatistics(startTime, endTime);
        if(null != orderStatistics){
            orderStatistics.setOrderStatisticsDetailList(orderStatisticsDetails);
        }
        return R.ok(orderStatistics);
    }


 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/OrderMapper.java

@@ -34,6 +34,6 @@
     */
    List<OrderPageListVo> getOrderPageList(PageInfo<OrderPageListVo> pageInfo,  @Param("item") OrderPageList orderPageList);

    OrderStatistics getOrderStatistics(@Param("startTime")LocalDateTime startTime,
                                       @Param("endTime") LocalDateTime endTime);
    OrderStatistics getOrderStatistics(@Param("startTime")String startTime,
                                       @Param("endTime") String endTime);
}

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

@@ -79,21 +79,16 @@
    </select>
    <select id="getOrderStatistics" resultType="com.ruoyi.order.vo.OrderStatistics">
        SELECT
            count(*),
            SUM( CASE WHEN tor.order_type = 1 THEN 1 ELSE 0 END ) a,
            SUM( CASE WHEN tor.order_type = 2 THEN 1 ELSE 0 END ) b,
            SUM( tor.total_amount ) c,
            SUM( CASE WHEN tor.order_type = 1 THEN tor.total_amount ELSE 0 END ),
            SUM( CASE WHEN tor.order_type = 2 THEN tor.total_amount ELSE 0 END )
            count(*) as total,
            SUM( CASE WHEN tor.order_type = 1 THEN 1 ELSE 0 END ) as serviceTotal,
            SUM( CASE WHEN tor.order_type = 2 THEN 1 ELSE 0 END ) as singleTotal,
            SUM( tor.total_amount ) as totalMoney,
            SUM( CASE WHEN tor.order_type = 1 THEN tor.total_amount ELSE 0 END ) as serviceTotalMoney,
            SUM( CASE WHEN tor.order_type = 2 THEN tor.total_amount ELSE 0 END ) as singleTotalMoney
        FROM
            t_order tor
        <where>
            <if test="startTime != null">
                and tor.create_time <![CDATA[>=]]> #{startTime}
            </if>
            <if test="endTime != null">
                and tor.create_time <![CDATA[<=]]> #{endTime}
            </if>
        </where>
        t_order tor where 1 = 1
        <if test="startTime != null and '' != startTime and endTime != null and '' != endTime">
            and tor.create_time between #{startTime} and #{endTime}
        </if>
    </select>
</mapper>

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsBargainPriceServiceImpl.java

@@ -55,11 +55,12 @@
        SysUser sysUser = sysUserClient.getSysUser(userid).getData();
        GoodsBargainPrice bargainPrice = this.getOne(new LambdaQueryWrapper<GoodsBargainPrice>().eq(GoodsBargainPrice::getShopId, sysUser.getObjectId())
                .eq(GoodsBargainPrice::getGoodsId, id).eq(GoodsBargainPrice::getDelFlag, 0).last(" order by create_time desc limit 0, 1"));
        GoodsBargainPriceInfo info = new GoodsBargainPriceInfo();
        if(null == bargainPrice){
            return null;
            return info;
        }
        List<GoodsBargainPriceDetail> list = goodsBargainPriceDetailService.list(new LambdaQueryWrapper<GoodsBargainPriceDetail>().eq(GoodsBargainPriceDetail::getGoodsBargainPriceId, bargainPrice.getId()));
        GoodsBargainPriceInfo info = new GoodsBargainPriceInfo();

        info.setId(bargainPrice.getId().toString());
        info.setList(list);
        info.setAuditMsg(bargainPrice.getAuditMsg());