From f7fe60241c3480d6933bec0a73c466777233c378 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Tue, 15 Oct 2024 18:13:41 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E8=AE=A1=E5=88=92=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E8=AE=A2=E5=8D=95=E6=90=9C=E7=B4=A2=E5=85=A8=E6=A8=A1?= =?UTF-8?q?=E7=B3=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/BasicdataDriverArteryEntity.java | 18 ++++++++++++++++++ .../mapper/DistributionStockArticleMapper.xml | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) 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 3aa2fc6a5..401985485 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 @@ -221,4 +221,22 @@ public class BasicdataDriverArteryEntity extends TenantEntity { @ApiModelProperty(value = "仓库名称") private String warehouseName; + /** + * 结算渠道 + */ + @ApiModelProperty(value = "结算渠道 1-微信 2-支付宝 3-银行卡 4-现金") + private Integer settlementChannel ; + + /** + * 结算渠道 + */ + @ApiModelProperty(value = "结算账号") + private String settlementAccount ; + + /** + * 合同 + */ + @ApiModelProperty(value = "合同") + private String contract; + } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml index 901a42d84..ec0ff8bc1 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml @@ -775,7 +775,7 @@ AND ldpll.warehouse_id = #{par.warehouseId} AND ldsa.type_service = #{par.typeService} - and ldpll.order_code like concat(#{par.orderCode},'%') + and ldpll.order_code like concat('%',#{par.orderCode},'%') GROUP BY ldpll.stock_article_id HAVING SUM(ldpll.quantity) > 0