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

performance-api/src/main/java/com/clx/performance/param/app/AppGoodsOrderSearchParam.java

+package com.clx.performance.param.app;
+
+import com.msl.common.base.PageParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class AppGoodsOrderSearchParam extends PageParam {
+
+    @ApiModelProperty(value = "1：货源地 2: 目的地", example = "1")
+    @NotBlank(message = "查询类型")
+    private Integer searchType;
+
+    @ApiModelProperty(value = "搜索条件", example = "1")
+    private String searchName;
+}

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

@@ -20,13 +20,19 @@ public class PageAppPrepaidFreightAccountParam extends PageParam {
     @ApiModelProperty(value="货主编码",example = "20145787812312312")
     private Long ownerUserNo;
 
-    @ApiModelProperty(value="1: 全部 2：收入 3：支出",example = "10")
+    @ApiModelProperty(value="1: 全部 2：收入 3：支出",example = "1")
     private Integer queryWaterType;
 
+    @ApiModelProperty(value="1: 保证金 2：预付运费",example = "1")
+    private Integer accountType;
+
     @ApiModelProperty(value="操作开始时间",example = "2020-01-01 10:10:10")
     private String beginTime;
 
     @ApiModelProperty(value = "操作结束时间",example = "2020-01-01 10:10:10")
     private String endTime;
 
+    @ApiModelProperty(value="货主编号",example = "1")
+    private Long userNo;
+
 }

performance-web/src/main/java/com/clx/performance/controller/app/AppGoodsOrderController.java

@@ -3,6 +3,7 @@ package com.clx.performance.controller.app;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.mapper.OrderGoodsMapper;
 import com.clx.performance.model.OrderGoods;
+import com.clx.performance.param.app.AppGoodsOrderSearchParam;
 import com.clx.performance.param.app.OrderGoodsListPageParam;
 import com.clx.performance.service.OrderGoodsService;
 import com.clx.performance.service.OrderGoodsTruckBindService;
@@ -61,9 +62,12 @@ public class AppGoodsOrderController {
 
     }
 
-    @ApiOperation(value = "司机端无接单位置上报", notes = "<br>By:胡宇帆")
-    @GetMapping("/getCancelOrderGoods")
-    public Result<List<OrderGoodsAPPVO>> getCancelOrderGoods(@RequestParam(value = "userNo") Long userNo) {
-        return Result.ok(orderGoodsTruckBindService.getCancelOrderGoods(userNo));
+    @ApiOperation(value = "APP首页搜索", notes = "<br>By:胡宇帆")
+    @PostMapping("/indexOrderGoodsListSearch")
+    public Result<PageData<OrderGoodsAPPVO>> indexOrderGoodsListSearch(@RequestBody AppGoodsOrderSearchParam param) {
+        IPage<OrderGoodsAPPVO> page = orderGoodsService.indexOrderGoodsListSearch(param);
+        return Result.page(page.getRecords(), page.getTotal(), page.getPages());
     }
+
+
 }

performance-web/src/main/java/com/clx/performance/controller/app/AppOwnerAccountController.java

+package com.clx.performance.controller.app;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.param.pc.PageAppPrepaidFreightAccountParam;
+import com.clx.performance.service.OwnerAccountService;
+import com.clx.performance.vo.pc.OwnerAccountRunningWaterRecordVO;
+import com.msl.common.base.PageData;
+import com.msl.common.convertor.aspect.UnitCovert;
+import com.msl.common.result.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Slf4j
+@RestController
+@RequestMapping("/app/owner")
+@Validated
+@AllArgsConstructor
+@Api(tags = "APP-货主资金管理")
+public class AppOwnerAccountController {
+
+    private final OwnerAccountService ownerAccountService;
+
+
+    @ApiOperation(value = "APP货主流水", 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/controller/pc/owner/OwnerAccountController.java

@@ -167,10 +167,11 @@ public class OwnerAccountController {
         return Result.ok();
     }
 
-    @ApiOperation(value = "预付金账户详情流水列表", notes = "<br>By:胡宇帆")
+    @ApiOperation(value = "APP货主流水", notes = "<br>By:胡宇帆")
     @PostMapping("/prepaidFreightOwnerAccountPageList")
     @UnitCovert(param = false)
     public Result<PageData<OwnerAccountRunningWaterRecordVO>> prepaidFreightOwnerAccountPageList(@RequestBody PageAppPrepaidFreightAccountParam param) {
+        param.setUserNo(TokenUtil.getLoginUserInfo().getUserNo());
         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

@@ -5,6 +5,8 @@ import com.clx.performance.model.LargeScreenAddressRoute;
 import com.msl.common.base.Optional;
 import com.msl.common.dao.BaseDao;
 
+import java.util.List;
+
 /**
  * @author kavin
  * Date 2023-11-22
@@ -12,5 +14,7 @@ import com.msl.common.dao.BaseDao;
  */
 public interface LargeScreenAddressRouteDao extends BaseDao<LargeScreenAddressRouteMapper, LargeScreenAddressRoute, Integer> {
 
-    Optional<LargeScreenAddressRoute> getEntityByReceiveAddressIdAndSendAddressId(Integer receiveAddressId, Integer sendAddressId);
+    List<LargeScreenAddressRoute> getEntityByReceiveAddressIdAndSendAddressId(Integer receiveAddressId, Integer sendAddressId);
+
+    List<LargeScreenAddressRoute> selectList();
 }

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

 package com.clx.performance.dao;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.param.app.AppGoodsOrderSearchParam;
 import com.clx.performance.param.pc.OrderGoodsEditParams;
 import com.clx.performance.param.pc.PageOrderGoodsListParam;
 import com.clx.performance.mapper.OrderGoodsMapper;
@@ -93,5 +94,6 @@ public interface OrderGoodsDao extends BaseDao<OrderGoodsMapper, OrderGoods, Int
 
     List<Double> getFreightPrice( Integer sendAddressId,Integer receiveAddressId,String orderNo);
 
+    IPage<OrderGoodsAPPVO> indexOrderGoodsListSearch(AppGoodsOrderSearchParam param);
 
 }

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

@@ -8,6 +8,8 @@ import com.msl.common.base.Optional;
 import com.msl.common.dao.impl.BaseDaoImpl;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 /**
  * @author kavin
  * Date 2023-11-22
@@ -17,10 +19,15 @@ import org.springframework.stereotype.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)
+    public List<LargeScreenAddressRoute> getEntityByReceiveAddressIdAndSendAddressId(Integer receiveAddressId, Integer sendAddressId) {
+        return baseMapper.selectList(lQrWrapper().eq(LargeScreenAddressRoute::getReceiveSystemAddressId, receiveAddressId)
                 .eq(LargeScreenAddressRoute::getSendSystemAddressId, sendAddressId)
-        ));
+        );
+
+    }
 
+    @Override
+    public List<LargeScreenAddressRoute> selectList() {
+        return baseMapper.selectList(null);
     }
 }

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

@@ -3,6 +3,7 @@ package com.clx.performance.dao.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.clx.performance.param.app.AppGoodsOrderSearchParam;
 import com.clx.performance.param.pc.OrderGoodsEditParams;
 import com.clx.performance.param.pc.PageOrderGoodsListParam;
 import com.clx.performance.dao.OrderGoodsDao;
@@ -254,4 +255,10 @@ public class OrderGoodsDaoImpl extends BaseDaoImpl<OrderGoodsMapper, OrderGoods,
     public List<Double> getFreightPrice( Integer sendAddressId,Integer receiveAddressId,String orderNo) {
         return baseMapper.getFreightPrice(orderNo,sendAddressId,receiveAddressId);
     }
+
+    @Override
+    public IPage<OrderGoodsAPPVO> indexOrderGoodsListSearch(AppGoodsOrderSearchParam param) {
+        Page<OrderGoodsAPPVO> page = Page.of(param.getPage(), param.getPageSize());
+        return baseMapper.indexOrderGoodsListSearch(page,param);
+    }
 }

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

 package com.clx.performance.listener;
 
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.json.JSONUtil;
 import com.clx.order.feign.AddressFeign;
@@ -25,6 +26,7 @@ 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 org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
@@ -44,6 +46,7 @@ public class LargeScreenListener {
 
     private final MongoTemplate mongoTemplate;
 
+    @Transactional(rollbackFor = Exception.class)
     @RabbitListener(queues = RabbitKeyConstants.ORDER_LARGE_SCREEN_QUEUE)
     public void onMessage(String message) {
         try {
@@ -57,10 +60,10 @@ public class LargeScreenListener {
             String receiveName = orderVO.getReveiveAddressShorter();
             String sendName = orderVO.getSendAddressShorter();
 
-            Optional<LargeScreenAddressRoute> optional = largeScreenAddressRouteDao.getEntityByReceiveAddressIdAndSendAddressId(receiveAddressId, sendAddressId);
-            if (optional.isPresent()) {
-                return;
-            }
+            List<LargeScreenAddressRoute> list = largeScreenAddressRouteDao.getEntityByReceiveAddressIdAndSendAddressId(receiveAddressId, sendAddressId);
+            if (CollectionUtil.isNotEmpty(list)) {
+                log.info("当前地址已经记录receiveAddressId{}, sendAddressId{}", receiveAddressId, sendAddressId);
+            } else {
                 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);
@@ -86,22 +89,21 @@ public class LargeScreenListener {
                     points.add(geoJsonPoint);
                 }
                 mongoEntity.setGeometry(new GeoJsonLineString(points));
-
-
                 mongoTemplate.insert(mongoEntity);
+                LargeScreenAddressRoute build = LargeScreenAddressRoute.builder().
+                        receiveSystemAddressId(receiveAddressId)
+                        .sendSystemAddressId(sendAddressId)
+                        .receiveName(receiveName)
+                        .sendName(sendName)
+                        .build();
+                largeScreenAddressRouteDao.saveEntity(build);
+            }
 
         } catch (Exception e) {
-
+            log.info("数据大屏监控订单轨迹线路异常:{}", e.getMessage());
         }
 
 
-//        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/mapper/OrderGoodsMapper.java

@@ -3,6 +3,7 @@ package com.clx.performance.mapper;
 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.param.app.AppGoodsOrderSearchParam;
 import com.clx.performance.param.pc.OrderGoodsEditParams;
 import com.clx.performance.param.pc.PageOrderGoodsListParam;
 import com.clx.performance.model.OrderGoods;
@@ -92,4 +93,7 @@ public interface OrderGoodsMapper extends BaseMapper<OrderGoods> {
                                  @Param("sendAddressId") Integer sendAddressId,
                                                   @Param("receiveAddressId") Integer receiveAddressId);
 
+    @SelectProvider(type = OrderGoodsSqlProvider.class, method = "indexOrderGoodsListSearch")
+    IPage<OrderGoodsAPPVO> indexOrderGoodsListSearch(@Param("page")Page<OrderGoodsAPPVO> page, @Param("param")AppGoodsOrderSearchParam param);
+
 }

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

@@ -29,7 +29,7 @@ public interface OwnerRunningWaterRecordMapper extends BaseMapper<OwnerRunningWa
     IPage<OwnerAccountRunningWaterRecordVO> prepaidFreightAccountPageList(Page<OwnerAccountRunningWaterRecordVO> page, PagePlatformPrepaidFreightAccountParam param);
 
     @SelectProvider(type = OwnerRunningWaterRecordSqlProvider.class, method = "prepaidFreightOwnerAccountPageList")
-    IPage<OwnerAccountRunningWaterRecordVO> prepaidFreightOwnerAccountPageList(Page<OwnerAccountRunningWaterRecordVO> page, PageAppPrepaidFreightAccountParam param);
+    IPage<OwnerAccountRunningWaterRecordVO> prepaidFreightOwnerAccountPageList(@Param(value = "page")Page<OwnerAccountRunningWaterRecordVO> page, @Param(value = "param")PageAppPrepaidFreightAccountParam param);
 
 
     @SelectProvider(type = OwnerRunningWaterRecordSqlProvider.class, method = "ownerAccountRunningWaterPageList")

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

@@ -7,6 +7,8 @@ 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.Builder;
+import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.Accessors;
@@ -16,10 +18,10 @@ import lombok.experimental.Accessors;
  * Date 2023-11-22
  * Time 10:54
  */
-@Getter
-@Setter
 @Accessors(chain = true)
 @TableName("large_screen_address_route")
+@Data
+@Builder
 public class LargeScreenAddressRoute implements HasKey<Integer> {
 
     @TableId(value = "id", type = IdType.AUTO)
@@ -41,26 +43,6 @@ public class LargeScreenAddressRoute implements HasKey<Integer> {
     @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() {

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

@@ -5,7 +5,7 @@ import org.springframework.data.mongodb.core.geo.GeoJsonLineString;
 import org.springframework.data.mongodb.core.mapping.Document;
 
 @Data
-@Document(collection = "demo_entity_collection")
+@Document(collection = "large_screen_address_route")
 public class MongoLargeScreenAddressRoute {
 
 //    private Integer id;

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

@@ -3,6 +3,7 @@ package com.clx.performance.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.model.OrderChild;
 import com.clx.performance.model.OrderGoods;
+import com.clx.performance.param.app.AppGoodsOrderSearchParam;
 import com.clx.performance.param.app.OrderGoodsListPageParam;
 import com.clx.performance.param.pc.*;
 import com.clx.performance.vo.app.OrderGoodsAPPVO;
@@ -94,4 +95,6 @@ public interface OrderGoodsService {
     Boolean updateSystemAddressId( Integer ownerAddressId, Integer systemAddressId);
 
     FreightEstimateVO listFreightEstimate(OrderChildReportParam param);
+
+    IPage<OrderGoodsAPPVO> indexOrderGoodsListSearch(AppGoodsOrderSearchParam param);
 }

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

@@ -189,6 +189,8 @@ public class LargeScreenServiceImpl implements LargeScreenService {
         MongoLargeScreenAddressRoute route = routes.get(randomNum);
         GeoJsonLineString geometry = route.getGeometry();
         jsonObject.set("id", "1");
+        jsonObject.set("sendSystemAddressId", route.getSendSystemAddressId());
+        jsonObject.set("receiveSystemAddressId", route.getReceiveSystemAddressId());
         jsonObject.set("name", route.getName());
         jsonObject.set("value", route.getValue());
         jsonObject.set("sizeField", "3");

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

@@ -12,6 +12,7 @@ import com.clx.order.param.feign.OrderCancelReasonParam;
 import com.clx.order.param.feign.RollbackOrderWeightParam;
 import com.clx.performance.component.OrderCancelComponent;
 import com.clx.performance.extranal.user.DriverService;
+import com.clx.performance.param.app.AppGoodsOrderSearchParam;
 import com.clx.performance.param.pc.*;
 import com.clx.order.vo.feign.FeignOrderVO;
 import com.clx.performance.component.GoodsOrderTruckRecordComponent;
@@ -750,6 +751,11 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
         return freightEstimateVO;
     }
 
+    @Override
+    public IPage<OrderGoodsAPPVO> indexOrderGoodsListSearch(AppGoodsOrderSearchParam param) {
+        return orderGoodsDao.indexOrderGoodsListSearch(param);
+    }
+
     @Override
     public void borrowWeight(OrderGoods orderGoods,String orderChildNo, BigDecimal subOrderGoodsResidue, BigDecimal addAlready,BigDecimal borrowOrderWeight,
             Integer orderGoodsStatus) {

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

 package com.clx.performance.sqlProvider;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.clx.performance.param.app.AppGoodsOrderSearchParam;
 import com.clx.performance.param.pc.OrderGoodsEditParams;
 import com.clx.performance.param.pc.PageOrderGoodsListParam;
 import com.clx.performance.enums.OrderGoodsStatusEnum;
@@ -295,4 +297,35 @@ public class OrderGoodsSqlProvider {
         return sql;
     }
 
+    public String indexOrderGoodsListSearch(@Param("page") Page<OrderGoodsAPPVO> page, @Param("param") AppGoodsOrderSearchParam param) {
+        String sql = new SQL() {{
+            SELECT("a.id, a.order_no," +
+                    " a.order_goods_no, a.order_goods_status, a.extract_weight, " +
+                    " a.residue_transport_weight,a.already_transport_weight, a.send_address_id, a.send_address_shorter,a.send_longitude," +
+                    " a.send_latitude,a.receive_address_id, a.receive_address_shorter,a.receive_longitude,a.receive_latitude," +
+                    "a.goods_id, a.goods_name, a.pending_order_way," +
+                    " date_format(a.directional_expire_time, '%Y-%m-%d %H:%i:%s') as directional_expire_time ," +
+                    " date_format(a.last_arrive_send_time, '%Y-%m-%d %H:%i:%s') as last_arrive_send_time ," +
+                    " date_format(a.pending_order_time, '%Y-%m-%d %H:%i:%s') as pending_order_time," +
+                    " date_format(a.create_time, '%Y-%m-%d %H:%i:%s') as create_time," +
+                    " date_format(a.modified_time, '%Y-%m-%d %H:%i:%s') as modified_time," +
+                    "a.extract_way,a.need_truck_num,a.senior_logistics_manager_id,a.senior_logistics_manager_name,a.pending_order_freight," +
+                    "a.user_no,a.user_name");
+            FROM("order_goods a");
+            WHERE("a.stop_flag = "+ OrderGoodsStopEnum.Status.NO.getCode());
+            WHERE("a.last_arrive_send_time >= now()");
+            WHERE("(a.order_goods_status = "+OrderGoodsStatusEnum.Status.PAYING.getCode()+" or a.order_goods_status = "+OrderGoodsStatusEnum.Status.GO_TO_SEND.getCode()+")");
+            WHERE("a.residue_transport_weight >=35");
+            if (ObjectUtil.isNotNull(param.getSearchType())) {
+                if (1 == param.getSearchType()) {
+                    WHERE("a.send_address = "+ param.getSearchName());
+                }else if (2 == param.getSearchType()) {
+                    WHERE("a.receive_address = "+ param.getSearchName());
+                }
+            }
+            ORDER_BY("a.pending_order_time desc");
+        }}.toString();
+        return sql;
+    }
+
 }

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

 package com.clx.performance.sqlProvider;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 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;
+import com.clx.performance.vo.pc.OwnerAccountRunningWaterRecordVO;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.jdbc.SQL;
@@ -85,14 +87,13 @@ public class OwnerRunningWaterRecordSqlProvider {
         return sql;
     }
 
-    public String prepaidFreightOwnerAccountPageList(@Param("param") PageAppPrepaidFreightAccountParam param) {
+    public String prepaidFreightOwnerAccountPageList(@Param(value = "page") Page<OwnerAccountRunningWaterRecordVO> page, @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}");
+            //WHERE("a.owner_user_no = #{param.userNo}");
 
             if (StringUtils.isNotBlank(param.getBeginTime()) && StringUtils.isNotBlank(param.getEndTime())) {
                 WHERE("a.create_time >= #{param.beginTime} and a.create_time <= #{param.endTime}");
@@ -110,6 +111,15 @@ public class OwnerRunningWaterRecordSqlProvider {
                             );
                 }
             }
+            if (ObjectUtil.isNotNull(param.getAccountType())) {
+                if (OwnerAccountEnum.AccountTypeStatus.MARGIN_ACCOUNT.getCode().equals(param.getAccountType())) {
+                    WHERE("a.account_type =" + OwnerAccountEnum.AccountTypeStatus.MARGIN_ACCOUNT.getCode());
+
+                }else if (OwnerAccountEnum.AccountTypeStatus.PREPAID_FREIGHT_ACCOUNT.getCode().equals(param.getAccountType())) {
+                    WHERE("a.account_type =" + OwnerAccountEnum.AccountTypeStatus.PREPAID_FREIGHT_ACCOUNT.getCode());
+
+                }
+            }
 
             ORDER_BY("a.create_time desc");
         }}.toString();