Merge remote-tracking branch 'origin/developerD' into developerD

src/main/java/com/caimei/modules/order/entity/NewOrderProduct.java

@@ -1040,4 +1040,21 @@ public class NewOrderProduct extends DataEntity<NewOrderProduct> {
     public void setReturnGoodsStutas(Integer returnGoodsStutas) {
         this.returnGoodsStutas = returnGoodsStutas;
     }
+
+    public String getSkuStr() {
+        return skuStr;
+    }
+
+    public void setSkuStr(String skuStr) {
+        this.skuStr = skuStr;
+    }
+
+    public List<CmSku> getSkuList() {
+        return skuList;
+    }
+
+    public void setSkuList(List<CmSku> skuList) {
+        this.skuList = skuList;
+    }
+
 }

src/main/java/com/caimei/modules/order/service/NewOrderService.java

@@ -1341,6 +1341,9 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
                         } else {
                             orderProduct.setSvipTaxReduction(0d);
                         }
+                        // sku信息
+                        List<CmSku> skuList = productDao.findSkuList(orderProduct.getProductID());
+                        orderProduct.setSkuList(skuList);
                     });
                     list.addAll(pList);
                     shopOrder.setNewOrderProducts(pList);

src/main/webapp/WEB-INF/views/modules/order/orderDetail.jsp

@@ -276,7 +276,7 @@
         }
 
         .supplier-product-info {
-            width: 50%;
+            width: 55%;
             display: inline-block;
             position: relative;
             top: 50%;
@@ -879,6 +879,7 @@
                 <c:if test="${order.organizeID != 4&&shopOrder.commercialCode eq 'E1807059160' && (order.receiptStatus == 2 || order.receiptStatus == 3)}">
                     <font color="red">(采美信息线上收款)</font>
                 </c:if>
+                <c:if test="${order.organizeID == 4}">
                     <c:if test="${order.organizeID == 4&& voucherVo eq null }">
                         <font color="red">(联合丽格线上收款)</font>
                     </c:if>