bug fixes

src/main/java/com/caimei/modules/order/entity/NewOrderProduct.java

@@ -98,47 +98,6 @@ public class NewOrderProduct {
     private Integer frequency;  //订单量
     private Integer totalNum;   //销售量
 
-    public Integer getFrequency() {
-        return frequency;
-    }
-
-    public void setFrequency(Integer frequency) {
-        this.frequency = frequency;
-    }
-
-    public Integer getTotalNum() {
-        return totalNum;
-    }
-
-    public void setTotalNum(Integer totalNum) {
-        this.totalNum = totalNum;
-    }
-
-    public String getBuyer() {
-        return buyer;
-    }
-
-    public void setBuyer(String buyer) {
-        this.buyer = buyer;
-    }
-
-    public String getConsignee() {
-        return consignee;
-    }
-
-    public void setConsignee(String consignee) {
-        this.consignee = consignee;
-    }
-
-
-    public Double getShouldPayTotalTax() {
-        return shouldPayTotalTax;
-    }
-
-    public void setShouldPayTotalTax(Double shouldPayTotalTax) {
-        this.shouldPayTotalTax = shouldPayTotalTax;
-    }
-
     public Integer getOrderProductID() {
         return orderProductID;
     }
@@ -171,6 +130,14 @@ public class NewOrderProduct {
         this.shopID = shopID;
     }
 
+    public String getLedgerNo() {
+        return ledgerNo;
+    }
+
+    public void setLedgerNo(String ledgerNo) {
+        this.ledgerNo = ledgerNo;
+    }
+
     public Integer getProductID() {
         return productID;
     }
@@ -243,6 +210,22 @@ public class NewOrderProduct {
         this.price = price;
     }
 
+    public Double getShopProductAmount() {
+        return shopProductAmount;
+    }
+
+    public void setShopProductAmount(Double shopProductAmount) {
+        this.shopProductAmount = shopProductAmount;
+    }
+
+    public Double getNormalPrice() {
+        return normalPrice;
+    }
+
+    public void setNormalPrice(Double normalPrice) {
+        this.normalPrice = normalPrice;
+    }
+
     public Double getTotalAmount() {
         return totalAmount;
     }
@@ -291,6 +274,14 @@ public class NewOrderProduct {
         this.totalAddedValueTax = totalAddedValueTax;
     }
 
+    public Double getShouldPayTotalTax() {
+        return shouldPayTotalTax;
+    }
+
+    public void setShouldPayTotalTax(Double shouldPayTotalTax) {
+        this.shouldPayTotalTax = shouldPayTotalTax;
+    }
+
     public Double getShopFee() {
         return shopFee;
     }
@@ -355,12 +346,20 @@ public class NewOrderProduct {
         this.commentFlag = commentFlag;
     }
 
-    public Double getNormalPrice() {
-        return normalPrice;
+    public Double getPrice0() {
+        return price0;
     }
 
-    public void setNormalPrice(Double normalPrice) {
-        this.normalPrice = normalPrice;
+    public void setPrice0(Double price0) {
+        this.price0 = price0;
+    }
+
+    public Double getPrice1() {
+        return price1;
+    }
+
+    public void setPrice1(Double price1) {
+        this.price1 = price1;
     }
 
     public Double getTotalFee() {
@@ -491,20 +490,20 @@ public class NewOrderProduct {
         this.name = name;
     }
 
-    public Double getPrice0() {
-        return price0;
+    public String getAliasName() {
+        return aliasName;
     }
 
-    public void setPrice0(Double price0) {
-        this.price0 = price0;
+    public void setAliasName(String aliasName) {
+        this.aliasName = aliasName;
     }
 
-    public Double getPrice1() {
-        return price1;
+    public String getUnit() {
+        return unit;
     }
 
-    public void setPrice1(Double price1) {
-        this.price1 = price1;
+    public void setUnit(String unit) {
+        this.unit = unit;
     }
 
     public String getPayStatus() {
@@ -515,14 +514,6 @@ public class NewOrderProduct {
         this.payStatus = payStatus;
     }
 
-    public Double getActPreferential() {
-        return actPreferential;
-    }
-
-    public void setActPreferential(Double actPreferential) {
-        this.actPreferential = actPreferential;
-    }
-
     public Double getPreferential() {
         return preferential;
     }
@@ -531,48 +522,20 @@ public class NewOrderProduct {
         this.preferential = preferential;
     }
 
-    @Transient
-    public String getImage() {
-        return AppUtils.getImageURL("product", image, 0, "");
-    }
-
-    public void setImage(String image) {
-        this.image = image;
-    }
-
-    @Transient
-    public Integer getDeliveryNum() {
-        return deliveryNum;
-    }
-
-    public void setDeliveryNum(Integer deliveryNum) {
-        this.deliveryNum = deliveryNum;
-    }
-
-    @Transient
-    public Integer getOutStoreTimes() {
-        return outStoreTimes;
-    }
-
-    public void setOutStoreTimes(Integer outStoreTimes) {
-        this.outStoreTimes = outStoreTimes;
-    }
-
-    public Double getCostPrice() {
-        return costPrice;
+    public Double getActPreferential() {
+        return actPreferential;
     }
 
-    public void setCostPrice(Double costPrice) {
-        this.costPrice = costPrice;
+    public void setActPreferential(Double actPreferential) {
+        this.actPreferential = actPreferential;
     }
 
-    @Transient
-    public Integer getStock() {
-        return stock;
+    public String getImage() {
+        return image;
     }
 
-    public void setStock(Integer stock) {
-        this.stock = stock;
+    public void setImage(String image) {
+        this.image = image;
     }
 
     public Double getDiscountFee() {
@@ -583,94 +546,92 @@ public class NewOrderProduct {
         this.discountFee = discountFee;
     }
 
-    @Transient
-    public Integer getStatus() {
-        return status;
+    public String getProductUnit() {
+        return productUnit;
     }
 
-    public void setStatus(Integer status) {
-        this.status = status;
+    public void setProductUnit(String productUnit) {
+        this.productUnit = productUnit;
     }
 
-    @Transient
-    public String getLogisticsBatchID() {
-        return logisticsBatchID;
+    public String getProductImage() {
+        return productImage;
     }
 
-    public void setLogisticsBatchID(String logisticsBatchID) {
-        this.logisticsBatchID = logisticsBatchID;
+    public void setProductImage(String productImage) {
+        this.productImage = productImage;
     }
 
-    /*public List<NewCmFinanceReceipts> getNewCmFinanceReceiptsList() {
-        return newCmFinanceReceiptsList;
+    public String getShopFee1() {
+        return shopFee1;
     }
 
-    public void setNewCmFinanceReceiptsList(List<NewCmFinanceReceipts> newCmFinanceReceiptsList) {
-        this.newCmFinanceReceiptsList = newCmFinanceReceiptsList;
+    public void setShopFee1(String shopFee1) {
+        this.shopFee1 = shopFee1;
     }
 
-    public List<NewCmFinanceCharge> getNewCmFinanceChargeList() {
-        return newCmFinanceChargeList;
+    public String getOtherFee1() {
+        return otherFee1;
     }
 
-    public void setNewCmFinanceChargeList(List<NewCmFinanceCharge> newCmFinanceChargeList) {
-        this.newCmFinanceChargeList = newCmFinanceChargeList;
-    }*/
+    public void setOtherFee1(String otherFee1) {
+        this.otherFee1 = otherFee1;
+    }
 
-    public String getLedgerNo() {
-        return ledgerNo;
+    public String getCmFee1() {
+        return cmFee1;
     }
 
-    public void setLedgerNo(String ledgerNo) {
-        this.ledgerNo = ledgerNo;
+    public void setCmFee1(String cmFee1) {
+        this.cmFee1 = cmFee1;
     }
 
-    public String getShopFee1() {
-        return singleShopFee == null ? "" : singleShopFee.toString();
+    public Integer getDeliveryNum() {
+        return deliveryNum;
     }
 
-    public void setShopFee1(String shopFee1) {
-        this.shopFee1 = shopFee1;
+    public void setDeliveryNum(Integer deliveryNum) {
+        this.deliveryNum = deliveryNum;
     }
 
-    public String getOtherFee1() {
-        return singleOtherFee == null ? "" : singleOtherFee.toString();
+    public Integer getOutStoreTimes() {
+        return outStoreTimes;
     }
 
-    public void setOtherFee1(String otherFee1) {
-        this.otherFee1 = otherFee1;
+    public void setOutStoreTimes(Integer outStoreTimes) {
+        this.outStoreTimes = outStoreTimes;
     }
 
-    public String getCmFee1() {
-        return singleCmFee == null ? "" : singleCmFee.toString();
+    public Double getCostPrice() {
+        return costPrice;
     }
 
-    public void setCmFee1(String cmFee1) {
-        this.cmFee1 = cmFee1;
+    public void setCostPrice(Double costPrice) {
+        this.costPrice = costPrice;
     }
 
-    public String getUnit() {
-        return unit;
+    public Integer getStock() {
+        return stock;
     }
 
-    public void setUnit(String unit) {
-        this.unit = unit;
+    public void setStock(Integer stock) {
+        this.stock = stock;
     }
 
-    public String getProductUnit() {
-        return productUnit;
+    public Integer getStatus() {
+        return status;
     }
 
-    public void setProductUnit(String productUnit) {
-        this.productUnit = productUnit;
+    public void setStatus(Integer status) {
+        this.status = status;
     }
 
-    public String getProductImage() {
-        return AppUtils.getImageURL("product", productImage, 0, "");
+    public String getLogisticsBatchID() {
+        return logisticsBatchID;
     }
 
-    public void setProductImage(String productImage) {
-        this.productImage = productImage;
+    public void setLogisticsBatchID(String logisticsBatchID) {
+        this.logisticsBatchID = logisticsBatchID;
     }
 
     public String getSplitFlag() {
@@ -681,7 +642,6 @@ public class NewOrderProduct {
         this.splitFlag = splitFlag;
     }
 
-    @Transient
     public String getCostCheckFlag() {
         return costCheckFlag;
     }
@@ -690,7 +650,6 @@ public class NewOrderProduct {
         this.costCheckFlag = costCheckFlag;
     }
 
-    @Transient
     public Double getCostProportional() {
         return costProportional;
     }
@@ -707,7 +666,30 @@ public class NewOrderProduct {
         this.cmProductSnList = cmProductSnList;
     }
 
-    @Transient
+    public String getConsignee() {
+        return consignee;
+    }
+
+    public void setConsignee(String consignee) {
+        this.consignee = consignee;
+    }
+
+    public String getBuyer() {
+        return buyer;
+    }
+
+    public void setBuyer(String buyer) {
+        this.buyer = buyer;
+    }
+
+    public Integer getThisTimePostNum() {
+        return thisTimePostNum;
+    }
+
+    public void setThisTimePostNum(Integer thisTimePostNum) {
+        this.thisTimePostNum = thisTimePostNum;
+    }
+
     public Integer getReturnedPurchaseProductNum() {
         return returnedPurchaseProductNum;
     }
@@ -716,7 +698,6 @@ public class NewOrderProduct {
         this.returnedPurchaseProductNum = returnedPurchaseProductNum;
     }
 
-    @Transient
     public Integer getReturningPurchaseProductNum() {
         return returningPurchaseProductNum;
     }
@@ -725,7 +706,6 @@ public class NewOrderProduct {
         this.returningPurchaseProductNum = returningPurchaseProductNum;
     }
 
-    @Transient
     public Integer getCancelProductNum() {
         return cancelProductNum;
     }
@@ -734,16 +714,6 @@ public class NewOrderProduct {
         this.cancelProductNum = cancelProductNum;
     }
 
-    @Transient
-    public Integer getThisTimePostNum() {
-        return thisTimePostNum;
-    }
-
-    public void setThisTimePostNum(Integer thisTimePostNum) {
-        this.thisTimePostNum = thisTimePostNum;
-    }
-
-    @Transient
     public Integer getReceivedNum() {
         return receivedNum;
     }
@@ -752,7 +722,6 @@ public class NewOrderProduct {
         this.receivedNum = receivedNum;
     }
 
-    @Transient
     public Integer getReturningNum() {
         return returningNum;
     }
@@ -761,7 +730,6 @@ public class NewOrderProduct {
         this.returningNum = returningNum;
     }
 
-    @Transient
     public Integer getReturnedNum() {
         return returnedNum;
     }
@@ -770,16 +738,6 @@ public class NewOrderProduct {
         this.returnedNum = returnedNum;
     }
 
-    @Transient
-    public String getAliasName() {
-        return aliasName;
-    }
-
-    public void setAliasName(String aliasName) {
-        this.aliasName = aliasName;
-    }
-
-    @Transient
     public Boolean getFirstReturn() {
         return firstReturn;
     }
@@ -788,14 +746,6 @@ public class NewOrderProduct {
         this.firstReturn = firstReturn;
     }
 
-    public Double getShopProductAmount() {
-        return shopProductAmount;
-    }
-
-    public void setShopProductAmount(Double shopProductAmount) {
-        this.shopProductAmount = shopProductAmount;
-    }
-
     public Double getNewCostPrice() {
         return newCostPrice;
     }
@@ -811,4 +761,20 @@ public class NewOrderProduct {
     public void setSingleShouldPayTotalTax(Double singleShouldPayTotalTax) {
         this.singleShouldPayTotalTax = singleShouldPayTotalTax;
     }
+
+    public Integer getFrequency() {
+        return frequency;
+    }
+
+    public void setFrequency(Integer frequency) {
+        this.frequency = frequency;
+    }
+
+    public Integer getTotalNum() {
+        return totalNum;
+    }
+
+    public void setTotalNum(Integer totalNum) {
+        this.totalNum = totalNum;
+    }
 }

src/main/java/com/caimei/modules/order/entity/NewShopOrder.java

@@ -1,6 +1,5 @@
 package com.caimei.modules.order.entity;
 
-import java.beans.Transient;
 import java.math.BigInteger;
 import java.util.List;
 
@@ -106,30 +105,6 @@ public class NewShopOrder {
     private String modifyShouldPayDate;   //修改应付金额的时间
     private Double payed;//已付金额
 
-    public String getReceiptStatus() {
-        return receiptStatus;
-    }
-
-    public void setReceiptStatus(String receiptStatus) {
-        this.receiptStatus = receiptStatus;
-    }
-
-    public Double getReceiptTotalFee() {
-        return receiptTotalFee;
-    }
-
-    public void setReceiptTotalFee(Double receiptTotalFee) {
-        this.receiptTotalFee = receiptTotalFee;
-    }
-
-    public Double getShouldPayProduct() {
-        return shouldPayProduct;
-    }
-
-    public void setShouldPayProduct(Double shouldPayProduct) {
-        this.shouldPayProduct = shouldPayProduct;
-    }
-
     public Integer getShopOrderID() {
         return shopOrderID;
     }
@@ -138,6 +113,14 @@ public class NewShopOrder {
         this.shopOrderID = shopOrderID;
     }
 
+    public Integer getOrganizeID() {
+        return organizeID;
+    }
+
+    public void setOrganizeID(Integer organizeID) {
+        this.organizeID = organizeID;
+    }
+
     public String getShopOrderNo() {
         return shopOrderNo;
     }
@@ -154,6 +137,30 @@ public class NewShopOrder {
         this.orderNo = orderNo;
     }
 
+    public Integer getOrderID() {
+        return orderID;
+    }
+
+    public void setOrderID(Integer orderID) {
+        this.orderID = orderID;
+    }
+
+    public String getReceiptStatus() {
+        return receiptStatus;
+    }
+
+    public void setReceiptStatus(String receiptStatus) {
+        this.receiptStatus = receiptStatus;
+    }
+
+    public Double getReceiptTotalFee() {
+        return receiptTotalFee;
+    }
+
+    public void setReceiptTotalFee(Double receiptTotalFee) {
+        this.receiptTotalFee = receiptTotalFee;
+    }
+
     public Integer getUserID() {
         return userID;
     }
@@ -194,6 +201,14 @@ public class NewShopOrder {
         this.productAmount = productAmount;
     }
 
+    public Double getShouldPayProduct() {
+        return shouldPayProduct;
+    }
+
+    public void setShouldPayProduct(Double shouldPayProduct) {
+        this.shouldPayProduct = shouldPayProduct;
+    }
+
     public Double getFee() {
         return fee;
     }
@@ -266,6 +281,14 @@ public class NewShopOrder {
         this.refundStatus = refundStatus;
     }
 
+    public BigInteger getDeliveryTimeMills() {
+        return deliveryTimeMills;
+    }
+
+    public void setDeliveryTimeMills(BigInteger deliveryTimeMills) {
+        this.deliveryTimeMills = deliveryTimeMills;
+    }
+
     public Double getNeedPayAmount() {
         return needPayAmount;
     }
@@ -442,102 +465,6 @@ public class NewShopOrder {
         this.newOrderProducts = newOrderProducts;
     }
 
-    public Integer getOrderID() {
-        return orderID;
-    }
-
-    public void setOrderID(Integer orderID) {
-        this.orderID = orderID;
-    }
-
-    public int getOrderType() {
-        return orderType;
-    }
-
-    public void setOrderType(int orderType) {
-        this.orderType = orderType;
-    }
-
-    @Transient
-    public String getShopName() {
-        return shopName;
-    }
-
-    public void setShopName(String shopName) {
-        this.shopName = shopName;
-    }
-
-    @Transient
-    public String getReceiver() {
-        return receiver;
-    }
-
-    public void setReceiver(String receiver) {
-        this.receiver = receiver;
-    }
-
-    @Transient
-    public String getBuyer() {
-        return buyer;
-    }
-
-    public void setBuyer(String buyer) {
-        this.buyer = buyer;
-    }
-
-    @Transient
-    public String getOrderSource() {
-        return orderSource;
-    }
-
-    public void setOrderSource(String orderSource) {
-        this.orderSource = orderSource;
-    }
-
-    public String getOrderTime() {
-        return orderTime;
-    }
-
-    public void setOrderTime(String orderTime) {
-        this.orderTime = orderTime;
-    }
-
-    @Transient
-    public String getAlreadyReceipt() {
-        return alreadyReceipt;
-    }
-
-    public void setAlreadyReceipt(String alreadyReceipt) {
-        this.alreadyReceipt = alreadyReceipt;
-    }
-
-    @Transient
-    public String getUnReceipt() {
-        return unReceipt;
-    }
-
-    public void setUnReceipt(String unReceipt) {
-        this.unReceipt = unReceipt;
-    }
-
-    @Transient
-    public String getPaid() {
-        return paid;
-    }
-
-    public void setPaid(String paid) {
-        this.paid = paid;
-    }
-
-    @Transient
-    public String getUnpaid() {
-        return unpaid;
-    }
-
-    public void setUnpaid(String unpaid) {
-        this.unpaid = unpaid;
-    }
-
     public Double getPreferential() {
         return preferential;
     }
@@ -554,12 +481,20 @@ public class NewShopOrder {
         this.orderSubmitType = orderSubmitType;
     }
 
-    public BigInteger getDeliveryTimeMills() {
-        return deliveryTimeMills;
+    public int getOrderType() {
+        return orderType;
     }
 
-    public void setDeliveryTimeMills(BigInteger deliveryTimeMills) {
-        this.deliveryTimeMills = deliveryTimeMills;
+    public void setOrderType(int orderType) {
+        this.orderType = orderType;
+    }
+
+    public String getOrderTime() {
+        return orderTime;
+    }
+
+    public void setOrderTime(String orderTime) {
+        this.orderTime = orderTime;
     }
 
     public Integer getPresentNum() {
@@ -594,7 +529,6 @@ public class NewShopOrder {
         this.totalAddedValueTax = totalAddedValueTax;
     }
 
-    @Transient
     public String getSplitFlag() {
         return splitFlag;
     }
@@ -643,14 +577,6 @@ public class NewShopOrder {
         this.note = note;
     }
 
-    public List<NewOrderProduct> getSnOrderProducts() {
-        return snOrderProducts;
-    }
-
-    public void setSnOrderProducts(List<NewOrderProduct> snOrderProducts) {
-        this.snOrderProducts = snOrderProducts;
-    }
-
     public String getPayStatus() {
         return payStatus;
     }
@@ -667,6 +593,78 @@ public class NewShopOrder {
         this.sendOutStatus = sendOutStatus;
     }
 
+    public String[] getPs() {
+        return ps;
+    }
+
+    public void setPs(String[] ps) {
+        this.ps = ps;
+    }
+
+    public String getShopName() {
+        return shopName;
+    }
+
+    public void setShopName(String shopName) {
+        this.shopName = shopName;
+    }
+
+    public String getReceiver() {
+        return receiver;
+    }
+
+    public void setReceiver(String receiver) {
+        this.receiver = receiver;
+    }
+
+    public String getBuyer() {
+        return buyer;
+    }
+
+    public void setBuyer(String buyer) {
+        this.buyer = buyer;
+    }
+
+    public String getOrderSource() {
+        return orderSource;
+    }
+
+    public void setOrderSource(String orderSource) {
+        this.orderSource = orderSource;
+    }
+
+    public String getAlreadyReceipt() {
+        return alreadyReceipt;
+    }
+
+    public void setAlreadyReceipt(String alreadyReceipt) {
+        this.alreadyReceipt = alreadyReceipt;
+    }
+
+    public String getUnReceipt() {
+        return unReceipt;
+    }
+
+    public void setUnReceipt(String unReceipt) {
+        this.unReceipt = unReceipt;
+    }
+
+    public String getPaid() {
+        return paid;
+    }
+
+    public void setPaid(String paid) {
+        this.paid = paid;
+    }
+
+    public String getUnpaid() {
+        return unpaid;
+    }
+
+    public void setUnpaid(String unpaid) {
+        this.unpaid = unpaid;
+    }
+
     public String getPostFeeCos() {
         return postFeeCos;
     }
@@ -675,6 +673,14 @@ public class NewShopOrder {
         this.postFeeCos = postFeeCos;
     }
 
+    public List<NewOrderProduct> getSnOrderProducts() {
+        return snOrderProducts;
+    }
+
+    public void setSnOrderProducts(List<NewOrderProduct> snOrderProducts) {
+        this.snOrderProducts = snOrderProducts;
+    }
+
     public Boolean getDefaultStatus() {
         return defaultStatus;
     }
@@ -691,7 +697,14 @@ public class NewShopOrder {
         this.paying = paying;
     }
 
-    @Transient
+    public String getRefunding() {
+        return refunding;
+    }
+
+    public void setRefunding(String refunding) {
+        this.refunding = refunding;
+    }
+
     public Double getPayTotalFee() {
         return payTotalFee;
     }
@@ -748,7 +761,14 @@ public class NewShopOrder {
         this.shopOtherFee = shopOtherFee;
     }
 
-    @Transient
+    public Double getWaitPayShop() {
+        return waitPayShop;
+    }
+
+    public void setWaitPayShop(Double waitPayShop) {
+        this.waitPayShop = waitPayShop;
+    }
+
     public String getStartTime() {
         return startTime;
     }
@@ -757,7 +777,6 @@ public class NewShopOrder {
         this.startTime = startTime;
     }
 
-    @Transient
     public String getEndTime() {
         return endTime;
     }
@@ -766,25 +785,6 @@ public class NewShopOrder {
         this.endTime = endTime;
     }
 
-    @Transient
-    public Double getWaitPayShop() {
-        return waitPayShop;
-    }
-
-    public void setWaitPayShop(Double waitPayShop) {
-        this.waitPayShop = waitPayShop;
-    }
-
-    @Transient
-    public String getRefunding() {
-        return refunding;
-    }
-
-    public void setRefunding(String refunding) {
-        this.refunding = refunding;
-    }
-
-    @Transient
     public String getOperatingMode() {
         return operatingMode;
     }
@@ -809,14 +809,6 @@ public class NewShopOrder {
         this.proportional = proportional;
     }
 
-    public String[] getPs() {
-        return ps;
-    }
-
-    public void setPs(String[] ps) {
-        this.ps = ps;
-    }
-
     public String getModifyShouldPayNote() {
         return modifyShouldPayNote;
     }
@@ -841,7 +833,6 @@ public class NewShopOrder {
         this.modifyShouldPayDate = modifyShouldPayDate;
     }
 
-    @Transient
     public Double getPayed() {
         return payed;
     }
@@ -849,12 +840,4 @@ public class NewShopOrder {
     public void setPayed(Double payed) {
         this.payed = payed;
     }
-
-    public Integer getOrganizeID() {
-        return organizeID;
-    }
-
-    public void setOrganizeID(Integer organizeID) {
-        this.organizeID = organizeID;
-    }
 }