From 36bddf78453732727081de8514f227e804242e35 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Tue, 15 Oct 2024 20:37:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=B8=E6=9C=BA=E5=A2=9E=E5=8A=A0=E7=BB=93?= =?UTF-8?q?=E7=AE=97=E6=B8=A0=E9=81=93=E3=80=81=E5=90=88=E5=90=8C=E3=80=81?= =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basicdata/entity/BasicdataDriverArteryEntity.java | 2 +- .../controller/BasicdataDriverArteryController.java | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataDriverArteryEntity.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataDriverArteryEntity.java index 401985485..3d97a95c6 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataDriverArteryEntity.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataDriverArteryEntity.java @@ -225,7 +225,7 @@ public class BasicdataDriverArteryEntity extends TenantEntity { * 结算渠道 */ @ApiModelProperty(value = "结算渠道 1-微信 2-支付宝 3-银行卡 4-现金") - private Integer settlementChannel ; + private String settlementChannel ; /** * 结算渠道 diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataDriverArteryController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataDriverArteryController.java index 638f523b8..e807b80ea 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataDriverArteryController.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataDriverArteryController.java @@ -61,12 +61,7 @@ import springfox.documentation.annotations.ApiIgnore; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Date; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.*; import java.util.stream.Collectors; /** @@ -234,6 +229,9 @@ public class BasicdataDriverArteryController extends BladeController { if (null != basicdataDriverArtery.getBindVehicles()) { basicdataDriverArteryService.updateVehicle(basicdataDriverArtery); } + if (Objects.isNull(basicdataDriverArtery.getSettlementChannel())){ + basicdataDriverArtery.setSettlementChannel(""); + } boolean b = basicdataDriverArteryService.updateById(basicdataDriverArtery); if (b) { List warehouseIds = basicdataDriverArtery.getWarehouseIds();