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

fix

Browse Source
This commit is contained in:
shuo.wang
2025-04-18 11:07:01 +08:00
parent e130fcc29a
commit 43327a3c32
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -192,6 +192,9 @@ public class ZxjpApiRequest {
@ApiModelProperty(value = "报货物流仓库(编码)") @ApiModelProperty(value = "报货物流仓库(编码)")
private String declareGoodsLogisticsWarehouse ; private String declareGoodsLogisticsWarehouse ;
@ApiModelProperty(value = "报货物流仓库" )
private String declareGoodsLogisticsWarehouseName;
@ApiModelProperty(value = "报货类型 0-按周报货 1-按月报货 2-自提" ) @ApiModelProperty(value = "报货类型 0-按周报货 1-按月报货 2-自提" )
private String declareGoodsType; private String declareGoodsType;

7
coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncDataServiceImpl.java
View File

@@ -12,6 +12,7 @@ import com.cool.store.enums.FranchiseBrandEnum;
import com.cool.store.exception.ServiceException; import com.cool.store.exception.ServiceException;
import com.cool.store.mapper.ApplyLicenseMapper; import com.cool.store.mapper.ApplyLicenseMapper;
import com.cool.store.mapper.SignFranchiseMapper; import com.cool.store.mapper.SignFranchiseMapper;
import com.cool.store.mapper.WarehouseInfoMapper;
import com.cool.store.request.ZxjpApiRequest; import com.cool.store.request.ZxjpApiRequest;
import com.cool.store.service.SyncDataService; import com.cool.store.service.SyncDataService;
import com.cool.store.utils.JSONUtils; import com.cool.store.utils.JSONUtils;
@@ -39,6 +40,8 @@ import java.util.stream.Collectors;
@Service @Service
public class SyncDataServiceImpl implements SyncDataService { public class SyncDataServiceImpl implements SyncDataService {
@Resource
private WarehouseInfoMapper warehouseInfoMapper;
@Resource @Resource
private ShopInfoDAO shopInfoDAO; private ShopInfoDAO shopInfoDAO;
@Resource @Resource
@@ -144,6 +147,10 @@ public class SyncDataServiceImpl implements SyncDataService {
request.setAddresseeDistrict(orderSysInfoDO.getAddresseeDistrict()); request.setAddresseeDistrict(orderSysInfoDO.getAddresseeDistrict());
request.setAddresseeAddress(orderSysInfoDO.getAddresseeAddress()); request.setAddresseeAddress(orderSysInfoDO.getAddresseeAddress());
request.setDeclareGoodsLogisticsWarehouse(orderSysInfoDO.getDeclareGoodsLogisticsWarehouse()); request.setDeclareGoodsLogisticsWarehouse(orderSysInfoDO.getDeclareGoodsLogisticsWarehouse());
WarehouseInfoDO warehouseInfoDO = warehouseInfoMapper.getByCode(orderSysInfoDO.getDeclareGoodsLogisticsWarehouse());
if (Objects.nonNull(warehouseInfoDO)) {
request.setDeclareGoodsLogisticsWarehouseName(warehouseInfoDO.getWarehouseName());
}
request.setDeclareGoodsType(orderSysInfoDO.getDeclareGoodsType()); request.setDeclareGoodsType(orderSysInfoDO.getDeclareGoodsType());
request.setDeclareGoodsDate(JSONUtils.parseToListOrMap(orderSysInfoDO.getDeclareGoodsDate(), new TypeReference<List<DeclareGoodsDateDTO>>() {})); request.setDeclareGoodsDate(JSONUtils.parseToListOrMap(orderSysInfoDO.getDeclareGoodsDate(), new TypeReference<List<DeclareGoodsDateDTO>>() {}));
request.setReceivingFirmName(orderSysInfoDO.getReceivingFirmName()); request.setReceivingFirmName(orderSysInfoDO.getReceivingFirmName());