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();