huanglizhi 1 سال پیش
والد
کامیت
a91e066a37

+ 2 - 2
module-erp/src/main/java/com/hys/app/mapper/erp/WarehouseEntryMapper.java

@@ -36,8 +36,8 @@ public interface WarehouseEntryMapper extends BaseMapperX<WarehouseEntryDO> {
                 .likeIfPresent(WarehouseEntryDO::getContractAttachment, params.getContractAttachment())
                 .eqIfPresent(WarehouseEntryDO::getStatus, params.getStatus())
                 .eqIfPresent(WarehouseEntryDO::getSupplierSettlementFlag, params.getSupplierSettlementFlag())
-                .eqIfPresent(WarehouseEntryDO::getCustomerName, params.getCustomerName())
-                .eqIfPresent(WarehouseEntryDO::getCustomerPhone, params.getCustomerPhone())
+                .likeIfPresent(WarehouseEntryDO::getCustomerName, params.getCustomerName())
+                .likeIfPresent(WarehouseEntryDO::getCustomerPhone, params.getCustomerPhone())
                 .eqIfPresent(WarehouseEntryDO::getType, params.getType())
                 .orderByDesc(WarehouseEntryDO::getEntryTime)
                 .page(params);

+ 6 - 0
module-erp/src/main/java/com/hys/app/service/kuaidiniao/entity/PreOrderModel.java

@@ -91,7 +91,13 @@ public class PreOrderModel {
     @ApiModelProperty(value = "商家订单号 全局唯一")
     private String orderCode;
 
+    @ApiModelProperty(value = "发货人信息")
+    @Valid
+    private ReceiverSender sender;
 
+    @ApiModelProperty(value = "收货人信息")
+    @Valid
+    private ReceiverSender receiver;
 
 
 }

+ 0 - 6
module-erp/src/main/java/com/hys/app/service/kuaidiniao/entity/PreOrderModelDTO.java

@@ -29,13 +29,7 @@ public class PreOrderModelDTO extends PreOrderModel{
     @ApiModelProperty("寄件人手机号后四位")
     private String  logisticsPhone;
 
-    @ApiModelProperty(value = "发货人信息")
-    @Valid
-    private ReceiverSender sender;
 
-    @ApiModelProperty(value = "收货人信息")
-    @Valid
-    private ReceiverSender receiver;
 
     private String sendAddress;