Commit 389770e0 authored by knight's avatar knight

需求138 客户端-首页修改

parent dab2a1fe
...@@ -172,15 +172,18 @@ public class AppUserController { ...@@ -172,15 +172,18 @@ public class AppUserController {
if (Objects.isNull(customerContacts)) { if (Objects.isNull(customerContacts)) {
respVO.setDefaultPay(Boolean.FALSE); respVO.setDefaultPay(Boolean.FALSE);
respVO.setNoConsignee(Boolean.FALSE); respVO.setNoConsignee(Boolean.FALSE);
respVO.setIsConsService(Boolean.FALSE);
}else { }else {
CustomerDO customerDO = customerService.getCustomer(customerContacts.getCustomerId()); CustomerDO customerDO = customerService.getCustomer(customerContacts.getCustomerId());
if (customerDO != null) { if (customerDO != null) {
respVO.setDefaultPay(customerDO.getDefaultPay()); respVO.setDefaultPay(customerDO.getDefaultPay());
respVO.setNoConsignee(customerDO.getNoConsignee()); respVO.setNoConsignee(customerDO.getNoConsignee());
respVO.setFirstDealTime(customerDO.getFirstDealTime()); respVO.setFirstDealTime(customerDO.getFirstDealTime());
respVO.setIsConsService(customerDO.getIsConsService());
}else { }else {
respVO.setDefaultPay(Boolean.FALSE); respVO.setDefaultPay(Boolean.FALSE);
respVO.setNoConsignee(Boolean.FALSE); respVO.setNoConsignee(Boolean.FALSE);
respVO.setIsConsService(Boolean.FALSE);
} }
} }
......
...@@ -73,6 +73,9 @@ public class AppUserInfoRespVO { ...@@ -73,6 +73,9 @@ public class AppUserInfoRespVO {
@ApiModelProperty(value = "客户档案设置的是否允许控货无收货人:1 是 0 否") @ApiModelProperty(value = "客户档案设置的是否允许控货无收货人:1 是 0 否")
private Boolean noConsignee ; private Boolean noConsignee ;
@ApiModelProperty(value = "是否开启集运服务:1 是 0 否")
private Boolean isConsService ;
@ApiModelProperty(value = "客户档案记录的首次成交时间") @ApiModelProperty(value = "客户档案记录的首次成交时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
@JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment