bug fixes

src/main/java/com/caimei/controller/products/DetailsController.java

@@ -48,7 +48,12 @@ public class DetailsController {
         String openid = (String) session.getAttribute("openid");
         CmOperationUser operationUser = loginService.doLogin(openid, cmMallCart.getOrganizeID());
         if (operationUser == null) return model.error("账户异常");*/
-        Integer count = detailsService.saveCart(cmMallCart);
+        Integer count = 0;
+        try {
+            count = detailsService.saveCart(cmMallCart);
+        } catch (Exception e) {
+            return model.error("加入购物车失败");
+        }
         return model.success("加入购物车成功", count);
     }
 }

src/main/java/com/caimei/controller/products/ShoppingController.java

@@ -35,6 +35,7 @@ public class ShoppingController {
     /**
      * 更新商品数量
      */
+    @ResponseBody
     @RequestMapping("/update")
     public void updateNumber(CmMallCart cmMallCart) {
         shoppingService.updateNumber(cmMallCart);

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

@@ -16,7 +16,9 @@ public class CmOrganizeProducts implements Serializable {
     private String commonlyProduct;     //是否是常用商品：0不是常用,1常用商品
     private String preferentialProduct; //是否是惊喜特惠：0不是特惠,1惊喜特惠商品
     private String validFlag;       //商品状态,1已上架,2已下架
-    private Integer sort;       //排序默认为空,排序优先级1最高，空最后
+    private Integer preferredProductSort;       //（优选排序）排序默认为空,排序优先级1最高，空最后
+    private Integer commonlyProductSort;   //(常用排序）排序默认为空,排序优先级1最高,空最后
+    private Integer preferentialProductSort;   //（精品排序）排序默认为空,排序优先级1最高,空最后
     private String addTime;     //添加时间
     private String updateTime;     //更新时间
     private String delFlag;     //是否有效状态 0 有效 其它无效
@@ -127,12 +129,28 @@ public class CmOrganizeProducts implements Serializable {
         this.validFlag = validFlag;
     }
 
-    public Integer getSort() {
-        return sort;
+    public Integer getPreferredProductSort() {
+        return preferredProductSort;
     }
 
-    public void setSort(Integer sort) {
-        this.sort = sort;
+    public void setPreferredProductSort(Integer preferredProductSort) {
+        this.preferredProductSort = preferredProductSort;
+    }
+
+    public Integer getCommonlyProductSort() {
+        return commonlyProductSort;
+    }
+
+    public void setCommonlyProductSort(Integer commonlyProductSort) {
+        this.commonlyProductSort = commonlyProductSort;
+    }
+
+    public Integer getPreferentialProductSort() {
+        return preferentialProductSort;
+    }
+
+    public void setPreferentialProductSort(Integer preferentialProductSort) {
+        this.preferentialProductSort = preferentialProductSort;
     }
 
     public String getAddTime() {

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

@@ -86,7 +86,7 @@ public class Shop implements Serializable {
     private Double totalPrice;
     private List<CmOrganizeProducts> productsList;  //商品集合
     private Boolean checked = false; //勾选状态
-    private Integer checkedCount = 1;  //商铺下商品选中数量
+    private Integer checkedCount = 0;  //商铺下商品选中数量
 
     public Integer getShopID() {
         return shopID;

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

@@ -9,6 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -26,10 +27,24 @@ public class DetailsServiceImpl implements DetailsService {
         //商品信息
         CmOrganizeProducts organizeProducts = detailsMapper.findProduct(id);
         Product product = detailsMapper.product(organizeProducts.getProductID());
-        if (product.getTags() != null && product.getTags().contains(",")) {
-            String[] split = product.getTags().split(",");
-            product.setTagsList(split);
+        String[] split = null;
+        String tags = "";
+        //商品标签
+        if (product.getTags() != null) {
+            tags = product.getTags();
+            tags = tags.replace(" ", ",");
+            tags = tags.replace("、", ",");
+            tags = tags.replace("，", ",");
+            if (tags.contains(",")) {
+                split = tags.split(",");
+                List<String> list = new ArrayList();
+                for (String s : split) {
+                    if (s != null && !s.equals("")) list.add(s);
+                    split = list.toArray(new String[list.size()]);
+                }
+            }
         }
+        product.setTagsList(split);
         product.setMainImage(AppUtils.getImageURL("product", product.getMainImage(), 0, domain));
         if (product.getStock() == null || product.getStock() == 0) product.setStock(99);
         organizeProducts.setProduct(product);

src/main/resources/mapper/HomePageMapper.xml

@@ -32,9 +32,10 @@
           AND cop.commonlyProduct = '1'
           AND cop.delFlag = '0'
           AND cop.validFlag='1'
+          AND p.productID IS NOT NULL
         ORDER BY
-          IF(ISNULL(cop.sort),1,0) ASC,
-          cop.sort ASC
+          IF(ISNULL(cop.commonlyProductSort),1,0) ASC,
+          cop.commonlyProductSort ASC
         LIMIT
           5
     </select>
@@ -71,6 +72,7 @@
           AND cmop.organizeID= #{organizeID}
           AND cmop.validFlag = '1'
           AND cmop.delFlag = '0'
+          AND p.productID IS NOT NULL
         ORDER BY
           cmop.addTime DESC
     </select>
@@ -97,9 +99,20 @@
             AND cmop.organizeID = #{organizeID}
             AND cmop.validFlag = '1'
             AND cmop.delFlag = '0'
+            AND p.productID IS NOT NULL
         </where>
-        ORDER BY
-          cmop.addTime DESC
+        <if test="preferredProduct != null and preferredProduct != ''">
+            ORDER BY IF(ISNULL(cmop.preferredProductSort),1,0) ASC,
+            cmop.preferredProductSort ASC,cmop.addTime DESC
+        </if>
+        <if test="commonlyProduct != null and commonlyProduct != ''">
+            ORDER BY IF(ISNULL(cmop.commonlyProductSort),1,0) ASC,
+            cmop.commonlyProductSort ASC,cmop.addTime DESC
+        </if>
+        <if test="preferentialProduct != null and preferentialProduct != ''">
+            ORDER BY IF(ISNULL(cmop.preferentialProductSort),1,0) ASC,
+            cmop.preferentialProductSort ASC,cmop.addTime DESC
+        </if>
     </select>
 
     <select id="member" resultType="com.caimei.entity.hospital">