Commit cc05f10d by 徐高华

归属导购

parent cf45efc6
......@@ -581,6 +581,12 @@ public class GicOrderController {
member.setAddressName(orderInfo.getBuyerName());
member.setAddressDetail(orderInfo.getFullName() + orderInfo.getAddressInfo());
orderDetailVO.setAddressInfo(orderInfo.getFullName() + orderInfo.getAddressInfo());
member.setBelongClerkId(orderInfo.getBelongClerkId());
member.setBelongClerkCode(orderInfo.getBelongClerkCode());
member.setBelongClerkName(orderInfo.getBelongClerkName());
member.setBelongStoreId(orderInfo.getBelongStoreId());
member.setBelongStoreCode(orderInfo.getBelongStoreCode());
member.setBelongStoreName(orderInfo.getBelongClerkName());
orderDetailVO.setMember(member);
// 判断能否发货
// 导购发货,一笔订单仅允许单门店发货
......
......@@ -50,6 +50,36 @@ public class OrderExchangeDetailVO implements Serializable {
private String mainStoreName;
private String openClerkName;
private String openStoreName;
/**
* 订单归属导购id
*/
private String belongClerkId;
/**
* 订单归属导购code
*/
private String belongClerkCode;
/**
* 订单归属导购名称
*/
private String belongClerkName;
/**
* 订单归属门店id
*/
private String belongStoreId;
/**
* 订单归属门店code
*/
private String belongStoreCode;
/**
* 订单归属门店名称
*/
private String belongStoreName;
/**
* 换货商品件数(或单位 贵金属-重量等)
......@@ -244,6 +274,54 @@ public class OrderExchangeDetailVO implements Serializable {
// 2:门店自提 1:快递发货
private Integer deliveryChannel ;
public String getBelongClerkId() {
return belongClerkId;
}
public String getBelongClerkCode() {
return belongClerkCode;
}
public String getBelongClerkName() {
return belongClerkName;
}
public String getBelongStoreId() {
return belongStoreId;
}
public String getBelongStoreCode() {
return belongStoreCode;
}
public String getBelongStoreName() {
return belongStoreName;
}
public void setBelongClerkId(String belongClerkId) {
this.belongClerkId = belongClerkId;
}
public void setBelongClerkCode(String belongClerkCode) {
this.belongClerkCode = belongClerkCode;
}
public void setBelongClerkName(String belongClerkName) {
this.belongClerkName = belongClerkName;
}
public void setBelongStoreId(String belongStoreId) {
this.belongStoreId = belongStoreId;
}
public void setBelongStoreCode(String belongStoreCode) {
this.belongStoreCode = belongStoreCode;
}
public void setBelongStoreName(String belongStoreName) {
this.belongStoreName = belongStoreName;
}
public Integer getBusinessType() {
return businessType;
......
......@@ -57,6 +57,37 @@ public class OrderRefundDetailVO implements Serializable {
private String openClerkName ;
private String openStoreName ;
/**
* 订单归属导购id
*/
private String belongClerkId;
/**
* 订单归属导购code
*/
private String belongClerkCode;
/**
* 订单归属导购名称
*/
private String belongClerkName;
/**
* 订单归属门店id
*/
private String belongStoreId;
/**
* 订单归属门店code
*/
private String belongStoreCode;
/**
* 订单归属门店名称
*/
private String belongStoreName;
// 赠品1是0否
private int giftFlag;
......@@ -115,6 +146,54 @@ public class OrderRefundDetailVO implements Serializable {
// 申请积分
private Integer applyRefundPoints ;
public String getBelongClerkId() {
return belongClerkId;
}
public String getBelongClerkCode() {
return belongClerkCode;
}
public String getBelongClerkName() {
return belongClerkName;
}
public String getBelongStoreId() {
return belongStoreId;
}
public String getBelongStoreCode() {
return belongStoreCode;
}
public String getBelongStoreName() {
return belongStoreName;
}
public void setBelongClerkId(String belongClerkId) {
this.belongClerkId = belongClerkId;
}
public void setBelongClerkCode(String belongClerkCode) {
this.belongClerkCode = belongClerkCode;
}
public void setBelongClerkName(String belongClerkName) {
this.belongClerkName = belongClerkName;
}
public void setBelongStoreId(String belongStoreId) {
this.belongStoreId = belongStoreId;
}
public void setBelongStoreCode(String belongStoreCode) {
this.belongStoreCode = belongStoreCode;
}
public void setBelongStoreName(String belongStoreName) {
this.belongStoreName = belongStoreName;
}
public Integer getApplyRefundPoints() {
return applyRefundPoints;
}
......
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