订单打印

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

@@ -112,6 +112,26 @@ public class GetWxOrderno {
 		return m;
 	}
 
+
+	public static void main(String[] args) {
+		String xml = "<xml><return_code><![CDATA[SUCCESS]]></return_code>" +
+				"<return_msg><![CDATA[OK]]></return_msg>" +
+				"<appid><![CDATA[wxdb090f0af89e0be3]]></appid>" +
+				"<mch_id><![CDATA[1490237892]]></mch_id>" +
+				"<nonce_str><![CDATA[7UdjfHj8Ao6YfzT4]]></nonce_str>" +
+				"<sign><![CDATA[97CE080DCB323D532353305279679101]]></sign>" +
+				"<result_code><![CDATA[SUCCESS]]></result_code>" +
+				"<prepay_id><![CDATA[wx1516544215177622cb20750d1872644010]]></prepay_id>" +
+				"<trade_type><![CDATA[JSAPI]]></trade_type>" +
+				"</xml> ";
+		Map<String, String> map = new HashMap<String, String>();
+		try {
+			map = doXMLParse(xml);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+
 	/**
 	 * 获取子结点的xml
 	 *

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/SalesOrderItem.java

@@ -28,6 +28,8 @@ public class SalesOrderItem implements Serializable {
     private String productAbbreviation;		//商品简称
     private String colorAbbreviation;	//所属产品简称
 
+    private Integer colorIsWeight;    //重量
+
     public Integer getItemIsSource() {
         return itemIsSource;
     }
@@ -155,4 +157,12 @@ public class SalesOrderItem implements Serializable {
     public void setColorAbbreviation(String colorAbbreviation) {
         this.colorAbbreviation = colorAbbreviation;
     }
+
+    public Integer getColorIsWeight() {
+        return colorIsWeight;
+    }
+
+    public void setColorIsWeight(Integer colorIsWeight) {
+        this.colorIsWeight = colorIsWeight;
+    }
 }

watero-rst-core/src/main/java/com.iamberry.rst.core/order/ProductColor.java

@@ -41,6 +41,8 @@ public class ProductColor implements Serializable {
 
     private String productTypeName;    //产品类型名称
 
+    private Integer colorIsWeight;    //重量
+
     public String getProductName() {
         return productName;
     }
@@ -145,6 +147,14 @@ public class ProductColor implements Serializable {
         this.productTypeName = productTypeName;
     }
 
+    public Integer getColorIsWeight() {
+        return colorIsWeight;
+    }
+
+    public void setColorIsWeight(Integer colorIsWeight) {
+        this.colorIsWeight = colorIsWeight;
+    }
+
     @Override
     public String toString() {
         return "ProductColor{" +

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/salesOrderMapper.xml

@@ -111,6 +111,9 @@
       <if test="salesBatchId !=null and salesBatchId !=''">
         AND sales_batch_id = #{salesBatchId}
       </if>
+      <if test="salesAddressInfo !=null and salesAddressInfo !=''">
+         AND sales_address_info like CONCAT('%',#{salesAddressInfo},'%')
+      </if>
       <if test="startDate != null and startDate != ''">
         AND sales_create_time <![CDATA[>=]]> #{startDate}
       </if>
@@ -151,7 +154,8 @@
             item_is_source,
             item_create_time,
             pi.product_abbreviation,
-            pc.color_abbreviation
+            pc.color_abbreviation,
+            pc.color_is_weight
         FROM
             tb_rst_sales_order_item
       LEFT JOIN tb_rst_product_info pi ON tb_rst_sales_order_item.item_product_id = pi.product_id

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

@@ -243,14 +243,19 @@ public class AwaitSendController {
         SalesOrderItem item = new SalesOrderItem();
         item.setItemOrderId(salesOrderInfo.getSalesId());
         List<SalesOrderItem> items = salesOrderService.listSalesOrderItem(item);
+        Double colorIsWeight = 0.00;  //克
         String goodName = "";
         for (SalesOrderItem temp : items) {
             goodName += temp.getProductAbbreviation() + "(" + (temp.getColorAbbreviation()) + ")*"+temp.getItemNum() + ";";
+
+            if(temp.getColorIsWeight() != null){
+                colorIsWeight += temp.getColorIsWeight();
+            }
         }
         Map<String, Object> product1 = new HashMap<String, Object>();
         product1.put("GoodsName", goodName);
         // 计算产品重量
-        product1.put("GoodsWeight", 1.0);
+        product1.put("GoodsWeight", colorIsWeight/1000);
         Commodity.add(product1);
 
         eOrderRequestData.setCommodity(Commodity);

watero-rst-web/src/main/java/com/iamberry/rst/utils/OrderUtils.java

@@ -32,6 +32,7 @@ public class OrderUtils {
     // 正式环境地址：http://api.kdniao.cc/api/Eorderservice
     // 测试环境地址：http://testapi.kdniao.cc:8081/api/EOrderService
     private static final String ReqURL="http://api.kdniao.cc/api/Eorderservice";
+    //private static final String ReqURL="http://testapi.kdniao.cc:8081/api/EOrderService";
 
     public static void main(String[] args) throws Exception {
         EOrderRequestData eOrderRequestData = new EOrderRequestData();

watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/sales_order_detail.ftl

@@ -65,7 +65,7 @@
             <thead>
             <tr>
                 <th width="10">批次号：</th>
-                <td width="10" style="font-weight: normal;"><span>${order.salesBatchId!'暂无批次batchCreateTime'}</span></td>
+                <td width="10" style="font-weight: normal;"><span>${order.salesBatchId!'暂无批次'}</span></td>
                 <td width="10"></td>
                 <th width="10">下单日期：</th>
                 <td width="10" style="font-weight: normal;"><span>${(order.batchCreateTime?string("yyyy-MM-dd HH:mm:ss"))!''}</span></td>

watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/sales_order_list.ftl

@@ -82,6 +82,9 @@
             <input type="text" class="my-input trim_input"  style="width:80px;margin-right: 0px;" value="${salesOrder.salesAddressName!}" placeholder="收货人姓名" name="salesAddressName" id="salesAddressName">
             <input type="text" class="my-input trim_input"  style="width:80px;margin-right: 0px;" value="${salesOrder.salesAddressTel!}" placeholder="收货人电话" name="salesAddressTel" id="salesAddressTel">
 
+            <#--<input type="text" class="my-input trim_input"  style="width:80px;margin-right: 0px;" value="${salesOrder.salesAddressTel!}" placeholder="产品" name="salesAddressTel" id="salesAddressTel">-->
+            <input type="text" class="my-input trim_input"  style="width:80px;margin-right: 0px;" value="${salesOrder.salesAddressInfo!}" placeholder="收货人地址" name="salesAddressInfo" id="salesAddressInfo">
+
             <button type="submit" class="btn" style="background: #32a3d8;color: #fff;-webkit-transform:translateY(-5%);height: 35px;" id=""><i class="Hui-iconfont">&#xe665;</i> 搜索</button>
             <button type="button" class="btn" style="background: #32a3d8;color: #fff;-webkit-transform:translateY(-5%);height: 35px;" id="order_excel"><i class="Hui-iconfont">&#xe644;</i> 下载订单</button>
             <#--<button onClick="upFiles();" class="btn radius" style="background: #32a3d8;color: #fff; height: 35px" type="button"><i class="Hui-iconfont">&#xe632;</i>上传第三方平台订单</button>-->