模块修改

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

@@ -0,0 +1,97 @@
+package com.caimei.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class CmMallPageModules implements Serializable {
+    private Integer id;
+    private Integer organizeID;//组织ID
+    private String organizeName;//组织名称
+    private String firstModulesName;//模块一名称
+    private String secondModulesName;//模块二名称
+    private String thirdModulesName;//模块三名称
+    private String firstModulesImage;//模块一图片
+    private String secondModulesImage;//模块二图片
+    private Date addTime;//添加时间
+    private Date updateTime;//修改时间
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getOrganizeID() {
+        return organizeID;
+    }
+
+    public void setOrganizeID(Integer organizeID) {
+        this.organizeID = organizeID;
+    }
+
+    public String getOrganizeName() {
+        return organizeName;
+    }
+
+    public void setOrganizeName(String organizeName) {
+        this.organizeName = organizeName;
+    }
+
+    public String getFirstModulesName() {
+        return firstModulesName;
+    }
+
+    public void setFirstModulesName(String firstModulesName) {
+        this.firstModulesName = firstModulesName;
+    }
+
+    public String getSecondModulesName() {
+        return secondModulesName;
+    }
+
+    public void setSecondModulesName(String secondModulesName) {
+        this.secondModulesName = secondModulesName;
+    }
+
+    public String getThirdModulesName() {
+        return thirdModulesName;
+    }
+
+    public void setThirdModulesName(String thirdModulesName) {
+        this.thirdModulesName = thirdModulesName;
+    }
+
+    public String getFirstModulesImage() {
+        return firstModulesImage;
+    }
+
+    public void setFirstModulesImage(String firstModulesImage) {
+        this.firstModulesImage = firstModulesImage;
+    }
+
+    public String getSecondModulesImage() {
+        return secondModulesImage;
+    }
+
+    public void setSecondModulesImage(String secondModulesImage) {
+        this.secondModulesImage = secondModulesImage;
+    }
+
+    public Date getAddTime() {
+        return addTime;
+    }
+
+    public void setAddTime(Date addTime) {
+        this.addTime = addTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+}

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

@@ -8,6 +8,7 @@ public class CmProductsClassify implements Serializable {
     private String classifyName;  //分类名称
     private String classifyImage;  //分类图标
     private Integer sort;    // 排序
+    private String postageToPay;    //邮费是否到付:1是，2否
     private String status;   //分类使用状态：1启用,2停用
     private String addTime;   //添加时间
     private String updateTime;  //更新时间
@@ -84,4 +85,12 @@ public class CmProductsClassify implements Serializable {
     public void setDelFlag(String delFlag) {
         this.delFlag = delFlag;
     }
+
+    public String getPostageToPay() {
+        return postageToPay;
+    }
+
+    public void setPostageToPay(String postageToPay) {
+        this.postageToPay = postageToPay;
+    }
 }

src/main/java/com/caimei/mapper/order/OrderMapper.java

@@ -77,4 +77,6 @@ public interface OrderMapper {
     List<String> findShopOrderID(@Param("orderID") Integer orderID, @Param("id") Integer id);
 
     List<CmLogisticsBatch> findLogistics(Integer orderID);
+
+    CmProductsClassify findClassifyID(String classifyID);
 }

src/main/java/com/caimei/mapper/products/HomePageMapper.java

@@ -23,4 +23,8 @@ public interface HomePageMapper {
     List<brand> findId(Integer id);
 
     CmMallOrganize afterSale(Integer organizeID);
+
+    CmMallPageModules findModules(Integer organizeID);
+
+    List<String> findBannerImage(Integer organizeID);
 }

src/main/java/com/caimei/service/order/impl/OrderServiceImpl.java

@@ -105,22 +105,35 @@ public class OrderServiceImpl implements OrderService {
         UserInvoiceInfo invoice = personalMapper.findInvoice(userId);
         //运费
         FreePostageCard freePostageCard = orderMapper.queryFree(userId);
-        String freight = "";
         //-1到付，0包邮,-2仪器到付其它包邮
-        boolean classify = true;//判断是否全部是仪器
-        for (String classifyID : classifyIDS.split(",")) {
-            if (classifyID != null && classifyID.equals("3") && classify) {
-                classify = true;
+        boolean pinkage = true;//判断是否全部包邮
+        boolean collect = true;//判断是否全部到付
+        if (classifyIDS.contains(",")) {
+            for (String classifyID : classifyIDS.split(",")) {
+                if (classifyID != null && !classifyID.equals("")) {
+                    CmProductsClassify productsClassify = orderMapper.findClassifyID(classifyID);
+                    if (productsClassify.getPostageToPay().equals("1")) {
+                        pinkage = false;
+                    } else {
+                        collect = false;
+                    }
+                }
+            }
+        } else {
+            CmProductsClassify productsClassify = orderMapper.findClassifyID(classifyIDS);
+            if (productsClassify.getPostageToPay().equals("1")) {
+                pinkage = false;
             } else {
-                classify = false;
+                collect = false;
             }
         }
-        if (freePostageCard == null || classify) {
+        String freight = "";
+        if (pinkage && freePostageCard != null) {
+            freight = "0";
+        } else if (collect) {
             freight = "-1";
-        } else if (classifyIDS.contains("3")) {
-            freight = "-2";
         } else {
-            freight = "0";
+            freight = "-2";
         }
         //客服热线号码
         String cellPhone = loginMapper.cellPhone(organizeID);

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

@@ -37,9 +37,15 @@ public class HomePageServiceImpl implements HomePageService {
         Integer count = homePageMapper.cartQuantity(userID);
         if (count == null) count = 0;
         logger.info("------------HomePageServiceImpl.information.count:" + count);
+        //模块数据
+        CmMallPageModules mallPageModules = homePageMapper.findModules(organizeID);
+        //banner图
+        List<String> bannerImageList = homePageMapper.findBannerImage(organizeID);
         map.put("productsClassify", productsClassify);
         map.put("organizeProducts", organizeProducts);
         map.put("count", count);
+        map.put("mallPageModules", mallPageModules);
+        map.put("bannerImageList", bannerImageList);
         return map;
     }
 

src/main/resources/mapper/HomePageMapper.xml

@@ -157,4 +157,25 @@
           id = #{organizeID}
           AND delFlag = '0'
     </select>
+
+    <select id="findModules" resultType="com.caimei.entity.CmMallPageModules">
+        SELECT
+          *
+        FROM
+          cm_mall_page_modules
+        WHERE
+          organizeID = #{organizeID}
+    </select>
+    
+    <select id="findBannerImage" resultType="string">
+        SELECT
+          bannerImage
+        FROM
+          cm_mall_banner_image
+        WHERE
+          enabledStatus = '1'
+          AND organizeID = #{organizeID}
+        ORDER BY
+          sort DESC
+    </select>
 </mapper>

src/main/resources/mapper/OrderMapper.xml

@@ -551,4 +551,14 @@
         SELECT * FROM cm_logistics_batch WHERE orderID= #{orderID}
     </select>
 
+    <select id="findClassifyID" resultType="com.caimei.entity.CmProductsClassify">
+        SELECT
+          *
+        FROM
+          cm_mall_products_classify
+        WHERE
+          id = #{classifyID}
+          AND delFlag = '0'
+    </select>
+
 </mapper>