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

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

@@ -964,7 +964,7 @@ public class NewShopOrderService extends CrudService<NewShopOrderDao, NewShopOrd
             }
         }
         //拼接运费
-        Double ColdChina = Double.valueOf(700);
+        Double ColdChina = 700d;
         String shopPostFlag = shopOrder.getShopPostFlag() != null ? shopOrder.getShopPostFlag() : "-2";
         String PostageInfo = null;
         if (null != shopOrder.getIsColdChina() && shopOrder.getIsColdChina() == 1) {

src/main/resources/mappings/modules/order/OrderMapper.xml

@@ -1157,7 +1157,7 @@
                productAmount,
                needPayAmount,
                shopProductAmount,
-               shopPostFee,
+               ifnull(shopPostFee, 0) as shopPostFee,
                shopTaxFee,
                shouldPayShopAmount,
                orderTime,
@@ -1331,7 +1331,7 @@
                productAmount,
                needPayAmount,
                shopProductAmount,
-               shopPostFee,
+               ifnull(shopPostFee, 0) as shopPostFee,
                shopTaxFee,
                shouldPayShopAmount,
                orderTime,

src/main/resources/mappings/modules/order/ShopOrderMapper.xml

@@ -69,7 +69,7 @@
     		a.payStatus AS payStatus,
     		a.sendOutStatus AS sendOutStatus,
     		a.shopProductAmount AS shopProductAmount,
-    		a.shopPostFee AS shopPostFee,
+    		ifnull(a.shopPostFee, 0) AS shopPostFee,
     		a.shopTaxFee AS shopTaxFee,
     		a.shouldPayShopAmount AS shouldPayShopAmount,
     		a.payedShopAmount AS payedShopAmount,

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

@@ -428,7 +428,7 @@
                     <th>退款状态</th>
                     <th>退款金额</th>
                     <th>优惠券</th>
-                    <th>经理折扣</th>
+                    <th>促销满减</th>
                 </tr>
                 <tr>
                     <td rowspan="0" class="item0">${(page.pageNo-1)*page.pageSize+sIndex.index+1}</td>
@@ -499,7 +499,7 @@
                     <td>
                         <fmt:formatNumber value="${s.couponAmount}" type="number" pattern="#,##0.00"/>
                     </td>
-                    <td><fmt:formatNumber value="${s.discountFee}" type="number" pattern="#,##0.00"/></td>
+                    <td><fmt:formatNumber value="${s.promotionFullReduction}" type="number" pattern="#,##0.00"/></td>
                 </tr>
                 <tr class="t2">
                     <th colspan="3">机构</th>

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

@@ -334,7 +334,7 @@
                     <th>机构运费</th>
                     <th>收款状态</th>
                     <th colspan="3">收款金额</th>
-                    <th>经理折扣</th>
+                    <th>促销满减</th>
                     <th>优惠券</th>
                 <tr/>
                 <tr>
@@ -393,7 +393,8 @@
                            style="text-decoration: underline">${s.receiptTotalFee}</a>
                     </td>
                     <td>
-                        <label class="discountFee" style="display: none">
+                        <fmt:formatNumber value="${s.promotionFullReduction}" type="number" pattern="#,##0.00"/>
+                        <%--<label class="discountFee" style="display: none">
                             <c:choose>
                                 <c:when test="${s.discountTotalFee gt 0 && s.discountTotalFee gt s.returnedPurchaseTotalFee}">
                                     <fmt:formatNumber value="${s.discountTotalFee - s.returnedPurchaseTotalFee}"/>
@@ -423,7 +424,7 @@
                                 </span>
                             </c:if>
                         </c:if>
-                        <c:if test="${s.discountTotalFee le 0}">¥0.00</c:if>
+                        <c:if test="${s.discountTotalFee le 0}">¥0.00</c:if>--%>
                     </td>
                     <td>${s.couponAmount} </td>
                     <td class="eachDiscount" style="display: none">${s.eachDiscount}</td>

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

@@ -348,7 +348,7 @@
                             <%--                        <th>机构运费</th>--%>
                         <th colspan="2">收款状态</th>
                         <th colspan="3">收款金额</th>
-                        <th colspan="2">经理折扣</th>
+                        <th colspan="2">促销满减</th>
                         <th colspan="2">优惠券</th>
                     <tr/>
                     <tr>
@@ -411,7 +411,8 @@
                                 <c:if test="${s.accountAmount>0}">(余额抵扣 ￥${s.accountAmount})</c:if>
                         </td>
                         <td colspan="2">
-                            <label class="discountFee">
+                            <fmt:formatNumber value="${s.promotionFullReduction}" type="number" pattern="#,##0.00"/>
+                            <%--<label class="discountFee">
                                 <c:choose>
                                     <c:when test="${s.discountTotalFee gt 0 && s.discountTotalFee gt s.returnedPurchaseTotalFee}">
                                         <fmt:formatNumber value="${s.discountTotalFee - s.returnedPurchaseTotalFee}"/>
@@ -441,7 +442,7 @@
                                 </span>
                                 </c:if>
                             </c:if>
-                            <c:if test="${s.discountTotalFee le 0}">¥0.00</c:if>
+                            <c:if test="${s.discountTotalFee le 0}">¥0.00</c:if>--%>
                         </td>
                         <td class="couponAmount" colspan="2">${s.couponAmount} </td>
                         <td class="eachDiscount" style="display: none">${s.eachDiscount}</td>

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

@@ -98,7 +98,7 @@
                             <%--                        <th>机构运费</th>--%>
                         <th colspan="2">收款状态</th>
                         <th colspan="3">收款金额</th>
-                        <th colspan="2">经理折扣</th>
+                        <th colspan="2">促销满减</th>
                         <th colspan="2">优惠券</th>
                     <tr/>
                     <tr>
@@ -161,7 +161,8 @@
                             <c:if test="${s.accountAmount>0}">(余额抵扣 ￥${s.accountAmount})</c:if>
                         </td>
                         <td colspan="2">
-                            <label class="discountFee">
+                            <fmt:formatNumber value="${s.promotionFullReduction}" type="number" pattern="#,##0.00"/>
+                            <%--<label class="discountFee">
                                 <c:choose>
                                     <c:when test="${s.discountTotalFee gt 0 && s.discountTotalFee gt s.returnedPurchaseTotalFee}">
                                         <fmt:formatNumber value="${s.discountTotalFee - s.returnedPurchaseTotalFee}"/>
@@ -191,7 +192,7 @@
                                 </span>
                                 </c:if>
                             </c:if>
-                            <c:if test="${s.discountTotalFee le 0}">¥0.00</c:if>
+                            <c:if test="${s.discountTotalFee le 0}">¥0.00</c:if>--%>
                         </td>
                         <td class="couponAmount" colspan="2">${s.couponAmount} </td>
                         <td class="eachDiscount" style="display: none">${s.eachDiscount}</td>

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

@@ -430,7 +430,7 @@
 <%--                        <th>机构运费</th>--%>
                         <th colspan="2">收款状态</th>
                         <th colspan="3">收款金额</th>
-                        <th colspan="2">经理折扣</th>
+                        <th colspan="2">促销满减</th>
                         <th colspan="2">优惠券</th>
                     <tr/>
                     <tr>
@@ -493,7 +493,8 @@
                                 <c:if test="${s.accountAmount>0}">(余额抵扣 ￥${s.accountAmount})</c:if>
                         </td>
                         <td colspan="2">
-                            <label class="discountFee">
+                            <fmt:formatNumber value="${s.promotionFullReduction}" type="number" pattern="#,##0.00"/>
+                            <%--<label class="discountFee">
                                 <c:choose>
                                     <c:when test="${s.discountTotalFee gt 0 && s.discountTotalFee gt s.returnedPurchaseTotalFee}">
                                         <fmt:formatNumber value="${s.discountTotalFee - s.returnedPurchaseTotalFee}"/>
@@ -523,7 +524,7 @@
                                 </span>
                                 </c:if>
                             </c:if>
-                            <c:if test="${s.discountTotalFee le 0}">¥0.00</c:if>
+                            <c:if test="${s.discountTotalFee le 0}">¥0.00</c:if>--%>
                         </td>
                         <td class="couponAmount" colspan="2">${s.couponAmount} </td>
                         <td class="eachDiscount" style="display: none">${s.eachDiscount}</td>

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

@@ -409,7 +409,7 @@
                     <th colspan="3">下单时间</th>
                     <th>收款状态</th>
                     <th>收款金额</th>
-                    <th colspan="3">经理折扣</th>
+                    <th colspan="3">促销满减</th>
                     <th colspan="2">优惠券</th>
 <%--                    <th>成本类型</th>--%>
                 </tr>
@@ -428,7 +428,8 @@
                         ${s.receiptAmount}
                         <c:if test="${s.accountAmount>0}">(余额抵扣 ￥${s.accountAmount})</c:if>
                     <td colspan="3">
-                        <c:if test="${s.discountTotalFee gt 0}">
+                        <fmt:formatNumber value="${s.promotionFullReduction}" type="number" pattern="#,##0.00"/>
+                        <%--<c:if test="${s.discountTotalFee gt 0}">
                             <c:if test="${s.discountTotalFee gt s.returnedPurchaseTotalFee}">
                                 <fmt:formatNumber value="${s.discountTotalFee - s.returnedPurchaseTotalFee}"
                                                   type="currency"/>
@@ -448,7 +449,7 @@
                                 </span>
                             </c:if>
                         </c:if>
-                        <c:if test="${s.discountTotalFee le 0}">¥0.00</c:if>
+                        <c:if test="${s.discountTotalFee le 0}">¥0.00</c:if>--%>
                     </td>
                     <td colspan="2">
                             ${s.couponAmount}

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

@@ -352,7 +352,7 @@
                     <th>机构运费</th>
                     <th>收款状态</th>
                     <th colspan="3">收款金额</th>
-                    <th>经理折扣</th>
+                    <th>促销满减</th>
                     <th>优惠券</th>
                 <tr/>
                 <tr>
@@ -406,7 +406,8 @@
                            style="text-decoration: underline">${s.receiptTotalFee}</a>
                     </td>
                     <td>
-                        <label class="discountFee"  style="display: none">
+                        <fmt:formatNumber value="${s.promotionFullReduction}" type="number" pattern="#,##0.00"/>
+                        <%--<label class="discountFee"  style="display: none">
                             <c:choose>
                                 <c:when test="${s.discountTotalFee gt 0 && s.discountTotalFee gt s.returnedPurchaseTotalFee}">
                                     <fmt:formatNumber value="${s.discountTotalFee - s.returnedPurchaseTotalFee}"/>
@@ -436,7 +437,7 @@
                                 </span>
                             </c:if>
                         </c:if>
-                        <c:if test="${s.discountTotalFee le 0}">¥0.00</c:if>
+                        <c:if test="${s.discountTotalFee le 0}">¥0.00</c:if>--%>
                     </td>
                     <td>${s.couponAmount} </td>
                 <tr/>

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

@@ -503,7 +503,7 @@
                         <%--                        <th>机构运费</th>--%>
                     <th colspan="2">收款状态</th>
                     <th colspan="3">收款金额</th>
-                    <th colspan="2">经理折扣</th>
+                    <th colspan="2">促销满减</th>
                     <th colspan="2">付第三方</th>
                 </tr>
                 <tr>
@@ -521,7 +521,8 @@
                         <c:if test="${s.accountAmount>0}">(余额抵扣 ￥${s.accountAmount})</c:if>
                     </td>
                     <td colspan="2">
-                        <label class="discountFee">
+                        <fmt:formatNumber value="${s.promotionFullReduction}" type="number" pattern="#,##0.00"/>
+                        <%--<label class="discountFee">
                             <c:choose>
                                 <c:when test="${s.discountTotalFee gt 0 && s.discountTotalFee gt s.returnedPurchaseTotalFee}">
                                     <fmt:formatNumber value="${s.discountTotalFee - s.returnedPurchaseTotalFee}"/>
@@ -548,7 +549,7 @@
                                 </span>
                             </c:if>
                         </c:if>
-                        <c:if test="${s.discountTotalFee le 0}">¥0.00</c:if>
+                        <c:if test="${s.discountTotalFee le 0}">¥0.00</c:if>--%>
                     </td>
                     <td colspan="2" class="third-party-fee"><fmt:formatNumber value="${s.shopOtherFee}" type="number"
                                                                               pattern="#,##0.00"/></td>

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

@@ -315,7 +315,7 @@
                     <th colspan="3">下单时间</th>
                     <th>收款状态</th>
                     <th>收款金额</th>
-                    <th colspan="3">经理折扣</th>
+                    <th colspan="3">促销满减</th>
                     <th>优惠券</th>
                     <th>成本类型</th>
                 </tr>
@@ -332,7 +332,8 @@
                     </td>
                     <td><a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${s.orderID}&from=1" style="text-decoration: underline">${s.receiptTotalFee}</a></td>
                     <td colspan="3">
-                        <c:if test="${s.discountTotalFee gt 0}">
+                        <fmt:formatNumber value="${s.promotionFullReduction}" type="number" pattern="#,##0.00"/>
+                        <%--<c:if test="${s.discountTotalFee gt 0}">
                             <c:if test="${s.discountTotalFee gt s.returnedPurchaseTotalFee}">
                                 <fmt:formatNumber value="${s.discountTotalFee - s.returnedPurchaseTotalFee}"
                                                   type="currency"/>
@@ -352,7 +353,7 @@
                                 </span>
                             </c:if>
                         </c:if>
-                        <c:if test="${s.discountTotalFee le 0}">¥0.00</c:if>
+                        <c:if test="${s.discountTotalFee le 0}">¥0.00</c:if>--%>
                     </td>
                     <td>
                             ${s.couponAmount}