Commit 2250a953 authored by honghy's avatar honghy Committed by wux

需求95 报价单页面和列表调整

parent 1feddc30
......@@ -209,6 +209,11 @@ public class OfferDO extends BaseDO {
*/
private Integer reasonDict;
/**
* 优惠信息
*/
private String specialOffers;
/**
* 预计发货时间
*/
......
......@@ -105,6 +105,12 @@ public interface OfferMapper extends BaseMapperX<OfferDO> {
"JOIN ecw_offer_prod op on op.offer_id = o.offer_id ",
"where o.deleted = 0 and op.deleted = 0",
//followUpSalesmanList
"<when test = 'pageVO.followUpSalesmanList != null and pageVO.followUpSalesmanList.size() > 0'>",
"AND o.follow_up_salesman_id IN",
"<foreach item='item' collection='pageVO.followUpSalesmanList' open='(' close=')' separator=','> #{item} </foreach>",
"</when>",
//transportList
"<when test = 'pageVO.transportList != null and pageVO.transportList.size() > 0'>",
"AND o.transport_id IN",
......@@ -311,6 +317,12 @@ public interface OfferMapper extends BaseMapperX<OfferDO> {
"left join ecw_channel l on o.channel_id = l.channel_id ",
"where o.deleted = 0",
//followUpSalesmanList
"<when test = 'pageVO.followUpSalesmanList != null and pageVO.followUpSalesmanList.size() > 0'>",
"AND o.follow_up_salesman_id IN",
"<foreach item='item' collection='pageVO.followUpSalesmanList' open='(' close=')' separator=','> #{item} </foreach>",
"</when>",
//transportList
"<when test = 'pageVO.transportList != null and pageVO.transportList.size() > 0'>",
"AND o.transport_id IN",
......@@ -499,6 +511,12 @@ public interface OfferMapper extends BaseMapperX<OfferDO> {
"left join ecw_channel l on o.channel_id = l.channel_id ",
"where o.deleted = 0",
//followUpSalesmanList
"<when test = 'pageVO.followUpSalesmanList != null and pageVO.followUpSalesmanList.size() > 0'>",
"AND o.follow_up_salesman_id IN",
"<foreach item='item' collection='pageVO.followUpSalesmanList' open='(' close=')' separator=','> #{item} </foreach>",
"</when>",
//transportList
"<when test = 'pageVO.transportList != null and pageVO.transportList.size() > 0'>",
"AND o.transport_id IN",
......
......@@ -165,9 +165,9 @@ public class OfferServiceImpl extends AbstractService<OfferMapper, OfferDO> impl
@Override
@Transactional(rollbackFor = Exception.class)
public Long createOffer(OfferCreateReqVO createReqVO) {
if (null == createReqVO.getStartTime() || null == createReqVO.getEndTime()) {
throw exception(OFFER_START_END_TIME_NOT_NULL);
}
// if (null == createReqVO.getStartTime() || null == createReqVO.getEndTime()) {
// throw exception(OFFER_START_END_TIME_NOT_NULL);
// }
if (StringUtils.isNotBlank(createReqVO.getMarks())) {
// 如果报价单唛头不为空,已校验过格式,需要对长度进行再校验
if (createReqVO.getMarks().length() > 20) {
......@@ -245,7 +245,7 @@ public class OfferServiceImpl extends AbstractService<OfferMapper, OfferDO> impl
if (Objects.nonNull(customerContactsDO.getCustomerId())) {
CustomerDO customerDO = customerService.getById(customerContactsDO.getCustomerId());
if (Objects.nonNull(customerDO) && Objects.nonNull(customerDO.getCustomerService())) {
offer.setFollowUpSalesmanId(String.valueOf(customerDO.getCustomerService()));
// offer.setFollowUpSalesmanId(String.valueOf(customerDO.getCustomerService()));
offer.setSalesmanId(customerDO.getCustomerService());
AdminUserRespDTO adminUserRespDTO = adminUserApi.getUser(customerDO.getCustomerService());
if (Objects.nonNull(adminUserRespDTO)) {
......
......@@ -8,6 +8,7 @@ import lombok.Data;
import javax.validation.constraints.NotNull;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
/**
......@@ -204,4 +205,12 @@ public class OfferBaseVO {
*/
@JsonFormat(pattern = "yyyy-MM-dd")
private Date estimatedShippingTime;
/**
* 优惠信息
*/
private String specialOffers;
@ApiModelProperty(value = "客户经理(跟进业务员)")
private List<String> followUpSalesmanList;
}
......@@ -227,6 +227,9 @@ public class OfferPageReqVO extends PageParam {
@ApiModelProperty(value = "运输方式")
private List<Integer> transportList;
@ApiModelProperty(value = "客户经理(跟进业务员)")
private List<String> followUpSalesmanList;
@ApiModelProperty(value = "联系人手机号")
private String relationPhone;
......@@ -235,4 +238,9 @@ public class OfferPageReqVO extends PageParam {
@ApiModelProperty(value = "厂家电话")
private String manufacturerPhone;
/**
* 优惠信息
*/
private String specialOffers;
}
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