Merge remote-tracking branch 'origin/v7.0_small_version_fix_20231120' into test

performance-api/src/main/java/com/clx/performance/enums/OwnerAccountEnum.java

@@ -86,7 +86,7 @@ public enum OwnerAccountEnum {
         THAW(30, "解冻"),
         CASE_OUT_FROZEN(40, "提现冻结"),
         CASE_OUT_SUCCESS(50, "提现成功"),
-        TAKE_OUT(60, "扣除"),
+        TAKE_OUT(60, "扣款"),
         CASE_OUT_FAIL(70, "提现失败"),
 
         ;

performance-api/src/main/java/com/clx/performance/param/pc/PageAppPrepaidFreightAccountParam.java

+package com.clx.performance.param.pc;
+
+import com.msl.common.base.PageParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+/**
+ * @Author huyufan
+ * @create 2023-09-19 13:33
+ */
+@Getter
+@Setter
+@NoArgsConstructor
+@ToString
+public class PageAppPrepaidFreightAccountParam extends PageParam {
+
+    @ApiModelProperty(value="货主编码",example = "20145787812312312")
+    private Long ownerUserNo;
+
+    @ApiModelProperty(value="1: 全部 2：收入 3：支出",example = "10")
+    private Integer queryWaterType;
+
+    @ApiModelProperty(value="操作开始时间",example = "2020-01-01 10:10:10")
+    private String beginTime;
+
+    @ApiModelProperty(value = "操作结束时间",example = "2020-01-01 10:10:10")
+    private String endTime;
+
+}

performance-web/pom.xml

@@ -239,6 +239,11 @@
             <version>2.1.230630</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-mongodb</artifactId>
+        </dependency>
+
     </dependencies>
 
 

performance-web/src/main/java/com/clx/performance/constant/RabbitKeyConstants.java

@@ -61,4 +61,6 @@ public class RabbitKeyConstants {
 
     public static final String ORDER_CANCEL_ROUTE_KEY ="clx-order.order.cancel.route.key";
 
+    public static final String ORDER_LARGE_SCREEN_QUEUE ="clx-order.order.large.screen.queue";
+
 }

performance-web/src/main/java/com/clx/performance/controller/pc/LargeScreenController.java

@@ -51,4 +51,10 @@ public class LargeScreenController {
         return largeScreenService.sendAddress(addressId);
     }
 
+    @ApiOperation(value = "线路", notes = "<br>By:胡宇帆")
+    @GetMapping("/lineString")
+    public String lineString(@RequestParam(value = "addressId") Integer addressId) {
+        return largeScreenService.routeLine(addressId);
+    }
+
 }
\ No newline at end of file

performance-web/src/main/java/com/clx/performance/controller/pc/owner/OwnerAccountController.java

@@ -166,4 +166,12 @@ public class OwnerAccountController {
         ownerAccountService.createAccount(param);
         return Result.ok();
     }
+
+    @ApiOperation(value = "预付金账户详情流水列表", notes = "<br>By:胡宇帆")
+    @PostMapping("/prepaidFreightOwnerAccountPageList")
+    @UnitCovert(param = false)
+    public Result<PageData<OwnerAccountRunningWaterRecordVO>> prepaidFreightOwnerAccountPageList(@RequestBody PageAppPrepaidFreightAccountParam param) {
+        IPage<OwnerAccountRunningWaterRecordVO> page = ownerAccountService.prepaidFreightOwnerAccountPageList(param);
+        return Result.page(page.getRecords(), page.getTotal(), page.getPages());
+    }
 }

performance-web/src/main/java/com/clx/performance/dao/LargeScreenAddressRouteDao.java

+package com.clx.performance.dao;
+
+import com.clx.performance.mapper.LargeScreenAddressRouteMapper;
+import com.clx.performance.model.LargeScreenAddressRoute;
+import com.msl.common.base.Optional;
+import com.msl.common.dao.BaseDao;
+
+/**
+ * @author kavin
+ * Date 2023-11-22
+ * Time 10:54
+ */
+public interface LargeScreenAddressRouteDao extends BaseDao<LargeScreenAddressRouteMapper, LargeScreenAddressRoute, Integer> {
+
+    Optional<LargeScreenAddressRoute> getEntityByReceiveAddressIdAndSendAddressId(Integer receiveAddressId, Integer sendAddressId);
+}

performance-web/src/main/java/com/clx/performance/dao/OwnerRunningWaterRecordDao.java

@@ -3,6 +3,7 @@ package com.clx.performance.dao;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.mapper.OwnerRunningWaterRecordMapper;
 import com.clx.performance.model.OwnerRunningWaterRecord;
+import com.clx.performance.param.pc.PageAppPrepaidFreightAccountParam;
 import com.clx.performance.param.pc.PageOwnerAccountRunningWaterParam;
 import com.clx.performance.param.pc.PagePlatformMarginAccountParam;
 import com.clx.performance.param.pc.PagePlatformPrepaidFreightAccountParam;
@@ -18,6 +19,9 @@ public interface OwnerRunningWaterRecordDao extends BaseDao<OwnerRunningWaterRec
 
     IPage<OwnerAccountRunningWaterRecordVO> prepaidFreightAccountPageList(PagePlatformPrepaidFreightAccountParam param);
 
+    IPage<OwnerAccountRunningWaterRecordVO> prepaidFreightOwnerAccountPageList(PageAppPrepaidFreightAccountParam param);
+
+
     List<OwnerAccountRunningWaterRecordVO> prepaidFreightAccountList(PagePlatformPrepaidFreightAccountParam param);
 
 

performance-web/src/main/java/com/clx/performance/dao/impl/LargeScreenAddressRouteDaoImpl.java

+package com.clx.performance.dao.impl;
+
+import com.clx.performance.dao.LargeScreenAddressRouteDao;
+import com.clx.performance.enums.PerformanceResultEnum;
+import com.clx.performance.mapper.LargeScreenAddressRouteMapper;
+import com.clx.performance.model.LargeScreenAddressRoute;
+import com.msl.common.base.Optional;
+import com.msl.common.dao.impl.BaseDaoImpl;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @author kavin
+ * Date 2023-11-22
+ * Time 10:54
+ */
+@Repository
+public class LargeScreenAddressRouteDaoImpl extends BaseDaoImpl<LargeScreenAddressRouteMapper, LargeScreenAddressRoute, Integer> implements LargeScreenAddressRouteDao {
+
+    @Override
+    public Optional<LargeScreenAddressRoute> getEntityByReceiveAddressIdAndSendAddressId(Integer receiveAddressId, Integer sendAddressId) {
+        return Optional.ofNullable(baseMapper.selectOne(lQrWrapper().eq(LargeScreenAddressRoute::getReceiveSystemAddressId, receiveAddressId)
+                .eq(LargeScreenAddressRoute::getSendSystemAddressId, sendAddressId)
+        ));
+
+    }
+}

performance-web/src/main/java/com/clx/performance/dao/impl/OwnerRunningWaterRecordDaoImpl.java

@@ -6,6 +6,7 @@ import com.clx.performance.dao.OwnerRunningWaterRecordDao;
 import com.clx.performance.enums.OwnerAccountEnum;
 import com.clx.performance.mapper.OwnerRunningWaterRecordMapper;
 import com.clx.performance.model.OwnerRunningWaterRecord;
+import com.clx.performance.param.pc.PageAppPrepaidFreightAccountParam;
 import com.clx.performance.param.pc.PageOwnerAccountRunningWaterParam;
 import com.clx.performance.param.pc.PagePlatformMarginAccountParam;
 import com.clx.performance.param.pc.PagePlatformPrepaidFreightAccountParam;
@@ -30,6 +31,12 @@ public class OwnerRunningWaterRecordDaoImpl extends BaseDaoImpl<OwnerRunningWate
         return baseMapper.prepaidFreightAccountPageList(page, param);
     }
 
+    @Override
+    public IPage<OwnerAccountRunningWaterRecordVO> prepaidFreightOwnerAccountPageList(PageAppPrepaidFreightAccountParam param) {
+        Page<OwnerAccountRunningWaterRecordVO> page = Page.of(param.getPage(), param.getPageSize());
+        return baseMapper.prepaidFreightOwnerAccountPageList(page, param);
+    }
+
     @Override
     public List<OwnerAccountRunningWaterRecordVO> prepaidFreightAccountList(PagePlatformPrepaidFreightAccountParam param) {
         return baseMapper.prepaidFreightAccountList(param);

performance-web/src/main/java/com/clx/performance/listener/LargeScreenListener.java

+package com.clx.performance.listener;
+
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.json.JSONUtil;
+import com.clx.order.feign.AddressFeign;
+import com.clx.order.vo.feign.FeignAddressVO;
+import com.clx.order.vo.feign.FeignOrderVO;
+import com.clx.order.vo.feign.ReceiveAndSendAddressVO;
+import com.clx.performance.constant.RabbitKeyConstants;
+import com.clx.performance.dao.LargeScreenAddressRouteDao;
+import com.clx.performance.dto.gd.GdPosDTO;
+import com.clx.performance.dto.gd.GdRouteDTO;
+import com.clx.performance.enums.PerformanceResultEnum;
+import com.clx.performance.model.Geometry;
+import com.clx.performance.model.LargeScreenAddressRoute;
+import com.clx.performance.model.MongoLargeScreenAddressRoute;
+import com.clx.performance.utils.gd.GdService;
+import com.msl.common.base.Optional;
+import com.msl.common.result.Result;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.amqp.rabbit.annotation.RabbitListener;
+import org.springframework.data.geo.Point;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.geo.GeoJsonLineString;
+import org.springframework.data.mongodb.core.geo.GeoJsonPoint;
+import org.springframework.stereotype.Component;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.LinkedList;
+import java.util.List;
+
+@Slf4j
+@Component
+@AllArgsConstructor
+public class LargeScreenListener {
+
+    private final LargeScreenAddressRouteDao largeScreenAddressRouteDao;
+
+    private final GdService gdService;
+
+    private final AddressFeign addressFeign;
+
+    private final MongoTemplate mongoTemplate;
+
+    @RabbitListener(queues = RabbitKeyConstants.ORDER_LARGE_SCREEN_QUEUE)
+    public void onMessage(String message) {
+        try {
+            log.info("处理数据大屏标准地址路线监听器执行,订单为{}", message);
+            FeignOrderVO orderVO = JSONUtil.toBean(message, FeignOrderVO.class);
+            if (ObjectUtil.isNull(orderVO.getSendSystemAddressId()) || ObjectUtil.isNull(orderVO.getReveiveSystemAddressId())) {
+                return;
+            }
+            Integer receiveAddressId = orderVO.getReveiveSystemAddressId();
+            Integer sendAddressId = orderVO.getSendSystemAddressId();
+            String receiveName = orderVO.getReveiveAddressShorter();
+            String sendName = orderVO.getSendAddressShorter();
+
+            Optional<LargeScreenAddressRoute> optional = largeScreenAddressRouteDao.getEntityByReceiveAddressIdAndSendAddressId(receiveAddressId, sendAddressId);
+            if (optional.isPresent()) {
+                return;
+            }
+            ReceiveAndSendAddressVO feignAddressVO = Optional.of(addressFeign.getSendAndReceiveSystemAddress(sendAddressId, receiveAddressId)).filter(Result::succeed)
+                    .map(Result::getData).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
+            BigDecimal sendAddressLatitude = feignAddressVO.getSendAddressVo().getLatitude().setScale(4, RoundingMode.DOWN);
+            BigDecimal sendAddressLongitude = feignAddressVO.getSendAddressVo().getLongitude().setScale(4, RoundingMode.DOWN);
+
+            BigDecimal receiveAddressLatitude = feignAddressVO.getReceiveAddressVo().getLatitude().setScale(4, RoundingMode.DOWN);
+            BigDecimal receiveAddressLongitude = feignAddressVO.getReceiveAddressVo().getLongitude().setScale(4, RoundingMode.DOWN);
+
+            List<GdRouteDTO> route = gdService.getRoute(sendAddressLongitude, sendAddressLatitude, receiveAddressLongitude, receiveAddressLatitude);
+            MongoLargeScreenAddressRoute mongoEntity = new MongoLargeScreenAddressRoute();
+
+            mongoEntity.setName(sendName);
+            mongoEntity.setReceiveSystemAddressId(receiveAddressId);
+            mongoEntity.setSendSystemAddressId(sendAddressId);
+            mongoEntity.setValue(sendName);
+            mongoEntity.setColorField("3");
+            mongoEntity.setSizeField("3");
+            mongoEntity.setInfo(receiveName);
+            List<Point> points = new LinkedList<>();
+            List<GdPosDTO> posList = route.get(0).getPosList();
+            for (GdPosDTO gdPosDTO : posList) {
+                GeoJsonPoint geoJsonPoint = new GeoJsonPoint(new Point(gdPosDTO.getLongitude().doubleValue(), gdPosDTO.getLatitude().doubleValue()));
+                points.add(geoJsonPoint);
+            }
+            mongoEntity.setGeometry(new GeoJsonLineString(points));
+
+
+            mongoTemplate.insert(mongoEntity);
+
+        } catch (Exception e) {
+
+        }
+
+
+//        LargeScreenAddressRoute build = LargeScreenAddressRoute.builder().receiveSystemAddressId(receiveAddressId)
+//                .sendSystemAddressId(receiveAddressId)
+//                .receiveName(receiveName)
+//                .sendName(sendName)
+//                .line("").build();
+//
+//        largeScreenAddressRouteDao.saveEntity(build);
+    }
+
+
+}

performance-web/src/main/java/com/clx/performance/listener/OrderCancelHandler.java → performance-web/src/main/java/com/clx/performance/listener/OrderCancelListener.java

 package com.clx.performance.listener;
 
-import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.json.JSONUtil;
 import com.clx.performance.constant.RabbitKeyConstants;
-import com.clx.performance.enums.RoleEnum;
 import com.clx.performance.param.pc.OrderCancelParam;
 import com.clx.performance.service.OrderCancelService;
-import com.clx.performance.service.breakcontract.BreakContractSettlementOwnerService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.amqp.rabbit.annotation.RabbitListener;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.util.Objects;
-
 /**
  * 处理货单取消吨数回填
  */
 @Slf4j
 @Component
 @AllArgsConstructor
-public class OrderCancelHandler {
+public class OrderCancelListener {
 
     private final OrderCancelService orderCancelService;
 

performance-web/src/main/java/com/clx/performance/mapper/LargeScreenAddressRouteMapper.java

+package com.clx.performance.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.clx.performance.model.LargeScreenAddressRoute;
+
+/**
+ * @author kavin
+ * Date 2023-11-22
+ * Time 10:54
+ */
+public interface LargeScreenAddressRouteMapper extends BaseMapper<LargeScreenAddressRoute> {
+}

performance-web/src/main/java/com/clx/performance/mapper/OwnerRunningWaterRecordMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.performance.model.OwnerRunningWaterRecord;
+import com.clx.performance.param.pc.PageAppPrepaidFreightAccountParam;
 import com.clx.performance.param.pc.PageOwnerAccountRunningWaterParam;
 import com.clx.performance.param.pc.PagePlatformMarginAccountParam;
 import com.clx.performance.param.pc.PagePlatformPrepaidFreightAccountParam;
@@ -27,6 +28,10 @@ public interface OwnerRunningWaterRecordMapper extends BaseMapper<OwnerRunningWa
     @SelectProvider(type = OwnerRunningWaterRecordSqlProvider.class, method = "prepaidFreightAccountPageList")
     IPage<OwnerAccountRunningWaterRecordVO> prepaidFreightAccountPageList(Page<OwnerAccountRunningWaterRecordVO> page, PagePlatformPrepaidFreightAccountParam param);
 
+    @SelectProvider(type = OwnerRunningWaterRecordSqlProvider.class, method = "prepaidFreightOwnerAccountPageList")
+    IPage<OwnerAccountRunningWaterRecordVO> prepaidFreightOwnerAccountPageList(Page<OwnerAccountRunningWaterRecordVO> page, PageAppPrepaidFreightAccountParam param);
+
+
     @SelectProvider(type = OwnerRunningWaterRecordSqlProvider.class, method = "ownerAccountRunningWaterPageList")
     IPage<OwnerAccountRunningWaterRecordVO> ownerAccountRunningWaterPageList(Page<OwnerAccountRunningWaterRecordVO> page, PageOwnerAccountRunningWaterParam param);
 

performance-web/src/main/java/com/clx/performance/model/Geometry.java

+package com.clx.performance.model;
+
+import lombok.Data;
+import org.springframework.data.mongodb.core.geo.GeoJsonLineString;
+
+import java.util.List;
+
+@Data
+public class Geometry {
+
+    private String type;
+
+    private GeoJsonLineString coordinates;
+}

performance-web/src/main/java/com/clx/performance/model/LargeScreenAddressRoute.java

+package com.clx.performance.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.msl.common.config.KeyColumn;
+import com.msl.common.model.HasKey;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+/**
+ * @author kavin
+ * Date 2023-11-22
+ * Time 10:54
+ */
+@Getter
+@Setter
+@Accessors(chain = true)
+@TableName("large_screen_address_route")
+public class LargeScreenAddressRoute implements HasKey<Integer> {
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @TableField("receive_name")
+    @ApiModelProperty("收货地址")
+    private String receiveName;
+
+    @TableField("send_name")
+    @ApiModelProperty("发货地址")
+    private String sendName;
+
+    @TableField("receive_system_address_id")
+    @ApiModelProperty("收货标准地址id")
+    private Integer receiveSystemAddressId;
+
+    @TableField("send_system_address_id")
+    @ApiModelProperty("发货标准地址id")
+    private Integer sendSystemAddressId;
+
+    @TableField("value")
+    @ApiModelProperty("数据大屏展示需要")
+    private String value;
+
+    @TableField("size_field")
+    @ApiModelProperty("数据大屏展示需要")
+    private String sizeField;
+
+    @TableField("color_field")
+    @ApiModelProperty("数据大屏展示需要")
+    private String colorField;
+
+    @TableField("info")
+    @ApiModelProperty("数据大屏展示需要")
+    private String info;
+
+    @TableField("line")
+    @ApiModelProperty("数据大屏展示需要")
+    private String line;
+
+    @Override
+    @KeyColumn("id")
+    public Integer gainKey() {
+    return this.id;
+    }
+}

performance-web/src/main/java/com/clx/performance/model/MongoLargeScreenAddressRoute.java

+package com.clx.performance.model;
+
+import lombok.Data;
+import org.springframework.data.mongodb.core.geo.GeoJsonLineString;
+import org.springframework.data.mongodb.core.mapping.Document;
+
+@Data
+@Document(collection = "demo_entity_collection")
+public class MongoLargeScreenAddressRoute {
+
+//    private Integer id;
+
+    private Integer sendSystemAddressId;
+
+    private Integer receiveSystemAddressId;
+
+    private String name;
+
+    private String value;
+
+    private String sizeField;
+
+    private String colorField;
+
+    private String info;
+
+    private GeoJsonLineString geometry;
+}

performance-web/src/main/java/com/clx/performance/service/LargeScreenService.java

@@ -14,4 +14,6 @@ public interface LargeScreenService {
 
     String sendAddress(Integer addressId);
 
+    String routeLine(Integer addressId);
+
 }

performance-web/src/main/java/com/clx/performance/service/OwnerAccountService.java

@@ -26,6 +26,9 @@ public interface OwnerAccountService {
 
     IPage<OwnerAccountRunningWaterRecordVO> prepaidFreightAccountPageList(PagePlatformPrepaidFreightAccountParam param);
 
+    IPage<OwnerAccountRunningWaterRecordVO> prepaidFreightOwnerAccountPageList(PageAppPrepaidFreightAccountParam param);
+
+
     OwnerAccountAllVO accountInfo(Long ownerUserNo);
 
     Long accountTopUp(OwnerTopUpParam param);

performance-web/src/main/java/com/clx/performance/service/impl/LargeScreenServiceImpl.java

@@ -2,6 +2,7 @@ package com.clx.performance.service.impl;
 
 import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
 import com.clx.order.feign.AddressFeign;
 import com.clx.order.feign.OrderFeign;
 import com.clx.order.vo.feign.FeignAddressVO;
@@ -10,6 +11,7 @@ import com.clx.order.vo.feign.SystemAddressVO;
 import com.clx.performance.dao.OrderChildDao;
 import com.clx.performance.dto.zjxl.TruckTraceDTO;
 import com.clx.performance.enums.PerformanceResultEnum;
+import com.clx.performance.model.MongoLargeScreenAddressRoute;
 import com.clx.performance.model.OrderChild;
 import com.clx.performance.service.LargeScreenService;
 import com.clx.performance.utils.zjxl.ZjxlGpsService;
@@ -22,6 +24,10 @@ import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.geo.GeoJsonLineString;
+import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
@@ -29,6 +35,7 @@ import java.math.RoundingMode;
 import java.time.LocalDateTime;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Random;
 import java.util.stream.Collectors;
 
 @Service
@@ -47,6 +54,8 @@ public class LargeScreenServiceImpl implements LargeScreenService {
 
     private final OrderFeign orderFeign;
 
+    private final MongoTemplate mongoTemplate;
+
     @Override
     public List<JSONObject> emptyCarList() {
         List<String> data = driverFeign.driverTruckList().getData();
@@ -145,7 +154,7 @@ public class LargeScreenServiceImpl implements LargeScreenService {
     @Override
     public String sendAddress(Integer addressId) {
         List<SystemAddressVO> list = Optional.of(orderFeign.getOrderListByReceiveAddressId(addressId)).filter(Result::succeed)
-                .map(Result::getData).orElseThrow(PerformanceResultEnum.HTTP_ERROR);
+                .map(Result::getData).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
         JSONArray jsonArray = new JSONArray();
 
         for (SystemAddressVO vo : list) {
@@ -165,5 +174,30 @@ public class LargeScreenServiceImpl implements LargeScreenService {
         return jsonArray.toString();
     }
 
+    @Override
+    public String routeLine(Integer addressId) {
+        JSONArray jsonArray = new JSONArray();
+        JSONObject jsonObject = new JSONObject();
+        Query query = new Query();
+        query.addCriteria(Criteria.where("receiveSystemAddressId").is(addressId));
+        List<MongoLargeScreenAddressRoute> routes = mongoTemplate.find(query, MongoLargeScreenAddressRoute.class);
+        if (CollectionUtils.isEmpty(routes)) {
+            return null;
+        }
+        int randomNum = (int)(Math.random() * routes.size());
+
+        MongoLargeScreenAddressRoute route = routes.get(randomNum);
+        GeoJsonLineString geometry = route.getGeometry();
+        jsonObject.set("id", "1");
+        jsonObject.set("name", route.getName());
+        jsonObject.set("value", route.getValue());
+        jsonObject.set("sizeField", "3");
+        jsonObject.set("sizeField", "3");
+        jsonObject.set("info", "info");
+        jsonObject.set("geometry", JSONUtil.parse(geometry.getCoordinates()));
+        jsonArray.add(jsonObject);
+        return jsonArray.toString();
+    }
+
 
 }

performance-web/src/main/java/com/clx/performance/service/impl/OwnerAccountServiceImpl.java

@@ -85,6 +85,11 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
         return ownerRunningWaterRecordDao.prepaidFreightAccountPageList(param);
     }
 
+    @Override
+    public IPage<OwnerAccountRunningWaterRecordVO> prepaidFreightOwnerAccountPageList(PageAppPrepaidFreightAccountParam param) {
+        return ownerRunningWaterRecordDao.prepaidFreightOwnerAccountPageList(param);
+    }
+
     @Override
     public OwnerAccountAllVO accountInfo(Long ownerUserNo) {
         OwnerAccountAllVO result = new OwnerAccountAllVO();

performance-web/src/main/java/com/clx/performance/sqlProvider/OwnerRunningWaterRecordSqlProvider.java

@@ -2,6 +2,7 @@ package com.clx.performance.sqlProvider;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.clx.performance.enums.OwnerAccountEnum;
+import com.clx.performance.param.pc.PageAppPrepaidFreightAccountParam;
 import com.clx.performance.param.pc.PageOwnerAccountRunningWaterParam;
 import com.clx.performance.param.pc.PagePlatformMarginAccountParam;
 import com.clx.performance.param.pc.PagePlatformPrepaidFreightAccountParam;
@@ -84,6 +85,37 @@ public class OwnerRunningWaterRecordSqlProvider {
         return sql;
     }
 
+    public String prepaidFreightOwnerAccountPageList(@Param("param") PageAppPrepaidFreightAccountParam param) {
+        String sql = new SQL() {{
+            SELECT("a.id, a.owner_user_no," +
+                    " a.owner_user_name,a.running_water_no, a.mobile, a.account_type, a.running_water_type,a.order_id,a.order_no,a.order_child_id,a.order_child_no,a.alteration_balance," +
+                    " a.account_balance,a.usable_balance,a.take_out_balance,a.frozen_balance,a.create_by,date_format(a.create_time, '%Y-%m-%d %H:%i:%s') as create_time");
+            FROM("owner_running_water_record a");
+            WHERE("a.account_type =" + OwnerAccountEnum.AccountTypeStatus.PREPAID_FREIGHT_ACCOUNT.getCode());
+            WHERE("a.owner_user_no = #{param.ownerUserNo}");
+
+            if (StringUtils.isNotBlank(param.getBeginTime()) && StringUtils.isNotBlank(param.getEndTime())) {
+                WHERE("a.create_time >= #{param.beginTime} and a.create_time <= #{param.endTime}");
+            }
+            if (ObjectUtil.isNotNull(param.getQueryWaterType())) {
+                if (1 == param.getQueryWaterType()) {
+                    WHERE("a.running_water_type !=" + OwnerAccountEnum.RunningWaterStatus.CASE_OUT_FAIL.getCode());
+                }
+                if (2 == param.getQueryWaterType()) {
+                    WHERE("a.running_water_type =" + OwnerAccountEnum.RunningWaterStatus.TOP_UP.getCode());
+                }
+                if (param.getQueryWaterType() == 3) {
+                    WHERE("a.running_water_type in (" + OwnerAccountEnum.RunningWaterStatus.TAKE_OUT.getCode() +
+                            "," + OwnerAccountEnum.RunningWaterStatus.CASE_OUT_SUCCESS.getCode() + " )"
+                            );
+                }
+            }
+
+            ORDER_BY("a.create_time desc");
+        }}.toString();
+        return sql;
+    }
+
     public String prepaidFreightAccountList(@Param("param") PagePlatformPrepaidFreightAccountParam param) {
         String sql = new SQL() {{
             SELECT("a.id, a.owner_user_no," +