Merge remote-tracking branch 'origin/v6.5_transport_open_20231115' into test

performance-api/src/main/java/com/clx/performance/feign/NetworkFeign.java

+package com.clx.performance.feign;
+
+import com.clx.performance.param.pc.driver.NetworkDriverAccountParam;
+import com.msl.common.result.Result;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+@FeignClient(name = "clx-performance",configuration = PerformanceClientConfiguration.class)
+public interface NetworkFeign {
+
+    @ApiOperation(value = "新增网络货运司机账户")
+    @PostMapping("clx-performance/feign/driver/createNetworkDriverAccount")
+    Result<Object> createNetworkDriverAccount(@RequestBody @Validated NetworkDriverAccountParam param);
+
+}

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

+package com.clx.performance.param.pc.driver;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+
+@Getter
+@Setter
+@NoArgsConstructor
+@ToString
+public class NetworkDriverAccountParam {
+
+    private Long driverUserNo;
+
+    private String driverUserName;
+
+    private String mobile;
+
+}

performance-web/src/main/java/com/clx/performance/controller/feign/DriverAccountFeignController.java

+package com.clx.performance.controller.feign;
+
+import cn.hutool.json.JSONUtil;
+import com.clx.performance.param.pc.driver.NetworkDriverAccountParam;
+import com.clx.performance.service.OwnerAccountService;
+import com.clx.performance.service.settle.NetworkDriverAccountService;
+import com.msl.common.result.Result;
+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("/feign/driver")
+@Validated
+@AllArgsConstructor
+public class DriverAccountFeignController {
+
+    private final NetworkDriverAccountService networkDriverAccountService;
+
+
+    @ApiOperation(value = "创建司机网络货运账户", notes = "<br>By:胡宇帆")
+    @PostMapping("/createNetworkDriverAccount")
+    public Result<Object> createNetworkDriverAccount(@RequestBody NetworkDriverAccountParam param) {
+        log.info("进行创建司机网络货运账户,相关参数{}", JSONUtil.parse(param).toString());
+        networkDriverAccountService.createNetworkDriverAccount(param);
+        return Result.ok();
+    }
+
+}

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

 package com.clx.performance.controller.pc.driver;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.clx.performance.model.OwnerTransferInfo;
 import com.clx.performance.param.pc.*;
-import com.clx.performance.param.pc.owner.CreteAccountParam;
-import com.clx.performance.service.*;
 import com.clx.performance.service.settle.NetworkCaseOutRecordService;
 import com.clx.performance.service.settle.NetworkDriverAccountService;
 import com.clx.performance.service.settle.NetworkDriverRunningWaterRecordService;
 import com.clx.performance.vo.pc.*;
-import com.clx.user.vo.pc.owner.OwnerBindCardVO;
 import com.msl.common.base.PageData;
 import com.msl.common.convertor.aspect.UnitCovert;
 import com.msl.common.result.Result;
-import com.msl.user.data.UserSessionData;
-import com.msl.user.utils.TokenUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.xssf.streaming.SXSSFWorkbook;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.MediaType;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.constraints.NotNull;
-
 @Slf4j
 @RestController
 @RequestMapping("/pc/driver")
@@ -57,7 +45,7 @@ public class NetworkDriverAccountController {
     @PostMapping("/networkAccountInfoList")
     @UnitCovert(param = false)
     public Result<PageData<NetworkDriverRunningWaterRecordVO>> networkAccountInfoList(PageNetworkAccountInfoListParam param) {
-        IPage<NetworkDriverRunningWaterRecordVO> page = networkDriverRunningWaterRecordService.networkAccountInfoList(param);
+        IPage<NetworkDriverRunningWaterRecordVO> page = networkDriverRunningWaterRecordService.networkDriverRunningWaterRecordList(param);
         return Result.page(page.getRecords(), page.getTotal(), page.getPages());
     }
 

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

 package com.clx.performance.dao.impl.settle;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.performance.dao.settle.NetworkCaseOutRecordDao;
 import com.clx.performance.mapper.settle.NetworkCaseOutRecordMapper;
 import com.clx.performance.model.settle.NetworkCaseOutRecord;
+import com.clx.performance.param.pc.PageNetworkCaseOutRecordListParam;
+import com.clx.performance.vo.pc.NetworkCaseOutRecordVO;
+import com.clx.performance.vo.pc.OwnerAccountVO;
 import com.msl.common.dao.impl.BaseDaoImpl;
 import org.springframework.stereotype.Repository;
 
@@ -14,4 +19,10 @@ import org.springframework.stereotype.Repository;
  */
 @Repository
 public class NetworkCaseOutRecordDaoImpl extends BaseDaoImpl<NetworkCaseOutRecordMapper, NetworkCaseOutRecord, Integer> implements NetworkCaseOutRecordDao {
+
+    @Override
+    public IPage<NetworkCaseOutRecordVO> networkCaseOutRecord(PageNetworkCaseOutRecordListParam param) {
+        Page<OwnerAccountVO> page = Page.of(param.getPage(), param.getPageSize());
+        return baseMapper.networkCaseOutRecord(page, param);
+    }
 }

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

@@ -7,7 +7,6 @@ import com.clx.performance.dao.settle.NetworkDriverRunningWaterRecordDao;
 import com.clx.performance.mapper.settle.NetworkDriverRunningWaterRecordMapper;
 import com.clx.performance.model.settle.NetworkDriverRunningWaterRecord;
 import com.clx.performance.param.pc.PageNetworkAccountInfoListParam;
-import com.clx.performance.vo.pc.NetworkDriverAccountVO;
 import com.clx.performance.vo.pc.NetworkDriverRunningWaterRecordVO;
 import com.msl.common.dao.impl.BaseDaoImpl;
 import org.springframework.stereotype.Repository;
@@ -22,8 +21,8 @@ public class NetworkDriverRunningWaterRecordDaoImpl extends BaseDaoImpl<NetworkD
 
 
     @Override
-    public IPage<NetworkDriverRunningWaterRecordVO> networkAccountInfoList(PageNetworkAccountInfoListParam param) {
+    public IPage<NetworkDriverRunningWaterRecordVO> networkDriverRunningWaterRecordDao(PageNetworkAccountInfoListParam param) {
         Page<NetworkDriverRunningWaterRecordVO> page = Page.of(param.getPage(), param.getPageSize());
-        return baseMapper.networkAccountInfoList(page, param);
+        return baseMapper.networkDriverRunningWaterRecordDao(page, param);
     }
 }

performance-web/src/main/java/com/clx/performance/dao/settle/NetworkCaseOutRecordDao.java

 package com.clx.performance.dao.settle;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.mapper.settle.NetworkCaseOutRecordMapper;
 import com.clx.performance.model.settle.NetworkCaseOutRecord;
+import com.clx.performance.param.pc.PageNetworkCaseOutRecordListParam;
+import com.clx.performance.vo.pc.NetworkCaseOutRecordVO;
 import com.msl.common.dao.BaseDao;
 
 /**
@@ -11,4 +14,7 @@ import com.msl.common.dao.BaseDao;
  * Time 11:34
  */
 public interface NetworkCaseOutRecordDao extends BaseDao<NetworkCaseOutRecordMapper, NetworkCaseOutRecord, Integer> {
+
+
+    IPage<NetworkCaseOutRecordVO> networkCaseOutRecord(PageNetworkCaseOutRecordListParam param);
 }

performance-web/src/main/java/com/clx/performance/dao/settle/NetworkDriverRunningWaterRecordDao.java

@@ -15,5 +15,5 @@ import com.msl.common.dao.BaseDao;
  */
 public interface NetworkDriverRunningWaterRecordDao extends BaseDao<NetworkDriverRunningWaterRecordMapper, NetworkDriverRunningWaterRecord, Integer> {
 
-    IPage<NetworkDriverRunningWaterRecordVO> networkAccountInfoList(PageNetworkAccountInfoListParam param);
+    IPage<NetworkDriverRunningWaterRecordVO> networkDriverRunningWaterRecordDao(PageNetworkAccountInfoListParam param);
 }

performance-web/src/main/java/com/clx/performance/mapper/settle/NetworkCaseOutRecordMapper.java

 package com.clx.performance.mapper.settle;
 
 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.settle.NetworkCaseOutRecord;
+import com.clx.performance.param.pc.PageNetworkCaseOutRecordListParam;
+import com.clx.performance.sqlProvider.settle.NetworkCaseOutRecordProvider;
+import com.clx.performance.vo.pc.NetworkCaseOutRecordVO;
+import com.clx.performance.vo.pc.OwnerAccountVO;
+import org.apache.ibatis.annotations.SelectProvider;
 
 /**
  * @author kavin
@@ -9,4 +16,8 @@ import com.clx.performance.model.settle.NetworkCaseOutRecord;
  * Time 11:34
  */
 public interface NetworkCaseOutRecordMapper extends BaseMapper<NetworkCaseOutRecord> {
+
+
+    @SelectProvider(type = NetworkCaseOutRecordProvider.class, method = "networkCaseOutRecord")
+    IPage<NetworkCaseOutRecordVO> networkCaseOutRecord(Page<OwnerAccountVO> page, PageNetworkCaseOutRecordListParam param);
 }

performance-web/src/main/java/com/clx/performance/mapper/settle/NetworkDriverRunningWaterRecordMapper.java

@@ -16,6 +16,6 @@ import org.apache.ibatis.annotations.SelectProvider;
  */
 public interface NetworkDriverRunningWaterRecordMapper extends BaseMapper<NetworkDriverRunningWaterRecord> {
 
-    @SelectProvider(type = NetworkDriverRunningWaterRecordProvider.class, method = "networkAccountInfoList")
-    IPage<NetworkDriverRunningWaterRecordVO> networkAccountInfoList(Page<NetworkDriverRunningWaterRecordVO> page, PageNetworkAccountInfoListParam param);
+    @SelectProvider(type = NetworkDriverRunningWaterRecordProvider.class, method = "networkDriverRunningWaterRecordDao")
+    IPage<NetworkDriverRunningWaterRecordVO> networkDriverRunningWaterRecordDao(Page<NetworkDriverRunningWaterRecordVO> page, PageNetworkAccountInfoListParam param);
 }

performance-web/src/main/java/com/clx/performance/model/settle/NetworkCaseOutRecord.java

@@ -34,7 +34,7 @@ public class NetworkCaseOutRecord implements HasKey<Integer> {
 
     @TableField("driver_user_no")
     @ApiModelProperty("司机编码")
-    private String driverUserNo;
+    private Long driverUserNo;
 
     @TableField("driver_user_name")
     @ApiModelProperty("司机名称")

performance-web/src/main/java/com/clx/performance/model/settle/NetworkDriverAccount.java

@@ -7,6 +7,7 @@ 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.Getter;
 import lombok.Setter;
 import lombok.experimental.Accessors;
@@ -23,6 +24,7 @@ import java.time.LocalDateTime;
 @Setter
 @Accessors(chain = true)
 @TableName("network_driver_account")
+@Builder
 public class NetworkDriverAccount implements HasKey<Integer> {
 
     @TableId(value = "id", type = IdType.AUTO)
@@ -30,7 +32,7 @@ public class NetworkDriverAccount implements HasKey<Integer> {
 
     @TableField("driver_user_no")
     @ApiModelProperty("司机编码")
-    private String driverUserNo;
+    private Long driverUserNo;
 
     @TableField("driver_user_name")
     @ApiModelProperty("司机名称")

performance-web/src/main/java/com/clx/performance/model/settle/NetworkDriverRunningWaterRecord.java

@@ -34,7 +34,7 @@ public class NetworkDriverRunningWaterRecord implements HasKey<Integer> {
 
     @TableField("driver_user_no")
     @ApiModelProperty("司机编码")
-    private String driverUserNo;
+    private Long driverUserNo;
 
     @TableField("driver_user_name")
     @ApiModelProperty("司机名称")

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

@@ -176,7 +176,7 @@ public class TransportSyncServiceImpl implements TransportSyncService {
         orderGoodsDto.setSendMobile(sendAddress.getContactPhone());
         orderGoodsDto.setLoadLongitude(orderGoods.getSendLongitude().toString());
         orderGoodsDto.setLoadLatitude(orderGoods.getSendLatitude().toString());
-        orderGoodsDto.setReceiveAddress(orderChild.getReceiveAddress());
+        orderGoodsDto.setReceiveAddress(receiveAddress.getAddress());
         orderGoodsDto.setReceiveProvince(receiveAddress.getProvince());
         orderGoodsDto.setReceiveCity(receiveAddress.getCity());
         orderGoodsDto.setReceiveCounty(receiveAddress.getCounty());

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

 package com.clx.performance.service.impl.settle;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.dao.settle.NetworkCaseOutRecordDao;
 import com.clx.performance.param.pc.PageNetworkCaseOutRecordListParam;
 import com.clx.performance.service.settle.NetworkCaseOutRecordService;
 import com.clx.performance.vo.pc.NetworkCaseOutRecordVO;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 /**
@@ -12,9 +15,14 @@ import org.springframework.stereotype.Service;
  * Time 11:34
  */
 @Service
+@AllArgsConstructor
+@Slf4j
 public class NetworkCaseOutRecordServiceImpl  implements NetworkCaseOutRecordService {
+
+    private final NetworkCaseOutRecordDao networkCaseOutRecordDao;
+
     @Override
     public IPage<NetworkCaseOutRecordVO> networkCaseOutRecord(PageNetworkCaseOutRecordListParam param) {
-        return null;
+        return networkCaseOutRecordDao.networkCaseOutRecord(param);
     }
 }

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

@@ -2,13 +2,18 @@ package com.clx.performance.service.impl.settle;
 
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.component.IdGenerateSnowFlake;
 import com.clx.performance.dao.settle.NetworkDriverAccountDao;
+import com.clx.performance.model.settle.NetworkDriverAccount;
 import com.clx.performance.param.pc.PageNetworkAccountListParam;
+import com.clx.performance.param.pc.driver.NetworkDriverAccountParam;
 import com.clx.performance.service.settle.NetworkDriverAccountService;
 import com.clx.performance.vo.pc.NetworkDriverAccountVO;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
+
 /**
  * @author kavin
  * Date 2023-12-19
@@ -20,8 +25,23 @@ public class NetworkDriverAccountServiceImpl implements NetworkDriverAccountServ
 
     private final NetworkDriverAccountDao networkDriverAccountDao;
 
+    private final IdGenerateSnowFlake idGenerateSnowFlake;
+
     @Override
     public IPage<NetworkDriverAccountVO> networkAccountList(PageNetworkAccountListParam param) {
         return networkDriverAccountDao.networkAccountList(param);
     }
+
+    @Override
+    public void createNetworkDriverAccount(NetworkDriverAccountParam param) {
+        String walletCode = idGenerateSnowFlake.nextIdToString(1L);
+        NetworkDriverAccount entity = NetworkDriverAccount.builder().driverUserNo(param.getDriverUserNo())
+                .driverUserName(param.getDriverUserName())
+                .accountBalance(BigDecimal.ZERO)
+                .usableBalance(BigDecimal.ZERO)
+                .frozenBalance(BigDecimal.ZERO)
+                .createBy("系统")
+                .walletCode(walletCode).build();
+        networkDriverAccountDao.saveEntity(entity);
+    }
 }

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

@@ -22,7 +22,7 @@ public class NetworkDriverRunningWaterRecordServiceImpl implements NetworkDriver
     private final NetworkDriverRunningWaterRecordDao networkDriverRunningWaterRecordDao;
 
     @Override
-    public IPage<NetworkDriverRunningWaterRecordVO> networkAccountInfoList(PageNetworkAccountInfoListParam param) {
-        return networkDriverRunningWaterRecordDao.networkAccountInfoList(param);
+    public IPage<NetworkDriverRunningWaterRecordVO> networkDriverRunningWaterRecordList(PageNetworkAccountInfoListParam param) {
+        return networkDriverRunningWaterRecordDao.networkDriverRunningWaterRecordDao(param);
     }
 }

performance-web/src/main/java/com/clx/performance/service/settle/NetworkDriverAccountService.java

@@ -2,6 +2,7 @@ package com.clx.performance.service.settle;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.param.pc.PageNetworkAccountListParam;
+import com.clx.performance.param.pc.driver.NetworkDriverAccountParam;
 import com.clx.performance.vo.pc.NetworkDriverAccountVO;
 
 /**
@@ -12,4 +13,6 @@ import com.clx.performance.vo.pc.NetworkDriverAccountVO;
 public interface NetworkDriverAccountService {
 
     IPage<NetworkDriverAccountVO> networkAccountList(PageNetworkAccountListParam param);
+
+    void createNetworkDriverAccount(NetworkDriverAccountParam param);
 }

performance-web/src/main/java/com/clx/performance/service/settle/NetworkDriverRunningWaterRecordService.java

@@ -11,5 +11,5 @@ import com.clx.performance.vo.pc.NetworkDriverRunningWaterRecordVO;
  */
 public interface NetworkDriverRunningWaterRecordService {
 
-    IPage<NetworkDriverRunningWaterRecordVO> networkAccountInfoList(PageNetworkAccountInfoListParam param);
+    IPage<NetworkDriverRunningWaterRecordVO> networkDriverRunningWaterRecordList(PageNetworkAccountInfoListParam param);
 }

performance-web/src/main/java/com/clx/performance/sqlProvider/settle/NetworkCaseOutRecordProvider.java

+package com.clx.performance.sqlProvider.settle;
+
+import com.clx.performance.param.pc.PageNetworkCaseOutRecordListParam;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.jdbc.SQL;
+
+public class NetworkCaseOutRecordProvider {
+
+    public String networkCaseOutRecord(@Param("param") PageNetworkCaseOutRecordListParam param) {
+        String sql = new SQL() {{
+            SELECT("a.id,a.case_out_no,a.driver_user_no," +
+                    " a.driver_user_name,a.payee,a.bank,a.collection_bank_code,a.status,a.platform,a.relation_id,a.order_id,a.order_no,a.order_child_id," +
+                    "a.order_child_no,a.mobile,a.alteration_balance,a.account_balance, " +
+                    " a.usable_balance,a.frozen_balance,a.take_out_balance,a.create_by," +
+                    "date_format(a.finish_time, '%Y-%m-%d %H:%i:%s') as finish_time,date_format(a.create_time, '%Y-%m-%d %H:%i:%s') as create_time");
+            FROM("network_case_out_record a");
+
+            if (StringUtils.isNotBlank(param.getDriverUserNo())) {
+                WHERE("a.driver_user_no = #{param.driverUserNo}");
+            }
+            if (StringUtils.isNotBlank(param.getMobile())) {
+                WHERE("a.mobile = #{param.mobile}");
+            }
+
+            if (StringUtils.isNotBlank(param.getChildNo())) {
+                WHERE("a.child_no = #{param.childNo}");
+            }
+            ORDER_BY("a.create_time desc");
+        }}.toString();
+        return sql;
+    }
+
+}

performance-web/src/main/java/com/clx/performance/sqlProvider/settle/NetworkDriverRunningWaterRecordProvider.java

@@ -9,7 +9,7 @@ import org.apache.ibatis.jdbc.SQL;
 
 public class NetworkDriverRunningWaterRecordProvider {
 
-    public String networkAccountInfoList(@Param("param") PageNetworkAccountInfoListParam param) {
+    public String networkDriverRunningWaterRecordDao(@Param("param") PageNetworkAccountInfoListParam param) {
         String sql = new SQL() {{
             SELECT("a.id, a.running_water_no," +
                     " a.driver_user_no,a.driver_user_name, a.mobile,a.running_water_type, a.account_balance, " +