Merge remote-tracking branch 'origin/master'

zhibing.pu

2024-08-26 eb915c7878b485c0f75595fdf85e02a3832af400

Merge remote-tracking branch 'origin/master'

 ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/vo/SiteDetailVO.java

@@ -9,6 +9,8 @@
@ApiModel(value = "SiteDetailVO对象",description = "站点详情VO")
public class SiteDetailVO extends Site {

    @ApiModelProperty(value = "合作商名称")
    private String partnerName;
    @ApiModelProperty(value = "绑定车牌提示文案")
    private String bindCarTips;
    @ApiModelProperty(value = "距离")

 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/SiteDetailEvaluateVO.java

@@ -5,12 +5,13 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.io.Serializable;
import java.math.BigDecimal;
import java.util.List;

@Data
@ApiModel(value = "SiteDetailEvaluateVO对象",description = "站点详情订单评价")
public class SiteDetailEvaluateVO extends TOrderEvaluate {
public class SiteDetailEvaluateVO implements Serializable {

    @ApiModelProperty(value = "好评率")
    private BigDecimal reviewRate;

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/util/carBrand/SSLCipherSuiteUtil.java

@@ -14,7 +14,7 @@
import org.openeuler.BGMProvider;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import okhttp3.OkHttpClient;
import shade.okhttp3.OkHttpClient;

import javax.net.ssl.*;
import java.net.HttpURLConnection;

 ruoyi-service/ruoyi-account/src/main/resources/mapper/account/TAppCouponMapper.xml

@@ -71,10 +71,10 @@
            t1.del_flag = 0
          AND t1.app_user_id = #{userId}
          AND t1.status = 1
        and t1.endTime >= now()
        and t1.end_time >= now()
        GROUP BY
            t1.coupon_id,
            t1.end_time
            t1.app_user_id,
        t1.coupon_id
    </select>

</mapper>

 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/SiteController.java

@@ -138,6 +138,11 @@
    @PostMapping("/getDetailById")
    public AjaxResult<SiteDetailVO> getDetailById(@Validated @RequestBody SiteDetailQuery query){
        SiteDetailVO siteDetailVO = siteService.getDetailById(query.getSiteId());
        // 查询合作商名称
        Partner partner = partnerService.getById(siteDetailVO.getPartnerId());
        if(Objects.nonNull(partner)){
            siteDetailVO.setPartnerName(partner.getName());
        }
        // 计算距离
        Map<String, Double> distance = GeodesyUtil.getDistance(query.getLat() + "," + query.getLon(), siteDetailVO.getLat() + "," + siteDetailVO.getLon());
        siteDetailVO.setDistance(distance.get("WGS84"));

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

@@ -82,12 +82,12 @@
    <select id="getOrderEvaluateBySiteId" resultType="com.ruoyi.order.api.vo.TOrderEvaluateVO">
        select id, order_type, order_id, app_user_id,app_user_car_id, mark, content, img_url, evaluation_response,
               create_time, response_time, del_flag
        from t_order_evaluate toe
        where toe.order_id in
        (select toc.order_id
        from t_charging_order toc
        where toc.site_id = #{siteId}
        and toc.del_flag = ${@com.ruoyi.common.core.enums.DelFlagEnum@NO.getCode()})
        from t_order_evaluate
        where order_id in
        (select order_id
        from t_charging_order
        where site_id = #{siteId}
        and del_flag = ${@com.ruoyi.common.core.enums.DelFlagEnum@NO.getCode()})
    </select>