bug fixes

src/main/java/com/caimei/modules/order/controller/CmOrderRemarkController.java

@@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 订单备注Controller
@@ -55,13 +56,11 @@ public class CmOrderRemarkController {
     /**
      * 保存备注
      *
-     * @param remarks
-     * @param orderID
      * @return
      */
     @ResponseBody
     @RequestMapping(value = "addRemarks", method = RequestMethod.POST)
-    public JsonModel addRemarks(@RequestBody String remarks, @RequestBody Integer orderID, HttpServletRequest httpRequest) {
+    public JsonModel addRemarks(@RequestBody Map<String, String> person, HttpServletRequest httpRequest) {
         JsonModel jsonModel = JsonModel.newInstance();
         String token = httpRequest.getHeader("token");
         String decoded = TokenEncryptUtils.decoded(token);
@@ -71,8 +70,8 @@ public class CmOrderRemarkController {
         try {
             //保存备注信息
             CmOrderRemark remark = new CmOrderRemark();
-            remark.setOrderID(orderID);
-            remark.setRemarks(remarks);
+            remark.setOrderID(Integer.valueOf(person.get("orderID")));
+            remark.setRemarks(person.get("remarks"));
             remark.setCreateBy(user.getId());
             remark.setCreateDate(new Date());
             cmOrderRemarkService.save(remark);

src/main/java/com/caimei/modules/products/controller/CmMallOrganizeProductsController.java

@@ -189,16 +189,16 @@ public class CmMallOrganizeProductsController {
      * @return
      */
     @ResponseBody
-    @RequestMapping(value = "saveAddProductInfo")
-    public JsonModel saveAddProductInfo(CmMallOrganizeProducts cmMallOrganizeProducts) {
+    @RequestMapping(value = "saveAddProductInfo", method = RequestMethod.POST)
+    public JsonModel saveAddProductInfo(@RequestBody CmMallOrganizeProducts cmMallOrganizeProducts) {
         JsonModel jsonModel = JsonModel.newInstance();
         try {
             JSONArray parse = (JSONArray) JSON.parse(cmMallOrganizeProducts.getItemsList());
             if (null != parse && parse.size() > 0) {
                 for (int j = 0; j < parse.size(); j++) {
-                    String productID = (String) parse.get(j);//获取商品ID
+                    Integer productID = (Integer) parse.get(j);//获取商品ID
                     CmMallOrganizeProducts cop = new CmMallOrganizeProducts();
-                    cop.setId(Integer.valueOf(productID));
+                    cop.setId(productID);
                     cop.setModules(cmMallOrganizeProducts.getModules());
                     cmMallOrganizeProductsService.updateProductInfo1(cop);
                 }

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

@@ -43,6 +43,10 @@ public class CmMallOrganizeProducts implements Serializable {
     private String itemsList;//添加商品字符串
     private String existsFlag;//是否已存在小程序商品中 1已存在，其他都为不存在
 
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
     public Integer getId() {
         return id;
     }
@@ -51,7 +55,6 @@ public class CmMallOrganizeProducts implements Serializable {
         this.id = id;
     }
 
-    @Length(min = 0, max = 11, message = "对应cm_mall_products_classify商品分类表id长度必须介于 0 和 11 之间")
     public String getClassifyID() {
         return classifyID;
     }
@@ -60,7 +63,6 @@ public class CmMallOrganizeProducts implements Serializable {
         this.classifyID = classifyID;
     }
 
-    @Length(min = 0, max = 11, message = "组织ID,具体对应cm_mall_organize表ID长度必须介于 0 和 11 之间")
     public String getOrganizeID() {
         return organizeID;
     }
@@ -69,7 +71,6 @@ public class CmMallOrganizeProducts implements Serializable {
         this.organizeID = organizeID;
     }
 
-    @Length(min = 0, max = 11, message = "商品ID,具体对应product表长度必须介于 0 和 11 之间")
     public String getProductID() {
         return productID;
     }
@@ -102,7 +103,6 @@ public class CmMallOrganizeProducts implements Serializable {
         this.retailPrice = retailPrice;
     }
 
-    @Length(min = 0, max = 11, message = "最小起订量长度必须介于 0 和 11 之间")
     public String getMinBuyNumber() {
         return minBuyNumber;
     }
@@ -111,7 +111,6 @@ public class CmMallOrganizeProducts implements Serializable {
         this.minBuyNumber = minBuyNumber;
     }
 
-    @Length(min = 0, max = 1, message = "是否是优选商品：0不是优选,1优选商品长度必须介于 0 和 1 之间")
     public String getPreferredProduct() {
         return preferredProduct;
     }
@@ -120,7 +119,6 @@ public class CmMallOrganizeProducts implements Serializable {
         this.preferredProduct = preferredProduct;
     }
 
-    @Length(min = 0, max = 1, message = "是否是常用商品：0不是常用,1常用商品长度必须介于 0 和 1 之间")
     public String getCommonlyProduct() {
         return commonlyProduct;
     }
@@ -129,7 +127,6 @@ public class CmMallOrganizeProducts implements Serializable {
         this.commonlyProduct = commonlyProduct;
     }
 
-    @Length(min = 0, max = 1, message = "是否是星范精品：0不是特惠,1星范精品商品长度必须介于 0 和 1 之间")
     public String getPreferentialProduct() {
         return preferentialProduct;
     }
@@ -138,7 +135,6 @@ public class CmMallOrganizeProducts implements Serializable {
         this.preferentialProduct = preferentialProduct;
     }
 
-    @Length(min = 0, max = 2, message = "商品状态,1已上架,2已下架长度必须介于 0 和 2 之间")
     public String getValidFlag() {
         return validFlag;
     }
@@ -147,7 +143,30 @@ public class CmMallOrganizeProducts implements Serializable {
         this.validFlag = validFlag;
     }
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    public String getPreferredProductSort() {
+        return preferredProductSort;
+    }
+
+    public void setPreferredProductSort(String preferredProductSort) {
+        this.preferredProductSort = preferredProductSort;
+    }
+
+    public String getCommonlyProductSort() {
+        return commonlyProductSort;
+    }
+
+    public void setCommonlyProductSort(String commonlyProductSort) {
+        this.commonlyProductSort = commonlyProductSort;
+    }
+
+    public String getPreferentialProductSort() {
+        return preferentialProductSort;
+    }
+
+    public void setPreferentialProductSort(String preferentialProductSort) {
+        this.preferentialProductSort = preferentialProductSort;
+    }
+
     public Date getAddTime() {
         return addTime;
     }
@@ -156,7 +175,6 @@ public class CmMallOrganizeProducts implements Serializable {
         this.addTime = addTime;
     }
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     public Date getUpdateTime() {
         return updateTime;
     }
@@ -165,6 +183,14 @@ public class CmMallOrganizeProducts implements Serializable {
         this.updateTime = updateTime;
     }
 
+    public Integer getModules() {
+        return modules;
+    }
+
+    public void setModules(Integer modules) {
+        this.modules = modules;
+    }
+
     public String getMainImage() {
         return mainImage;
     }
@@ -197,30 +223,6 @@ public class CmMallOrganizeProducts implements Serializable {
         this.productClassifyName = productClassifyName;
     }
 
-    public String getPreferredProductSort() {
-        return preferredProductSort;
-    }
-
-    public void setPreferredProductSort(String preferredProductSort) {
-        this.preferredProductSort = preferredProductSort;
-    }
-
-    public String getCommonlyProductSort() {
-        return commonlyProductSort;
-    }
-
-    public void setCommonlyProductSort(String commonlyProductSort) {
-        this.commonlyProductSort = commonlyProductSort;
-    }
-
-    public String getPreferentialProductSort() {
-        return preferentialProductSort;
-    }
-
-    public void setPreferentialProductSort(String preferentialProductSort) {
-        this.preferentialProductSort = preferentialProductSort;
-    }
-
     public String getItemsList() {
         return itemsList;
     }
@@ -236,12 +238,4 @@ public class CmMallOrganizeProducts implements Serializable {
     public void setExistsFlag(String existsFlag) {
         this.existsFlag = existsFlag;
     }
-
-    public Integer getModules() {
-        return modules;
-    }
-
-    public void setModules(Integer modules) {
-        this.modules = modules;
-    }
 }