Przeglądaj źródła

佣金为0置为已收已付修改

zhijiezhao 3 lat temu
rodzic
commit
662baa23c7

+ 2 - 1
src/main/java/com/caimei/modules/order/web/NewOrderController.java

@@ -1120,7 +1120,6 @@ 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());
@@ -1282,6 +1281,8 @@ public class NewOrderController extends BaseController {
             returnValue = returnedPurchaseFee - order.getDiscountFee(); //抵用完经理折扣后才是真实价值
         }
         //订单已收金额
+        Double brokerage = cmUtilsDao.selectPayTotalFees(order.getOrderID());
+        model.addAttribute("brokerage",brokerage);
         Double receiptAmount = cmDiscernReceiptService.findOrderReceipt(order.getOrderID());
         model.addAttribute("returnValue", returnValue);
         model.addAttribute("receiptAmount", receiptAmount == null ? 0 : receiptAmount);