suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/cc_20250325_select' into cc_20250325_select

Browse Source
This commit is contained in:
苏竹红
2025-04-17 16:04:10 +08:00
parent d54537937a b301d5375c
commit 7b81ce98e3
10 changed files with 117 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
coolstore-partner-model/src/main/java/com/cool/store/dto/DeclareGoodsDateDTO.java Normal file
View File

@@ -0,0 +1,20 @@
package com.cool.store.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @Author: WangShuo
* @Date: 2025/04/16/20:46
* @Version 1.0
* @注释:
*/
@Data
public class DeclareGoodsDateDTO {
@ApiModelProperty(value = "报货日期，例如：星期一（星期六，星期天）/每月1号")
private String declareGoods;
@ApiModelProperty(value = "报货日期，例如：星期一（星期六，星期天）/每月1号")
private String deliverGoods;
}

4
coolstore-partner-model/src/main/java/com/cool/store/entity/OrderSysInfoDO.java
View File

@@ -58,6 +58,10 @@ public class OrderSysInfoDO {
@Column(name = "declare_goods_logistics_warehouse")
private String declareGoodsLogisticsWarehouse;
/** 报货类型 */
@Column(name = "declare_goods_type")
private String declareGoodsType;
/** 报货日期 */
@Column(name = "declare_goods_date")
private String declareGoodsDate;

9
coolstore-partner-model/src/main/java/com/cool/store/request/OrderSysInfoRequest.java
View File

@@ -48,7 +48,10 @@ public class OrderSysInfoRequest {
@ApiModelProperty(value = "报货物流仓库（编码）" )
private String declareGoodsLogisticsWarehouse;
@ApiModelProperty(value = "报货日期" )
@ApiModelProperty(value = "报货类型 0-按周报货 1-按月报货 2-自提" )
private String declareGoodsType;
@ApiModelProperty(value = "报货日期 数组格式\"[{ 报货日期 \"declareGoods\": \"\",送货日期\"deliverGoods\":\"\"}]" )
private String declareGoodsDate;
@ApiModelProperty(value = "仓库配送日期" )
@@ -101,6 +104,7 @@ public class OrderSysInfoRequest {
orderSysInfoDO.setAddresseeDistrict(this.addresseeDistrict);
orderSysInfoDO.setAddresseeAddress(this.addresseeAddress);
orderSysInfoDO.setDeclareGoodsLogisticsWarehouse(this.declareGoodsLogisticsWarehouse);
orderSysInfoDO.setDeclareGoodsType(this.declareGoodsType);
orderSysInfoDO.setDeclareGoodsDate(this.declareGoodsDate);
orderSysInfoDO.setWarehouseDeliveryDate(this.warehouseDeliveryDate);
@@ -113,7 +117,8 @@ public class OrderSysInfoRequest {
}
public Boolean check(){
if (Objects.equals(this.type, OrderSysTypeEnum.ORDER_SYS_TYPE_1.getType())){
if (StringUtils.isAnyBlank(this.xgjRegionId,this.xgjVicePresident,this.declareGoodsDate,this.declareGoodsLogisticsWarehouse,this.warehouseDeliveryDate)){
//todo
if (StringUtils.isAnyBlank(this.xgjRegionId,this.xgjVicePresident,this.declareGoodsDate,this.declareGoodsLogisticsWarehouse)){
return false;
}
}

9
coolstore-partner-model/src/main/java/com/cool/store/request/ZxjpApiRequest.java
View File

@@ -1,5 +1,6 @@
package com.cool.store.request;
import com.cool.store.dto.DeclareGoodsDateDTO;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -191,11 +192,11 @@ public class ZxjpApiRequest {
@ApiModelProperty(value = "报货物流仓库(编码)")
private String declareGoodsLogisticsWarehouse ;
@ApiModelProperty(value = "报货日期")
private String declareGoodsDate ;
@ApiModelProperty(value = "报货类型 0-按周报货 1-按月报货 2-自提" )
private String declareGoodsType;
@ApiModelProperty(value = "仓库配送日期")
private String warehouseDeliveryDate ;
@ApiModelProperty(value = "报货日期" )
private List<DeclareGoodsDateDTO> declareGoodsDate;
@ApiModelProperty(value = "收款公司名称")
private String receivingFirmName;

5
coolstore-partner-model/src/main/java/com/cool/store/response/BuildInformationResponse.java
View File

@@ -150,7 +150,10 @@ public class BuildInformationResponse {
@ApiModelProperty(value = "报货物流仓库" )
private String declareGoodsLogisticsWarehouseName;
@ApiModelProperty(value = "报货日期" )
@ApiModelProperty(value = "报货类型 0-按周报货 1-按月报货 2-自提" )
private String declareGoodsType;
@ApiModelProperty(value = "报货日期 数组格式\"[{ 报货日期declareGoods: \"\",送货日期deliverGoods:\"\"}]" )
private String declareGoodsDate;
@ApiModelProperty(value = "仓库配送日期" )