Merge branch 'refs/heads/v17.5_order_child_sync_broker_20240617' into test

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

@@ -19,8 +19,6 @@ import com.clx.performance.vo.app.APPNetworkDriverRunningWaterRecordVO;
 import com.clx.performance.vo.pc.NetworkDriverRunningWaterRecordVO;
 import com.clx.user.feign.DriverFeign;
 import com.clx.user.vo.feign.BankCardVO;
-import com.msl.common.base.Optional;
-import com.msl.common.enums.ResultCodeEnum;
 import com.msl.common.result.Result;
 import com.msl.user.utils.TokenUtil;
 import lombok.AllArgsConstructor;
@@ -33,7 +31,6 @@ import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 
 import static java.util.Locale.filter;
@@ -200,6 +197,36 @@ public class NetworkDriverRunningWaterRecordServiceImpl implements NetworkDriver
         }
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void generateCaseOutSuccessRunningWaterRecord1(SettlementDriverDetail settlementDriverDetail) {
+        log.info("运单同步网络货运生成司机运单提现成功流水");
+        NetworkDriverAccount account = networkDriverAccountDao.getOneByField(NetworkDriverAccount::getDriverUserNo, settlementDriverDetail.getDriverUserNo()).get();
+
+        networkDriverRunningWaterRecordDao.updateFrozenFlagByChildNo(settlementDriverDetail.getChildNo());
+
+        NetworkDriverRunningWaterRecord entity = NetworkDriverRunningWaterRecord.builder()
+                .usableBalance(account.getUsableBalance())
+                .mobile(account.getMobile())
+                .alterationBalance(settlementDriverDetail.getSettlementFreight())
+                .accountBalance(account.getAccountBalance())
+                .frozenBalance(account.getFrozenBalance()).createBy("系统")
+                .fundType(NetworkDriverAccountEnum.FundType.EXPENDITURE.getCode())
+                .fundTypeMsg(NetworkDriverAccountEnum.FundType.EXPENDITURE.getMsg())
+                .driverUserName(account.getDriverUserName())
+                .driverUserNo(account.getDriverUserNo())
+                .runningWaterNo(idGenerateSnowFlake.nextId(3L))
+                .runningWaterTypeMsg(NetworkDriverAccountEnum.RunningWaterStatus.CASE_OUT_SUCCESS.getMsg())
+                .runningWaterType(NetworkDriverAccountEnum.RunningWaterStatus.CASE_OUT_SUCCESS.getCode())
+                .childNo(settlementDriverDetail.getChildNo())
+                .orderNo(settlementDriverDetail.getOrderNo())
+                .orderGoodsNo(settlementDriverDetail.getOrderGoodsNo())
+                .build();
+
+        networkDriverRunningWaterRecordDao.saveEntity(entity);
+
+    }
+
     @Override
     public void generateNetworkDriverRunningWaterRecord(SettlementDriverDetail settlementDriverDetail, Integer runningWaterType) {
         if (NetworkDriverAccountEnum.RunningWaterStatus.SETTLEMENT.getCode().equals(runningWaterType)) {

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

@@ -98,7 +98,8 @@ public class OrderChildSyncTransportRecordServiceImpl implements OrderChildSyncT
         if (Objects.equals(orderGoods.getPlatformFreightQuotationTaxType(),
                 QuotationEnum.PlatformFreightQuotationTaxType.NO.getCode())
                 && Objects.equals(orderGoods.getSettlementWay(), SettlementWayEnum.WayType.UNLOAD_LOSS.getCode())) {
-            // 未税，卸车减货损账户不变动
+            // 未税，卸车减货损
+            networkDriverRunningWaterRecordService.generateCaseOutSuccessRunningWaterRecord1(driverDetail);
         }
         else {
             networkDriverRunningWaterRecordService.generateCaseOutSuccessRunningWaterRecord(driverDetail);

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

@@ -7,6 +7,7 @@ import com.clx.performance.param.app.NetworkDriverPageParam;
 import com.clx.performance.param.pc.PageNetworkAccountInfoListParam;
 import com.clx.performance.vo.app.APPNetworkDriverRunningWaterRecordVO;
 import com.clx.performance.vo.pc.NetworkDriverRunningWaterRecordVO;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 
@@ -25,6 +26,8 @@ public interface NetworkDriverRunningWaterRecordService {
 
     void generateCaseOutSuccessRunningWaterRecord(SettlementDriverDetail settlementDriverDetail);
 
+    void generateCaseOutSuccessRunningWaterRecord1(SettlementDriverDetail settlementDriverDetail);
+
     void generateNetworkDriverRunningWaterRecord(SettlementDriverDetail settlementDriverDetail, Integer runningWaterType);
 
     IPage<APPNetworkDriverRunningWaterRecordVO> pageFrozenList(NetworkDriverPageParam param);