佣金为0置为已收已付放到详情页，订单列表关闭功能按钮

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

@@ -12,10 +12,7 @@ import com.caimei.modules.common.utils.ExcelUtil;
 import com.caimei.modules.common.utils.UploadUtils;
 import com.caimei.modules.coupon.entity.CmCouponOrderRecord;
 import com.caimei.modules.coupon.service.CmCouponService;
-import com.caimei.modules.order.dao.CmDiscernReceiptDao;
-import com.caimei.modules.order.dao.CmReceiptOrderRelationDao;
-import com.caimei.modules.order.dao.CmReturnedPurchaseDao;
-import com.caimei.modules.order.dao.NewOrderProductDao;
+import com.caimei.modules.order.dao.*;
 import com.caimei.modules.order.entity.*;
 import com.caimei.modules.order.service.*;
 import com.caimei.modules.order.utils.OrderUtil;
@@ -80,6 +77,8 @@ import java.util.stream.IntStream;
 @RequestMapping(value = "${adminPath}/order")
 public class NewOrderController extends BaseController {
 
+    @Resource
+    private CmUtilsDao cmUtilsDao;
     @Resource
     private NewOrderService newOrderService;
     @Resource
@@ -1121,6 +1120,7 @@ public class NewOrderController extends BaseController {
     @RequiresPermissions("order:order:edit")
     @RequestMapping("detailPage")
     public String detailPage(NewOrder order, Integer shopOrderID, Model model) {
+        Double brokerage = cmUtilsDao.selectPayTotalFees(order.getOrderID());
         if (order.getOrderID() != null) {
             model.addAttribute("orderID", order.getOrderID());
             model.addAttribute("orderProducts", order.getOrderProduct());

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

@@ -564,11 +564,10 @@
                             </c:if>
                                   <%--1少付2多付--%>
                             <c:if test="${so.differenceType eq 1 && so.differencePrice > 0}">
-                                <font color="red">${so.shouldPayShopAmount+so.differencePrice}(原应付：${so.shouldPayShopAmount},已补差价：${so.differencePrice})</font>
+                                <font color="black">${so.shouldPayShopAmount+so.differencePrice}</font><font color="red">(原应付：${so.shouldPayShopAmount},已补差价：${so.differencePrice})</font>
                             </c:if>
-
                             <c:if test="${so.differenceType eq 2 && so.differencePrice > 0}">
-                                <font color="red">${so.shouldPayShopAmount-so.differencePrice}(原应付：${so.shouldPayShopAmount}，已退差价：${so.differencePrice})</font>
+                                <font color="black">${so.shouldPayShopAmount-so.differencePrice}</font><font color="red">(原应付：${so.shouldPayShopAmount}，已退差价：${so.differencePrice})</font>
                             </c:if>
 
                         </td>

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

@@ -410,10 +410,10 @@
                                     value="${s.shouldPayShopAmount}" type="number" pattern="#,##0.00"/>
                             </c:if>
                             <c:if test="${s.differenceType eq 1 && s.differencePrice > 0}">
-                                <font color="red">${s.shouldPayShopAmount+s.differencePrice}(原应付：${s.shouldPayShopAmount},已补差价：${s.differencePrice})</font>
+                                <font color="black">${s.shouldPayShopAmount+s.differencePrice}</font><font color="red">(原应付：${s.shouldPayShopAmount},已补差价：${s.differencePrice})</font>
                             </c:if>
                             <c:if test="${s.differenceType eq 2 && s.differencePrice > 0}">
-                                <font color="red">${s.shouldPayShopAmount-s.differencePrice}(原应付：${s.shouldPayShopAmount}，已退差价：${s.differencePrice})</font>
+                                <font color="black">${s.shouldPayShopAmount-s.differencePrice}</font><font color="red">(原应付：${s.shouldPayShopAmount}，已退差价：${s.differencePrice})</font>
                             </c:if>
                             ， 已付：<fmt:formatNumber value="${s.payedShopAmount}" type="number" pattern="#,##0.00"/>
                         </div>

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

@@ -185,10 +185,10 @@
 								应付：<fmt:formatNumber value="${s.shouldPayShopAmount}" type="number" pattern="#,##0.00"/>
 							</c:if>
 							<c:if test="${s.differenceType eq 1 && s.differencePrice > 0}">
-								<font color="red">${s.shouldPayShopAmount+s.differencePrice}(原应付：${s.shouldPayShopAmount},已补差价：${s.differencePrice})</font>
+								<font color="black">${s.shouldPayShopAmount+s.differencePrice}</font><font color="red">(原应付：${s.shouldPayShopAmount},已补差价：${s.differencePrice})</font>
 							</c:if>
 							<c:if test="${s.differenceType eq 2 && s.differencePrice > 0}">
-								<font color="red">${s.shouldPayShopAmount-s.differencePrice}(原应付：${s.shouldPayShopAmount}，已退差价：${s.differencePrice})</font>
+							<font color="black">${s.shouldPayShopAmount-s.differencePrice}</font><font color="red">(原应付：${s.shouldPayShopAmount}，已退差价：${s.differencePrice})</font>
 							</c:if>
 							， 已付：<fmt:formatNumber value="${s.payedShopAmount}" type="number" pattern="#,##0.00"/>
 						</div>

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

@@ -170,10 +170,10 @@
                                     应付：<fmt:formatNumber value="${s.shouldPayShopAmount}" type="number" pattern="#,##0.00"/>
                                 </c:if>
                                 <c:if test="${s.differenceType eq 1 && s.differencePrice > 0}">
-                                    <font color="red">${s.shouldPayShopAmount+s.differencePrice}(原应付：${s.shouldPayShopAmount},已补差价：${s.differencePrice})</font>
+                                    <font color="black">${s.shouldPayShopAmount+s.differencePrice}</font><font color="red">(原应付：${s.shouldPayShopAmount},已补差价：${s.differencePrice})</font>
                                 </c:if>
                                 <c:if test="${s.differenceType eq 2 && s.differencePrice > 0}">
-                                    <font color="red">${s.shouldPayShopAmount-s.differencePrice}(原应付：${s.shouldPayShopAmount}，已退差价：${s.differencePrice})</font>
+                                    <font color="black">${s.shouldPayShopAmount-s.differencePrice}</font><font color="red">(原应付：${s.shouldPayShopAmount}，已退差价：${s.differencePrice})</font>
                                 </c:if>
                                 ,已付：<fmt:formatNumber value="${s.payedShopAmount}" type="number" pattern="#,##0.00"/>
                             </div>

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

@@ -507,11 +507,11 @@
                             <c:if test="${s.differenceType ne 1 && s.differenceType ne 2}">
                                 应付：<fmt:formatNumber value="${s.shouldPayShopAmount}" type="number" pattern="#,##0.00"/>
                             </c:if>
-                            <c:if test="${s.differenceType eq 1 && s.differencePrice > 0}">
-                                <font color="red">${s.shouldPayShopAmount+s.differencePrice}(原应付：${s.shouldPayShopAmount},已补差价：${s.differencePrice})</font>
+							<c:if test="${s.differenceType eq 1 && s.differencePrice > 0}">
+                                <font color="black">${s.shouldPayShopAmount+s.differencePrice}</font><font color="red">(原应付：${s.shouldPayShopAmount},已补差价：${s.differencePrice})</font>
                             </c:if>
-                            <c:if test="${s.differenceType eq 2 && s.differencePrice > 0}">
-                                <font color="red">${s.shouldPayShopAmount-s.differencePrice}(原应付：${s.shouldPayShopAmount}，已退差价：${s.differencePrice})</font>
+							<c:if test="${s.differenceType eq 2 && s.differencePrice > 0}">
+                                <font color="black">${s.shouldPayShopAmount-s.differencePrice}</font><font color="red">(原应付：${s.shouldPayShopAmount}，已退差价：${s.differencePrice})</font>
                             </c:if>
 							，</span>
                                 <span class="nowrap">已付：${s.payedShopAmount}，</span></div>

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

@@ -491,10 +491,10 @@
                             <font color="#E15616"><fmt:formatNumber value="${s.shouldPayShopAmount}" type="number" pattern="#,##0.00"/></font>
                         </c:if>
                         <c:if test="${s.differenceType eq 1 && s.differencePrice > 0}">
-                            <font color="red">${s.shouldPayShopAmount+s.differencePrice}(原应付：${s.shouldPayShopAmount},已补差价：${s.differencePrice})</font>
+                            <font color="black">${s.shouldPayShopAmount+s.differencePrice}</font><font color="red">(原应付：${s.shouldPayShopAmount},已补差价：${s.differencePrice})</font>
                         </c:if>
                         <c:if test="${s.differenceType eq 2 && s.differencePrice > 0}">
-                            <font color="red">${s.shouldPayShopAmount-s.differencePrice}(原应付：${s.shouldPayShopAmount}，已退差价：${s.differencePrice})</font>
+                            <font color="black">${s.shouldPayShopAmount-s.differencePrice}</font><font color="red">(原应付：${s.shouldPayShopAmount}，已退差价：${s.differencePrice})</font>
                         </c:if>
                     </td>
                     <input type="hidden" class="payedShopAmount" value="${s.payedShopAmount}">

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

@@ -426,11 +426,10 @@
                             <c:if test="${s.differenceType ne 1 && s.differenceType ne 2}">应付：<fmt:formatNumber value="${s.shouldPayShopAmount}" type="number" pattern="#,##0.00"/>
                             </c:if>
                             <c:if test="${s.differenceType eq 1 && s.differencePrice > 0}">
-                                <font color="red">${s.shouldPayShopAmount+s.differencePrice}(原应付：${s.shouldPayShopAmount},已补差价：${s.differencePrice})</font>
+                                <font color="black">${s.shouldPayShopAmount+s.differencePrice}</font><font color="red">(原应付：${s.shouldPayShopAmount},已补差价：${s.differencePrice})</font>
                             </c:if>
-
                             <c:if test="${s.differenceType eq 2 && s.differencePrice > 0}">
-                                <font color="red">${s.shouldPayShopAmount-s.differencePrice}(原应付：${s.shouldPayShopAmount}，已退差价：${s.differencePrice})</font>
+                                <font color="black">${s.shouldPayShopAmount-s.differencePrice}</font><font color="red">(原应付：${s.shouldPayShopAmount}，已退差价：${s.differencePrice})</font>
                             </c:if>
                             ， 已付：<fmt:formatNumber value="${s.payedShopAmount}" type="number" pattern="#,##0.00"/>
                         </div>

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

@@ -590,10 +590,10 @@
                                     value="${s.shouldPayShopAmount}" type="number" pattern="#,##0.00"/>
                             </c:if>
                             <c:if test="${s.differenceType eq 1 && s.differencePrice > 0}">
-                                <font color="red">${s.shouldPayShopAmount+s.differencePrice}(原应付：${s.shouldPayShopAmount},已补差价：${s.differencePrice})</font>
+                                <font color="black">${s.shouldPayShopAmount+s.differencePrice}</font><font color="red">(原应付：${s.shouldPayShopAmount},已补差价：${s.differencePrice})</font>
                             </c:if>
                             <c:if test="${s.differenceType eq 2 && s.differencePrice > 0}">
-                                <font color="red">${s.shouldPayShopAmount-s.differencePrice}(原应付：${s.shouldPayShopAmount}，已退差价：${s.differencePrice})</font>
+                                <font color="black">${s.shouldPayShopAmount-s.differencePrice}</font><font color="red">(原应付：${s.shouldPayShopAmount}，已退差价：${s.differencePrice})</font>
                             </c:if>，
                             已付：<fmt:formatNumber value="${s.payedShopAmount}" type="number" pattern="#,##0.00"/>
                         </div>

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

@@ -414,10 +414,10 @@
                                     value="${s.shouldPayShopAmount}" type="number" pattern="#,##0.00"/>
                             </c:if>
                             <c:if test="${s.differenceType eq 1 && s.differencePrice > 0}">
-                                <font color="red">${s.shouldPayShopAmount+s.differencePrice}(原应付：${s.shouldPayShopAmount},已补差价：${s.differencePrice})</font>
+                                <font color="black">${s.shouldPayShopAmount+s.differencePrice}</font><font color="red">(原应付：${s.shouldPayShopAmount},已补差价：${s.differencePrice})</font>
                             </c:if>
                             <c:if test="${s.differenceType eq 2 && s.differencePrice > 0}">
-                                <font color="red">${s.shouldPayShopAmount-s.differencePrice}(原应付：${s.shouldPayShopAmount}，已退差价：${s.differencePrice})</font>
+                                <font color="black">${s.shouldPayShopAmount-s.differencePrice}</font><font color="red">(原应付：${s.shouldPayShopAmount}，已退差价：${s.differencePrice})</font>
                             </c:if>
                             ，已付：<fmt:formatNumber value="${s.payedShopAmount}" type="number" pattern="#,##0.00"/>
                         </div>

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

@@ -174,10 +174,10 @@
 									value="${s.shouldPayShopAmount}" type="number" pattern="#,##0.00"/>
 							</c:if>
 							<c:if test="${s.differenceType eq 1 && s.differencePrice > 0}">
-								<font color="red">${s.shouldPayShopAmount+s.differencePrice}(原应付：${s.shouldPayShopAmount},已补差价：${s.differencePrice})</font>
+								<font color="black">${s.shouldPayShopAmount+s.differencePrice}</font><font color="red">(原应付：${s.shouldPayShopAmount},已补差价：${s.differencePrice})</font>
 							</c:if>
 							<c:if test="${s.differenceType eq 2 && s.differencePrice > 0}">
-								<font color="red">${s.shouldPayShopAmount-s.differencePrice}(原应付：${s.shouldPayShopAmount}，已退差价：${s.differencePrice})</font>
+								<font color="black">${s.shouldPayShopAmount-s.differencePrice}</font><font color="red">(原应付：${s.shouldPayShopAmount}，已退差价：${s.differencePrice})</font>
 							</c:if>
 							，已付：<fmt:formatNumber value="${s.payedShopAmount}" type="number" pattern="#,##0.00"/>
 						</div>

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

@@ -1029,7 +1029,7 @@
             <li class="operation-wrap">
                 <a href="${ctx}/order/detail?id=${order.orderID}">查看详情</a>
 <%--                <a class="operation-btn">功能</a>--%>
-                <div class="operation-block">
+<%--                <div class="operation-block">--%>
 <%--                    <shiro:hasPermission name="order:order:edit">--%>
 <%--                        &lt;%&ndash;包含订单充值商品就不显示&ndash;%&gt;--%>
 <%--                        <c:if test="${empty order.rechargeGoods}">--%>
@@ -1149,7 +1149,7 @@
 <%--                            </c:if>--%>
 <%--                        </c:if>--%>
 <%--                    </shiro:hasPermission>--%>
-                </div>
+<%--                </div>--%>
             </li>
         </ul>
     </c:forEach>

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

@@ -401,10 +401,10 @@
                                                                 pattern="#,##0.00"/></font>
                         </c:if>
                         <c:if test="${s.differenceType eq 1 && s.differencePrice > 0}">
-                            <font color="red">${s.shouldPayShopAmount+s.differencePrice}(原应付：${s.shouldPayShopAmount},已补差价：${s.differencePrice})</font>
+                            <font color="black">${s.shouldPayShopAmount+s.differencePrice}</font><font color="red">(原应付：${s.shouldPayShopAmount},已补差价：${s.differencePrice})</font>
                         </c:if>
                         <c:if test="${s.differenceType eq 2 && s.differencePrice > 0}">
-                            <font color="red">${s.shouldPayShopAmount-s.differencePrice}(原应付：${s.shouldPayShopAmount}，已退差价：${s.differencePrice})</font>
+                            <font color="black">${s.shouldPayShopAmount-s.differencePrice}</font><font color="red">(原应付：${s.shouldPayShopAmount}，已退差价：${s.differencePrice})</font>
                         </c:if>
                     </td>
                     <input type="hidden" class="payedShopAmount" value="${s.payedShopAmount}">

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

@@ -205,12 +205,12 @@
                 <c:if test="${s.differenceType ne 1 && s.differenceType ne 2 }">
                     <font color="#E15616"><fmt:formatNumber value="${s.shouldPayShopAmount}" type="number" pattern="#,##0.00"/></font>
                 </c:if>
-                <c:if test="${s.differenceType eq 1 && s.differencePrice > 0}">
-                    <font color="red">${s.shouldPayShopAmount+s.differencePrice}(原应付：${s.shouldPayShopAmount},已补差价：${s.differencePrice})</font>
-                </c:if>
-                <c:if test="${s.differenceType eq 2 && s.differencePrice > 0}">
-                    <font color="red">${s.shouldPayShopAmount-s.differencePrice}(原应付：${s.shouldPayShopAmount}，已退差价：${s.differencePrice})</font>
-                </c:if>
+            <c:if test="${s.differenceType eq 1 && s.differencePrice > 0}">
+                <font color="black">${s.shouldPayShopAmount+s.differencePrice}</font><font color="red">(原应付：${s.shouldPayShopAmount},已补差价：${s.differencePrice})</font>
+            </c:if>
+            <c:if test="${s.differenceType eq 2 && s.differencePrice > 0}">
+                <font color="black">${s.shouldPayShopAmount-s.differencePrice}</font><font color="red">(原应付：${s.shouldPayShopAmount}，已退差价：${s.differencePrice})</font>
+            </c:if>
         </td>
     </tr>
     <tr>