联合丽格 付款管理bugfix

src/main/java/com/caimei/modules/order/web/NewOrderController.java

@@ -68,6 +68,7 @@ import java.io.ByteArrayOutputStream;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
 /**
@@ -1415,28 +1416,26 @@ public class NewOrderController extends BaseController {
                 returnValue = returnedPurchaseFee - order.getDiscountFee(); //抵用完经理折扣后才是真实价值
             }
         }
-//        ColdChina，用IsColdChina判断
-//        PostageInfo 这两个是自己拼出来的
-//        PostageFlag 就是订单的freePostFlag
-//        Postage 就是订单freight
+
         //联合丽格运费
         String PostageInfo = null;
         // 拼接运费信息--联合丽格
-        Integer isColdChina = order.getNewShopOrders().get(0).getIsColdChina();
+        boolean isColdChina = order.getNewShopOrders().stream().map(NewShopOrder::getIsColdChina).collect(Collectors.toList()).contains(1);
         Double ColdChina = Double.valueOf(700);
-        if (null != order.getNewShopOrders()&&isColdChina!=null) {
+
+        if (isColdChina) {
             if ("-1" == order.getFreePostFlag()) {
                 // 到付
-                PostageInfo = "￥" + order.getFreePostFlag() + "(" + (isColdChina == 1 ? "冷链费: ￥" + ColdChina + "," : "") + "其他: 到付)";
+                PostageInfo = "￥" + order.getFreePostFlag() + "(" + (isColdChina ? "冷链费: ￥" + ColdChina + "," : "") + "其他: 到付)";
             } else if ("0" == order.getFreePostFlag()) {
                 // 包邮
-                PostageInfo = "￥" + order.getFreePostFlag() + "(" + (isColdChina == 1 ? "冷链费: ￥" + ColdChina + "," : "") + "其他: 包邮)";
+                PostageInfo = "￥" + order.getFreePostFlag() + "(" + (isColdChina ? "冷链费: ￥" + ColdChina + "," : "") + "其他: 包邮)";
             } else {
                 // 有运费
-                PostageInfo = "￥" + order.getFreight() + "(" + (isColdChina == 1 ? "冷链费: ￥" + ColdChina + "," : "") + "其他: ￥" + MathUtil.sub(order.getFreight(), ColdChina)+ ")";
+                PostageInfo = "￥" + order.getFreight() + "(" + (isColdChina ? "冷链费: ￥" + ColdChina + "," : "") + "其他: ￥" + MathUtil.sub(order.getFreight(), ColdChina)+ ")";
             }
         } else {
-            PostageInfo = order.getFreePostFlag() == "-1" ? "到付" : order.getFreePostFlag() == "0" ? "包邮" : "￥" + order.getFreight().doubleValue();
+            PostageInfo = order.getFreePostFlag() == "-1" ? "到付" : order.getFreePostFlag() == "0" ? "包邮" : "￥" + order.getFreight();
         }
         //支付凭证
         List<CmOrderPaymentVoucherVo> voucherVo = newOrderService.findVoucherVoOrderID(order.getOrderID());

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

@@ -124,6 +124,7 @@
 					<form:select path="organizeID"  class="select-ele input-medium required">
 						<form:option value="" label="请选择"/>
 						<form:option value="0" label="采美"/>
+						<form:option value="9999" label="呵呵商城"/>
 						<form:options items="${cmUserOrganizeList}" itemLabel="organizeName" itemValue="id"
 									  htmlEscape="false"/>
 					</form:select>

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

@@ -187,6 +187,7 @@
                 <form:select path="organizeID" class="select-ele input-medium required">
                     <form:option value="" label="请选择"/>
                     <form:option value="0" label="采美365网"/>
+                    <form:option value="9999" label="呵呵商城"/>
                     <form:options items="${cmUserOrganizeList}" itemLabel="organizeName" itemValue="id"
                                   htmlEscape="false"/>
                 </form:select>
@@ -247,16 +248,22 @@
             <li style="position: relative">${order.orderNo}
             </li>
             <li>
-                <c:if test="${order.orderType == 1}">
-                    自主订单
-                </c:if>
-                <c:if test="${order.orderType == 0}">
-                    协销订单
-                    <c:if test="${not empty order.spName}">
-                        <br>${fns:appendLast1('(',order.spName,')')}
+                <c:if test="${order.organizeID != 4}">
+                    <c:if test="${order.orderType == 1}">
+                        自主订单
+                    </c:if>
+                    <c:if test="${order.orderType == 0}">
+                        协销订单
+                        <c:if test="${not empty order.spName}">
+                            <br>${fns:appendLast1('(',order.spName,')')}
+                        </c:if>
+                    </c:if>
+                    <c:if test="${order.orderType > 1}">
+                        ---
                     </c:if>
                 </c:if>
-                <c:if test="${order.orderType > 1}">
+
+                <c:if test="${order.organizeID == 4}">
                     ---
                 </c:if>
             </li>
@@ -268,7 +275,7 @@
                     是
                 </c:if>
             </li>
-<%--            <li>--%>
+                <%--            <li>--%>
 <%--                <c:if test="${order.secondHandOrderFlag == '1'}">--%>
 <%--                    是--%>
 <%--                </c:if>--%>

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

@@ -879,8 +879,13 @@
                 <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 && (order.receiptStatus == 2 || order.receiptStatus == 3)}">
-                    <font color="red">(联合丽格线上收款)</font>
+                <c:if test="${order.organizeID == 4}">
+                    <c:if test="${ voucherVo eq null &&voucher.addTime eq null }">
+                        <font color="red">(联合丽格线上收款)</font>
+                    </c:if>
+                    <c:if test="${ voucherVo ne null &&voucher.addTime ne null }">
+                        <font color="red">(联合丽格线下收款)</font>
+                    </c:if>
                 </c:if>
             </span>
             <span>待付金额：<fmt:formatNumber value="${shopOrder.restAmount}" type="currency"/></span>