Merge remote-tracking branch 'origin/test' into test

performance-web/src/main/java/com/clx/performance/job/NetworkDriverAccountSyncJob.java

+package com.clx.performance.job;
+
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.json.JSONUtil;
+import com.clx.performance.param.pc.driver.NetworkDriverAccountParam;
+import com.clx.performance.service.OrderChildService;
+import com.clx.performance.service.settle.NetworkDriverAccountService;
+import com.clx.user.feign.DriverFeign;
+import com.clx.user.vo.pc.driver.user.DriverInfoVo;
+import com.msl.common.result.Result;
+import com.xxl.job.core.handler.annotation.XxlJob;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Slf4j
+@Component
+@AllArgsConstructor
+public class NetworkDriverAccountSyncJob {
+
+
+    private final DriverFeign driverFeign;
+
+    private final NetworkDriverAccountService networkDriverAccountService;
+
+
+
+    /**
+     * 网络货运同步司机账户信息
+     */
+    @XxlJob("networkDriverAccountSync")
+    public void networkDriverAccountSync() {
+        Result<List<DriverInfoVo>> result = driverFeign.getDriverInfoList();
+        List<DriverInfoVo> data = result.getData();
+        log.info("查询出所有司机信息:{}", JSONUtil.parse(data));
+        for (DriverInfoVo vo : data) {
+            if (ObjectUtil.isNull(vo.getUserNo())) {
+                continue;
+            }
+            NetworkDriverAccountParam param = new NetworkDriverAccountParam();
+            param.setDriverUserName(vo.getName());
+            param.setDriverUserNo(vo.getUserNo());
+            param.setMobile(vo.getMobile());
+            networkDriverAccountService.createNetworkDriverAccount(param);
+        }
+
+    }
+}

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

 package com.clx.performance.service.impl.settle;
 
 
+import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.component.IdGenerateSnowFlake;
 import com.clx.performance.dao.settle.NetworkDriverAccountDao;
@@ -9,7 +10,9 @@ 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 com.msl.common.base.Optional;
 import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
@@ -21,6 +24,7 @@ import java.math.BigDecimal;
  */
 @Service
 @AllArgsConstructor
+@Slf4j
 public class NetworkDriverAccountServiceImpl implements NetworkDriverAccountService {
 
     private final NetworkDriverAccountDao networkDriverAccountDao;
@@ -34,8 +38,15 @@ public class NetworkDriverAccountServiceImpl implements NetworkDriverAccountServ
 
     @Override
     public void createNetworkDriverAccount(NetworkDriverAccountParam param) {
+        Optional<NetworkDriverAccount> optional = networkDriverAccountDao.getOneByField(NetworkDriverAccount::getDriverUserNo, param.getDriverUserNo());
+        if (optional.isPresent()) {
+            log.info("当前用户已经存在,相关参数:{}", JSONUtil.parse(param));
+            return;
+        }
+
         String walletCode = idGenerateSnowFlake.nextIdToString(1L);
         NetworkDriverAccount entity = NetworkDriverAccount.builder().driverUserNo(param.getDriverUserNo())
+                .mobile(param.getMobile())
                 .driverUserName(param.getDriverUserName())
                 .accountBalance(BigDecimal.ZERO)
                 .usableBalance(BigDecimal.ZERO)