Merge remote-tracking branch 'origin/master'

luodangjia

2024-04-18 fa4530c5aad79ee375954d0cd42358a20cffdf94

Merge remote-tracking branch 'origin/master'

 common-buiness/src/main/java/cn/stylefeng/guns/modular/business/mapper/OrderMentalTestMapper.java

@@ -24,6 +24,6 @@

    OrderMentalTestDetailDTO getInfoById(@Param("id") Long id);

    List<Map<String, Object>> getStatOrderList(@Param("dateFormat") String dateFormat, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("workerId") Long workerId, @Param("statusList") List<Integer> statusList);
    List<Map<String, Object>> getStatOrderList(@Param("dateFormat") String dateFormat, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("workerId") Long workerId, @Param("statusList") List<Integer> statusList, @Param("orderNoList") List<String> orderNoList);

}

 common-buiness/src/main/java/cn/stylefeng/guns/modular/business/mapper/mapping/OrderMentalTestMapper.xml

@@ -66,6 +66,12 @@
                    #{item}
                </foreach>
            </if>
            <if test="orderNoList != null and orderNoList.size != 0">
                AND o.order_no IN
                <foreach collection="orderNoList" item="item" open="(" separator="," close=")">
                    #{item}
                </foreach>
            </if>
            <if test="workerId != null">
                AND o.user_id = #{workerId}
            </if>

 common-buiness/src/main/java/cn/stylefeng/guns/modular/business/service/IOrderMentalTestService.java

@@ -65,6 +65,6 @@
    /**
     * 统计订单数据
     */
    List<Map<String, Object>> getStatOrderList(String dateFormat, String beginTime, String endTime, Long workerId, List<Integer> statusList);
    List<Map<String, Object>> getStatOrderList(String dateFormat, String beginTime, String endTime, Long workerId, List<Integer> statusList, List<String> orderNoList);

}

 common-buiness/src/main/java/cn/stylefeng/guns/modular/business/service/impl/CourseOrderServiceImpl.java

@@ -100,7 +100,7 @@
        }
        if (byId.getCourseUserId()!=null) {
            Customer byId1 = customerService.getById(byId.getCourseUserId());
            courseOrderResponseDTO.setCourseName(byId1.getNickName());
            courseOrderResponseDTO.setCourseUserName(byId1.getNickName());
        }
        if (byId.getTutoringUserId()!=null) {
            Customer byId1 = customerService.getById(byId.getTutoringUserId());

 common-buiness/src/main/java/cn/stylefeng/guns/modular/business/service/impl/OrderMentalTestServiceImpl.java

@@ -18,7 +18,6 @@

import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.Arrays;
import java.util.List;
import java.util.Map;

@@ -78,6 +77,18 @@
        MentalTestTopic topic = mentalTestTopicService.getById(topicId);
        Assert.notNull(topic, "题库不存在");

        // 查询题库后台添加的订单
        long isBackCount = this.count(
                Wrappers.<OrderMentalTest>lambdaQuery()
                        .eq(OrderMentalTest::getIsBack, true)
                        .eq(OrderMentalTest::getUserId, userId)
                        .eq(OrderMentalTest::getGoodsId, topicId)
        );
        if (isBackCount > 0) {
            // 以后的订单都标记为后台添加
            isBack = true;
        }

        // 获取用户最近创建的待支付订单
        OrderMentalTest o = this.baseMapper.selectOne(
                Wrappers.<OrderMentalTest>lambdaQuery()
@@ -133,8 +144,8 @@
    }

    @Override
    public List<Map<String, Object>> getStatOrderList(String dateFormat, String beginTime, String endTime, Long workerId, List<Integer> statusList) {
        return this.baseMapper.getStatOrderList(dateFormat, beginTime, endTime, workerId, statusList);
    public List<Map<String, Object>> getStatOrderList(String dateFormat, String beginTime, String endTime, Long workerId, List<Integer> statusList, List<String> orderNoList) {
        return this.baseMapper.getStatOrderList(dateFormat, beginTime, endTime, workerId, statusList, orderNoList);
    }

}

 common-buiness/src/main/java/cn/stylefeng/guns/utils/ReqDebugUtil.java

@@ -26,7 +26,7 @@
 * @author goupan
 */
@Slf4j
//@Component
@Component
public class ReqDebugUtil implements Filter {

    private static final ImmutableSet<String> IGNORED_HEADERS;
@@ -83,8 +83,8 @@
                        }
                    }

                    //log.info(
                    System.out.println(
                    log.info(
//                    System.out.println(
                            "请求url: " + url + "  method: " + request.getMethod()
                                    + "\nheader: " + JSONUtil.toJsonStr(header)
                                    + "\nparams: " + request.getQueryString()

 guns/src/main/java/cn/stylefeng/guns/modular/business/controller/StatMentalTestController.java

@@ -1,5 +1,6 @@
package cn.stylefeng.guns.modular.business.controller;

import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import cn.stylefeng.guns.modular.business.dto.StatMentalTestDTO;
import cn.stylefeng.guns.modular.business.entity.OrderConsultOne;
@@ -52,8 +53,24 @@
            @ApiImplicitParam(name = "type", value = "类型：1日，2周，3月，4年", dataTypeClass = Integer.class, required = true),
            @ApiImplicitParam(name = "beginTime", value = "开始时间", dataTypeClass = String.class),
            @ApiImplicitParam(name = "endTime", value = "结束时间", dataTypeClass = String.class),
            @ApiImplicitParam(name = "workerId", value = "咨询师ID", dataTypeClass = Long.class),
    })
    public ResponseData<StatMentalTestDTO> mentalTestData(Integer type, String beginTime, String endTime) {
    public ResponseData<StatMentalTestDTO> mentalTestData(Integer type, String beginTime, String endTime, Long workerId) {
        List<String> orderNoList = null;
        if (workerId != null) {
            orderNoList = orderConsultOneService.listObjs(
                    Wrappers.<OrderConsultOne>lambdaQuery()
                            .select(OrderConsultOne::getMentalTestOrderNo)
                            .eq(OrderConsultOne::getGoodsId, workerId)
                            .eq(OrderConsultOne::getStatusFlag, OrderStatusFlagEnum.PAY_SUCCESS.getCode())
                            .eq(OrderConsultOne::getStatusFlag, OrderStatusFlagEnum.PAY_SUCCESS.getCode()),
                    o -> StrUtil.toString(o)
            );
            if (CollUtil.isEmpty(orderNoList)) {
                orderNoList = Arrays.asList("0");
            }
        }

        // 获取日期格式化SQL
        String dateFormatSql = StatDataUtil.getDateFormatSql(type);

@@ -70,7 +87,7 @@

        // 统计订单数据
        List<Map<String, Object>> statOrderList = orderMentalTestService.getStatOrderList(
                dateFormatSql, beginTime, endTime, null, statusFlagList
                dateFormatSql, beginTime, endTime, null, statusFlagList, orderNoList
        );
        Double moneySum = statOrderList.stream()
                .mapToDouble(item -> Double.parseDouble(item.get("data").toString()))
@@ -82,6 +99,7 @@
                Wrappers.<OrderMentalTest>lambdaQuery()
                        .select(OrderMentalTest::getUserId)
                        .in(OrderMentalTest::getStatusFlag, statusFlagList)
                        .in(CollUtil.isNotEmpty(orderNoList), OrderMentalTest::getOrderNo, orderNoList)
                        .ge(StrUtil.isNotBlank(beginTime), OrderMentalTest::getCreateTime, beginTime)
                        .le(StrUtil.isNotBlank(endTime), OrderMentalTest::getCreateTime, endTime)
                        .groupBy(OrderMentalTest::getUserId)

 guns/src/main/resources/application-prod.yml

@@ -2,7 +2,7 @@
spring:
  datasource:
    driver-class-name: com.mysql.cj.jdbc.Driver
    url: jdbc:mysql://1.95.0.51:8306/xlzx?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT&nullCatalogMeansCurrent=true
    url: jdbc:mysql://192.168.0.33:8306/xlzx?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT&nullCatalogMeansCurrent=true
    username: root
    password: Root2024!


 rest/src/main/resources/application-prod.yml

@@ -2,7 +2,7 @@
spring:
  datasource:
    driver-class-name: com.mysql.cj.jdbc.Driver
    url: jdbc:mysql://1.95.0.51:8306/xlzx?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT&nullCatalogMeansCurrent=true
    url: jdbc:mysql://192.168.0.33:8306/xlzx?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT&nullCatalogMeansCurrent=true
    username: root
    password: Root2024!