Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

watero-common-tool/src/main/java/com/iamberry/redis/RedisUtils.java

@@ -217,21 +217,4 @@ public class RedisUtils {
             jedis.close();
         }
     }
-
-    public static void main(String[] args) {
-        // 判断Redis是否存在当前月的缓存信息
-        String key = "weixiu_total_" + "201905";
-        String total = get(key);
-        String no = null;
-        if (total == null) {
-            // 本月没有生成过数据
-            no = "0001";
-            // 写入下次的使用数据
-            put(key, "0002");
-            // 设置31天后过期
-            expire(key, new Date(System.currentTimeMillis() + 2678400000L));
-        } else {
-            no = total;
-        }
-    }
 }

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/BackGoods.java

@@ -15,250 +15,250 @@ import java.util.List;
 @Deprecated
 public class BackGoods  implements Serializable {
     private static final long serialVersionUID = -6844954322262497132L;
-    private Integer backGoodsId;
-
-    private Integer customerId;
-
-    private Integer orderId;
-
-    private Integer signclosedId;
-
-    // TODO: 2018/3/23  寄回状态变更顺序： 1 -> 2  -> 4  -> 3
-    //寄回状态  1：未寄回  2：已寄回  3：已收货  4:已签收待确认
-    private Integer backGoodsBackStatus;
-
-    private String backGoodsBackName;
-
-    private String backGoodsBackTel;
-
-    private String backGoodsBackLogisticsCompany;
-
-    private String backGoodsBackLogisticsNo;
-
-    private Integer backGoodsBackPostage;       //寄回邮费 单位为分
-
-    private String backGoodsBackMachineNo;
-
-    private String backGoodsDesc;
-
-    private Integer backGoodsState;
-
-    private String backGoodsAlipay;             //转账账户
-
-    private String backGoodsAlipayName;             //转账账户姓名
-
-    //20180327 当前邮费默认为  0 不需要
-    //是否已转账邮费  0:不需要 10:需要转账
-    private Integer backGoodsIsTransfer;        //是否已转账邮费  0:不需要 1:已转  2:已申请待转  3:未申请 -- 作废
-
-    private Date backGoodsCreateTime;
-
-    private Date backGoodsUpdateTime;
-
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
-    private Date salesPayTime;                  //支付时间
-
-    private Integer detectState;                //品质检测状态
-    @DateTimeFormat(pattern="yyyy-MM-dd")
-    private Date backGoodsBackReceiptDate;      //签收日期
-
-    //QC质检集合
-    private List<ComplaintDetectInfo> complaintDetectList = new ArrayList<ComplaintDetectInfo>();
-
-    private List<ClosedFitting> closedFittings = new ArrayList<ClosedFitting>();//寄回配件集合
-
-    private List<ClosedProdcue> closedProdcues = new ArrayList<ClosedProdcue>();//机会产品集合
-
-    public List<ComplaintDetectInfo> getComplaintDetectList() {
-        return complaintDetectList;
-    }
-
-    public void setComplaintDetectList(List<ComplaintDetectInfo> complaintDetectList) {
-        this.complaintDetectList = complaintDetectList;
-    }
-
-    public Integer getDetectState() {
-        return detectState;
-    }
-
-    public void setDetectState(Integer detectState) {
-        this.detectState = detectState;
-    }
-
-    public Date getSalesPayTime() {
-        return salesPayTime;
-    }
-
-    public void setSalesPayTime(Date salesPayTime) {
-        this.salesPayTime = salesPayTime;
-    }
-
-    public List<ClosedFitting> getClosedFittings() {
-        return closedFittings;
-    }
-
-    public void setClosedFittings(List<ClosedFitting> closedFittings) {
-        this.closedFittings = closedFittings;
-    }
-
-    public List<ClosedProdcue> getClosedProdcues() {
-        return closedProdcues;
-    }
-
-    public void setClosedProdcues(List<ClosedProdcue> closedProdcues) {
-        this.closedProdcues = closedProdcues;
-    }
-
-    public Integer getBackGoodsBackStatus() {
-        return backGoodsBackStatus;
-    }
-
-    public void setBackGoodsBackStatus(Integer backGoodsBackStatus) {
-        this.backGoodsBackStatus = backGoodsBackStatus;
-    }
-
-    public Integer getBackGoodsState() {
-        return backGoodsState;
-    }
-
-    public void setBackGoodsState(Integer backGoodsState) {
-        this.backGoodsState = backGoodsState;
-    }
-
-    public Integer getBackGoodsIsTransfer() {
-        return backGoodsIsTransfer;
-    }
-
-    public void setBackGoodsIsTransfer(Integer backGoodsIsTransfer) {
-        this.backGoodsIsTransfer = backGoodsIsTransfer;
-    }
-
-    public Integer getBackGoodsId() {
-        return backGoodsId;
-    }
-
-    public void setBackGoodsId(Integer backGoodsId) {
-        this.backGoodsId = backGoodsId;
-    }
-
-    public Integer getCustomerId() {
-        return customerId;
-    }
-
-    public void setCustomerId(Integer customerId) {
-        this.customerId = customerId;
-    }
-
-    public Integer getOrderId() {
-        return orderId;
-    }
-
-    public void setOrderId(Integer orderId) {
-        this.orderId = orderId;
-    }
-
-    public Integer getSignclosedId() {
-        return signclosedId;
-    }
-
-    public void setSignclosedId(Integer signclosedId) {
-        this.signclosedId = signclosedId;
-    }
-
-    public String getBackGoodsBackName() {
-        return backGoodsBackName;
-    }
-
-    public void setBackGoodsBackName(String backGoodsBackName) {
-        this.backGoodsBackName = backGoodsBackName == null ? null : backGoodsBackName.trim();
-    }
-
-    public String getBackGoodsBackTel() {
-        return backGoodsBackTel;
-    }
-
-    public void setBackGoodsBackTel(String backGoodsBackTel) {
-        this.backGoodsBackTel = backGoodsBackTel == null ? null : backGoodsBackTel.trim();
-    }
-
-    public String getBackGoodsBackLogisticsCompany() {
-        return backGoodsBackLogisticsCompany;
-    }
-
-    public void setBackGoodsBackLogisticsCompany(String backGoodsBackLogisticsCompany) {
-        this.backGoodsBackLogisticsCompany = backGoodsBackLogisticsCompany == null ? null : backGoodsBackLogisticsCompany.trim();
-    }
-
-    public String getBackGoodsBackLogisticsNo() {
-        return backGoodsBackLogisticsNo;
-    }
-
-    public void setBackGoodsBackLogisticsNo(String backGoodsBackLogisticsNo) {
-        this.backGoodsBackLogisticsNo = backGoodsBackLogisticsNo == null ? null : backGoodsBackLogisticsNo.trim();
-    }
-
-    public Integer getBackGoodsBackPostage() {
-        return backGoodsBackPostage;
-    }
-
-    public void setBackGoodsBackPostage(Integer backGoodsBackPostage) {
-        this.backGoodsBackPostage = backGoodsBackPostage;
-    }
-
-    public String getBackGoodsBackMachineNo() {
-        return backGoodsBackMachineNo;
-    }
-
-    public void setBackGoodsBackMachineNo(String backGoodsBackMachineNo) {
-        this.backGoodsBackMachineNo = backGoodsBackMachineNo == null ? null : backGoodsBackMachineNo.trim();
-    }
-
-    public String getBackGoodsDesc() {
-        return backGoodsDesc;
-    }
-
-    public void setBackGoodsDesc(String backGoodsDesc) {
-        this.backGoodsDesc = backGoodsDesc == null ? null : backGoodsDesc.trim();
-    }
-
-    public String getBackGoodsAlipay() {
-        return backGoodsAlipay;
-    }
-
-    public void setBackGoodsAlipay(String backGoodsAlipay) {
-        this.backGoodsAlipay = backGoodsAlipay == null ? null : backGoodsAlipay.trim();
-    }
-
-    public Date getBackGoodsCreateTime() {
-        return backGoodsCreateTime;
-    }
-
-    public void setBackGoodsCreateTime(Date backGoodsCreateTime) {
-        this.backGoodsCreateTime = backGoodsCreateTime;
-    }
-
-    public Date getBackGoodsUpdateTime() {
-        return backGoodsUpdateTime;
-    }
-
-    public void setBackGoodsUpdateTime(Date backGoodsUpdateTime) {
-        this.backGoodsUpdateTime = backGoodsUpdateTime;
-    }
-
-    public String getBackGoodsAlipayName() {
-        return backGoodsAlipayName;
-    }
-
-    public void setBackGoodsAlipayName(String backGoodsAlipayName) {
-        this.backGoodsAlipayName = backGoodsAlipayName;
-    }
-
-    public Date getBackGoodsBackReceiptDate() {
-        return backGoodsBackReceiptDate;
-    }
-
-    public void setBackGoodsBackReceiptDate(Date backGoodsBackReceiptDate) {
-        this.backGoodsBackReceiptDate = backGoodsBackReceiptDate;
-    }
+//    private Integer backGoodsId;
+//
+//    private Integer customerId;
+//
+//    private Integer orderId;
+//
+//    private Integer signclosedId;
+//
+//    // TODO: 2018/3/23  寄回状态变更顺序： 1 -> 2  -> 4  -> 3
+//    //寄回状态  1：未寄回  2：已寄回  3：已收货  4:已签收待确认
+//    private Integer backGoodsBackStatus;
+//
+//    private String backGoodsBackName;
+//
+//    private String backGoodsBackTel;
+//
+//    private String backGoodsBackLogisticsCompany;
+//
+//    private String backGoodsBackLogisticsNo;
+//
+//    private Integer backGoodsBackPostage;       //寄回邮费 单位为分
+//
+//    private String backGoodsBackMachineNo;
+//
+//    private String backGoodsDesc;
+//
+//    private Integer backGoodsState;
+//
+//    private String backGoodsAlipay;             //转账账户
+//
+//    private String backGoodsAlipayName;             //转账账户姓名
+//
+//    //20180327 当前邮费默认为  0 不需要
+//    //是否已转账邮费  0:不需要 10:需要转账
+//    private Integer backGoodsIsTransfer;        //是否已转账邮费  0:不需要 1:已转  2:已申请待转  3:未申请 -- 作废
+//
+//    private Date backGoodsCreateTime;
+//
+//    private Date backGoodsUpdateTime;
+//
+//    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+//    @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
+//    private Date salesPayTime;                  //支付时间
+//
+//    private Integer detectState;                //品质检测状态
+//    @DateTimeFormat(pattern="yyyy-MM-dd")
+//    private Date backGoodsBackReceiptDate;      //签收日期
+//
+//    //QC质检集合
+//    private List<ComplaintDetectInfo> complaintDetectList = new ArrayList<ComplaintDetectInfo>();
+//
+//    private List<ClosedFitting> closedFittings = new ArrayList<ClosedFitting>();//寄回配件集合
+//
+//    private List<ClosedProdcue> closedProdcues = new ArrayList<ClosedProdcue>();//机会产品集合
+//
+//    public List<ComplaintDetectInfo> getComplaintDetectList() {
+//        return complaintDetectList;
+//    }
+//
+//    public void setComplaintDetectList(List<ComplaintDetectInfo> complaintDetectList) {
+//        this.complaintDetectList = complaintDetectList;
+//    }
+//
+//    public Integer getDetectState() {
+//        return detectState;
+//    }
+//
+//    public void setDetectState(Integer detectState) {
+//        this.detectState = detectState;
+//    }
+//
+//    public Date getSalesPayTime() {
+//        return salesPayTime;
+//    }
+//
+//    public void setSalesPayTime(Date salesPayTime) {
+//        this.salesPayTime = salesPayTime;
+//    }
+//
+//    public List<ClosedFitting> getClosedFittings() {
+//        return closedFittings;
+//    }
+//
+//    public void setClosedFittings(List<ClosedFitting> closedFittings) {
+//        this.closedFittings = closedFittings;
+//    }
+//
+//    public List<ClosedProdcue> getClosedProdcues() {
+//        return closedProdcues;
+//    }
+//
+//    public void setClosedProdcues(List<ClosedProdcue> closedProdcues) {
+//        this.closedProdcues = closedProdcues;
+//    }
+//
+//    public Integer getBackGoodsBackStatus() {
+//        return backGoodsBackStatus;
+//    }
+//
+//    public void setBackGoodsBackStatus(Integer backGoodsBackStatus) {
+//        this.backGoodsBackStatus = backGoodsBackStatus;
+//    }
+//
+//    public Integer getBackGoodsState() {
+//        return backGoodsState;
+//    }
+//
+//    public void setBackGoodsState(Integer backGoodsState) {
+//        this.backGoodsState = backGoodsState;
+//    }
+//
+//    public Integer getBackGoodsIsTransfer() {
+//        return backGoodsIsTransfer;
+//    }
+//
+//    public void setBackGoodsIsTransfer(Integer backGoodsIsTransfer) {
+//        this.backGoodsIsTransfer = backGoodsIsTransfer;
+//    }
+//
+//    public Integer getBackGoodsId() {
+//        return backGoodsId;
+//    }
+//
+//    public void setBackGoodsId(Integer backGoodsId) {
+//        this.backGoodsId = backGoodsId;
+//    }
+//
+//    public Integer getCustomerId() {
+//        return customerId;
+//    }
+//
+//    public void setCustomerId(Integer customerId) {
+//        this.customerId = customerId;
+//    }
+//
+//    public Integer getOrderId() {
+//        return orderId;
+//    }
+//
+//    public void setOrderId(Integer orderId) {
+//        this.orderId = orderId;
+//    }
+//
+//    public Integer getSignclosedId() {
+//        return signclosedId;
+//    }
+//
+//    public void setSignclosedId(Integer signclosedId) {
+//        this.signclosedId = signclosedId;
+//    }
+//
+//    public String getBackGoodsBackName() {
+//        return backGoodsBackName;
+//    }
+//
+//    public void setBackGoodsBackName(String backGoodsBackName) {
+//        this.backGoodsBackName = backGoodsBackName == null ? null : backGoodsBackName.trim();
+//    }
+//
+//    public String getBackGoodsBackTel() {
+//        return backGoodsBackTel;
+//    }
+//
+//    public void setBackGoodsBackTel(String backGoodsBackTel) {
+//        this.backGoodsBackTel = backGoodsBackTel == null ? null : backGoodsBackTel.trim();
+//    }
+//
+//    public String getBackGoodsBackLogisticsCompany() {
+//        return backGoodsBackLogisticsCompany;
+//    }
+//
+//    public void setBackGoodsBackLogisticsCompany(String backGoodsBackLogisticsCompany) {
+//        this.backGoodsBackLogisticsCompany = backGoodsBackLogisticsCompany == null ? null : backGoodsBackLogisticsCompany.trim();
+//    }
+//
+//    public String getBackGoodsBackLogisticsNo() {
+//        return backGoodsBackLogisticsNo;
+//    }
+//
+//    public void setBackGoodsBackLogisticsNo(String backGoodsBackLogisticsNo) {
+//        this.backGoodsBackLogisticsNo = backGoodsBackLogisticsNo == null ? null : backGoodsBackLogisticsNo.trim();
+//    }
+//
+//    public Integer getBackGoodsBackPostage() {
+//        return backGoodsBackPostage;
+//    }
+//
+//    public void setBackGoodsBackPostage(Integer backGoodsBackPostage) {
+//        this.backGoodsBackPostage = backGoodsBackPostage;
+//    }
+//
+//    public String getBackGoodsBackMachineNo() {
+//        return backGoodsBackMachineNo;
+//    }
+//
+//    public void setBackGoodsBackMachineNo(String backGoodsBackMachineNo) {
+//        this.backGoodsBackMachineNo = backGoodsBackMachineNo == null ? null : backGoodsBackMachineNo.trim();
+//    }
+//
+//    public String getBackGoodsDesc() {
+//        return backGoodsDesc;
+//    }
+//
+//    public void setBackGoodsDesc(String backGoodsDesc) {
+//        this.backGoodsDesc = backGoodsDesc == null ? null : backGoodsDesc.trim();
+//    }
+//
+//    public String getBackGoodsAlipay() {
+//        return backGoodsAlipay;
+//    }
+//
+//    public void setBackGoodsAlipay(String backGoodsAlipay) {
+//        this.backGoodsAlipay = backGoodsAlipay == null ? null : backGoodsAlipay.trim();
+//    }
+//
+//    public Date getBackGoodsCreateTime() {
+//        return backGoodsCreateTime;
+//    }
+//
+//    public void setBackGoodsCreateTime(Date backGoodsCreateTime) {
+//        this.backGoodsCreateTime = backGoodsCreateTime;
+//    }
+//
+//    public Date getBackGoodsUpdateTime() {
+//        return backGoodsUpdateTime;
+//    }
+//
+//    public void setBackGoodsUpdateTime(Date backGoodsUpdateTime) {
+//        this.backGoodsUpdateTime = backGoodsUpdateTime;
+//    }
+//
+//    public String getBackGoodsAlipayName() {
+//        return backGoodsAlipayName;
+//    }
+//
+//    public void setBackGoodsAlipayName(String backGoodsAlipayName) {
+//        this.backGoodsAlipayName = backGoodsAlipayName;
+//    }
+//
+//    public Date getBackGoodsBackReceiptDate() {
+//        return backGoodsBackReceiptDate;
+//    }
+//
+//    public void setBackGoodsBackReceiptDate(Date backGoodsBackReceiptDate) {
+//        this.backGoodsBackReceiptDate = backGoodsBackReceiptDate;
+//    }
 }

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/ClosedFitting.java

@@ -5,103 +5,103 @@ import java.io.Serializable;
 @Deprecated
 public class ClosedFitting  implements Serializable {
     private static final long serialVersionUID = 8778123739128123226L;
-    private Integer closedFittingId;
-
-    private Integer relationId;
-
-    private Integer productId;
-
-    private Integer fittingsId;
-
-    private Integer closedFittingNumber;
-
-    private Integer closedFittingType;  //售后类型  3：换新;4：维修;5：补发;6：退货;7：无理由退货
-
-    private String closedFittingsName;     //配件名称
-
-    private String closedProductName;       //产品名称
-
-    private String closedFittingsBar;     //配件sku
-
-    private String colorBar;        //69码
-
-    public Integer getClosedFittingType() {
-        return closedFittingType;
-    }
-
-    public void setClosedFittingType(Integer closedFittingType) {
-        this.closedFittingType = closedFittingType;
-    }
-
-    public String getClosedFittingsName() {
-        return closedFittingsName;
-    }
-
-    public void setClosedFittingsName(String closedFittingsName) {
-        this.closedFittingsName = closedFittingsName;
-    }
-
-    public String getClosedFittingsBar() {
-        return closedFittingsBar;
-    }
-
-    public void setClosedFittingsBar(String closedFittingsBar) {
-        this.closedFittingsBar = closedFittingsBar;
-    }
-
-    public Integer getClosedFittingId() {
-        return closedFittingId;
-    }
-
-    public void setClosedFittingId(Integer closedFittingId) {
-        this.closedFittingId = closedFittingId;
-    }
-
-    public Integer getRelationId() {
-        return relationId;
-    }
-
-    public void setRelationId(Integer relationId) {
-        this.relationId = relationId;
-    }
-
-    public Integer getProductId() {
-        return productId;
-    }
-
-    public void setProductId(Integer productId) {
-        this.productId = productId;
-    }
-
-    public Integer getFittingsId() {
-        return fittingsId;
-    }
-
-    public void setFittingsId(Integer fittingsId) {
-        this.fittingsId = fittingsId;
-    }
-
-    public Integer getClosedFittingNumber() {
-        return closedFittingNumber;
-    }
-
-    public void setClosedFittingNumber(Integer closedFittingNumber) {
-        this.closedFittingNumber = closedFittingNumber;
-    }
-
-    public String getClosedProductName() {
-        return closedProductName;
-    }
-
-    public void setClosedProductName(String closedProductName) {
-        this.closedProductName = closedProductName;
-    }
-
-    public String getColorBar() {
-        return colorBar;
-    }
-
-    public void setColorBar(String colorBar) {
-        this.colorBar = colorBar;
-    }
+//    private Integer closedFittingId;
+//
+//    private Integer relationId;
+//
+//    private Integer productId;
+//
+//    private Integer fittingsId;
+//
+//    private Integer closedFittingNumber;
+//
+//    private Integer closedFittingType;  //售后类型  3：换新;4：维修;5：补发;6：退货;7：无理由退货
+//
+//    private String closedFittingsName;     //配件名称
+//
+//    private String closedProductName;       //产品名称
+//
+//    private String closedFittingsBar;     //配件sku
+//
+//    private String colorBar;        //69码
+//
+//    public Integer getClosedFittingType() {
+//        return closedFittingType;
+//    }
+//
+//    public void setClosedFittingType(Integer closedFittingType) {
+//        this.closedFittingType = closedFittingType;
+//    }
+//
+//    public String getClosedFittingsName() {
+//        return closedFittingsName;
+//    }
+//
+//    public void setClosedFittingsName(String closedFittingsName) {
+//        this.closedFittingsName = closedFittingsName;
+//    }
+//
+//    public String getClosedFittingsBar() {
+//        return closedFittingsBar;
+//    }
+//
+//    public void setClosedFittingsBar(String closedFittingsBar) {
+//        this.closedFittingsBar = closedFittingsBar;
+//    }
+//
+//    public Integer getClosedFittingId() {
+//        return closedFittingId;
+//    }
+//
+//    public void setClosedFittingId(Integer closedFittingId) {
+//        this.closedFittingId = closedFittingId;
+//    }
+//
+//    public Integer getRelationId() {
+//        return relationId;
+//    }
+//
+//    public void setRelationId(Integer relationId) {
+//        this.relationId = relationId;
+//    }
+//
+//    public Integer getProductId() {
+//        return productId;
+//    }
+//
+//    public void setProductId(Integer productId) {
+//        this.productId = productId;
+//    }
+//
+//    public Integer getFittingsId() {
+//        return fittingsId;
+//    }
+//
+//    public void setFittingsId(Integer fittingsId) {
+//        this.fittingsId = fittingsId;
+//    }
+//
+//    public Integer getClosedFittingNumber() {
+//        return closedFittingNumber;
+//    }
+//
+//    public void setClosedFittingNumber(Integer closedFittingNumber) {
+//        this.closedFittingNumber = closedFittingNumber;
+//    }
+//
+//    public String getClosedProductName() {
+//        return closedProductName;
+//    }
+//
+//    public void setClosedProductName(String closedProductName) {
+//        this.closedProductName = closedProductName;
+//    }
+//
+//    public String getColorBar() {
+//        return colorBar;
+//    }
+//
+//    public void setColorBar(String colorBar) {
+//        this.colorBar = colorBar;
+//    }
 }

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/FittingsInfo.java

@@ -10,77 +10,77 @@ import java.util.Date;
 @Deprecated
 public class FittingsInfo implements Serializable {
 
-    private static final long serialVersionUID = -1370229485119071783L;
-    private Integer fittingsId;         //主键
-    private Integer productId;          //产品id
-    private String fittingsName;        //配件名称
-    private Integer fittingsDiscount;   //配件折扣价
-    private Integer fittingsPrice;      //配件市场价
-    private String fittingsBar;         //产品条码(SKU)
-    private Integer fittingsStatus;     //状态
-    private Date fittingsCretaeTime;    //创建时间
-
-    public Integer getFittingsId() {
-        return fittingsId;
-    }
-
-    public void setFittingsId(Integer fittingsId) {
-        this.fittingsId = fittingsId;
-    }
-
-    public Integer getProductId() {
-        return productId;
-    }
-
-    public void setProductId(Integer productId) {
-        this.productId = productId;
-    }
-
-    public String getFittingsName() {
-        return fittingsName;
-    }
-
-    public void setFittingsName(String fittingsName) {
-        this.fittingsName = fittingsName;
-    }
-
-    public Integer getFittingsDiscount() {
-        return fittingsDiscount;
-    }
-
-    public void setFittingsDiscount(Integer fittingsDiscount) {
-        this.fittingsDiscount = fittingsDiscount;
-    }
-
-    public Integer getFittingsPrice() {
-        return fittingsPrice;
-    }
-
-    public void setFittingsPrice(Integer fittingsPrice) {
-        this.fittingsPrice = fittingsPrice;
-    }
-
-    public String getFittingsBar() {
-        return fittingsBar;
-    }
-
-    public void setFittingsBar(String fittingsBar) {
-        this.fittingsBar = fittingsBar;
-    }
-
-    public Integer getFittingsStatus() {
-        return fittingsStatus;
-    }
-
-    public void setFittingsStatus(Integer fittingsStatus) {
-        this.fittingsStatus = fittingsStatus;
-    }
-
-    public Date getFittingsCretaeTime() {
-        return fittingsCretaeTime;
-    }
-
-    public void setFittingsCretaeTime(Date fittingsCretaeTime) {
-        this.fittingsCretaeTime = fittingsCretaeTime;
-    }
+//    private static final long serialVersionUID = -1370229485119071783L;
+//    private Integer fittingsId;         //主键
+//    private Integer productId;          //产品id
+//    private String fittingsName;        //配件名称
+//    private Integer fittingsDiscount;   //配件折扣价
+//    private Integer fittingsPrice;      //配件市场价
+//    private String fittingsBar;         //产品条码(SKU)
+//    private Integer fittingsStatus;     //状态
+//    private Date fittingsCretaeTime;    //创建时间
+//
+//    public Integer getFittingsId() {
+//        return fittingsId;
+//    }
+//
+//    public void setFittingsId(Integer fittingsId) {
+//        this.fittingsId = fittingsId;
+//    }
+//
+//    public Integer getProductId() {
+//        return productId;
+//    }
+//
+//    public void setProductId(Integer productId) {
+//        this.productId = productId;
+//    }
+//
+//    public String getFittingsName() {
+//        return fittingsName;
+//    }
+//
+//    public void setFittingsName(String fittingsName) {
+//        this.fittingsName = fittingsName;
+//    }
+//
+//    public Integer getFittingsDiscount() {
+//        return fittingsDiscount;
+//    }
+//
+//    public void setFittingsDiscount(Integer fittingsDiscount) {
+//        this.fittingsDiscount = fittingsDiscount;
+//    }
+//
+//    public Integer getFittingsPrice() {
+//        return fittingsPrice;
+//    }
+//
+//    public void setFittingsPrice(Integer fittingsPrice) {
+//        this.fittingsPrice = fittingsPrice;
+//    }
+//
+//    public String getFittingsBar() {
+//        return fittingsBar;
+//    }
+//
+//    public void setFittingsBar(String fittingsBar) {
+//        this.fittingsBar = fittingsBar;
+//    }
+//
+//    public Integer getFittingsStatus() {
+//        return fittingsStatus;
+//    }
+//
+//    public void setFittingsStatus(Integer fittingsStatus) {
+//        this.fittingsStatus = fittingsStatus;
+//    }
+//
+//    public Date getFittingsCretaeTime() {
+//        return fittingsCretaeTime;
+//    }
+//
+//    public void setFittingsCretaeTime(Date fittingsCretaeTime) {
+//        this.fittingsCretaeTime = fittingsCretaeTime;
+//    }
 }

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/NoreasonBack.java

@@ -14,251 +14,251 @@ import java.util.List;
  */
 @Deprecated
 public class NoreasonBack  implements Serializable {
-    private static final long serialVersionUID = -8771772978569981906L;
-    private Integer noreasonBackId;
-
-    private Integer customerId;
-
-    private Integer orderId;
-
-    private Integer signclosedId;
-
-    // TODO: 2018/3/23  寄回状态变更顺序： 1 -> 2  -> 4  -> 3
-    //寄回状态  1：未寄回  2：已寄回  3：已收货  4:已签收待确认
-    private Integer noreasonBackBackStatus;
-
-    private String noreasonBackBackName;
-
-    private String noreasonBackBackTel;
-
-    private String noreasonBackBackLogisticsCompany;
-
-    private String noreasonBackBackLogisticsNo;
-
-    private Integer noreasonBackBackPostage;    //寄回邮费 单位为分
-
-    private String noreasonBackBackMachineNo;
-
-    private String noreasonBackDesc;
-
-    private Integer noreasonBackState;
-
-    private String noreasonBackAlipay;          //转账账户
-    private String noreasonBackAlipayName;          //转账账户姓名
-
-    //20180327 当前邮费默认为  0 不需要
-    //是否已转账邮费  0:不需要 10:需要转账
-    private Integer noreasonBackIsTransfer;     //是否已转账邮费  0:不需要 1:已转  2:已申请待转  3:未申请 -- 作废
-
-    private Date noreasonBackCreateTime;
-
-    private Date noreasonBackUpdateTime;
-    //签收日期
-    @DateTimeFormat(pattern="yyyy-MM-dd")
-    private Date noreasonBackReceiptDate;
-
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
-    private Date salesPayTime;                  //支付时间
-
-    private Integer detectState;                //品质检测状态
-
-    //QC质检集合
-    private List<ComplaintDetectInfo> complaintDetectList = new ArrayList<ComplaintDetectInfo>();
-
-    private List<ClosedFitting> closedFittings = new ArrayList<ClosedFitting>();//寄回配件集合
-
-    private List<ClosedProdcue> closedProdcues = new ArrayList<ClosedProdcue>();//机会产品集合
-
-    public List<ComplaintDetectInfo> getComplaintDetectList() {
-        return complaintDetectList;
-    }
-
-    public void setComplaintDetectList(List<ComplaintDetectInfo> complaintDetectList) {
-        this.complaintDetectList = complaintDetectList;
-    }
-
-    public Integer getDetectState() {
-        return detectState;
-    }
-
-    public void setDetectState(Integer detectState) {
-        this.detectState = detectState;
-    }
-
-    public Date getSalesPayTime() {
-        return salesPayTime;
-    }
-
-    public void setSalesPayTime(Date salesPayTime) {
-        this.salesPayTime = salesPayTime;
-    }
-
-    public List<ClosedFitting> getClosedFittings() {
-        return closedFittings;
-    }
-
-    public void setClosedFittings(List<ClosedFitting> closedFittings) {
-        this.closedFittings = closedFittings;
-    }
-
-    public List<ClosedProdcue> getClosedProdcues() {
-        return closedProdcues;
-    }
-
-    public void setClosedProdcues(List<ClosedProdcue> closedProdcues) {
-        this.closedProdcues = closedProdcues;
-    }
-
-    public Integer getNoreasonBackId() {
-        return noreasonBackId;
-    }
-
-    public void setNoreasonBackId(Integer noreasonBackId) {
-        this.noreasonBackId = noreasonBackId;
-    }
-
-    public Integer getCustomerId() {
-        return customerId;
-    }
-
-    public void setCustomerId(Integer customerId) {
-        this.customerId = customerId;
-    }
-
-    public Integer getOrderId() {
-        return orderId;
-    }
-
-    public void setOrderId(Integer orderId) {
-        this.orderId = orderId;
-    }
-
-    public Integer getSignclosedId() {
-        return signclosedId;
-    }
-
-    public void setSignclosedId(Integer signclosedId) {
-        this.signclosedId = signclosedId;
-    }
-
-    public String getNoreasonBackBackName() {
-        return noreasonBackBackName;
-    }
-
-    public void setNoreasonBackBackName(String noreasonBackBackName) {
-        this.noreasonBackBackName = noreasonBackBackName == null ? null : noreasonBackBackName.trim();
-    }
-
-    public String getNoreasonBackBackTel() {
-        return noreasonBackBackTel;
-    }
-
-    public void setNoreasonBackBackTel(String noreasonBackBackTel) {
-        this.noreasonBackBackTel = noreasonBackBackTel == null ? null : noreasonBackBackTel.trim();
-    }
-
-    public String getNoreasonBackBackLogisticsCompany() {
-        return noreasonBackBackLogisticsCompany;
-    }
-
-    public void setNoreasonBackBackLogisticsCompany(String noreasonBackBackLogisticsCompany) {
-        this.noreasonBackBackLogisticsCompany = noreasonBackBackLogisticsCompany == null ? null : noreasonBackBackLogisticsCompany.trim();
-    }
-
-    public String getNoreasonBackBackLogisticsNo() {
-        return noreasonBackBackLogisticsNo;
-    }
-
-    public void setNoreasonBackBackLogisticsNo(String noreasonBackBackLogisticsNo) {
-        this.noreasonBackBackLogisticsNo = noreasonBackBackLogisticsNo == null ? null : noreasonBackBackLogisticsNo.trim();
-    }
-
-    public Integer getNoreasonBackBackPostage() {
-        return noreasonBackBackPostage;
-    }
-
-    public void setNoreasonBackBackPostage(Integer noreasonBackBackPostage) {
-        this.noreasonBackBackPostage = noreasonBackBackPostage;
-    }
-
-    public String getNoreasonBackBackMachineNo() {
-        return noreasonBackBackMachineNo;
-    }
-
-    public void setNoreasonBackBackMachineNo(String noreasonBackBackMachineNo) {
-        this.noreasonBackBackMachineNo = noreasonBackBackMachineNo == null ? null : noreasonBackBackMachineNo.trim();
-    }
-
-    public String getNoreasonBackDesc() {
-        return noreasonBackDesc;
-    }
-
-    public void setNoreasonBackDesc(String noreasonBackDesc) {
-        this.noreasonBackDesc = noreasonBackDesc == null ? null : noreasonBackDesc.trim();
-    }
-
-    public String getNoreasonBackAlipay() {
-        return noreasonBackAlipay;
-    }
-
-    public void setNoreasonBackAlipay(String noreasonBackAlipay) {
-        this.noreasonBackAlipay = noreasonBackAlipay == null ? null : noreasonBackAlipay.trim();
-    }
-
-    public Date getNoreasonBackCreateTime() {
-        return noreasonBackCreateTime;
-    }
-
-    public void setNoreasonBackCreateTime(Date noreasonBackCreateTime) {
-        this.noreasonBackCreateTime = noreasonBackCreateTime;
-    }
-
-    public Date getNoreasonBackUpdateTime() {
-        return noreasonBackUpdateTime;
-    }
-
-    public void setNoreasonBackUpdateTime(Date noreasonBackUpdateTime) {
-        this.noreasonBackUpdateTime = noreasonBackUpdateTime;
-    }
-
-    public Integer getNoreasonBackBackStatus() {
-        return noreasonBackBackStatus;
-    }
-
-    public void setNoreasonBackBackStatus(Integer noreasonBackBackStatus) {
-        this.noreasonBackBackStatus = noreasonBackBackStatus;
-    }
-
-    public Integer getNoreasonBackState() {
-        return noreasonBackState;
-    }
-
-    public void setNoreasonBackState(Integer noreasonBackState) {
-        this.noreasonBackState = noreasonBackState;
-    }
-
-    public Integer getNoreasonBackIsTransfer() {
-        return noreasonBackIsTransfer;
-    }
-
-    public void setNoreasonBackIsTransfer(Integer noreasonBackIsTransfer) {
-        this.noreasonBackIsTransfer = noreasonBackIsTransfer;
-    }
-
-    public String getNoreasonBackAlipayName() {
-        return noreasonBackAlipayName;
-    }
-
-    public void setNoreasonBackAlipayName(String noreasonBackAlipayName) {
-        this.noreasonBackAlipayName = noreasonBackAlipayName;
-    }
-
-    public Date getNoreasonBackReceiptDate() {
-        return noreasonBackReceiptDate;
-    }
-
-    public void setNoreasonBackReceiptDate(Date noreasonBackReceiptDate) {
-        this.noreasonBackReceiptDate = noreasonBackReceiptDate;
-    }
+//    private static final long serialVersionUID = -8771772978569981906L;
+//    private Integer noreasonBackId;
+//
+//    private Integer customerId;
+//
+//    private Integer orderId;
+//
+//    private Integer signclosedId;
+//
+//    // TODO: 2018/3/23  寄回状态变更顺序： 1 -> 2  -> 4  -> 3
+//    //寄回状态  1：未寄回  2：已寄回  3：已收货  4:已签收待确认
+//    private Integer noreasonBackBackStatus;
+//
+//    private String noreasonBackBackName;
+//
+//    private String noreasonBackBackTel;
+//
+//    private String noreasonBackBackLogisticsCompany;
+//
+//    private String noreasonBackBackLogisticsNo;
+//
+//    private Integer noreasonBackBackPostage;    //寄回邮费 单位为分
+//
+//    private String noreasonBackBackMachineNo;
+//
+//    private String noreasonBackDesc;
+//
+//    private Integer noreasonBackState;
+//
+//    private String noreasonBackAlipay;          //转账账户
+//    private String noreasonBackAlipayName;          //转账账户姓名
+//
+//    //20180327 当前邮费默认为  0 不需要
+//    //是否已转账邮费  0:不需要 10:需要转账
+//    private Integer noreasonBackIsTransfer;     //是否已转账邮费  0:不需要 1:已转  2:已申请待转  3:未申请 -- 作废
+//
+//    private Date noreasonBackCreateTime;
+//
+//    private Date noreasonBackUpdateTime;
+//    //签收日期
+//    @DateTimeFormat(pattern="yyyy-MM-dd")
+//    private Date noreasonBackReceiptDate;
+//
+//    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+//    @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
+//    private Date salesPayTime;                  //支付时间
+//
+//    private Integer detectState;                //品质检测状态
+//
+//    //QC质检集合
+//    private List<ComplaintDetectInfo> complaintDetectList = new ArrayList<ComplaintDetectInfo>();
+//
+//    private List<ClosedFitting> closedFittings = new ArrayList<ClosedFitting>();//寄回配件集合
+//
+//    private List<ClosedProdcue> closedProdcues = new ArrayList<ClosedProdcue>();//机会产品集合
+//
+//    public List<ComplaintDetectInfo> getComplaintDetectList() {
+//        return complaintDetectList;
+//    }
+//
+//    public void setComplaintDetectList(List<ComplaintDetectInfo> complaintDetectList) {
+//        this.complaintDetectList = complaintDetectList;
+//    }
+//
+//    public Integer getDetectState() {
+//        return detectState;
+//    }
+//
+//    public void setDetectState(Integer detectState) {
+//        this.detectState = detectState;
+//    }
+//
+//    public Date getSalesPayTime() {
+//        return salesPayTime;
+//    }
+//
+//    public void setSalesPayTime(Date salesPayTime) {
+//        this.salesPayTime = salesPayTime;
+//    }
+//
+//    public List<ClosedFitting> getClosedFittings() {
+//        return closedFittings;
+//    }
+//
+//    public void setClosedFittings(List<ClosedFitting> closedFittings) {
+//        this.closedFittings = closedFittings;
+//    }
+//
+//    public List<ClosedProdcue> getClosedProdcues() {
+//        return closedProdcues;
+//    }
+//
+//    public void setClosedProdcues(List<ClosedProdcue> closedProdcues) {
+//        this.closedProdcues = closedProdcues;
+//    }
+//
+//    public Integer getNoreasonBackId() {
+//        return noreasonBackId;
+//    }
+//
+//    public void setNoreasonBackId(Integer noreasonBackId) {
+//        this.noreasonBackId = noreasonBackId;
+//    }
+//
+//    public Integer getCustomerId() {
+//        return customerId;
+//    }
+//
+//    public void setCustomerId(Integer customerId) {
+//        this.customerId = customerId;
+//    }
+//
+//    public Integer getOrderId() {
+//        return orderId;
+//    }
+//
+//    public void setOrderId(Integer orderId) {
+//        this.orderId = orderId;
+//    }
+//
+//    public Integer getSignclosedId() {
+//        return signclosedId;
+//    }
+//
+//    public void setSignclosedId(Integer signclosedId) {
+//        this.signclosedId = signclosedId;
+//    }
+//
+//    public String getNoreasonBackBackName() {
+//        return noreasonBackBackName;
+//    }
+//
+//    public void setNoreasonBackBackName(String noreasonBackBackName) {
+//        this.noreasonBackBackName = noreasonBackBackName == null ? null : noreasonBackBackName.trim();
+//    }
+//
+//    public String getNoreasonBackBackTel() {
+//        return noreasonBackBackTel;
+//    }
+//
+//    public void setNoreasonBackBackTel(String noreasonBackBackTel) {
+//        this.noreasonBackBackTel = noreasonBackBackTel == null ? null : noreasonBackBackTel.trim();
+//    }
+//
+//    public String getNoreasonBackBackLogisticsCompany() {
+//        return noreasonBackBackLogisticsCompany;
+//    }
+//
+//    public void setNoreasonBackBackLogisticsCompany(String noreasonBackBackLogisticsCompany) {
+//        this.noreasonBackBackLogisticsCompany = noreasonBackBackLogisticsCompany == null ? null : noreasonBackBackLogisticsCompany.trim();
+//    }
+//
+//    public String getNoreasonBackBackLogisticsNo() {
+//        return noreasonBackBackLogisticsNo;
+//    }
+//
+//    public void setNoreasonBackBackLogisticsNo(String noreasonBackBackLogisticsNo) {
+//        this.noreasonBackBackLogisticsNo = noreasonBackBackLogisticsNo == null ? null : noreasonBackBackLogisticsNo.trim();
+//    }
+//
+//    public Integer getNoreasonBackBackPostage() {
+//        return noreasonBackBackPostage;
+//    }
+//
+//    public void setNoreasonBackBackPostage(Integer noreasonBackBackPostage) {
+//        this.noreasonBackBackPostage = noreasonBackBackPostage;
+//    }
+//
+//    public String getNoreasonBackBackMachineNo() {
+//        return noreasonBackBackMachineNo;
+//    }
+//
+//    public void setNoreasonBackBackMachineNo(String noreasonBackBackMachineNo) {
+//        this.noreasonBackBackMachineNo = noreasonBackBackMachineNo == null ? null : noreasonBackBackMachineNo.trim();
+//    }
+//
+//    public String getNoreasonBackDesc() {
+//        return noreasonBackDesc;
+//    }
+//
+//    public void setNoreasonBackDesc(String noreasonBackDesc) {
+//        this.noreasonBackDesc = noreasonBackDesc == null ? null : noreasonBackDesc.trim();
+//    }
+//
+//    public String getNoreasonBackAlipay() {
+//        return noreasonBackAlipay;
+//    }
+//
+//    public void setNoreasonBackAlipay(String noreasonBackAlipay) {
+//        this.noreasonBackAlipay = noreasonBackAlipay == null ? null : noreasonBackAlipay.trim();
+//    }
+//
+//    public Date getNoreasonBackCreateTime() {
+//        return noreasonBackCreateTime;
+//    }
+//
+//    public void setNoreasonBackCreateTime(Date noreasonBackCreateTime) {
+//        this.noreasonBackCreateTime = noreasonBackCreateTime;
+//    }
+//
+//    public Date getNoreasonBackUpdateTime() {
+//        return noreasonBackUpdateTime;
+//    }
+//
+//    public void setNoreasonBackUpdateTime(Date noreasonBackUpdateTime) {
+//        this.noreasonBackUpdateTime = noreasonBackUpdateTime;
+//    }
+//
+//    public Integer getNoreasonBackBackStatus() {
+//        return noreasonBackBackStatus;
+//    }
+//
+//    public void setNoreasonBackBackStatus(Integer noreasonBackBackStatus) {
+//        this.noreasonBackBackStatus = noreasonBackBackStatus;
+//    }
+//
+//    public Integer getNoreasonBackState() {
+//        return noreasonBackState;
+//    }
+//
+//    public void setNoreasonBackState(Integer noreasonBackState) {
+//        this.noreasonBackState = noreasonBackState;
+//    }
+//
+//    public Integer getNoreasonBackIsTransfer() {
+//        return noreasonBackIsTransfer;
+//    }
+//
+//    public void setNoreasonBackIsTransfer(Integer noreasonBackIsTransfer) {
+//        this.noreasonBackIsTransfer = noreasonBackIsTransfer;
+//    }
+//
+//    public String getNoreasonBackAlipayName() {
+//        return noreasonBackAlipayName;
+//    }
+//
+//    public void setNoreasonBackAlipayName(String noreasonBackAlipayName) {
+//        this.noreasonBackAlipayName = noreasonBackAlipayName;
+//    }
+//
+//    public Date getNoreasonBackReceiptDate() {
+//        return noreasonBackReceiptDate;
+//    }
+//
+//    public void setNoreasonBackReceiptDate(Date noreasonBackReceiptDate) {
+//        this.noreasonBackReceiptDate = noreasonBackReceiptDate;
+//    }
 }

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/Reissue.java

@@ -15,241 +15,241 @@ import java.util.List;
 public class Reissue  implements Serializable {
 
     private static final long serialVersionUID = 6552482836665728058L;
-    //  售后补发主键 
-    private Integer reissueId;
-    //  客诉基本信息主键 
-    private Integer customerId;
-    //  订单id 
-    private Integer orderId;
-    //  发出Efast订单号 
-    private String reissueBackEfastOrderId;
-    //  寄送状态  1：未寄送  2：已寄送  3：已收货 
-    private Integer reissueSendStatus;
-    //  寄送人姓名 
-    private String reissueSendName;
-    //  寄送人电话 
-    private String reissueSendTel;
-    //  寄送地址-省 
-    private Integer provinceNumber;
-    //  寄送地址-市 
-    private Integer cityNumber;
-    //  寄送地址-区 
-    private Integer areaNumber;
-    //  寄送地址-省市区 
-    private String reissueSendMergeAddress;
-    //  寄送地址-详细地址 
-    private String reissueSendAddress;
-    //  寄送物流公司 
-    private String reissueSendLogisticsCompany;
-    //  寄送物流单号 
-    private String reissueSendLogisticsNo;
-    //  备注 
-    private String reissueDesc;
-    //  状态    1：使用中  2：停用中 
-    private Integer reissueState;
-    //  创建时间 
-    private Date reissueCreateTime;
-    //  CURRENT_TIMESTAMP ,
-    private Date reissueUpdateTime;
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
-    private Date salesPayTime;                  //支付时间
-    private String salesDealCode;               //交易号
-
-    private List<ClosedFitting> closedFittings = new ArrayList<ClosedFitting>();//寄回配件集合
-    private List<ClosedProdcue> closedProdcues = new ArrayList<ClosedProdcue>();//机会产品集合
-    private List<SendProdcue> sendProdcues = new ArrayList<SendProdcue>();//寄送产品集合
-    private List<SendFitting> sendFittings = new ArrayList<SendFitting>();//寄送配件集合
-
-    public List<SendProdcue> getSendProdcues() {
-        return sendProdcues;
-    }
-
-    public void setSendProdcues(List<SendProdcue> sendProdcues) {
-        this.sendProdcues = sendProdcues;
-    }
-
-    public List<SendFitting> getSendFittings() {
-        return sendFittings;
-    }
-
-    public void setSendFittings(List<SendFitting> sendFittings) {
-        this.sendFittings = sendFittings;
-    }
-
-    public Date getSalesPayTime() {
-        return salesPayTime;
-    }
-
-    public void setSalesPayTime(Date salesPayTime) {
-        this.salesPayTime = salesPayTime;
-    }
-
-    public List<ClosedFitting> getClosedFittings() {
-        return closedFittings;
-    }
-
-    public void setClosedFittings(List<ClosedFitting> closedFittings) {
-        this.closedFittings = closedFittings;
-    }
-
-    public List<ClosedProdcue> getClosedProdcues() {
-        return closedProdcues;
-    }
-
-    public void setClosedProdcues(List<ClosedProdcue> closedProdcues) {
-        this.closedProdcues = closedProdcues;
-    }
-
-    public Integer getReissueId() {
-        return reissueId;
-    }
-
-    public void setReissueId(Integer reissueId) {
-        this.reissueId = reissueId;
-    }
-
-    public Integer getCustomerId() {
-        return customerId;
-    }
-
-    public void setCustomerId(Integer customerId) {
-        this.customerId = customerId;
-    }
-
-    public Integer getOrderId() {
-        return orderId;
-    }
-
-    public void setOrderId(Integer orderId) {
-        this.orderId = orderId;
-    }
-
-    public String getReissueBackEfastOrderId() {
-        return reissueBackEfastOrderId;
-    }
-
-    public void setReissueBackEfastOrderId(String reissueBackEfastOrderId) {
-        this.reissueBackEfastOrderId = reissueBackEfastOrderId;
-    }
-
-    public Integer getReissueSendStatus() {
-        return reissueSendStatus;
-    }
-
-    public void setReissueSendStatus(Integer reissueSendStatus) {
-        this.reissueSendStatus = reissueSendStatus;
-    }
-
-    public String getReissueSendName() {
-        return reissueSendName;
-    }
-
-    public void setReissueSendName(String reissueSendName) {
-        this.reissueSendName = reissueSendName;
-    }
-
-    public String getReissueSendTel() {
-        return reissueSendTel;
-    }
-
-    public void setReissueSendTel(String reissueSendTel) {
-        this.reissueSendTel = reissueSendTel;
-    }
-
-    public Integer getProvinceNumber() {
-        return provinceNumber;
-    }
-
-    public void setProvinceNumber(Integer provinceNumber) {
-        this.provinceNumber = provinceNumber;
-    }
-
-    public Integer getCityNumber() {
-        return cityNumber;
-    }
-
-    public void setCityNumber(Integer cityNumber) {
-        this.cityNumber = cityNumber;
-    }
-
-    public Integer getAreaNumber() {
-        return areaNumber;
-    }
-
-    public void setAreaNumber(Integer areaNumber) {
-        this.areaNumber = areaNumber;
-    }
-
-    public String getReissueSendMergeAddress() {
-        return reissueSendMergeAddress;
-    }
-
-    public void setReissueSendMergeAddress(String reissueSendMergeAddress) {
-        this.reissueSendMergeAddress = reissueSendMergeAddress;
-    }
-
-    public String getReissueSendAddress() {
-        return reissueSendAddress;
-    }
-
-    public void setReissueSendAddress(String reissueSendAddress) {
-        this.reissueSendAddress = reissueSendAddress;
-    }
-
-    public String getReissueSendLogisticsCompany() {
-        return reissueSendLogisticsCompany;
-    }
-
-    public void setReissueSendLogisticsCompany(String reissueSendLogisticsCompany) {
-        this.reissueSendLogisticsCompany = reissueSendLogisticsCompany;
-    }
-
-    public String getReissueSendLogisticsNo() {
-        return reissueSendLogisticsNo;
-    }
-
-    public void setReissueSendLogisticsNo(String reissueSendLogisticsNo) {
-        this.reissueSendLogisticsNo = reissueSendLogisticsNo;
-    }
-
-    public String getReissueDesc() {
-        return reissueDesc;
-    }
-
-    public void setReissueDesc(String reissueDesc) {
-        this.reissueDesc = reissueDesc;
-    }
-
-    public Integer getReissueState() {
-        return reissueState;
-    }
-
-    public void setReissueState(Integer reissueState) {
-        this.reissueState = reissueState;
-    }
-
-    public Date getReissueCreateTime() {
-        return reissueCreateTime;
-    }
-
-    public void setReissueCreateTime(Date reissueCreateTime) {
-        this.reissueCreateTime = reissueCreateTime;
-    }
-
-    public Date getReissueUpdateTime() {
-        return reissueUpdateTime;
-    }
-
-    public void setReissueUpdateTime(Date reissueUpdateTime) {
-        this.reissueUpdateTime = reissueUpdateTime;
-    }
-
-    public String getSalesDealCode() {
-        return salesDealCode;
-    }
-
-    public void setSalesDealCode(String salesDealCode) {
-        this.salesDealCode = salesDealCode;
-    }
+//    //  售后补发主键
+//    private Integer reissueId;
+//    //  客诉基本信息主键
+//    private Integer customerId;
+//    //  订单id
+//    private Integer orderId;
+//    //  发出Efast订单号
+//    private String reissueBackEfastOrderId;
+//    //  寄送状态  1：未寄送  2：已寄送  3：已收货
+//    private Integer reissueSendStatus;
+//    //  寄送人姓名
+//    private String reissueSendName;
+//    //  寄送人电话
+//    private String reissueSendTel;
+//    //  寄送地址-省
+//    private Integer provinceNumber;
+//    //  寄送地址-市
+//    private Integer cityNumber;
+//    //  寄送地址-区
+//    private Integer areaNumber;
+//    //  寄送地址-省市区
+//    private String reissueSendMergeAddress;
+//    //  寄送地址-详细地址
+//    private String reissueSendAddress;
+//    //  寄送物流公司
+//    private String reissueSendLogisticsCompany;
+//    //  寄送物流单号
+//    private String reissueSendLogisticsNo;
+//    //  备注
+//    private String reissueDesc;
+//    //  状态    1：使用中  2：停用中
+//    private Integer reissueState;
+//    //  创建时间
+//    private Date reissueCreateTime;
+//    //  CURRENT_TIMESTAMP ,
+//    private Date reissueUpdateTime;
+//    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+//    @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
+//    private Date salesPayTime;                  //支付时间
+//    private String salesDealCode;               //交易号
+//
+//    private List<ClosedFitting> closedFittings = new ArrayList<ClosedFitting>();//寄回配件集合
+//    private List<ClosedProdcue> closedProdcues = new ArrayList<ClosedProdcue>();//机会产品集合
+//    private List<SendProdcue> sendProdcues = new ArrayList<SendProdcue>();//寄送产品集合
+//    private List<SendFitting> sendFittings = new ArrayList<SendFitting>();//寄送配件集合
+//
+//    public List<SendProdcue> getSendProdcues() {
+//        return sendProdcues;
+//    }
+//
+//    public void setSendProdcues(List<SendProdcue> sendProdcues) {
+//        this.sendProdcues = sendProdcues;
+//    }
+//
+//    public List<SendFitting> getSendFittings() {
+//        return sendFittings;
+//    }
+//
+//    public void setSendFittings(List<SendFitting> sendFittings) {
+//        this.sendFittings = sendFittings;
+//    }
+//
+//    public Date getSalesPayTime() {
+//        return salesPayTime;
+//    }
+//
+//    public void setSalesPayTime(Date salesPayTime) {
+//        this.salesPayTime = salesPayTime;
+//    }
+//
+//    public List<ClosedFitting> getClosedFittings() {
+//        return closedFittings;
+//    }
+//
+//    public void setClosedFittings(List<ClosedFitting> closedFittings) {
+//        this.closedFittings = closedFittings;
+//    }
+//
+//    public List<ClosedProdcue> getClosedProdcues() {
+//        return closedProdcues;
+//    }
+//
+//    public void setClosedProdcues(List<ClosedProdcue> closedProdcues) {
+//        this.closedProdcues = closedProdcues;
+//    }
+//
+//    public Integer getReissueId() {
+//        return reissueId;
+//    }
+//
+//    public void setReissueId(Integer reissueId) {
+//        this.reissueId = reissueId;
+//    }
+//
+//    public Integer getCustomerId() {
+//        return customerId;
+//    }
+//
+//    public void setCustomerId(Integer customerId) {
+//        this.customerId = customerId;
+//    }
+//
+//    public Integer getOrderId() {
+//        return orderId;
+//    }
+//
+//    public void setOrderId(Integer orderId) {
+//        this.orderId = orderId;
+//    }
+//
+//    public String getReissueBackEfastOrderId() {
+//        return reissueBackEfastOrderId;
+//    }
+//
+//    public void setReissueBackEfastOrderId(String reissueBackEfastOrderId) {
+//        this.reissueBackEfastOrderId = reissueBackEfastOrderId;
+//    }
+//
+//    public Integer getReissueSendStatus() {
+//        return reissueSendStatus;
+//    }
+//
+//    public void setReissueSendStatus(Integer reissueSendStatus) {
+//        this.reissueSendStatus = reissueSendStatus;
+//    }
+//
+//    public String getReissueSendName() {
+//        return reissueSendName;
+//    }
+//
+//    public void setReissueSendName(String reissueSendName) {
+//        this.reissueSendName = reissueSendName;
+//    }
+//
+//    public String getReissueSendTel() {
+//        return reissueSendTel;
+//    }
+//
+//    public void setReissueSendTel(String reissueSendTel) {
+//        this.reissueSendTel = reissueSendTel;
+//    }
+//
+//    public Integer getProvinceNumber() {
+//        return provinceNumber;
+//    }
+//
+//    public void setProvinceNumber(Integer provinceNumber) {
+//        this.provinceNumber = provinceNumber;
+//    }
+//
+//    public Integer getCityNumber() {
+//        return cityNumber;
+//    }
+//
+//    public void setCityNumber(Integer cityNumber) {
+//        this.cityNumber = cityNumber;
+//    }
+//
+//    public Integer getAreaNumber() {
+//        return areaNumber;
+//    }
+//
+//    public void setAreaNumber(Integer areaNumber) {
+//        this.areaNumber = areaNumber;
+//    }
+//
+//    public String getReissueSendMergeAddress() {
+//        return reissueSendMergeAddress;
+//    }
+//
+//    public void setReissueSendMergeAddress(String reissueSendMergeAddress) {
+//        this.reissueSendMergeAddress = reissueSendMergeAddress;
+//    }
+//
+//    public String getReissueSendAddress() {
+//        return reissueSendAddress;
+//    }
+//
+//    public void setReissueSendAddress(String reissueSendAddress) {
+//        this.reissueSendAddress = reissueSendAddress;
+//    }
+//
+//    public String getReissueSendLogisticsCompany() {
+//        return reissueSendLogisticsCompany;
+//    }
+//
+//    public void setReissueSendLogisticsCompany(String reissueSendLogisticsCompany) {
+//        this.reissueSendLogisticsCompany = reissueSendLogisticsCompany;
+//    }
+//
+//    public String getReissueSendLogisticsNo() {
+//        return reissueSendLogisticsNo;
+//    }
+//
+//    public void setReissueSendLogisticsNo(String reissueSendLogisticsNo) {
+//        this.reissueSendLogisticsNo = reissueSendLogisticsNo;
+//    }
+//
+//    public String getReissueDesc() {
+//        return reissueDesc;
+//    }
+//
+//    public void setReissueDesc(String reissueDesc) {
+//        this.reissueDesc = reissueDesc;
+//    }
+//
+//    public Integer getReissueState() {
+//        return reissueState;
+//    }
+//
+//    public void setReissueState(Integer reissueState) {
+//        this.reissueState = reissueState;
+//    }
+//
+//    public Date getReissueCreateTime() {
+//        return reissueCreateTime;
+//    }
+//
+//    public void setReissueCreateTime(Date reissueCreateTime) {
+//        this.reissueCreateTime = reissueCreateTime;
+//    }
+//
+//    public Date getReissueUpdateTime() {
+//        return reissueUpdateTime;
+//    }
+//
+//    public void setReissueUpdateTime(Date reissueUpdateTime) {
+//        this.reissueUpdateTime = reissueUpdateTime;
+//    }
+//
+//    public String getSalesDealCode() {
+//        return salesDealCode;
+//    }
+//
+//    public void setSalesDealCode(String salesDealCode) {
+//        this.salesDealCode = salesDealCode;
+//    }
 }

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/Renewed.java

@@ -17,493 +17,493 @@ public class Renewed  implements Serializable {
 
     private static final long serialVersionUID = -4562997728567506919L;
     
-     //售后换新主键 
-    private Integer renewedId;
-     //客诉基本信息主键 
-    private Integer customerId;
-     //订单id 
-    private Integer orderId;
-     //仓储任务(签收id) 
-    private Integer signclosedId;
-     //发出Efast订单号 
-    private String renewedBackEfastOrderId;
-    // TODO: 2018/3/23  寄回状态变更顺序： 1 -> 2  -> 4  -> 3
-     //寄回状态  1：未寄回  2：已寄回  3：已收货  4:已签收待确认
-    private Integer renewedBackStatus;
-     //寄回人姓名 
-    private String renewedBackName;
-     //寄回人电话 
-    private String renewedBackTel;
-     //寄回物流公司 
-    private String renewedBackLogisticsCompany;
-     //寄回物流单号 
-    private String renewedBackLogisticsNo;
-     //寄回邮费 单位为分 
-    private Integer renewedBackPostage;
-     //寄回机器编号 
-    private String renewedBackMachineNo;
-     //寄送状态  1：未寄送  2：已寄送  3：已收货 
-    private Integer renewedSendStatus;
-     //寄送人姓名 
-    private String renewedSendName;
-     //寄送人电话 
-    private String renewedSendTel;
-     //寄送地址-省 
-    private Integer provinceNumber;
-     //寄送地址-市 
-    private Integer cityNumber;
-     //寄送地址-区 
-    private Integer areaNumber;
-     //寄送地址-省市区 
-    private String renewedSendMergeAddress;
-     //寄送地址-详细地址 
-    private String renewedSendAddress;
-     //寄送物流公司 
-    private String renewedSendLogisticsCompany;
-     //寄送物流单号 
-    private String renewedSendLogisticsNo;
-     //备注 
-    private String renewedDesc;
-     //状态    1：使用中  2：停用中 
-    private Integer renewedState;
-     //转账账户 (支付宝账户)
-    private String renewedAlipay;
-    //转账账户 (账户姓名)
-    private String renewedAlipayName;
-    //20180327 当前邮费默认为  0 不需要
-     //是否已转账邮费  0:不需要 10:需要转账
-    private Integer renewedIsTransfer;
-     //创建时间 
-    private Date renewedCreateTime;
-    // 修改时间,
-    private Date renewedUpdateTime;
-    // 签收日期,
-    @DateTimeFormat(pattern="yyyy-MM-dd")
-    private Date renewedBackReceiptDate;
-
-    private String detectPhenomenon;            //工厂检测现象
-    private String detectFailureClassification; //故障分类
-    private String detectFailureCause;          //故障原因
-    private String detectResults;               //判定结果
-    private String detectPoint;                 //故障指向
-    private String detectAnalysis;              //原因分析
-    private Integer detectRevolutionProduced;   //是否转入生产部门
-    private Integer maintenanceIsRepair;        //是否可返修
-    private String maintenanceContent;          //返修内容
-    private Date maintenanceContentDate;        //返修日期
-    private Integer closedProdcueNumber;        //寄回产品数量
-    private String productName;                 //产品名称
-    private Integer detectState;                //品质检测状态
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
-    private Date salesPayTime;                  //支付时间
-    private String salesDealCode;               //交易号
-
-    //QC质检集合
-    private List<ComplaintDetectInfo> complaintDetectList = new ArrayList<ComplaintDetectInfo>();
-
-    private List<ClosedFitting> closedFittings = new ArrayList<ClosedFitting>();//寄回配件集合
-    private List<ClosedProdcue> closedProdcues = new ArrayList<ClosedProdcue>();//寄回产品集合
-    private List<SendProdcue> sendProdcues = new ArrayList<SendProdcue>();//寄送产品集合
-    private List<SendFitting> sendFittings = new ArrayList<SendFitting>();//寄送配件集合
-
-    public List<ComplaintDetectInfo> getComplaintDetectList() {
-        return complaintDetectList;
-    }
-
-    public void setComplaintDetectList(List<ComplaintDetectInfo> complaintDetectList) {
-        this.complaintDetectList = complaintDetectList;
-    }
-
-    public List<SendProdcue> getSendProdcues() {
-        return sendProdcues;
-    }
-
-    public void setSendProdcues(List<SendProdcue> sendProdcues) {
-        this.sendProdcues = sendProdcues;
-    }
-
-    public List<SendFitting> getSendFittings() {
-        return sendFittings;
-    }
-
-    public void setSendFittings(List<SendFitting> sendFittings) {
-        this.sendFittings = sendFittings;
-    }
-
-    public Date getSalesPayTime() {
-        return salesPayTime;
-    }
-
-    public void setSalesPayTime(Date salesPayTime) {
-        this.salesPayTime = salesPayTime;
-    }
-
-    public List<ClosedProdcue> getClosedProdcues() {
-        return closedProdcues;
-    }
-
-    public void setClosedProdcues(List<ClosedProdcue> closedProdcues) {
-        this.closedProdcues = closedProdcues;
-    }
-
-    public Integer getDetectState() {
-        return detectState;
-    }
-
-    public void setDetectState(Integer detectState) {
-        this.detectState = detectState;
-    }
-
-    public Integer getClosedProdcueNumber() {
-        return closedProdcueNumber;
-    }
-
-    public void setClosedProdcueNumber(Integer closedProdcueNumber) {
-        this.closedProdcueNumber = closedProdcueNumber;
-    }
-
-    public String getProductName() {
-        return productName;
-    }
-
-    public void setProductName(String productName) {
-        this.productName = productName;
-    }
-
-    public List<ClosedFitting> getClosedFittings() {
-        return closedFittings;
-    }
-
-    public void setClosedFittings(List<ClosedFitting> closedFittings) {
-        this.closedFittings = closedFittings;
-    }
-
-    public String getDetectPhenomenon() {
-        return detectPhenomenon;
-    }
-
-    public void setDetectPhenomenon(String detectPhenomenon) {
-        this.detectPhenomenon = detectPhenomenon;
-    }
-
-    public String getDetectFailureClassification() {
-        return detectFailureClassification;
-    }
-
-    public void setDetectFailureClassification(String detectFailureClassification) {
-        this.detectFailureClassification = detectFailureClassification;
-    }
-
-    public String getDetectFailureCause() {
-        return detectFailureCause;
-    }
-
-    public void setDetectFailureCause(String detectFailureCause) {
-        this.detectFailureCause = detectFailureCause;
-    }
-
-    public String getDetectResults() {
-        return detectResults;
-    }
-
-    public void setDetectResults(String detectResults) {
-        this.detectResults = detectResults;
-    }
-
-    public String getDetectPoint() {
-        return detectPoint;
-    }
-
-    public void setDetectPoint(String detectPoint) {
-        this.detectPoint = detectPoint;
-    }
-
-    public String getDetectAnalysis() {
-        return detectAnalysis;
-    }
-
-    public void setDetectAnalysis(String detectAnalysis) {
-        this.detectAnalysis = detectAnalysis;
-    }
-
-    public Integer getDetectRevolutionProduced() {
-        return detectRevolutionProduced;
-    }
-
-    public void setDetectRevolutionProduced(Integer detectRevolutionProduced) {
-        this.detectRevolutionProduced = detectRevolutionProduced;
-    }
-
-    public Integer getMaintenanceIsRepair() {
-        return maintenanceIsRepair;
-    }
-
-    public void setMaintenanceIsRepair(Integer maintenanceIsRepair) {
-        this.maintenanceIsRepair = maintenanceIsRepair;
-    }
-
-    public String getMaintenanceContent() {
-        return maintenanceContent;
-    }
-
-    public void setMaintenanceContent(String maintenanceContent) {
-        this.maintenanceContent = maintenanceContent;
-    }
-
-    public Date getMaintenanceContentDate() {
-        return maintenanceContentDate;
-    }
-
-    public void setMaintenanceContentDate(Date maintenanceContentDate) {
-        this.maintenanceContentDate = maintenanceContentDate;
-    }
-
-    public Integer getRenewedId() {
-        return renewedId;
-    }
-
-    public void setRenewedId(Integer renewedId) {
-        this.renewedId = renewedId;
-    }
-
-    public Integer getCustomerId() {
-        return customerId;
-    }
-
-    public void setCustomerId(Integer customerId) {
-        this.customerId = customerId;
-    }
-
-    public Integer getOrderId() {
-        return orderId;
-    }
-
-    public void setOrderId(Integer orderId) {
-        this.orderId = orderId;
-    }
-
-    public Integer getSignclosedId() {
-        return signclosedId;
-    }
-
-    public void setSignclosedId(Integer signclosedId) {
-        this.signclosedId = signclosedId;
-    }
-
-    public String getRenewedBackEfastOrderId() {
-        return renewedBackEfastOrderId;
-    }
-
-    public void setRenewedBackEfastOrderId(String renewedBackEfastOrderId) {
-        this.renewedBackEfastOrderId = renewedBackEfastOrderId;
-    }
-
-    public Integer getRenewedBackStatus() {
-        return renewedBackStatus;
-    }
-
-    public void setRenewedBackStatus(Integer renewedBackStatus) {
-        this.renewedBackStatus = renewedBackStatus;
-    }
-
-    public String getRenewedBackName() {
-        return renewedBackName;
-    }
-
-    public void setRenewedBackName(String renewedBackName) {
-        this.renewedBackName = renewedBackName;
-    }
-
-    public String getRenewedBackTel() {
-        return renewedBackTel;
-    }
-
-    public void setRenewedBackTel(String renewedBackTel) {
-        this.renewedBackTel = renewedBackTel;
-    }
-
-    public String getRenewedBackLogisticsCompany() {
-        return renewedBackLogisticsCompany;
-    }
-
-    public void setRenewedBackLogisticsCompany(String renewedBackLogisticsCompany) {
-        this.renewedBackLogisticsCompany = renewedBackLogisticsCompany;
-    }
-
-    public String getRenewedBackLogisticsNo() {
-        return renewedBackLogisticsNo;
-    }
-
-    public void setRenewedBackLogisticsNo(String renewedBackLogisticsNo) {
-        this.renewedBackLogisticsNo = renewedBackLogisticsNo;
-    }
-
-    public Integer getRenewedBackPostage() {
-        return renewedBackPostage;
-    }
-
-    public void setRenewedBackPostage(Integer renewedBackPostage) {
-        this.renewedBackPostage = renewedBackPostage;
-    }
-
-    public String getRenewedBackMachineNo() {
-        return renewedBackMachineNo;
-    }
-
-    public void setRenewedBackMachineNo(String renewedBackMachineNo) {
-        this.renewedBackMachineNo = renewedBackMachineNo;
-    }
-
-    public Integer getRenewedSendStatus() {
-        return renewedSendStatus;
-    }
-
-    public void setRenewedSendStatus(Integer renewedSendStatus) {
-        this.renewedSendStatus = renewedSendStatus;
-    }
-
-    public String getRenewedSendName() {
-        return renewedSendName;
-    }
-
-    public void setRenewedSendName(String renewedSendName) {
-        this.renewedSendName = renewedSendName;
-    }
-
-    public String getRenewedSendTel() {
-        return renewedSendTel;
-    }
-
-    public void setRenewedSendTel(String renewedSendTel) {
-        this.renewedSendTel = renewedSendTel;
-    }
-
-    public String getRenewedSendMergeAddress() {
-        return renewedSendMergeAddress;
-    }
-
-    public void setRenewedSendMergeAddress(String renewedSendMergeAddress) {
-        this.renewedSendMergeAddress = renewedSendMergeAddress;
-    }
-
-    public Integer getProvinceNumber() {
-        return provinceNumber;
-    }
-
-    public void setProvinceNumber(Integer provinceNumber) {
-        this.provinceNumber = provinceNumber;
-    }
-
-    public Integer getCityNumber() {
-        return cityNumber;
-    }
-
-    public void setCityNumber(Integer cityNumber) {
-        this.cityNumber = cityNumber;
-    }
-
-    public Integer getAreaNumber() {
-        return areaNumber;
-    }
-
-    public void setAreaNumber(Integer areaNumber) {
-        this.areaNumber = areaNumber;
-    }
-
-    public String getRenewedSendAddress() {
-        return renewedSendAddress;
-    }
-
-    public void setRenewedSendAddress(String renewedSendAddress) {
-        this.renewedSendAddress = renewedSendAddress;
-    }
-
-    public String getRenewedSendLogisticsCompany() {
-        return renewedSendLogisticsCompany;
-    }
-
-    public void setRenewedSendLogisticsCompany(String renewedSendLogisticsCompany) {
-        this.renewedSendLogisticsCompany = renewedSendLogisticsCompany;
-    }
-
-    public String getRenewedSendLogisticsNo() {
-        return renewedSendLogisticsNo;
-    }
-
-    public void setRenewedSendLogisticsNo(String renewedSendLogisticsNo) {
-        this.renewedSendLogisticsNo = renewedSendLogisticsNo;
-    }
-
-    public String getRenewedDesc() {
-        return renewedDesc;
-    }
-
-    public void setRenewedDesc(String renewedDesc) {
-        this.renewedDesc = renewedDesc;
-    }
-
-    public Integer getRenewedState() {
-        return renewedState;
-    }
-
-    public void setRenewedState(Integer renewedState) {
-        this.renewedState = renewedState;
-    }
-
-    public String getRenewedAlipay() {
-        return renewedAlipay;
-    }
-
-    public void setRenewedAlipay(String renewedAlipay) {
-        this.renewedAlipay = renewedAlipay;
-    }
-
-    public Integer getRenewedIsTransfer() {
-        return renewedIsTransfer;
-    }
-
-    public void setRenewedIsTransfer(Integer renewedIsTransfer) {
-        this.renewedIsTransfer = renewedIsTransfer;
-    }
-
-    public Date getRenewedCreateTime() {
-        return renewedCreateTime;
-    }
-
-    public void setRenewedCreateTime(Date renewedCreateTime) {
-        this.renewedCreateTime = renewedCreateTime;
-    }
-
-    public Date getRenewedUpdateTime() {
-        return renewedUpdateTime;
-    }
-
-    public void setRenewedUpdateTime(Date renewedUpdateTime) {
-        this.renewedUpdateTime = renewedUpdateTime;
-    }
-
-    public String getSalesDealCode() {
-        return salesDealCode;
-    }
-
-    public void setSalesDealCode(String salesDealCode) {
-        this.salesDealCode = salesDealCode;
-    }
-
-    public String getRenewedAlipayName() {
-        return renewedAlipayName;
-    }
-
-    public void setRenewedAlipayName(String renewedAlipayName) {
-        this.renewedAlipayName = renewedAlipayName;
-    }
-
-    public Date getRenewedBackReceiptDate() {
-        return renewedBackReceiptDate;
-    }
-
-    public void setRenewedBackReceiptDate(Date renewedBackReceiptDate) {
-        this.renewedBackReceiptDate = renewedBackReceiptDate;
-    }
+//     //售后换新主键
+//    private Integer renewedId;
+//     //客诉基本信息主键
+//    private Integer customerId;
+//     //订单id
+//    private Integer orderId;
+//     //仓储任务(签收id)
+//    private Integer signclosedId;
+//     //发出Efast订单号
+//    private String renewedBackEfastOrderId;
+//    // TODO: 2018/3/23  寄回状态变更顺序： 1 -> 2  -> 4  -> 3
+//     //寄回状态  1：未寄回  2：已寄回  3：已收货  4:已签收待确认
+//    private Integer renewedBackStatus;
+//     //寄回人姓名
+//    private String renewedBackName;
+//     //寄回人电话
+//    private String renewedBackTel;
+//     //寄回物流公司
+//    private String renewedBackLogisticsCompany;
+//     //寄回物流单号
+//    private String renewedBackLogisticsNo;
+//     //寄回邮费 单位为分
+//    private Integer renewedBackPostage;
+//     //寄回机器编号
+//    private String renewedBackMachineNo;
+//     //寄送状态  1：未寄送  2：已寄送  3：已收货
+//    private Integer renewedSendStatus;
+//     //寄送人姓名
+//    private String renewedSendName;
+//     //寄送人电话
+//    private String renewedSendTel;
+//     //寄送地址-省
+//    private Integer provinceNumber;
+//     //寄送地址-市
+//    private Integer cityNumber;
+//     //寄送地址-区
+//    private Integer areaNumber;
+//     //寄送地址-省市区
+//    private String renewedSendMergeAddress;
+//     //寄送地址-详细地址
+//    private String renewedSendAddress;
+//     //寄送物流公司
+//    private String renewedSendLogisticsCompany;
+//     //寄送物流单号
+//    private String renewedSendLogisticsNo;
+//     //备注
+//    private String renewedDesc;
+//     //状态    1：使用中  2：停用中
+//    private Integer renewedState;
+//     //转账账户 (支付宝账户)
+//    private String renewedAlipay;
+//    //转账账户 (账户姓名)
+//    private String renewedAlipayName;
+//    //20180327 当前邮费默认为  0 不需要
+//     //是否已转账邮费  0:不需要 10:需要转账
+//    private Integer renewedIsTransfer;
+//     //创建时间
+//    private Date renewedCreateTime;
+//    // 修改时间,
+//    private Date renewedUpdateTime;
+//    // 签收日期,
+//    @DateTimeFormat(pattern="yyyy-MM-dd")
+//    private Date renewedBackReceiptDate;
+//
+//    private String detectPhenomenon;            //工厂检测现象
+//    private String detectFailureClassification; //故障分类
+//    private String detectFailureCause;          //故障原因
+//    private String detectResults;               //判定结果
+//    private String detectPoint;                 //故障指向
+//    private String detectAnalysis;              //原因分析
+//    private Integer detectRevolutionProduced;   //是否转入生产部门
+//    private Integer maintenanceIsRepair;        //是否可返修
+//    private String maintenanceContent;          //返修内容
+//    private Date maintenanceContentDate;        //返修日期
+//    private Integer closedProdcueNumber;        //寄回产品数量
+//    private String productName;                 //产品名称
+//    private Integer detectState;                //品质检测状态
+//    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+//    @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
+//    private Date salesPayTime;                  //支付时间
+//    private String salesDealCode;               //交易号
+//
+//    //QC质检集合
+//    private List<ComplaintDetectInfo> complaintDetectList = new ArrayList<ComplaintDetectInfo>();
+//
+//    private List<ClosedFitting> closedFittings = new ArrayList<ClosedFitting>();//寄回配件集合
+//    private List<ClosedProdcue> closedProdcues = new ArrayList<ClosedProdcue>();//寄回产品集合
+//    private List<SendProdcue> sendProdcues = new ArrayList<SendProdcue>();//寄送产品集合
+//    private List<SendFitting> sendFittings = new ArrayList<SendFitting>();//寄送配件集合
+//
+//    public List<ComplaintDetectInfo> getComplaintDetectList() {
+//        return complaintDetectList;
+//    }
+//
+//    public void setComplaintDetectList(List<ComplaintDetectInfo> complaintDetectList) {
+//        this.complaintDetectList = complaintDetectList;
+//    }
+//
+//    public List<SendProdcue> getSendProdcues() {
+//        return sendProdcues;
+//    }
+//
+//    public void setSendProdcues(List<SendProdcue> sendProdcues) {
+//        this.sendProdcues = sendProdcues;
+//    }
+//
+//    public List<SendFitting> getSendFittings() {
+//        return sendFittings;
+//    }
+//
+//    public void setSendFittings(List<SendFitting> sendFittings) {
+//        this.sendFittings = sendFittings;
+//    }
+//
+//    public Date getSalesPayTime() {
+//        return salesPayTime;
+//    }
+//
+//    public void setSalesPayTime(Date salesPayTime) {
+//        this.salesPayTime = salesPayTime;
+//    }
+//
+//    public List<ClosedProdcue> getClosedProdcues() {
+//        return closedProdcues;
+//    }
+//
+//    public void setClosedProdcues(List<ClosedProdcue> closedProdcues) {
+//        this.closedProdcues = closedProdcues;
+//    }
+//
+//    public Integer getDetectState() {
+//        return detectState;
+//    }
+//
+//    public void setDetectState(Integer detectState) {
+//        this.detectState = detectState;
+//    }
+//
+//    public Integer getClosedProdcueNumber() {
+//        return closedProdcueNumber;
+//    }
+//
+//    public void setClosedProdcueNumber(Integer closedProdcueNumber) {
+//        this.closedProdcueNumber = closedProdcueNumber;
+//    }
+//
+//    public String getProductName() {
+//        return productName;
+//    }
+//
+//    public void setProductName(String productName) {
+//        this.productName = productName;
+//    }
+//
+//    public List<ClosedFitting> getClosedFittings() {
+//        return closedFittings;
+//    }
+//
+//    public void setClosedFittings(List<ClosedFitting> closedFittings) {
+//        this.closedFittings = closedFittings;
+//    }
+//
+//    public String getDetectPhenomenon() {
+//        return detectPhenomenon;
+//    }
+//
+//    public void setDetectPhenomenon(String detectPhenomenon) {
+//        this.detectPhenomenon = detectPhenomenon;
+//    }
+//
+//    public String getDetectFailureClassification() {
+//        return detectFailureClassification;
+//    }
+//
+//    public void setDetectFailureClassification(String detectFailureClassification) {
+//        this.detectFailureClassification = detectFailureClassification;
+//    }
+//
+//    public String getDetectFailureCause() {
+//        return detectFailureCause;
+//    }
+//
+//    public void setDetectFailureCause(String detectFailureCause) {
+//        this.detectFailureCause = detectFailureCause;
+//    }
+//
+//    public String getDetectResults() {
+//        return detectResults;
+//    }
+//
+//    public void setDetectResults(String detectResults) {
+//        this.detectResults = detectResults;
+//    }
+//
+//    public String getDetectPoint() {
+//        return detectPoint;
+//    }
+//
+//    public void setDetectPoint(String detectPoint) {
+//        this.detectPoint = detectPoint;
+//    }
+//
+//    public String getDetectAnalysis() {
+//        return detectAnalysis;
+//    }
+//
+//    public void setDetectAnalysis(String detectAnalysis) {
+//        this.detectAnalysis = detectAnalysis;
+//    }
+//
+//    public Integer getDetectRevolutionProduced() {
+//        return detectRevolutionProduced;
+//    }
+//
+//    public void setDetectRevolutionProduced(Integer detectRevolutionProduced) {
+//        this.detectRevolutionProduced = detectRevolutionProduced;
+//    }
+//
+//    public Integer getMaintenanceIsRepair() {
+//        return maintenanceIsRepair;
+//    }
+//
+//    public void setMaintenanceIsRepair(Integer maintenanceIsRepair) {
+//        this.maintenanceIsRepair = maintenanceIsRepair;
+//    }
+//
+//    public String getMaintenanceContent() {
+//        return maintenanceContent;
+//    }
+//
+//    public void setMaintenanceContent(String maintenanceContent) {
+//        this.maintenanceContent = maintenanceContent;
+//    }
+//
+//    public Date getMaintenanceContentDate() {
+//        return maintenanceContentDate;
+//    }
+//
+//    public void setMaintenanceContentDate(Date maintenanceContentDate) {
+//        this.maintenanceContentDate = maintenanceContentDate;
+//    }
+//
+//    public Integer getRenewedId() {
+//        return renewedId;
+//    }
+//
+//    public void setRenewedId(Integer renewedId) {
+//        this.renewedId = renewedId;
+//    }
+//
+//    public Integer getCustomerId() {
+//        return customerId;
+//    }
+//
+//    public void setCustomerId(Integer customerId) {
+//        this.customerId = customerId;
+//    }
+//
+//    public Integer getOrderId() {
+//        return orderId;
+//    }
+//
+//    public void setOrderId(Integer orderId) {
+//        this.orderId = orderId;
+//    }
+//
+//    public Integer getSignclosedId() {
+//        return signclosedId;
+//    }
+//
+//    public void setSignclosedId(Integer signclosedId) {
+//        this.signclosedId = signclosedId;
+//    }
+//
+//    public String getRenewedBackEfastOrderId() {
+//        return renewedBackEfastOrderId;
+//    }
+//
+//    public void setRenewedBackEfastOrderId(String renewedBackEfastOrderId) {
+//        this.renewedBackEfastOrderId = renewedBackEfastOrderId;
+//    }
+//
+//    public Integer getRenewedBackStatus() {
+//        return renewedBackStatus;
+//    }
+//
+//    public void setRenewedBackStatus(Integer renewedBackStatus) {
+//        this.renewedBackStatus = renewedBackStatus;
+//    }
+//
+//    public String getRenewedBackName() {
+//        return renewedBackName;
+//    }
+//
+//    public void setRenewedBackName(String renewedBackName) {
+//        this.renewedBackName = renewedBackName;
+//    }
+//
+//    public String getRenewedBackTel() {
+//        return renewedBackTel;
+//    }
+//
+//    public void setRenewedBackTel(String renewedBackTel) {
+//        this.renewedBackTel = renewedBackTel;
+//    }
+//
+//    public String getRenewedBackLogisticsCompany() {
+//        return renewedBackLogisticsCompany;
+//    }
+//
+//    public void setRenewedBackLogisticsCompany(String renewedBackLogisticsCompany) {
+//        this.renewedBackLogisticsCompany = renewedBackLogisticsCompany;
+//    }
+//
+//    public String getRenewedBackLogisticsNo() {
+//        return renewedBackLogisticsNo;
+//    }
+//
+//    public void setRenewedBackLogisticsNo(String renewedBackLogisticsNo) {
+//        this.renewedBackLogisticsNo = renewedBackLogisticsNo;
+//    }
+//
+//    public Integer getRenewedBackPostage() {
+//        return renewedBackPostage;
+//    }
+//
+//    public void setRenewedBackPostage(Integer renewedBackPostage) {
+//        this.renewedBackPostage = renewedBackPostage;
+//    }
+//
+//    public String getRenewedBackMachineNo() {
+//        return renewedBackMachineNo;
+//    }
+//
+//    public void setRenewedBackMachineNo(String renewedBackMachineNo) {
+//        this.renewedBackMachineNo = renewedBackMachineNo;
+//    }
+//
+//    public Integer getRenewedSendStatus() {
+//        return renewedSendStatus;
+//    }
+//
+//    public void setRenewedSendStatus(Integer renewedSendStatus) {
+//        this.renewedSendStatus = renewedSendStatus;
+//    }
+//
+//    public String getRenewedSendName() {
+//        return renewedSendName;
+//    }
+//
+//    public void setRenewedSendName(String renewedSendName) {
+//        this.renewedSendName = renewedSendName;
+//    }
+//
+//    public String getRenewedSendTel() {
+//        return renewedSendTel;
+//    }
+//
+//    public void setRenewedSendTel(String renewedSendTel) {
+//        this.renewedSendTel = renewedSendTel;
+//    }
+//
+//    public String getRenewedSendMergeAddress() {
+//        return renewedSendMergeAddress;
+//    }
+//
+//    public void setRenewedSendMergeAddress(String renewedSendMergeAddress) {
+//        this.renewedSendMergeAddress = renewedSendMergeAddress;
+//    }
+//
+//    public Integer getProvinceNumber() {
+//        return provinceNumber;
+//    }
+//
+//    public void setProvinceNumber(Integer provinceNumber) {
+//        this.provinceNumber = provinceNumber;
+//    }
+//
+//    public Integer getCityNumber() {
+//        return cityNumber;
+//    }
+//
+//    public void setCityNumber(Integer cityNumber) {
+//        this.cityNumber = cityNumber;
+//    }
+//
+//    public Integer getAreaNumber() {
+//        return areaNumber;
+//    }
+//
+//    public void setAreaNumber(Integer areaNumber) {
+//        this.areaNumber = areaNumber;
+//    }
+//
+//    public String getRenewedSendAddress() {
+//        return renewedSendAddress;
+//    }
+//
+//    public void setRenewedSendAddress(String renewedSendAddress) {
+//        this.renewedSendAddress = renewedSendAddress;
+//    }
+//
+//    public String getRenewedSendLogisticsCompany() {
+//        return renewedSendLogisticsCompany;
+//    }
+//
+//    public void setRenewedSendLogisticsCompany(String renewedSendLogisticsCompany) {
+//        this.renewedSendLogisticsCompany = renewedSendLogisticsCompany;
+//    }
+//
+//    public String getRenewedSendLogisticsNo() {
+//        return renewedSendLogisticsNo;
+//    }
+//
+//    public void setRenewedSendLogisticsNo(String renewedSendLogisticsNo) {
+//        this.renewedSendLogisticsNo = renewedSendLogisticsNo;
+//    }
+//
+//    public String getRenewedDesc() {
+//        return renewedDesc;
+//    }
+//
+//    public void setRenewedDesc(String renewedDesc) {
+//        this.renewedDesc = renewedDesc;
+//    }
+//
+//    public Integer getRenewedState() {
+//        return renewedState;
+//    }
+//
+//    public void setRenewedState(Integer renewedState) {
+//        this.renewedState = renewedState;
+//    }
+//
+//    public String getRenewedAlipay() {
+//        return renewedAlipay;
+//    }
+//
+//    public void setRenewedAlipay(String renewedAlipay) {
+//        this.renewedAlipay = renewedAlipay;
+//    }
+//
+//    public Integer getRenewedIsTransfer() {
+//        return renewedIsTransfer;
+//    }
+//
+//    public void setRenewedIsTransfer(Integer renewedIsTransfer) {
+//        this.renewedIsTransfer = renewedIsTransfer;
+//    }
+//
+//    public Date getRenewedCreateTime() {
+//        return renewedCreateTime;
+//    }
+//
+//    public void setRenewedCreateTime(Date renewedCreateTime) {
+//        this.renewedCreateTime = renewedCreateTime;
+//    }
+//
+//    public Date getRenewedUpdateTime() {
+//        return renewedUpdateTime;
+//    }
+//
+//    public void setRenewedUpdateTime(Date renewedUpdateTime) {
+//        this.renewedUpdateTime = renewedUpdateTime;
+//    }
+//
+//    public String getSalesDealCode() {
+//        return salesDealCode;
+//    }
+//
+//    public void setSalesDealCode(String salesDealCode) {
+//        this.salesDealCode = salesDealCode;
+//    }
+//
+//    public String getRenewedAlipayName() {
+//        return renewedAlipayName;
+//    }
+//
+//    public void setRenewedAlipayName(String renewedAlipayName) {
+//        this.renewedAlipayName = renewedAlipayName;
+//    }
+//
+//    public Date getRenewedBackReceiptDate() {
+//        return renewedBackReceiptDate;
+//    }
+//
+//    public void setRenewedBackReceiptDate(Date renewedBackReceiptDate) {
+//        this.renewedBackReceiptDate = renewedBackReceiptDate;
+//    }
 }

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/SendFitting.java

@@ -1,96 +1,96 @@
 package com.iamberry.rst.core.cm;
 
 import java.io.Serializable;
-
+@Deprecated
 public class SendFitting  implements Serializable {
     private static final long serialVersionUID = 5406750622369507409L;
-    private Integer sendFittingId;
-
-    private Integer relationId;
-
-    private Integer productId;
-
-    private Integer fittingsId;
-
-    private Integer sendFittingNumber;
-
-    private Integer sendFittingType;    //售后类型  3：换新;4：维修;5：补发;6：退货;7：无理由退货
-
-    private String sendFittingsName; //配件名称
-
-    private String sendProductName;         //商品名称
-
-    private String colorBar;        //69码
-
-    public String getSendFittingsName() {
-        return sendFittingsName;
-    }
-
-    public void setSendFittingsName(String sendFittingsName) {
-        this.sendFittingsName = sendFittingsName;
-    }
-
-    public Integer getSendFittingType() {
-        return sendFittingType;
-    }
-
-    public void setSendFittingType(Integer sendFittingType) {
-        this.sendFittingType = sendFittingType;
-    }
-
-    public Integer getSendFittingId() {
-        return sendFittingId;
-    }
-
-    public void setSendFittingId(Integer sendFittingId) {
-        this.sendFittingId = sendFittingId;
-    }
-
-    public Integer getRelationId() {
-        return relationId;
-    }
-
-    public void setRelationId(Integer relationId) {
-        this.relationId = relationId;
-    }
-
-    public Integer getProductId() {
-        return productId;
-    }
-
-    public void setProductId(Integer productId) {
-        this.productId = productId;
-    }
-
-    public Integer getFittingsId() {
-        return fittingsId;
-    }
-
-    public void setFittingsId(Integer fittingsId) {
-        this.fittingsId = fittingsId;
-    }
-
-    public Integer getSendFittingNumber() {
-        return sendFittingNumber;
-    }
-
-    public void setSendFittingNumber(Integer sendFittingNumber) {
-        this.sendFittingNumber = sendFittingNumber;
-    }
-
-    public String getSendProductName() {
-        return sendProductName;
-    }
-
-    public void setSendProductName(String sendProductName) {
-        this.sendProductName = sendProductName;
-    }
-
-    public String getColorBar() {
-        return colorBar;
-    }
-
-    public void setColorBar(String colorBar) {
-        this.colorBar = colorBar;
-    }
+//    private Integer sendFittingId;
+//
+//    private Integer relationId;
+//
+//    private Integer productId;
+//
+//    private Integer fittingsId;
+//
+//    private Integer sendFittingNumber;
+//
+//    private Integer sendFittingType;    //售后类型  3：换新;4：维修;5：补发;6：退货;7：无理由退货
+//
+//    private String sendFittingsName; //配件名称
+//
+//    private String sendProductName;         //商品名称
+//
+//    private String colorBar;        //69码
+//
+//    public String getSendFittingsName() {
+//        return sendFittingsName;
+//    }
+//
+//    public void setSendFittingsName(String sendFittingsName) {
+//        this.sendFittingsName = sendFittingsName;
+//    }
+//
+//    public Integer getSendFittingType() {
+//        return sendFittingType;
+//    }
+//
+//    public void setSendFittingType(Integer sendFittingType) {
+//        this.sendFittingType = sendFittingType;
+//    }
+//
+//    public Integer getSendFittingId() {
+//        return sendFittingId;
+//    }
+//
+//    public void setSendFittingId(Integer sendFittingId) {
+//        this.sendFittingId = sendFittingId;
+//    }
+//
+//    public Integer getRelationId() {
+//        return relationId;
+//    }
+//
+//    public void setRelationId(Integer relationId) {
+//        this.relationId = relationId;
+//    }
+//
+//    public Integer getProductId() {
+//        return productId;
+//    }
+//
+//    public void setProductId(Integer productId) {
+//        this.productId = productId;
+//    }
+//
+//    public Integer getFittingsId() {
+//        return fittingsId;
+//    }
+//
+//    public void setFittingsId(Integer fittingsId) {
+//        this.fittingsId = fittingsId;
+//    }
+//
+//    public Integer getSendFittingNumber() {
+//        return sendFittingNumber;
+//    }
+//
+//    public void setSendFittingNumber(Integer sendFittingNumber) {
+//        this.sendFittingNumber = sendFittingNumber;
+//    }
+//
+//    public String getSendProductName() {
+//        return sendProductName;
+//    }
+//
+//    public void setSendProductName(String sendProductName) {
+//        this.sendProductName = sendProductName;
+//    }
+//
+//    public String getColorBar() {
+//        return colorBar;
+//    }
+//
+//    public void setColorBar(String colorBar) {
+//        this.colorBar = colorBar;
+//    }
 }

watero-rst-core/src/main/java/com.iamberry.rst.core/sys/Admin.java

@@ -22,7 +22,8 @@ public class Admin implements Serializable {
 
     private Integer adminId;
 
-    private Integer adminDept;              // 1:技术组 2:销售组(销售部) 3:客服组(客服运营部) 4:运营组 5:财务部  6工厂生产部 7.管理部8工厂仓库部
+    private Integer adminDept;
+    private String departName;  //部门名称
 
     @NotBlank(message="姓名不能为空")
     @Length(min=2,max=10,message="姓名必须由2~10个字组成")
@@ -185,6 +186,14 @@ public class Admin implements Serializable {
         this.adminOpenId = adminOpenId;
     }
 
+    public String getDepartName() {
+        return departName;
+    }
+
+    public void setDepartName(String departName) {
+        this.departName = departName;
+    }
+
     /**
      * 本函数输出将作为默认的<shiro:principal/>输出.
      */

watero-rst-core/src/main/java/com.iamberry.rst.core/sys/Depart.java

@@ -0,0 +1,62 @@
+package com.iamberry.rst.core.sys;
+
+import  java.util.Date;
+import  java.io.Serializable;
+/**
+ *  管理员部门表类
+ * @author xm
+ * @Date 2019-05-22
+ */
+public class Depart  implements  Serializable{
+    private static final long serialVersionUID = 327332133504685446L;
+    //部门Id
+    private Integer departId;
+    //部门名称
+    private String departName;
+    //状态 1：启用 2：禁用
+    private Integer departStatus;
+    //备注
+    private String departRemake;
+    //创建时间'
+    private Date departCreateTime;
+
+    public Integer getDepartId(){
+        return departId;
+    }
+
+    public void setDepartId(Integer  departId){
+        this.departId=departId;
+    }
+
+    public String getDepartName(){
+        return departName;
+    }
+
+    public void setDepartName(String  departName){
+        this.departName=departName;
+    }
+
+    public Integer getDepartStatus(){
+        return departStatus;
+    }
+
+    public void setDepartStatus(Integer  departStatus){
+        this.departStatus=departStatus;
+    }
+
+    public String getDepartRemake(){
+        return departRemake;
+    }
+
+    public void setDepartRemake(String  departRemake){
+        this.departRemake=departRemake;
+    }
+
+    public Date getDepartCreateTime(){
+        return departCreateTime;
+    }
+
+    public void setDepartCreateTime(Date  departCreateTime){
+        this.departCreateTime=departCreateTime;
+    }
+}

watero-rst-core/src/main/java/com.iamberry.rst.core/sys/Dept.java

@@ -11,22 +11,23 @@ import java.util.Map;
  * @tel 18271840547
  * @date 2017/5/19
  */
+@Deprecated
 public class Dept {
 
-    private static Map<Integer, DeptInfo> depts = new HashMap<>();
+//    private static Map<Integer, DeptInfo> depts = new HashMap<>();
 
-    {
-        depts.put(1, new DeptInfo(1, "技术部", "ROOT"));
-        depts.put(2, new DeptInfo(2, "深圳销售部", "SALVE"));
-        depts.put(3, new DeptInfo(3, "客服运营部", "CS-RUN"));
-        depts.put(4, new DeptInfo(4, "广州销售部", "SALVE"));
-        depts.put(5, new DeptInfo(5, "财务部", "FINANCE"));
-        depts.put(6, new DeptInfo(6, "工厂生产部", "PRODUCE"));
-        depts.put(7, new DeptInfo(7, "管理部", "MANAGEMENT"));
-        depts.put(8, new DeptInfo(8, "工厂仓库部", "WAREHOUSE"));
-        depts.put(9, new DeptInfo(9, "优尼雅", "YULIAFACTORY"));
-        //7.管理部8工厂仓库部
-    }
+//    {
+//        depts.put(1, new DeptInfo(1, "技术部", "ROOT"));
+//        depts.put(2, new DeptInfo(2, "深圳销售部", "SALVE"));
+//        depts.put(3, new DeptInfo(3, "客服运营部", "CS-RUN"));
+//        depts.put(4, new DeptInfo(4, "广州销售部", "SALVE"));
+//        depts.put(5, new DeptInfo(5, "财务部", "FINANCE"));
+//        depts.put(6, new DeptInfo(6, "工厂生产部", "PRODUCE"));
+//        depts.put(7, new DeptInfo(7, "管理部", "MANAGEMENT"));
+//        depts.put(8, new DeptInfo(8, "工厂仓库部", "WAREHOUSE"));
+//        depts.put(9, new DeptInfo(9, "优尼雅", "YULIAFACTORY"));
+//        //7.管理部8工厂仓库部
+//    }
 
     /**
      * 根据部门id，获取部门的信息
@@ -36,7 +37,7 @@ public class Dept {
      *   id 部门id
      * @return   java.lang.String
      */
-    public static DeptInfo getDeptNameById(Integer id) {
-        return depts.get(id);
-    }
+//    public static DeptInfo getDeptNameById(Integer id) {
+//        return depts.get(id);
+//    }
 }

watero-rst-core/src/main/java/com.iamberry.rst.core/sys/DeptInfo.java

@@ -9,43 +9,44 @@ import java.io.Serializable;
  * @tel 18271840547
  * @website www.iamberry.com
  */
+@Deprecated
 public class DeptInfo implements Serializable {
 
     private static final long serialVersionUID = -8449945581093324623L;
-
-    private Integer id;         // 部门id
-
-    private String name;        // 部门名称
-
-    private String details;     // 部门简介
-
-    public DeptInfo(Integer id, String name, String details) {
-        this.id = id;
-        this.name = name;
-        this.details = details;
-    }
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getDetails() {
-        return details;
-    }
-
-    public void setDetails(String details) {
-        this.details = details;
-    }
+//
+//    private Integer id;         // 部门id
+//
+//    private String name;        // 部门名称
+//
+//    private String details;     // 部门简介
+//
+//    public DeptInfo(Integer id, String name, String details) {
+//        this.id = id;
+//        this.name = name;
+//        this.details = details;
+//    }
+//
+//    public Integer getId() {
+//        return id;
+//    }
+//
+//    public void setId(Integer id) {
+//        this.id = id;
+//    }
+//
+//    public String getName() {
+//        return name;
+//    }
+//
+//    public void setName(String name) {
+//        this.name = name;
+//    }
+//
+//    public String getDetails() {
+//        return details;
+//    }
+//
+//    public void setDetails(String details) {
+//        this.details = details;
+//    }
 }

watero-rst-interface/src/main/java/com/iamberry/rst/faces/cm/CustomerService.java

@@ -81,7 +81,7 @@ public interface CustomerService {
      * @param noreasonBack
      * @return
      */
-    NoreasonBack getNoreasonBack(NoreasonBack noreasonBack);
+//    NoreasonBack getNoreasonBack(NoreasonBack noreasonBack);
 
     /**
      * 获取售后补寄信息
@@ -137,7 +137,7 @@ public interface CustomerService {
      * @param customerCommon
      * @return
      */
-    void saveComplaintSignclosedInfo(ComplaintSignclosedInfo complaintSignclosedInfo, CustomerCommon customerCommon);
+//    void saveComplaintSignclosedInfo(ComplaintSignclosedInfo complaintSignclosedInfo, CustomerCommon customerCommon);
     /**
      * 添加品检
      * @param complaintDetectInfo

watero-rst-interface/src/main/java/com/iamberry/rst/faces/sys/DepartService.java

@@ -0,0 +1,43 @@
+package com.iamberry.rst.faces.sys;
+
+import com.iamberry.rst.core.sys.Depart;
+
+import java.util.List;
+
+/**
+ *  管理员部门表接口
+ * @author xm
+ * @Date 2019-05-22
+ */
+public interface DepartService {
+    /**
+     * 获取集合
+     * @param  depart
+     * @return List
+     */
+    List<Depart> getDepartList(Depart  depart);
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  depart
+     */
+    Depart  getDepartById(Integer  id);
+    /**
+     * 增加数据
+     * @param  depart
+     * @return Integer
+     */
+    Integer  save(Depart depart);
+    /**
+     * 修改数据
+     * @param  depart
+     * @return Integer
+     */
+    Integer  update(Depart  depart);
+    /**
+     * 删除数据
+     * @param  id
+     * @return Integer
+     */
+    Integer  delete(Integer  id);
+}

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/CustomerServiceImpl.java

@@ -622,55 +622,55 @@ public class CustomerServiceImpl implements CustomerService {
      * @param customerCommon
      * @return
      */
-    @Override
-    @Transactional
-    public void saveComplaintSignclosedInfo(ComplaintSignclosedInfo complaintSignclosedInfo,CustomerCommon customerCommon){
-        if(customerCommon.getIsNeedSelectOrder() == 2){
-            return;
-        }
-        Integer flag;
-        complaintSignclosedInfo.setSignclosedCustomerId(customerCommon.getCustomerId()); //客诉id
-        complaintSignclosedInfo.setSignclosedSendName(customerCommon.getRelationBackName());    //签收姓名
-        complaintSignclosedInfo.setSignclosedSendTel(customerCommon.getRelationBackTel());     //签收手机
-        flag = complaintSignclosedInfoMapper.insert(complaintSignclosedInfo);
-        if(flag < 1){
-            throw new RuntimeException("添加签收失败");
-        }
-
-        //添加代签收表
-        List<AwaitingSignclosedProductInfo> awaitingSignclosedProductInfoArrayList = new ArrayList<>();
-        for(int i=0 ;i< customerCommon.getClosedProdcues().size();i++){
-            ClosedProdcue closedProdcue = customerCommon.getClosedProdcues().get(i);
-            for(int k=0;k<closedProdcue.getClosedProdcueNumber();k++){
-                AwaitingSignclosedProductInfo awaitingSignclosedProductInfo = new AwaitingSignclosedProductInfo();
-                awaitingSignclosedProductInfo.setSignclosedId(complaintSignclosedInfo.getSignclosedId());   //仓储id
-                awaitingSignclosedProductInfo.setSignclosedProductType(1); //类型为产品
-                awaitingSignclosedProductInfo.setProductNum(1);
-                awaitingSignclosedProductInfo.setSignclosedProductId(closedProdcue.getProductId());         //产品id
-                awaitingSignclosedProductInfo.setSignclosedProductColor(closedProdcue.getColorId());        //颜色id
-                awaitingSignclosedProductInfo.setProductName(closedProdcue.getClosedProductName());         //产品名称
-                awaitingSignclosedProductInfoArrayList.add(awaitingSignclosedProductInfo);
-            }
-        }
-
-        for(int i=0 ;i< customerCommon.getClosedFittings().size();i++){
-            ClosedFitting closedFitting = customerCommon.getClosedFittings().get(i);
-            for(int k=0;k<closedFitting.getClosedFittingNumber();k++){
-                AwaitingSignclosedProductInfo awaitingSignclosedProductInfo = new AwaitingSignclosedProductInfo();
-                awaitingSignclosedProductInfo.setSignclosedId(complaintSignclosedInfo.getSignclosedId());   //仓储id
-                awaitingSignclosedProductInfo.setSignclosedProductType(2);  //类型为配件
-                awaitingSignclosedProductInfo.setProductNum(1);
-                awaitingSignclosedProductInfo.setSignclosedProductId(closedFitting.getFittingsId());         //配件id
-                awaitingSignclosedProductInfo.setSignclosedProductColor(null);
-                awaitingSignclosedProductInfo.setProductName(closedFitting.getClosedFittingsName());       //配件名称
-                awaitingSignclosedProductInfoArrayList.add(awaitingSignclosedProductInfo);
-            }
-        }
-        flag = complaintSignclosedProductInfoMapper.insertList(awaitingSignclosedProductInfoArrayList);
-        if(flag < 1){
-            throw new RuntimeException("添加签收产品失败");
-        }
-    }
+//    @Override
+//    @Transactional
+//    public void saveComplaintSignclosedInfo(ComplaintSignclosedInfo complaintSignclosedInfo,CustomerCommon customerCommon){
+//        if(customerCommon.getIsNeedSelectOrder() == 2){
+//            return;
+//        }
+//        Integer flag;
+//        complaintSignclosedInfo.setSignclosedCustomerId(customerCommon.getCustomerId()); //客诉id
+//        complaintSignclosedInfo.setSignclosedSendName(customerCommon.getRelationBackName());    //签收姓名
+//        complaintSignclosedInfo.setSignclosedSendTel(customerCommon.getRelationBackTel());     //签收手机
+//        flag = complaintSignclosedInfoMapper.insert(complaintSignclosedInfo);
+//        if(flag < 1){
+//            throw new RuntimeException("添加签收失败");
+//        }
+//
+//        //添加代签收表
+//        List<AwaitingSignclosedProductInfo> awaitingSignclosedProductInfoArrayList = new ArrayList<>();
+//        for(int i=0 ;i< customerCommon.getClosedProdcues().size();i++){
+//            ClosedProdcue closedProdcue = customerCommon.getClosedProdcues().get(i);
+//            for(int k=0;k<closedProdcue.getClosedProdcueNumber();k++){
+//                AwaitingSignclosedProductInfo awaitingSignclosedProductInfo = new AwaitingSignclosedProductInfo();
+//                awaitingSignclosedProductInfo.setSignclosedId(complaintSignclosedInfo.getSignclosedId());   //仓储id
+//                awaitingSignclosedProductInfo.setSignclosedProductType(1); //类型为产品
+//                awaitingSignclosedProductInfo.setProductNum(1);
+//                awaitingSignclosedProductInfo.setSignclosedProductId(closedProdcue.getProductId());         //产品id
+//                awaitingSignclosedProductInfo.setSignclosedProductColor(closedProdcue.getColorId());        //颜色id
+//                awaitingSignclosedProductInfo.setProductName(closedProdcue.getClosedProductName());         //产品名称
+//                awaitingSignclosedProductInfoArrayList.add(awaitingSignclosedProductInfo);
+//            }
+//        }
+//
+//        for(int i=0 ;i< customerCommon.getClosedFittings().size();i++){
+//            ClosedFitting closedFitting = customerCommon.getClosedFittings().get(i);
+//            for(int k=0;k<closedFitting.getClosedFittingNumber();k++){
+//                AwaitingSignclosedProductInfo awaitingSignclosedProductInfo = new AwaitingSignclosedProductInfo();
+//                awaitingSignclosedProductInfo.setSignclosedId(complaintSignclosedInfo.getSignclosedId());   //仓储id
+//                awaitingSignclosedProductInfo.setSignclosedProductType(2);  //类型为配件
+//                awaitingSignclosedProductInfo.setProductNum(1);
+//                awaitingSignclosedProductInfo.setSignclosedProductId(closedFitting.getFittingsId());         //配件id
+//                awaitingSignclosedProductInfo.setSignclosedProductColor(null);
+//                awaitingSignclosedProductInfo.setProductName(closedFitting.getClosedFittingsName());       //配件名称
+//                awaitingSignclosedProductInfoArrayList.add(awaitingSignclosedProductInfo);
+//            }
+//        }
+//        flag = complaintSignclosedProductInfoMapper.insertList(awaitingSignclosedProductInfoArrayList);
+//        if(flag < 1){
+//            throw new RuntimeException("添加签收产品失败");
+//        }
+//    }
 
     /**
      * 向Efast推送订单  仅换新，维修 ,补发
@@ -1240,29 +1240,29 @@ public class CustomerServiceImpl implements CustomerService {
         return null;
     }
 
-    @Override
-    public NoreasonBack getNoreasonBack(NoreasonBack noreasonBack) {
-        //获取无理由退货
-        List<NoreasonBack> backList = noreasonBackMapper.listNoreasonBack(noreasonBack);
-        if (backList == null || backList.size() == 0) {
-            return null;
-        }
-        NoreasonBack noreasonBackInfo = backList.get(0);
-        ClosedProdcue closedProdcue = new ClosedProdcue();
-        closedProdcue.setRelationId(noreasonBackInfo.getNoreasonBackId());
-        closedProdcue.setClosedProdcueType(7);
-        //查询寄回产品集合
-        List<ClosedProdcue> prodcueList = closedProdcueMapper.listclosedProdcue(closedProdcue);
-        ClosedFitting fitting = new ClosedFitting();
-        fitting.setRelationId(noreasonBackInfo.getNoreasonBackId());
-        fitting.setClosedFittingType(7);
-        //查询寄回配件集合
-
-        if (prodcueList != null && prodcueList.size() > 0) {
-            noreasonBackInfo.setClosedProdcues(prodcueList);
-        }
-        return noreasonBackInfo;
-    }
+//    @Override
+//    public NoreasonBack getNoreasonBack(NoreasonBack noreasonBack) {
+//        //获取无理由退货
+//        List<NoreasonBack> backList = noreasonBackMapper.listNoreasonBack(noreasonBack);
+//        if (backList == null || backList.size() == 0) {
+//            return null;
+//        }
+//        NoreasonBack noreasonBackInfo = backList.get(0);
+//        ClosedProdcue closedProdcue = new ClosedProdcue();
+//        closedProdcue.setRelationId(noreasonBackInfo.getNoreasonBackId());
+//        closedProdcue.setClosedProdcueType(7);
+//        //查询寄回产品集合
+//        List<ClosedProdcue> prodcueList = closedProdcueMapper.listclosedProdcue(closedProdcue);
+//        ClosedFitting fitting = new ClosedFitting();
+//        fitting.setRelationId(noreasonBackInfo.getNoreasonBackId());
+//        fitting.setClosedFittingType(7);
+//        //查询寄回配件集合
+//
+//        if (prodcueList != null && prodcueList.size() > 0) {
+//            noreasonBackInfo.setClosedProdcues(prodcueList);
+//        }
+//        return noreasonBackInfo;
+//    }
 
     @Override
     public Reissue getReissue(Reissue reissue) {

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/SalesOrderServiceImpl.java

@@ -1,6 +1,7 @@
 package com.iamberry.rst.service.cm;
 
 import com.github.pagehelper.PageHelper;
+import com.iamberry.redis.RedisUtils;
 import com.iamberry.rst.core.address.Province;
 import com.iamberry.rst.core.cm.FittingsInfo;
 import com.iamberry.rst.core.cm.SalesOrder;
@@ -28,6 +29,7 @@ import com.iamberry.rst.service.product.mapper.ProductMapper;
 import com.iamberry.rst.service.sys.mapper.SysConfigMapper;
 import com.iamberry.rst.util.PageUtil;
 import com.iamberry.wechat.tools.DateTimeUtil;
+import com.iamberry.wechat.tools.payUtil.DatetimeUtil;
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 import org.slf4j.Logger;
@@ -503,7 +505,23 @@ public class SalesOrderServiceImpl implements SalesOrderService {
 
     @Override
     public List<SalesOrderItem> listSalesOrderItem(SalesOrderItem salesOrderItem) {
-        return salesOrderMapper.listSalesOrderItem(salesOrderItem);
+        // 通过计算机名称来判断服务器环境
+        Map<String,String> map = System.getenv();
+        String name = map.get("COMPUTERNAME");
+        if ("iZ94klno8qrZ".equalsIgnoreCase(name)) {
+            name = "RST_";
+        } else {
+            name = "adv_";
+        }
+        // 获取数据
+        String key = name + "ORDER_ITEM_" + salesOrderItem.getItemOrderId();
+        List<SalesOrderItem> list = RedisUtils.list(key, SalesOrderItem.class);
+        if (list == null ) {
+            list = salesOrderMapper.listSalesOrderItem(salesOrderItem);
+            RedisUtils.put(key, list);
+            RedisUtils.expire(key, new Date(259200000 + System.currentTimeMillis()));
+        }
+        return list;
     }
 
     @Override

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/salesOrderMapper.xml

@@ -262,6 +262,7 @@
     </where>
     GROUP BY tb_rst_sales_order_info.sales_id
     ORDER BY sales_create_time DESC
+    LIMIT 0, #{endOrderNO}
   </select>
 
 

watero-rst-service/src/main/java/com/iamberry/rst/service/sys/DepartServiceImpl.java

@@ -0,0 +1,65 @@
+package com.iamberry.rst.service.sys;
+
+import com.iamberry.rst.core.sys.Depart;
+import com.iamberry.rst.faces.sys.DepartService;
+import com.iamberry.rst.service.sys.mapper.DepartMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ *  管理员部门表接口
+ * @author xm
+ * @Date 2019-05-22
+ */
+@Service
+public class DepartServiceImpl  implements DepartService {
+    @Autowired
+    private DepartMapper departMapper;
+    /**
+     * 获取集合
+     * @param  depart
+     * @return List
+     */
+    @Override
+    public List<Depart> getDepartList(Depart  depart){
+        return  departMapper.getDepartList(depart);
+    }
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  depart
+     */
+    @Override
+    public  Depart  getDepartById(Integer  id){
+        return  departMapper.getDepartById(id);
+    }
+    /**
+     * 增加数据
+     * @param  depart
+     * @return Integer
+     */
+    @Override
+    public  Integer  save(Depart  depart){
+        return  departMapper.save(depart);
+    }
+    /**
+     * 修改数据
+     * @param  depart
+     * @return Integer
+     */
+    @Override
+    public  Integer  update(Depart  depart){
+        return  departMapper.update(depart);
+    }
+    /**
+     * 删除数据
+     * @param  id
+     * @return Integer
+     */
+    @Override
+    public  Integer  delete(Integer  id){
+        return  departMapper.delete(id);
+    }
+}

watero-rst-service/src/main/java/com/iamberry/rst/service/sys/mapper/DepartMapper.java

@@ -0,0 +1,43 @@
+package com.iamberry.rst.service.sys.mapper;
+
+import com.iamberry.rst.core.sys.Depart;
+
+import java.util.List;
+
+/**
+ *  管理员部门表接口
+ * @author xm
+ * @Date 2019-05-22
+ */
+public interface DepartMapper {
+    /**
+     * 获取集合
+     * @param  depart
+     * @return List
+     */
+    List<Depart> getDepartList(Depart  depart);
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  depart
+     */
+    Depart  getDepartById(Integer  id);
+    /**
+     * 增加数据
+     * @param  depart
+     * @return Integer
+     */
+    Integer  save(Depart  depart);
+    /**
+     * 修改数据
+     * @param  depart
+     * @return Integer
+     */
+    Integer  update(Depart  depart);
+    /**
+     * 删除数据
+     * @param  id
+     * @return Integer
+     */
+    Integer  delete(Integer  id);
+}

watero-rst-service/src/main/java/com/iamberry/rst/service/sys/mapper/DepartMapper.xml

@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.iamberry.rst.service.sys.mapper.DepartMapper">
+    <resultMap  id="BaseResultMap" type="Depart" >
+        <result    column="depart_id"    property="departId" />
+        <result    column="depart_name"    property="departName" />
+        <result    column="depart_status"    property="departStatus" />
+        <result    column="depart_remake"    property="departRemake" />
+        <result    column="depart_create_time"    property="departCreateTime" />
+    </resultMap>
+    <sql    id="Base_List" >
+        t.depart_id,
+        t.depart_name,
+        t.depart_status,
+        t.depart_remake,
+        t.depart_create_time
+    </sql>
+    <select id="getDepartList" resultMap="BaseResultMap" parameterType="Depart" >
+        select
+        <include refid="Base_List" />
+        from tb_rst_sys_admin_depart t
+        <where>
+            <if test="departId != null ">
+                AND t.depart_id = #{departId}
+            </if >
+            <if test="departName != null and departName != ''">
+                AND t.depart_name  like  CONCAT ('%',#{departName},'%')
+            </if >
+            <if test="departStatus != null ">
+                AND t.depart_status = #{departStatus}
+            </if >
+            <if test="departRemake != null and departRemake != ''">
+                AND t.depart_remake  like  CONCAT ('%',#{departRemake},'%')
+            </if >
+        </where>
+    </select>
+    <select id="getDepartById" resultMap="BaseResultMap" parameterType="Integer" >
+        select
+        <include refid="Base_List" />
+        from tb_rst_sys_admin_depart t
+        where t.depart_id= #{departId}
+    </select>
+    <insert id="save" parameterType="Depart" >
+        insert into
+        tb_rst_sys_admin_depart
+        (
+        depart_id,
+        depart_name,
+        depart_status,
+        depart_remake
+        )
+        values
+        (
+        #{departId},
+        #{departName},
+        #{departStatus},
+        #{departRemake}
+        )
+    </insert>
+    <update id="update" parameterType="Depart" >
+        update
+        tb_rst_sys_admin_depart
+        <set >
+            <if test="departName != null and departName != ''">
+                depart_name = #{departName},
+            </if >
+            <if test="departStatus != null ">
+                depart_status = #{departStatus},
+            </if >
+            <if test="departRemake != null and departRemake != ''">
+                depart_remake = #{departRemake},
+            </if >
+        </set >
+        where depart_id= #{departId}
+    </update>
+    <delete id="delete" parameterType="Integer" >
+        delete
+        tb_rst_sys_admin_depart
+        where depart_id=#{departId}
+    </delete>
+</mapper>

watero-rst-service/src/main/java/com/iamberry/rst/service/sys/mapper/sysMapper.xml

@@ -118,7 +118,11 @@
 
 	<!-- 查询信息 -->
 	<select id="listAdmin" parameterType="Admin" resultType="Admin">
-		SELECT * FROM tb_rst_sys_admin
+		SELECT
+			sa.*,
+			ad.depart_name
+		FROM tb_rst_sys_admin sa
+		LEFT JOIN tb_rst_sys_admin_depart  ad ON  sa.admin_dept = ad.depart_id
 		<where>
 			<if test="adminDept != null">
 				AND admin_dept = #{adminDept}

watero-rst-service/src/main/java/com/iamberry/rst/util/CustomerCommonUtil.java

@@ -11,143 +11,143 @@ public class CustomerCommonUtil {
      * @param type 处理结果： 1：已解决  2：未解决 3：换新  4：维修 5：补发 6：退货 7：无理由退货
      * @return
      */
-    @Deprecated
-    public static Object getRelation(Integer type,CustomerCommon c){
-        switch (type){
-            case 3: //换新
-                Renewed renewed = new Renewed();
-                renewed.setRenewedId(c.getRelationId());
-                renewed.setCustomerId(c.getCustomerId());
-                renewed.setOrderId(c.getOrderId());
-                renewed.setSignclosedId(c.getSignclosedId());
-                renewed.setRenewedBackEfastOrderId(c.getRelationBackEfastOrderId());
-                renewed.setRenewedBackStatus(c.getRelationBackStatus());
-                renewed.setRenewedBackName(c.getRelationBackName());
-                renewed.setRenewedBackTel(c.getRelationBackTel());
-                renewed.setRenewedBackLogisticsCompany(c.getRelationBackLogisticsCompany());
-                renewed.setRenewedBackLogisticsNo(c.getRelationBackLogisticsNo());
-                renewed.setRenewedBackPostage(c.getRelationBackPostage());
-                renewed.setRenewedBackMachineNo(c.getRelationBackMachineNo());
-                renewed.setRenewedSendStatus(c.getRelationSendStatus());
-                renewed.setRenewedSendName(c.getRelationSendName());
-                renewed.setRenewedSendTel(c.getRelationSendTel());
-                renewed.setProvinceNumber(c.getProvinceNumber());
-                renewed.setCityNumber(c.getCityNumber());
-                renewed.setAreaNumber(c.getAreaNumber());
-                renewed.setRenewedSendMergeAddress(c.getRelationSendMergeAddress());
-                renewed.setRenewedSendAddress(c.getRelationSendAddress());
-                renewed.setRenewedSendLogisticsCompany(c.getRelationSendLogisticsCompany());
-                renewed.setRenewedSendLogisticsNo(c.getRelationSendLogisticsNo());
-                renewed.setRenewedDesc(c.getRelationDesc());
-                renewed.setRenewedState(c.getRelationState());
-                renewed.setRenewedAlipay(c.getRelationAlipay());
-                renewed.setRenewedAlipayName(c.getRelationAlipayName());
-                renewed.setRenewedIsTransfer(c.getRelationIsTransfer());
-                renewed.setRenewedCreateTime(c.getRelationCreateTime());
-                renewed.setRenewedUpdateTime(c.getRelationUpdateTime());
-                return renewed;
-            case 4: //维修
-                Repair repair = new Repair();
-                repair.setRepairId(c.getRelationId());
-                repair.setCustomerId(c.getCustomerId());
-                repair.setOrderId(c.getOrderId());
-                repair.setSignclosedId(c.getSignclosedId());
-                repair.setRepairBackEfastOrderId( c.getRelationBackEfastOrderId());
-                repair.setRepairBackStatus(c.getRelationBackStatus());
-                repair.setRepairBackName(c.getRelationBackName());
-                repair.setRepairBackTel(c.getRelationBackTel());
-                repair.setRepairBackLogisticsCompany(c.getRelationBackLogisticsCompany());
-                repair.setRepairBackLogisticsNo(c.getRelationBackLogisticsNo());
-                repair.setRepairBackPostage(c.getRelationBackPostage());
-                repair.setRepairBackMachineNo(c.getRelationBackMachineNo());
-                repair.setRepairSendStatus(c.getRelationSendStatus());
-                repair.setRepairSendName(c.getRelationSendName());
-                repair.setRepairSendTel(c.getRelationSendTel());
-                repair.setProvinceNumber(c.getProvinceNumber());
-                repair.setCityNumber(c.getCityNumber());
-                repair.setAreaNumber(c.getAreaNumber());
-                repair.setRepairSendMergeAddress(c.getRelationSendMergeAddress());
-                repair.setRepairSendAddress(c.getRelationSendAddress());
-                repair.setRepairSendLogisticsCompany(c.getRelationSendLogisticsCompany());
-                repair.setRepairSendLogisticsNo(c.getRelationSendLogisticsNo());
-                repair.setRepairDesc(c.getRelationDesc());
-                repair.setRepairState(c.getRelationState());
-                repair.setRepairAlipay(c.getRelationAlipay());
-                repair.setRepairAlipayName(c.getRelationAlipayName());
-                repair.setRepairIsTransfer(c.getRelationIsTransfer());
-                repair.setRepairCreateTime(c.getRelationCreateTime());
-                repair.setRepairUpdateTime(c.getRelationUpdateTime());
-                repair.setRepairFactoryCosts(c.getRelationFactoryCosts() == null ? null : c.getRelationFactoryCosts()*100);
-                repair.setRepairCustomerCosts(c.getRelationCustomerCosts() == null ? null : c.getRelationCustomerCosts()*100);
-                return repair;
-            case 5://补发
-                Reissue reissue = new Reissue();
-                reissue.setReissueId(c.getRelationId());
-                reissue.setCustomerId(c.getCustomerId());
-                reissue.setOrderId(c.getOrderId());
-                reissue.setReissueBackEfastOrderId(c.getRelationBackEfastOrderId());
-                reissue.setReissueSendStatus(c.getRelationSendStatus());
-                reissue.setReissueSendName(c.getRelationSendName());
-                reissue.setReissueSendTel(c.getRelationSendTel());
-                reissue.setProvinceNumber(c.getProvinceNumber());
-                reissue.setCityNumber(c.getCityNumber());
-                reissue.setAreaNumber(c.getAreaNumber());
-                reissue.setReissueSendMergeAddress(c.getRelationSendMergeAddress());
-                reissue.setReissueSendAddress(c.getRelationSendAddress());
-                reissue.setReissueSendLogisticsCompany(c.getRelationSendLogisticsCompany());
-                reissue.setReissueSendLogisticsNo(c.getRelationSendLogisticsNo());
-                reissue.setReissueDesc(c.getRelationDesc());
-                reissue.setReissueState(c.getRelationState());
-                reissue.setReissueCreateTime(c.getRelationCreateTime());
-                reissue.setReissueUpdateTime(c.getRelationUpdateTime());
-                return reissue;
-            case 6://退货
-                BackGoods backGoods = new BackGoods();
-                backGoods.setBackGoodsId(c.getRelationId());
-                backGoods.setCustomerId(c.getCustomerId());
-                backGoods.setOrderId(c.getOrderId());
-                backGoods.setSignclosedId(c.getSignclosedId());
-                backGoods.setBackGoodsBackStatus(c.getRelationBackStatus());
-                backGoods.setBackGoodsBackName(c.getRelationBackName());
-                backGoods.setBackGoodsBackTel(c.getRelationBackTel());
-                backGoods.setBackGoodsBackLogisticsCompany(c.getRelationBackLogisticsCompany());
-                backGoods.setBackGoodsBackLogisticsNo(c.getRelationBackLogisticsNo());
-                backGoods.setBackGoodsBackPostage(c.getRelationBackPostage());
-                backGoods.setBackGoodsBackMachineNo(c.getRelationBackMachineNo());
-                backGoods.setBackGoodsDesc(c.getRelationDesc());
-                backGoods.setBackGoodsState(c.getRelationState());
-                backGoods.setBackGoodsAlipay(c.getRelationAlipay());
-                backGoods.setBackGoodsAlipayName(c.getRelationAlipayName());
-                backGoods.setBackGoodsIsTransfer(c.getRelationIsTransfer());
-                backGoods.setBackGoodsCreateTime(c.getRelationCreateTime());
-                backGoods.setBackGoodsUpdateTime(c.getRelationUpdateTime());
-                return backGoods;
-            case 7://无理由退货
-                NoreasonBack noreasonBack = new NoreasonBack();
-                noreasonBack.setNoreasonBackId( c.getRelationId());
-                noreasonBack.setCustomerId(c.getCustomerId());
-                noreasonBack.setOrderId(c.getOrderId());
-                noreasonBack.setSignclosedId(c.getSignclosedId());
-                noreasonBack.setNoreasonBackBackStatus(c.getRelationBackStatus());
-                noreasonBack.setNoreasonBackBackName(c.getRelationBackName());
-                noreasonBack.setNoreasonBackBackTel(c.getRelationBackTel());
-                noreasonBack.setNoreasonBackBackLogisticsCompany(c.getRelationBackLogisticsCompany());
-                noreasonBack.setNoreasonBackBackLogisticsNo(c.getRelationBackLogisticsNo());
-                noreasonBack.setNoreasonBackBackPostage(c.getRelationBackPostage());
-                noreasonBack.setNoreasonBackBackMachineNo(c.getRelationBackMachineNo());
-                noreasonBack.setNoreasonBackDesc(c.getRelationDesc());
-                noreasonBack.setNoreasonBackState(c.getRelationState());
-                noreasonBack.setNoreasonBackAlipay(c.getRelationAlipay());
-                noreasonBack.setNoreasonBackAlipayName(c.getRelationAlipayName());
-                noreasonBack.setNoreasonBackIsTransfer(c.getRelationIsTransfer());
-                noreasonBack.setNoreasonBackCreateTime(c.getRelationCreateTime());
-                noreasonBack.setNoreasonBackUpdateTime(c.getRelationUpdateTime());
-                return noreasonBack;
-            default :
-                return null;
-        }
-    }
-
+//    @Deprecated
+//    public static Object getRelation(Integer type,CustomerCommon c){
+//        switch (type){
+//            case 3: //换新
+//                Renewed renewed = new Renewed();
+//                renewed.setRenewedId(c.getRelationId());
+//                renewed.setCustomerId(c.getCustomerId());
+//                renewed.setOrderId(c.getOrderId());
+//                renewed.setSignclosedId(c.getSignclosedId());
+//                renewed.setRenewedBackEfastOrderId(c.getRelationBackEfastOrderId());
+//                renewed.setRenewedBackStatus(c.getRelationBackStatus());
+//                renewed.setRenewedBackName(c.getRelationBackName());
+//                renewed.setRenewedBackTel(c.getRelationBackTel());
+//                renewed.setRenewedBackLogisticsCompany(c.getRelationBackLogisticsCompany());
+//                renewed.setRenewedBackLogisticsNo(c.getRelationBackLogisticsNo());
+//                renewed.setRenewedBackPostage(c.getRelationBackPostage());
+//                renewed.setRenewedBackMachineNo(c.getRelationBackMachineNo());
+//                renewed.setRenewedSendStatus(c.getRelationSendStatus());
+//                renewed.setRenewedSendName(c.getRelationSendName());
+//                renewed.setRenewedSendTel(c.getRelationSendTel());
+//                renewed.setProvinceNumber(c.getProvinceNumber());
+//                renewed.setCityNumber(c.getCityNumber());
+//                renewed.setAreaNumber(c.getAreaNumber());
+//                renewed.setRenewedSendMergeAddress(c.getRelationSendMergeAddress());
+//                renewed.setRenewedSendAddress(c.getRelationSendAddress());
+//                renewed.setRenewedSendLogisticsCompany(c.getRelationSendLogisticsCompany());
+//                renewed.setRenewedSendLogisticsNo(c.getRelationSendLogisticsNo());
+//                renewed.setRenewedDesc(c.getRelationDesc());
+//                renewed.setRenewedState(c.getRelationState());
+//                renewed.setRenewedAlipay(c.getRelationAlipay());
+//                renewed.setRenewedAlipayName(c.getRelationAlipayName());
+//                renewed.setRenewedIsTransfer(c.getRelationIsTransfer());
+//                renewed.setRenewedCreateTime(c.getRelationCreateTime());
+//                renewed.setRenewedUpdateTime(c.getRelationUpdateTime());
+//                return renewed;
+//            case 4: //维修
+//                Repair repair = new Repair();
+//                repair.setRepairId(c.getRelationId());
+//                repair.setCustomerId(c.getCustomerId());
+//                repair.setOrderId(c.getOrderId());
+//                repair.setSignclosedId(c.getSignclosedId());
+//                repair.setRepairBackEfastOrderId( c.getRelationBackEfastOrderId());
+//                repair.setRepairBackStatus(c.getRelationBackStatus());
+//                repair.setRepairBackName(c.getRelationBackName());
+//                repair.setRepairBackTel(c.getRelationBackTel());
+//                repair.setRepairBackLogisticsCompany(c.getRelationBackLogisticsCompany());
+//                repair.setRepairBackLogisticsNo(c.getRelationBackLogisticsNo());
+//                repair.setRepairBackPostage(c.getRelationBackPostage());
+//                repair.setRepairBackMachineNo(c.getRelationBackMachineNo());
+//                repair.setRepairSendStatus(c.getRelationSendStatus());
+//                repair.setRepairSendName(c.getRelationSendName());
+//                repair.setRepairSendTel(c.getRelationSendTel());
+//                repair.setProvinceNumber(c.getProvinceNumber());
+//                repair.setCityNumber(c.getCityNumber());
+//                repair.setAreaNumber(c.getAreaNumber());
+//                repair.setRepairSendMergeAddress(c.getRelationSendMergeAddress());
+//                repair.setRepairSendAddress(c.getRelationSendAddress());
+//                repair.setRepairSendLogisticsCompany(c.getRelationSendLogisticsCompany());
+//                repair.setRepairSendLogisticsNo(c.getRelationSendLogisticsNo());
+//                repair.setRepairDesc(c.getRelationDesc());
+//                repair.setRepairState(c.getRelationState());
+//                repair.setRepairAlipay(c.getRelationAlipay());
+//                repair.setRepairAlipayName(c.getRelationAlipayName());
+//                repair.setRepairIsTransfer(c.getRelationIsTransfer());
+//                repair.setRepairCreateTime(c.getRelationCreateTime());
+//                repair.setRepairUpdateTime(c.getRelationUpdateTime());
+//                repair.setRepairFactoryCosts(c.getRelationFactoryCosts() == null ? null : c.getRelationFactoryCosts()*100);
+//                repair.setRepairCustomerCosts(c.getRelationCustomerCosts() == null ? null : c.getRelationCustomerCosts()*100);
+//                return repair;
+//            case 5://补发
+//                Reissue reissue = new Reissue();
+//                reissue.setReissueId(c.getRelationId());
+//                reissue.setCustomerId(c.getCustomerId());
+//                reissue.setOrderId(c.getOrderId());
+//                reissue.setReissueBackEfastOrderId(c.getRelationBackEfastOrderId());
+//                reissue.setReissueSendStatus(c.getRelationSendStatus());
+//                reissue.setReissueSendName(c.getRelationSendName());
+//                reissue.setReissueSendTel(c.getRelationSendTel());
+//                reissue.setProvinceNumber(c.getProvinceNumber());
+//                reissue.setCityNumber(c.getCityNumber());
+//                reissue.setAreaNumber(c.getAreaNumber());
+//                reissue.setReissueSendMergeAddress(c.getRelationSendMergeAddress());
+//                reissue.setReissueSendAddress(c.getRelationSendAddress());
+//                reissue.setReissueSendLogisticsCompany(c.getRelationSendLogisticsCompany());
+//                reissue.setReissueSendLogisticsNo(c.getRelationSendLogisticsNo());
+//                reissue.setReissueDesc(c.getRelationDesc());
+//                reissue.setReissueState(c.getRelationState());
+//                reissue.setReissueCreateTime(c.getRelationCreateTime());
+//                reissue.setReissueUpdateTime(c.getRelationUpdateTime());
+//                return reissue;
+//            case 6://退货
+//                BackGoods backGoods = new BackGoods();
+//                backGoods.setBackGoodsId(c.getRelationId());
+//                backGoods.setCustomerId(c.getCustomerId());
+//                backGoods.setOrderId(c.getOrderId());
+//                backGoods.setSignclosedId(c.getSignclosedId());
+//                backGoods.setBackGoodsBackStatus(c.getRelationBackStatus());
+//                backGoods.setBackGoodsBackName(c.getRelationBackName());
+//                backGoods.setBackGoodsBackTel(c.getRelationBackTel());
+//                backGoods.setBackGoodsBackLogisticsCompany(c.getRelationBackLogisticsCompany());
+//                backGoods.setBackGoodsBackLogisticsNo(c.getRelationBackLogisticsNo());
+//                backGoods.setBackGoodsBackPostage(c.getRelationBackPostage());
+//                backGoods.setBackGoodsBackMachineNo(c.getRelationBackMachineNo());
+//                backGoods.setBackGoodsDesc(c.getRelationDesc());
+//                backGoods.setBackGoodsState(c.getRelationState());
+//                backGoods.setBackGoodsAlipay(c.getRelationAlipay());
+//                backGoods.setBackGoodsAlipayName(c.getRelationAlipayName());
+//                backGoods.setBackGoodsIsTransfer(c.getRelationIsTransfer());
+//                backGoods.setBackGoodsCreateTime(c.getRelationCreateTime());
+//                backGoods.setBackGoodsUpdateTime(c.getRelationUpdateTime());
+//                return backGoods;
+//            case 7://无理由退货
+//                NoreasonBack noreasonBack = new NoreasonBack();
+//                noreasonBack.setNoreasonBackId( c.getRelationId());
+//                noreasonBack.setCustomerId(c.getCustomerId());
+//                noreasonBack.setOrderId(c.getOrderId());
+//                noreasonBack.setSignclosedId(c.getSignclosedId());
+//                noreasonBack.setNoreasonBackBackStatus(c.getRelationBackStatus());
+//                noreasonBack.setNoreasonBackBackName(c.getRelationBackName());
+//                noreasonBack.setNoreasonBackBackTel(c.getRelationBackTel());
+//                noreasonBack.setNoreasonBackBackLogisticsCompany(c.getRelationBackLogisticsCompany());
+//                noreasonBack.setNoreasonBackBackLogisticsNo(c.getRelationBackLogisticsNo());
+//                noreasonBack.setNoreasonBackBackPostage(c.getRelationBackPostage());
+//                noreasonBack.setNoreasonBackBackMachineNo(c.getRelationBackMachineNo());
+//                noreasonBack.setNoreasonBackDesc(c.getRelationDesc());
+//                noreasonBack.setNoreasonBackState(c.getRelationState());
+//                noreasonBack.setNoreasonBackAlipay(c.getRelationAlipay());
+//                noreasonBack.setNoreasonBackAlipayName(c.getRelationAlipayName());
+//                noreasonBack.setNoreasonBackIsTransfer(c.getRelationIsTransfer());
+//                noreasonBack.setNoreasonBackCreateTime(c.getRelationCreateTime());
+//                noreasonBack.setNoreasonBackUpdateTime(c.getRelationUpdateTime());
+//                return noreasonBack;
+//            default :
+//                return null;
+//        }
+//    }
+//
 
 
 
@@ -157,153 +157,153 @@ public class CustomerCommonUtil {
      * @param object
      * @return
      */
-    @Deprecated
-    public static CustomerCommon getCustomerCommon(int solve, Object object) {
-        if (object == null) {
-            return null;
-        }
-        CustomerCommon customerCommon = new CustomerCommon();
-        switch (solve) {
-            case 3://换新
-                Renewed renewed = (Renewed)object;
-                customerCommon.setRelationId(renewed.getRenewedId());
-                customerCommon.setCustomerId(renewed.getCustomerId());
-                customerCommon.setOrderId(renewed.getOrderId());
-                customerCommon.setSignclosedId(renewed.getSignclosedId());
-                customerCommon.setRelationBackEfastOrderId(renewed.getRenewedBackEfastOrderId());
-                customerCommon.setRelationBackStatus(renewed.getRenewedBackStatus());
-                customerCommon.setRelationBackName(renewed.getRenewedBackName());
-                customerCommon.setRelationBackTel(renewed.getRenewedBackTel());
-                customerCommon.setRelationBackLogisticsCompany(renewed.getRenewedBackLogisticsCompany());
-                customerCommon.setRelationBackLogisticsNo(renewed.getRenewedBackLogisticsNo());
-                customerCommon.setRelationBackPostage(renewed.getRenewedBackPostage());
-                customerCommon.setRelationBackMachineNo(renewed.getRenewedBackMachineNo());
-                customerCommon.setRelationSendStatus(renewed.getRenewedSendStatus());
-                customerCommon.setRelationSendName(renewed.getRenewedSendName());
-                customerCommon.setRelationSendTel(renewed.getRenewedSendTel());
-                customerCommon.setProvinceNumber(renewed.getProvinceNumber());
-                customerCommon.setCityNumber(renewed.getCityNumber());
-                customerCommon.setAreaNumber(renewed.getAreaNumber());
-                customerCommon.setRelationSendMergeAddress(renewed.getRenewedSendMergeAddress());
-                customerCommon.setRelationSendAddress(renewed.getRenewedSendAddress());
-                customerCommon.setRelationSendLogisticsCompany(renewed.getRenewedSendLogisticsCompany());
-                customerCommon.setRelationSendLogisticsNo(renewed.getRenewedSendLogisticsNo());
-                customerCommon.setRelationDesc(renewed.getRenewedDesc());
-                customerCommon.setRelationState(renewed.getRenewedState());
-                customerCommon.setRelationAlipay(renewed.getRenewedAlipay());
-                customerCommon.setRelationAlipayName(renewed.getRenewedAlipayName());
-                customerCommon.setRelationIsTransfer(renewed.getRenewedIsTransfer());
-                customerCommon.setRelationCreateTime(renewed.getRenewedCreateTime());
-                customerCommon.setRelationUpdateTime(renewed.getRenewedUpdateTime());
-                customerCommon.setMaintenanceIsRepair(renewed.getMaintenanceIsRepair());
-                break;
-            case 4://维修
-                Repair repair = (Repair)object;
-                customerCommon.setRelationId(repair.getRepairId());
-                customerCommon.setCustomerId(repair.getCustomerId());
-                customerCommon.setOrderId(repair.getOrderId());
-                customerCommon.setSignclosedId(repair.getSignclosedId());
-                customerCommon.setRelationBackEfastOrderId(repair.getRepairBackEfastOrderId());
-                customerCommon.setRelationBackStatus(repair.getRepairBackStatus());
-                customerCommon.setRelationBackName(repair.getRepairBackName());
-                customerCommon.setRelationBackTel(repair.getRepairBackTel());
-                customerCommon.setRelationBackLogisticsCompany(repair.getRepairBackLogisticsCompany());
-                customerCommon.setRelationBackLogisticsNo(repair.getRepairBackLogisticsNo());
-                customerCommon.setRelationBackPostage(repair.getRepairBackPostage());
-                customerCommon.setRelationBackMachineNo(repair.getRepairBackMachineNo());
-                customerCommon.setRelationSendStatus(repair.getRepairSendStatus());
-                customerCommon.setRelationSendName(repair.getRepairSendName());
-                customerCommon.setRelationSendTel(repair.getRepairSendTel());
-                customerCommon.setProvinceNumber(repair.getProvinceNumber());
-                customerCommon.setCityNumber(repair.getCityNumber());
-                customerCommon.setAreaNumber(repair.getAreaNumber());
-                customerCommon.setRelationSendMergeAddress(repair.getRepairSendMergeAddress());
-                customerCommon.setRelationSendAddress(repair.getRepairSendAddress());
-                customerCommon.setRelationSendLogisticsCompany(repair.getRepairSendLogisticsCompany());
-                customerCommon.setRelationSendLogisticsNo(repair.getRepairSendLogisticsNo());
-                customerCommon.setRelationDesc(repair.getRepairDesc());
-                customerCommon.setRelationState(repair.getRepairState());
-                customerCommon.setRelationAlipay(repair.getRepairAlipay());
-                customerCommon.setRelationAlipayName(repair.getRepairAlipayName());
-                customerCommon.setRelationIsTransfer(repair.getRepairIsTransfer());
-                customerCommon.setRelationCreateTime(repair.getRepairCreateTime());
-                customerCommon.setRelationUpdateTime(repair.getRepairUpdateTime());
-                customerCommon.setMaintenanceIsRepair(repair.getMaintenanceIsRepair());
-                customerCommon.setDetectState(repair.getDetectState());
-                customerCommon.setRelationFactoryCosts(repair.getRepairFactoryCosts()== null ? null: repair.getRepairFactoryCosts()/100);
-                customerCommon.setRelationCustomerCosts(repair.getRepairCustomerCosts() == null ? null:repair.getRepairCustomerCosts()/100);
-                break;
-            case 5://补发
-                Reissue reissue = (Reissue)object;
-                customerCommon.setRelationId(reissue.getReissueId());
-                customerCommon.setCustomerId(reissue.getCustomerId());
-                customerCommon.setOrderId(reissue.getOrderId());
-                customerCommon.setRelationBackEfastOrderId(reissue.getReissueBackEfastOrderId());
-                customerCommon.setRelationSendStatus(reissue.getReissueSendStatus());
-                customerCommon.setRelationSendName(reissue.getReissueSendName());
-                customerCommon.setRelationSendTel(reissue.getReissueSendTel());
-                customerCommon.setProvinceNumber(reissue.getProvinceNumber());
-                customerCommon.setCityNumber(reissue.getCityNumber());
-                customerCommon.setAreaNumber(reissue.getAreaNumber());
-                customerCommon.setRelationSendMergeAddress(reissue.getReissueSendMergeAddress());
-                customerCommon.setRelationSendAddress(reissue.getReissueSendAddress());
-                customerCommon.setRelationSendLogisticsCompany(reissue.getReissueSendLogisticsCompany());
-                customerCommon.setRelationSendLogisticsNo(reissue.getReissueSendLogisticsNo());
-                customerCommon.setRelationDesc(reissue.getReissueDesc());
-                customerCommon.setRelationState(reissue.getReissueState());
-                customerCommon.setRelationCreateTime(reissue.getReissueCreateTime());
-                customerCommon.setRelationUpdateTime(reissue.getReissueUpdateTime());
-                break;
-            case 6://退货
-                BackGoods backGoods = (BackGoods)object;
-                customerCommon.setRelationId(backGoods.getBackGoodsId());
-                customerCommon.setCustomerId(backGoods.getCustomerId());
-                customerCommon.setOrderId(backGoods.getOrderId());
-                customerCommon.setSignclosedId(backGoods.getSignclosedId());
-                customerCommon.setRelationBackStatus(backGoods.getBackGoodsBackStatus());
-                customerCommon.setRelationBackName(backGoods.getBackGoodsBackName());
-                customerCommon.setRelationBackTel(backGoods.getBackGoodsBackTel());
-                customerCommon.setRelationBackLogisticsCompany(backGoods.getBackGoodsBackLogisticsCompany());
-                customerCommon.setRelationBackLogisticsNo(backGoods.getBackGoodsBackLogisticsNo());
-                customerCommon.setRelationBackPostage(backGoods.getBackGoodsBackPostage());
-                customerCommon.setRelationBackMachineNo(backGoods.getBackGoodsBackMachineNo());
-                customerCommon.setRelationDesc(backGoods.getBackGoodsDesc());
-                customerCommon.setRelationState(backGoods.getBackGoodsState());
-                customerCommon.setRelationAlipay(backGoods.getBackGoodsAlipay());
-                customerCommon.setRelationAlipayName(backGoods.getBackGoodsAlipayName());
-                customerCommon.setRelationIsTransfer(backGoods.getBackGoodsIsTransfer());
-                customerCommon.setRelationCreateTime(backGoods.getBackGoodsCreateTime());
-                customerCommon.setRelationUpdateTime(backGoods.getBackGoodsUpdateTime());
-                customerCommon.setDetectState(backGoods.getDetectState());
-                break;
-            case 7://无理由退货
-                NoreasonBack noreasonBack = (NoreasonBack)object;
-                customerCommon.setRelationId(noreasonBack.getNoreasonBackId());
-                customerCommon.setCustomerId(noreasonBack.getCustomerId());
-                customerCommon.setOrderId(noreasonBack.getOrderId());
-                customerCommon.setSignclosedId(noreasonBack.getSignclosedId());
-                customerCommon.setRelationBackStatus(noreasonBack.getNoreasonBackBackStatus());
-                customerCommon.setRelationBackName(noreasonBack.getNoreasonBackBackName());
-                customerCommon.setRelationBackTel(noreasonBack.getNoreasonBackBackTel());
-                customerCommon.setRelationBackLogisticsCompany(noreasonBack.getNoreasonBackBackLogisticsCompany());
-                customerCommon.setRelationBackLogisticsNo(noreasonBack.getNoreasonBackBackLogisticsNo());
-                customerCommon.setRelationBackPostage(noreasonBack.getNoreasonBackBackPostage());
-                customerCommon.setRelationBackMachineNo(noreasonBack.getNoreasonBackBackMachineNo());
-                customerCommon.setRelationDesc(noreasonBack.getNoreasonBackDesc());
-                customerCommon.setRelationState(noreasonBack.getNoreasonBackState());
-                customerCommon.setRelationAlipay(noreasonBack.getNoreasonBackAlipay());
-                customerCommon.setRelationAlipayName(noreasonBack.getNoreasonBackAlipayName());
-                customerCommon.setRelationIsTransfer(noreasonBack.getNoreasonBackIsTransfer());
-                customerCommon.setRelationCreateTime(noreasonBack.getNoreasonBackCreateTime());
-                customerCommon.setRelationUpdateTime(noreasonBack.getNoreasonBackUpdateTime());
-                customerCommon.setDetectState(noreasonBack.getDetectState());
-                break;
-            default:
-                customerCommon = null;
-                break;
-        }
-        return customerCommon;
-    }
+//    @Deprecated
+//    public static CustomerCommon getCustomerCommon(int solve, Object object) {
+//        if (object == null) {
+//            return null;
+//        }
+//        CustomerCommon customerCommon = new CustomerCommon();
+//        switch (solve) {
+//            case 3://换新
+//                Renewed renewed = (Renewed)object;
+//                customerCommon.setRelationId(renewed.getRenewedId());
+//                customerCommon.setCustomerId(renewed.getCustomerId());
+//                customerCommon.setOrderId(renewed.getOrderId());
+//                customerCommon.setSignclosedId(renewed.getSignclosedId());
+//                customerCommon.setRelationBackEfastOrderId(renewed.getRenewedBackEfastOrderId());
+//                customerCommon.setRelationBackStatus(renewed.getRenewedBackStatus());
+//                customerCommon.setRelationBackName(renewed.getRenewedBackName());
+//                customerCommon.setRelationBackTel(renewed.getRenewedBackTel());
+//                customerCommon.setRelationBackLogisticsCompany(renewed.getRenewedBackLogisticsCompany());
+//                customerCommon.setRelationBackLogisticsNo(renewed.getRenewedBackLogisticsNo());
+//                customerCommon.setRelationBackPostage(renewed.getRenewedBackPostage());
+//                customerCommon.setRelationBackMachineNo(renewed.getRenewedBackMachineNo());
+//                customerCommon.setRelationSendStatus(renewed.getRenewedSendStatus());
+//                customerCommon.setRelationSendName(renewed.getRenewedSendName());
+//                customerCommon.setRelationSendTel(renewed.getRenewedSendTel());
+//                customerCommon.setProvinceNumber(renewed.getProvinceNumber());
+//                customerCommon.setCityNumber(renewed.getCityNumber());
+//                customerCommon.setAreaNumber(renewed.getAreaNumber());
+//                customerCommon.setRelationSendMergeAddress(renewed.getRenewedSendMergeAddress());
+//                customerCommon.setRelationSendAddress(renewed.getRenewedSendAddress());
+//                customerCommon.setRelationSendLogisticsCompany(renewed.getRenewedSendLogisticsCompany());
+//                customerCommon.setRelationSendLogisticsNo(renewed.getRenewedSendLogisticsNo());
+//                customerCommon.setRelationDesc(renewed.getRenewedDesc());
+//                customerCommon.setRelationState(renewed.getRenewedState());
+//                customerCommon.setRelationAlipay(renewed.getRenewedAlipay());
+//                customerCommon.setRelationAlipayName(renewed.getRenewedAlipayName());
+//                customerCommon.setRelationIsTransfer(renewed.getRenewedIsTransfer());
+//                customerCommon.setRelationCreateTime(renewed.getRenewedCreateTime());
+//                customerCommon.setRelationUpdateTime(renewed.getRenewedUpdateTime());
+//                customerCommon.setMaintenanceIsRepair(renewed.getMaintenanceIsRepair());
+//                break;
+//            case 4://维修
+//                Repair repair = (Repair)object;
+//                customerCommon.setRelationId(repair.getRepairId());
+//                customerCommon.setCustomerId(repair.getCustomerId());
+//                customerCommon.setOrderId(repair.getOrderId());
+//                customerCommon.setSignclosedId(repair.getSignclosedId());
+//                customerCommon.setRelationBackEfastOrderId(repair.getRepairBackEfastOrderId());
+//                customerCommon.setRelationBackStatus(repair.getRepairBackStatus());
+//                customerCommon.setRelationBackName(repair.getRepairBackName());
+//                customerCommon.setRelationBackTel(repair.getRepairBackTel());
+//                customerCommon.setRelationBackLogisticsCompany(repair.getRepairBackLogisticsCompany());
+//                customerCommon.setRelationBackLogisticsNo(repair.getRepairBackLogisticsNo());
+//                customerCommon.setRelationBackPostage(repair.getRepairBackPostage());
+//                customerCommon.setRelationBackMachineNo(repair.getRepairBackMachineNo());
+//                customerCommon.setRelationSendStatus(repair.getRepairSendStatus());
+//                customerCommon.setRelationSendName(repair.getRepairSendName());
+//                customerCommon.setRelationSendTel(repair.getRepairSendTel());
+//                customerCommon.setProvinceNumber(repair.getProvinceNumber());
+//                customerCommon.setCityNumber(repair.getCityNumber());
+//                customerCommon.setAreaNumber(repair.getAreaNumber());
+//                customerCommon.setRelationSendMergeAddress(repair.getRepairSendMergeAddress());
+//                customerCommon.setRelationSendAddress(repair.getRepairSendAddress());
+//                customerCommon.setRelationSendLogisticsCompany(repair.getRepairSendLogisticsCompany());
+//                customerCommon.setRelationSendLogisticsNo(repair.getRepairSendLogisticsNo());
+//                customerCommon.setRelationDesc(repair.getRepairDesc());
+//                customerCommon.setRelationState(repair.getRepairState());
+//                customerCommon.setRelationAlipay(repair.getRepairAlipay());
+//                customerCommon.setRelationAlipayName(repair.getRepairAlipayName());
+//                customerCommon.setRelationIsTransfer(repair.getRepairIsTransfer());
+//                customerCommon.setRelationCreateTime(repair.getRepairCreateTime());
+//                customerCommon.setRelationUpdateTime(repair.getRepairUpdateTime());
+//                customerCommon.setMaintenanceIsRepair(repair.getMaintenanceIsRepair());
+//                customerCommon.setDetectState(repair.getDetectState());
+//                customerCommon.setRelationFactoryCosts(repair.getRepairFactoryCosts()== null ? null: repair.getRepairFactoryCosts()/100);
+//                customerCommon.setRelationCustomerCosts(repair.getRepairCustomerCosts() == null ? null:repair.getRepairCustomerCosts()/100);
+//                break;
+//            case 5://补发
+//                Reissue reissue = (Reissue)object;
+//                customerCommon.setRelationId(reissue.getReissueId());
+//                customerCommon.setCustomerId(reissue.getCustomerId());
+//                customerCommon.setOrderId(reissue.getOrderId());
+//                customerCommon.setRelationBackEfastOrderId(reissue.getReissueBackEfastOrderId());
+//                customerCommon.setRelationSendStatus(reissue.getReissueSendStatus());
+//                customerCommon.setRelationSendName(reissue.getReissueSendName());
+//                customerCommon.setRelationSendTel(reissue.getReissueSendTel());
+//                customerCommon.setProvinceNumber(reissue.getProvinceNumber());
+//                customerCommon.setCityNumber(reissue.getCityNumber());
+//                customerCommon.setAreaNumber(reissue.getAreaNumber());
+//                customerCommon.setRelationSendMergeAddress(reissue.getReissueSendMergeAddress());
+//                customerCommon.setRelationSendAddress(reissue.getReissueSendAddress());
+//                customerCommon.setRelationSendLogisticsCompany(reissue.getReissueSendLogisticsCompany());
+//                customerCommon.setRelationSendLogisticsNo(reissue.getReissueSendLogisticsNo());
+//                customerCommon.setRelationDesc(reissue.getReissueDesc());
+//                customerCommon.setRelationState(reissue.getReissueState());
+//                customerCommon.setRelationCreateTime(reissue.getReissueCreateTime());
+//                customerCommon.setRelationUpdateTime(reissue.getReissueUpdateTime());
+//                break;
+//            case 6://退货
+//                BackGoods backGoods = (BackGoods)object;
+//                customerCommon.setRelationId(backGoods.getBackGoodsId());
+//                customerCommon.setCustomerId(backGoods.getCustomerId());
+//                customerCommon.setOrderId(backGoods.getOrderId());
+//                customerCommon.setSignclosedId(backGoods.getSignclosedId());
+//                customerCommon.setRelationBackStatus(backGoods.getBackGoodsBackStatus());
+//                customerCommon.setRelationBackName(backGoods.getBackGoodsBackName());
+//                customerCommon.setRelationBackTel(backGoods.getBackGoodsBackTel());
+//                customerCommon.setRelationBackLogisticsCompany(backGoods.getBackGoodsBackLogisticsCompany());
+//                customerCommon.setRelationBackLogisticsNo(backGoods.getBackGoodsBackLogisticsNo());
+//                customerCommon.setRelationBackPostage(backGoods.getBackGoodsBackPostage());
+//                customerCommon.setRelationBackMachineNo(backGoods.getBackGoodsBackMachineNo());
+//                customerCommon.setRelationDesc(backGoods.getBackGoodsDesc());
+//                customerCommon.setRelationState(backGoods.getBackGoodsState());
+//                customerCommon.setRelationAlipay(backGoods.getBackGoodsAlipay());
+//                customerCommon.setRelationAlipayName(backGoods.getBackGoodsAlipayName());
+//                customerCommon.setRelationIsTransfer(backGoods.getBackGoodsIsTransfer());
+//                customerCommon.setRelationCreateTime(backGoods.getBackGoodsCreateTime());
+//                customerCommon.setRelationUpdateTime(backGoods.getBackGoodsUpdateTime());
+//                customerCommon.setDetectState(backGoods.getDetectState());
+//                break;
+//            case 7://无理由退货
+//                NoreasonBack noreasonBack = (NoreasonBack)object;
+//                customerCommon.setRelationId(noreasonBack.getNoreasonBackId());
+//                customerCommon.setCustomerId(noreasonBack.getCustomerId());
+//                customerCommon.setOrderId(noreasonBack.getOrderId());
+//                customerCommon.setSignclosedId(noreasonBack.getSignclosedId());
+//                customerCommon.setRelationBackStatus(noreasonBack.getNoreasonBackBackStatus());
+//                customerCommon.setRelationBackName(noreasonBack.getNoreasonBackBackName());
+//                customerCommon.setRelationBackTel(noreasonBack.getNoreasonBackBackTel());
+//                customerCommon.setRelationBackLogisticsCompany(noreasonBack.getNoreasonBackBackLogisticsCompany());
+//                customerCommon.setRelationBackLogisticsNo(noreasonBack.getNoreasonBackBackLogisticsNo());
+//                customerCommon.setRelationBackPostage(noreasonBack.getNoreasonBackBackPostage());
+//                customerCommon.setRelationBackMachineNo(noreasonBack.getNoreasonBackBackMachineNo());
+//                customerCommon.setRelationDesc(noreasonBack.getNoreasonBackDesc());
+//                customerCommon.setRelationState(noreasonBack.getNoreasonBackState());
+//                customerCommon.setRelationAlipay(noreasonBack.getNoreasonBackAlipay());
+//                customerCommon.setRelationAlipayName(noreasonBack.getNoreasonBackAlipayName());
+//                customerCommon.setRelationIsTransfer(noreasonBack.getNoreasonBackIsTransfer());
+//                customerCommon.setRelationCreateTime(noreasonBack.getNoreasonBackCreateTime());
+//                customerCommon.setRelationUpdateTime(noreasonBack.getNoreasonBackUpdateTime());
+//                customerCommon.setDetectState(noreasonBack.getDetectState());
+//                break;
+//            default:
+//                customerCommon = null;
+//                break;
+//        }
+//        return customerCommon;
+//    }
 
     /**
      * 封装参数  list
@@ -311,15 +311,15 @@ public class CustomerCommonUtil {
      * @param relationList
      * @return
      */
-    @Deprecated
-    public static List<CustomerCommon> listToCustomerCommon(int solve,List<?> relationList){
-        List<CustomerCommon> ccList = new ArrayList<>();
-        for (Object relation : relationList){
-            CustomerCommon cc = CustomerCommonUtil.getCustomerCommon(solve,relationList);
-            ccList.add(cc);
-        }
-        return ccList;
-    }
+//    @Deprecated
+//    public static List<CustomerCommon> listToCustomerCommon(int solve,List<?> relationList){
+//        List<CustomerCommon> ccList = new ArrayList<>();
+//        for (Object relation : relationList){
+//            CustomerCommon cc = CustomerCommonUtil.getCustomerCommon(solve,relationList);
+//            ccList.add(cc);
+//        }
+//        return ccList;
+//    }
 
 
     /**
@@ -333,18 +333,18 @@ public class CustomerCommonUtil {
             cc.getSendProdcues().get(i).setSendProduceType(type);
             cc.getSendProdcues().get(i).setRelationId(cc.getRelationId());
         }
-        for (int i=0;i<cc.getSendFittings().size();i++) {
-            cc.getSendFittings().get(i).setSendFittingType(type);
-            cc.getSendFittings().get(i).setRelationId(cc.getRelationId());
-        }
+//        for (int i=0;i<cc.getSendFittings().size();i++) {
+//            cc.getSendFittings().get(i).setSendFittingType(type);
+//            cc.getSendFittings().get(i).setRelationId(cc.getRelationId());
+//        }
         for (int i=0;i<cc.getClosedProdcues().size();i++) {
             cc.getClosedProdcues().get(i).setClosedProdcueType(type);
             cc.getClosedProdcues().get(i).setRelationId(cc.getRelationId());
         }
-        for (int i=0;i<cc.getClosedFittings().size();i++) {
-            cc.getClosedFittings().get(i).setClosedFittingType(type);
-            cc.getClosedFittings().get(i).setRelationId(cc.getRelationId());
-        }
+//        for (int i=0;i<cc.getClosedFittings().size();i++) {
+//            cc.getClosedFittings().get(i).setClosedFittingType(type);
+//            cc.getClosedFittings().get(i).setRelationId(cc.getRelationId());
+//        }
     }
 
     /**

watero-rst-web/src/main/java/com/iamberry/rst/controllers/cm/AdminPostageController.java

@@ -69,7 +69,7 @@ public class AdminPostageController {
         List<CompanyInfo> companyInfoList = companyInfoService.listCompanyInfo(new CompanyInfo());
 
         //获取登录人id
-        if(loginAdmin.getAdminDept() == 3){        //员工
+        if(loginAdmin.getAdminDept() == 3){        //客服
             postage.setAdminId(loginAdmin.getAdminId());
 
             if(companyInfoList != null && companyInfoList.size() > 0){

watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AwaitSendController.java

@@ -136,13 +136,15 @@ public class AwaitSendController {
         mv.addObject("postMap", postMap);
         mv.addObject("errorOrderNum", errorOrderNum);
         mv.addObject("productColorList", productColorList);
+        mv.addObject("pageSize", pageSize);
         return mv;
     }
 
     // 打单发货页面
     @RequestMapping("/printOrderUI")
     @RequiresPermissions("order:listAwaitSendOrder")
-    public ModelAndView printOrderUI(@RequestParam(value = "orderId", required = false) String[] orders) {
+    public ModelAndView printOrderUI(@RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                     @RequestParam(value = "orderId", required = false) String[] orders) {
         SalesOrder salesOrder = new SalesOrder();
         if (orders == null) {
             salesOrder.setSalesShippingStatus(11);
@@ -158,7 +160,7 @@ public class AwaitSendController {
         salesOrder.setSalesWarehouseId(orderWarehouse.getWarehouseId());
         // 查询确认的订单
         salesOrder.setSalesStatus(1);
-        PagedResult<SalesOrder> pagedResult = salesOrderService.listSalesOrderPage(1, 1000, salesOrder, false);
+        PagedResult<SalesOrder> pagedResult = salesOrderService.listSalesOrderPage(1, pageSize, salesOrder, false);
         // 待发货产品总数
         int waitProductTotal = 0;
         // 查询订单项
@@ -420,7 +422,6 @@ public class AwaitSendController {
 
     /**
      * 跳转到手动发货页面
-     *
      * @return
      */
     @RequiresPermissions("salesOrder:send:salesOrder")
@@ -490,6 +491,7 @@ public class AwaitSendController {
                                  @RequestParam(value = "totalNum", defaultValue = "0", required = false) Integer totalNum) {
         ResponseJson rj = ResponseJson.getFAILURE();
         salesOrder.setSalesShippingStatus(11);      //salesShippingStatus
+        salesOrder.setEndOrderNO(pageSize);
         List<SalesOrder>  salesOrderList = salesOrderService.listSalesOrder(salesOrder);
         StringBuffer ids = new StringBuffer();
         for (int i =0 ;i<salesOrderList.size();i++){

watero-rst-web/src/main/java/com/iamberry/rst/controllers/sys/SysController.java

@@ -4,6 +4,7 @@ import com.iamberry.app.tool.des.MD5;
 import com.iamberry.rst.core.page.PageRequest;
 import com.iamberry.rst.core.page.PagedResult;
 import com.iamberry.rst.core.sys.*;
+import com.iamberry.rst.faces.sys.DepartService;
 import com.iamberry.rst.faces.sys.SysService;
 import com.iamberry.rst.utils.AdminUtils;
 import com.iamberry.rst.utils.StaticModelUtil;
@@ -49,6 +50,8 @@ public class SysController {
 
     @Autowired
     private SysService sysService;
+    @Autowired
+    private DepartService departService;
 
     private static Logger logger = LoggerFactory.getLogger(SysController.class);
 
@@ -66,7 +69,7 @@ public class SysController {
     public ModelAndView indexUI(HttpServletRequest request) {
         Subject currentUser = SecurityUtils.getSubject();
         Admin admin = (Admin) currentUser.getPrincipal();
-        DeptInfo deptInfo = Dept.getDeptNameById(admin.getAdminDept());
+        Depart depart = departService.getDepartById(admin.getAdminDept());
         // 判断来源
         String userAgent = request.getHeader("User-Agent").toLowerCase();
         if (userAgent.contains("ipad") || userAgent.contains("iphone os") || userAgent.contains("android")) {
@@ -74,13 +77,13 @@ public class SysController {
             logger.info("用户{}来源于手机端", currentUser.getPrincipal());
             // 传递部门信息
             return new ModelAndView("wap/wap_index")
-                    .addObject("dept_name", deptInfo.getDetails())
+                    .addObject("dept_name", depart.getDepartName())
                     .addObject("dept_role", admin.getAdminManager() == 2);
         }
         logger.info("用户{}来源于PC端", currentUser.getPrincipal());
 
         // 注入数据:管理员名称、管理员部门
-        String dept = deptInfo.getName();
+        String dept = depart.getDepartName();
         List<Menu> list = sysService.listMenu(AdminUtils.getLoginAdminId());
         return new ModelAndView("home/pc_index").addObject("adminName", admin.getAdminName())
                 .addObject("deptName", dept).addObject("menus", sysService.listMenu(AdminUtils.getLoginAdminId()));
@@ -332,6 +335,10 @@ public class SysController {
     @RequestMapping("/_add_admin")
     public ModelAndView goAddAdmin(HttpServletRequest request) throws Exception {
         ModelAndView mv = new ModelAndView("sys/add_admin");
+        Depart depart = new Depart();
+        depart.setDepartStatus(1);
+        List<Depart> departList = departService.getDepartList(depart);
+        mv.addObject("departList",departList);
         return mv;
     }
 
@@ -367,7 +374,6 @@ public class SysController {
         }
         adminSalt = md5.stringToMD5(salt.toString());
         admin.setAdminSalt(adminSalt);
-        admin.setAdminDept(adminInfo.getAdminDept());
         admin.setAdminSaleNum(0);
         admin.setAdminStatus(1);
         passWord.append(adminSalt);

watero-rst-web/src/main/java/com/iamberry/rst/realm/IamberryRealm.java

@@ -2,7 +2,9 @@ package com.iamberry.rst.realm;
 
 import com.iamberry.cache.LocalCache;
 import com.iamberry.rst.core.sys.Admin;
+import com.iamberry.rst.core.sys.Depart;
 import com.iamberry.rst.core.sys.Dept;
+import com.iamberry.rst.faces.sys.DepartService;
 import com.iamberry.rst.faces.sys.SysService;
 import org.apache.shiro.authc.*;
 import org.apache.shiro.authz.AuthorizationInfo;
@@ -24,6 +26,8 @@ public class IamberryRealm extends AuthorizingRealm {
 
     @Autowired
     private SysService sysService;
+    @Autowired
+    private DepartService departService;
 
     /**
      * 认证
@@ -71,7 +75,8 @@ public class IamberryRealm extends AuthorizingRealm {
         Set<String> roles = new HashSet<>();
         roles.add("admin");
         // 部门
-        roles.add(Dept.getDeptNameById(admin.getAdminDept()).getDetails());
+        Depart depart = departService.getDepartById(admin.getAdminDept());
+        roles.add(depart.getDepartName());
         // 是否为部门领导,如果为部门领导，则需要展示对应的部门信息
         if (admin.getAdminManager() != 1) {
             roles.add("MANAGER");

watero-rst-web/src/main/resources/watero-rst-orm.xml

@@ -22,6 +22,7 @@
 		<typeAlias type="com.iamberry.rst.core.sys.SubMenu" alias="SubMenu"/>
 		<typeAlias type="com.iamberry.rst.core.sys.MenuPermisssion" alias="MenuPermisssion"/>
 		<typeAlias type="com.iamberry.rst.core.sys.Relu" alias="Relu"/>
+		<typeAlias type="com.iamberry.rst.core.sys.Depart" alias="Depart"/>
 
 		<typeAlias type="com.iamberry.rst.core.order.FilterChangeLogs" alias="FilterChangeLogs"/>
 		<typeAlias type="com.iamberry.rst.core.order.Order" alias="Order"/>
@@ -223,6 +224,7 @@
 
 		<mapper resource="com/iamberry/rst/service/sms/mapper/messageMapper.xml"/>
 		<mapper resource="com/iamberry/rst/service/sys/mapper/sysConfigMapper.xml"/>
+		<mapper resource="com/iamberry/rst/service/sys/mapper/DepartMapper.xml"/>
 
 		<mapper resource="com/iamberry/rst/service/product/mapper/productMapper.xml"/>
 		<mapper resource="com/iamberry/rst/service/product/mapper/productColorMapper.xml"/>

watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/update_customer.ftl

@@ -551,23 +551,23 @@
                         <#if (cmRelation.closedProdcues?size>0)>
                             <#list cmRelation.closedProdcues as closedProdcues>
                             <tr>
-                                <td style="text-align: center;">
+                                <td style="text-align: center;" width="80">
                                 ${closedProdcues.closedProductName!""}
                                 </td>
-                                <td style="text-align: center;">
+                                <td style="text-align: center;" width="40">
                                 ${closedProdcues.closedColorName!""}
                                 </td>
-                                <td style="text-align: center;">
+                                <td style="text-align: center;"  width="20">
                                     <input type="text" style="width: 100%;border: none;text-align: center;" class="input-text input-number input-itemNum" value="${closedProdcues.closedProdcueNumber!"0"}"  placeholder="产品数量" onkeyup="keyFun($(this),999,0)" onpaste="keyFun($(this),999,0)">
                                 </td>
-                                <td style="text-align: center;">
+                                <td style="text-align: center;" width="100">
                                     <input type="hidden" class="input-item-id" value="${closedProdcues.itemId!''}">
                                     <input type="hidden" class="input-produce-id" value="${closedProdcues.productId}">
                                     <input type="hidden" class="input-fc-id" value="${closedProdcues.colorId}">
                                     <input type="hidden" class="input-69code" value="${closedProdcues.colorBar}">
                                     <input type="text" class="input-text input-number input-code" style="width: 100%;border: none;text-align: center;" value="${closedProdcues.closedProdcueMachineNo!""}" placeholder="机器编号" name="" id="item-${closedProdcues.productId}-${closedProdcues.colorId}" number="${closedProdcues.closedProdcueNumber}"  itemIsSource="1"  onkeyup="keyFunString($(this),30)" onpaste="keyFunString($(this),30)" >
                                 </td>
-                                <td style="text-align: center;" ><a href="javascript:void(0)" onclick="delColor(this)" >删除</a></td>
+                                <td style="text-align: center;"  width="20"><a href="javascript:void(0)" onclick="delColor(this)" >删除</a></td>
                             </tr>
                             </#list>
                         <#else >
@@ -605,22 +605,22 @@
                             <#if (cmRelation.sendProdcues?size>0)>
                                 <#list cmRelation.sendProdcues as sendProdcues>
                                 <tr>
-                                    <td style="text-align: center;">
+                                    <td style="text-align: center;" width="80">
                                     ${sendProdcues.sendProduceName!""}
                                     </td>
-                                    <td style="text-align: center;">
+                                    <td style="text-align: center;" width="40">
                                     ${sendProdcues.sendColorName!""}
                                     </td>
-                                    <td style="text-align: center;">
+                                    <td style="text-align: center;" width="20">
                                         <input type="text" style="width: 100%;border: none;text-align: center;" class="input-text input-number input-itemNum" value="${sendProdcues.sendProdcueNumber!"0"}"  placeholder="产品数量" onkeyup="keyFun($(this),999,1)" onpaste="keyFun($(this),999,1)">
                                     </td>
-                                    <td style="text-align: center;">
+                                    <td style="text-align: center;" width="100">
                                         <input type="hidden" class="input-produce-id" value="${sendProdcues.productId}">
                                         <input type="hidden" class="input-fc-id" value="${sendProdcues.colorId}">
                                         <input type="hidden" class="input-69code" value="${sendProdcues.colorBar}">
                                         <input type="text" class="input-text input-number input-code" style="width: 100%;border: none;text-align: center;" value="${sendProdcues.sendProdcueMachineNo!""}" placeholder="机器编号" name="" id="item-${sendProdcues.productId}-${sendProdcues.colorId}" number="${sendProdcues.sendProdcueNumber}"  itemIsSource="1"  onkeyup="keyFunString($(this),30)" onpaste="keyFunString($(this),30)" >
                                     </td>
-                                    <td style="text-align: center;" ><a href="javascript:void(0)" onclick="delColor(this)" >删除</a></td>
+                                    <td style="text-align: center;" width="20"><a href="javascript:void(0)" onclick="delColor(this)" >删除</a></td>
                                 </tr>
                                 </#list>
                             <#else >

watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/print_order.ftl

@@ -8,7 +8,7 @@
     <meta http-equiv="Cache-Control" content="no-siteapp" />
     <link rel="Bookmark" href="/favicon.ico" >
     <link rel="Shortcut Icon" href="/favicon.ico" />
-<#include "/base/add_base.ftl">
+    <#include "/base/add_base.ftl">
     <script type="text/javascript" src="https://s.iamberry.com/js/LodopFuncs.js"></script>
     <title>打单发货</title>
 

watero-rst-web/src/main/webapp/WEB-INF/views/sys/add_admin.ftl

@@ -63,6 +63,21 @@
                 <input type="text" class="input-text" style="width: 250px;" name="adminMail" id="adminMail">
             </div>
         </div>
+
+        <div class="row cl">
+            <label class="form-label col-xs-4 col-sm-3"><span class="c-red"></span>所属部门：</label>
+            <div class="formControls col-xs-8 col-sm-9">
+                 <span class="select-box" style="width: 250px;">
+                    <select class="select" id="adminDept" name="adminDept" >
+                        <option value="" >-部门-</option>
+                        <#list departList as depart>
+                            <option value="${depart.departId}" >${depart.departName}</option>
+                        </#list>
+                    </select>
+                </span>
+            </div>
+        </div>
+
         <div class="row cl">
             <label class="form-label col-xs-4 col-sm-3"><span class="c-red"></span>管理员类型：</label>
             <div style="margin-left: 26%">
@@ -129,6 +144,12 @@
             check = false;
             return false;
         }
+        var adminDept = $("#adminDept").val();
+        if (!isEmpty(adminDept)) {
+            msg = "请选择所属部门！";
+            check = false;
+            return false;
+        }
     }
 
     function add_admin() {
@@ -140,7 +161,8 @@
             "adminPassword":$('#adminPassword').val(),
             "adminTel":$('#adminTel').val(),
             "adminManager":$('input[name=adminManager]:checked').val(),
-            "adminMail":$('#adminMail').val()
+            "adminMail":$('#adminMail').val(),
+            "adminDept":$('#adminDept').val()
         };
         if (sure) {
             if (check) {

watero-rst-web/src/main/webapp/WEB-INF/views/sys/edit_permission.ftl

@@ -187,9 +187,17 @@
         if (obj.checked) {
             // 全选所有
             $(".ermissions-" + id).prop("checked", "true");
+            $(".ermissions-" + id).each(function () {
+                var val = $(this).val();
+                $(".check-permission"+ val).prop("checked", "true");
+            })
         } else {
             // 取消全选所有
             $(".ermissions-" + id).removeAttr("checked");
+            $(".ermissions-" + id).each(function () {
+                var val = $(this).val();
+                $(".check-permission"+ val).removeAttr("checked");
+            })
         }
         // 停止事件冒泡
         event.stopPropagation();

watero-rst-web/src/main/webapp/WEB-INF/views/sys/list_admin.ftl

@@ -45,7 +45,7 @@
                 <#else>
                     <td class="td-status"><span class="label radius">已停止使用</span></td>
                 </#if>
-                <td>${deptUtil.getDeptNameById(o.adminDept).name}</td>
+                <td>${o.departName!""}</td>
                 <#assign isAdminSex=(o.adminSex == 1)/>
                 <td>${isAdminSex?string("男", "女")}</td>
                 <td>${strUtil.phoneFormat(o.adminTel)}</td>

watero-rst-web/src/main/webapp/common/js/customer/customer.js

@@ -1495,6 +1495,13 @@ function setSelectProduct(colorIds){
         shade: [0.5,'#fff'] //0.1透明度的白色背景
     });
 
+    var $addProduct;
+    if(productAddType == 2){   // 1：寄回产品添加   2：寄出产品添加
+        $addProduct=$("#addSendProduct");
+    }else if(productAddType == 1){
+        $addProduct=$("#addBackProduct");
+    }
+
     var colorIdArray = colorIds.split("_");
     for(var i=0;i<colorIdArray.length;i++){
         var colorId = colorIdArray[i];
@@ -1503,8 +1510,8 @@ function setSelectProduct(colorIds){
         }
 
         var flag = true;
-        $("#add_product").find("tr").each(function (){
-            var colId = $(this).find(".color_id").eq(0).val();
+        $addProduct.find("tr").each(function (){
+            var colId = $(this).find(".input-fc-id").eq(0).val();
             if(colId == colorId){
                 flag  = false;
             }
@@ -1537,21 +1544,14 @@ function setSelectProduct(colorIds){
                 }else{
                     layer.msg("添加产品失败！", {icon: 5, time: 3000});
                 }
-                var notSelectOrderHtml = $("#addSendProduct").find(".notSelectOrder").html();
+
+                var notSelectOrderHtml = $addProduct.find(".notSelectOrder").html();
+
                 if(!isEmpty(notSelectOrderHtml)){
-                    if(productAddType == 2){
-                        $("#addSendProduct").append(html);
-                    }else if(productAddType == 1){
-                        $("#addBackProduct").append(html);
-                    }
+                    $addProduct.append(html);
                 }else{
-                    if(productAddType == 2){
-                        $("#addSendProduct").html(html);
-                    }else if(productAddType == 1){
-                        $("#addBackProduct").html(html);
-                    }
+                    $addProduct.html(html);
                 }
-
             }
         });
     }