Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

watero-common-tool/src/main/java/com/iamberry/wechat/tools/AddrUtil.java

@@ -4,6 +4,8 @@ package com.iamberry.wechat.tools;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 import org.jsoup.select.Elements;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
@@ -18,6 +20,8 @@ import java.util.TreeMap;
  */
 public class AddrUtil {
 
+	private static final Logger LOGGER = LoggerFactory.getLogger(AddrUtil.class);
+
 	/**
 	 * 发货时处理省份问题
 	 * @param province
@@ -66,7 +70,7 @@ public class AddrUtil {
 			Elements rows = doc.select(".op_exactqa_s_answer");
 			return rows.text().trim();
 		} catch (Exception e) {
-			e.printStackTrace();
+			LOGGER.error("", e);
 		}
 		return null;
 	}

watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AwaitSendController.java

@@ -248,22 +248,24 @@ public class AwaitSendController {
         List<SalesOrderItem> items = salesOrderService.listSalesOrderItem(item);
         Double colorIsWeight = 0.00;  //克
         String goodName = "";
+        int Goodsquantity = 0;
         for (SalesOrderItem temp : items) {
             goodName += temp.getProductAbbreviation() + "(" + (temp.getColorAbbreviation()) + ")*"+temp.getItemNum() + ";";
-
             if(temp.getColorIsWeight() != null){
                 colorIsWeight += temp.getColorIsWeight();
             }
+            Goodsquantity += temp.getItemNum();
         }
         String uuid = UUIDGenerator.getUUID();
         Map<String, Object> product1 = new HashMap<String, Object>();
         product1.put("GoodsName", uuid);
+        product1.put("Goodsquantity", Goodsquantity);
         // 计算产品重量
         product1.put("GoodsWeight", colorIsWeight/1000);
         Commodity.add(product1);
 
         eOrderRequestData.setCommodity(Commodity);
-        eOrderRequestData.setWeight(1.0);
+        eOrderRequestData.setWeight(colorIsWeight/1000);
         eOrderRequestData.setQuantity(1);
         eOrderRequestData.setIsReturnPrintTemplate(1);