Merge remote-tracking branch 'origin/developer' into developer

src/main/java/com/caimei/entity/CmMallOrganizeProducts.java

@@ -28,10 +28,10 @@ public class CmMallOrganizeProducts implements Serializable {
     private String unit;        //包装规格
     private Integer productCount;  //商品数量
     private Integer cartCount;   //购物车总数量
-    private CmMallProduct cmMallProduct;    //采美商品表
-    private List<CmMallProductImage> CmMallProductImage;  //商品图片
-    private CmMallProductDetailInfo cmMallProductDetailInfo; //商品详情
-    private CmMallShop cmMallShop;      //供应商信息
+    private CmMallProduct product;    //采美商品表
+    private List<CmMallProductImage> productImage;  //商品图片
+    private CmMallProductDetailInfo productDetailInfo; //商品详情
+    private CmMallShop shop;      //供应商信息
     private String shopName;        //商品名称
     private Integer shopID;//
     private String productClassifyName;//商品分类名字
@@ -207,36 +207,36 @@ public class CmMallOrganizeProducts implements Serializable {
         this.unit = unit;
     }
 
-    public CmMallProduct getCmMallProduct() {
-        return cmMallProduct;
+    public CmMallProduct getProduct() {
+        return product;
     }
 
-    public void setCmMallProduct(CmMallProduct cmMallProduct) {
-        this.cmMallProduct = cmMallProduct;
+    public void setProduct(CmMallProduct product) {
+        this.product = product;
     }
 
-    public List<CmMallProductImage> getCmMallProductImage() {
-        return CmMallProductImage;
+    public List<CmMallProductImage> getProductImage() {
+        return productImage;
     }
 
-    public void setCmMallProductImage(List<CmMallProductImage> cmMallProductImage) {
-        CmMallProductImage = cmMallProductImage;
+    public void setProductImage(List<CmMallProductImage> productImage) {
+        this.productImage = productImage;
     }
 
-    public CmMallProductDetailInfo getCmMallProductDetailInfo() {
-        return cmMallProductDetailInfo;
+    public CmMallProductDetailInfo getProductDetailInfo() {
+        return productDetailInfo;
     }
 
-    public void setCmMallProductDetailInfo(CmMallProductDetailInfo cmMallProductDetailInfo) {
-        this.cmMallProductDetailInfo = cmMallProductDetailInfo;
+    public void setProductDetailInfo(CmMallProductDetailInfo productDetailInfo) {
+        this.productDetailInfo = productDetailInfo;
     }
 
-    public CmMallShop getCmMallShop() {
-        return cmMallShop;
+    public CmMallShop getShop() {
+        return shop;
     }
 
-    public void setCmMallShop(CmMallShop cmMallShop) {
-        this.cmMallShop = cmMallShop;
+    public void setShop(CmMallShop shop) {
+        this.shop = shop;
     }
 
     public Integer getCartCount() {

src/main/java/com/caimei/service/products/impl/DetailsServiceImpl.java

@@ -47,17 +47,17 @@ public class DetailsServiceImpl implements DetailsService {
         cmMallProduct.setTagsList(split);
         cmMallProduct.setMainImage(AppUtils.getImageURL("cmMallProduct", cmMallProduct.getMainImage(), 0, domain));
         if (cmMallProduct.getStock() == null || cmMallProduct.getStock() == 0) cmMallProduct.setStock(99);
-        organizeProducts.setCmMallProduct(cmMallProduct);
+        organizeProducts.setProduct(cmMallProduct);
         //商品图片
         List<CmMallProductImage> cmMallProductImage = detailsMapper.findAllProductImage(organizeProducts.getProductID());
         for (CmMallProductImage image : cmMallProductImage) {
             String imageURL = AppUtils.getImageURL("cmMallProduct", image.getImage(), 0, domain);
             image.setImage(imageURL);
         }
-        organizeProducts.setCmMallProductImage(cmMallProductImage);
+        organizeProducts.setProductImage(cmMallProductImage);
         //商品详情
         CmMallProductDetailInfo cmMallProductDetailInfo = detailsMapper.findProductDetail(organizeProducts.getProductID());
-        organizeProducts.setCmMallProductDetailInfo(cmMallProductDetailInfo);
+        organizeProducts.setProductDetailInfo(cmMallProductDetailInfo);
         //供应商信息
         CmMallShop cmMallShop = detailsMapper.findShop(cmMallProduct.getShopID());
         if (cmMallShop.getBusinessScope() != null && cmMallShop.getBusinessScope().contains("/")) {
@@ -66,7 +66,7 @@ public class DetailsServiceImpl implements DetailsService {
         }
         cmMallShop.setLogo(AppUtils.getImageURL("shopLogo", cmMallShop.getLogo(), 0, domain));
         cmMallShop.setBusinessLicenseImage(AppUtils.getImageURL("shopLogo", cmMallShop.getBusinessLicenseImage(), 0, domain));
-        organizeProducts.setCmMallShop(cmMallShop);
+        organizeProducts.setShop(cmMallShop);
         //购物车数量
         Integer count = homePageMapper.cartQuantity(userID);
         if (count == null) count = 0;