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

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

@@ -130,8 +130,8 @@ public class AwaitSendController {
             // 省外EMS (无需操作)
         } else if (post.equalsIgnoreCase("STO")) {
             // 申通快递
-            eOrderRequestData.setCustomerName("爱贝源母婴直销店");
-            eOrderRequestData.setCustomerPwd("客户密码");
+            eOrderRequestData.setCustomerName("爱贝源");
+            eOrderRequestData.setCustomerPwd("Iamberry321.");
             eOrderRequestData.setSendSite("广东东莞公司");
         } else if (post.equalsIgnoreCase("DBL")) {
             eOrderRequestData.setCustomerName("月结编码");
@@ -173,12 +173,16 @@ public class AwaitSendController {
         SalesOrderItem item = new SalesOrderItem();
         item.setItemOrderId(salesOrderInfo.getSalesId());
         List<SalesOrderItem> items = salesOrderService.listSalesOrderItem(item);
+        String goodName = "";
         for (SalesOrderItem temp : items) {
-            Map<String, Object> product1 = new HashMap<String, Object>();
-            product1.put("GoodsName", temp.getProductAbbreviation() + "(" + (temp.getColorAbbreviation()) + ")*"+temp.getItemNum());
-            product1.put("GoodsWeight", 10.0);
-            Commodity.add(product1);
+            goodName += temp.getProductAbbreviation() + "(" + (temp.getColorAbbreviation()) + ")*"+temp.getItemNum() + ";";
         }
+        Map<String, Object> product1 = new HashMap<String, Object>();
+        product1.put("GoodsName", goodName);
+        product1.put("GoodsWeight", 10.0);
+        Commodity.add(product1);
+
+
         eOrderRequestData.setCommodity(Commodity);
         eOrderRequestData.setWeight(1.0);
         eOrderRequestData.setQuantity(1);
@@ -220,7 +224,7 @@ public class AwaitSendController {
                 }
             } else {
                 // 获取电子面单失败
-                LOGGER.info("{} 获取电子名单失败，原因{}", orderId, jsonObject.get("Reason"));
+                LOGGER.error("{} 获取电子面单失败，原因:{}", orderId, jsonObject.get("Reason"));
             }
             return ResponseJson.getSUCCESS().addResponseKeyValue("json", json);
         } catch (Exception e) {

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

@@ -37,6 +37,7 @@
         <thead>
         <tr class="text-c">
             <th width="25"><input type="checkbox" name="" value=""></th>
+            <th width="50">订单类型</th>
             <th width="50">订单编号</th>
             <th width="50">交易号</th>
             <th width="50">收件人姓名</th>
@@ -62,6 +63,33 @@
                     </#if>
                 </td>
 
+                <td>
+                    <#if (o.salesCustomerId)??>
+                        <div>售后订单</div>
+                        <div>
+                            (
+                            <#if o.customerIsSolve == 1>
+                                已解决
+                            <#elseif o.customerIsSolve == 2>
+                                未解决
+                            <#elseif o.customerIsSolve == 3>
+                                换新
+                            <#elseif o.customerIsSolve == 4>
+                                维修
+                            <#elseif o.customerIsSolve == 5>
+                                补发
+                            <#elseif o.customerIsSolve == 6>
+                                退货
+                            <#elseif o.customerIsSolve == 7>
+                                无理由退货
+                            </#if>
+                            )
+                        </div>
+                    <#else>
+                        正常订单
+                    </#if>
+                </td>
+
                 <td>${(o.salesOrderId)!}</td>
                 <td>${(o.salesDealCode)!}</td>
                 <td>${(o.salesAddressName)!}</td>