From 693f6204a6db2b4b1b80b562fcc1dccc09bb26e7 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sat, 19 Jun 2021 14:45:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/api_score_meger' into api_score_meger
---
zq-erp/src/main/java/com/matrix/system/hiveErp/action/ErpOrderController.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hiveErp/action/ErpOrderController.java b/zq-erp/src/main/java/com/matrix/system/hiveErp/action/ErpOrderController.java
index 54e6096..ed53c67 100644
--- a/zq-erp/src/main/java/com/matrix/system/hiveErp/action/ErpOrderController.java
+++ b/zq-erp/src/main/java/com/matrix/system/hiveErp/action/ErpOrderController.java
@@ -18,7 +18,7 @@
import com.matrix.system.hive.bean.SysOrderItem;
import com.matrix.system.hive.dao.SysOrderDao;
import com.matrix.system.hive.dao.SysOrderItemDao;
-import com.matrix.system.hive.plugin.util.DateUtils;
+import com.matrix.core.tools.DateUtil;
import com.matrix.system.hive.service.AchieveNewService;
import com.matrix.system.hive.service.MoneyCardUseService;
import com.matrix.system.hive.service.SysOrderItemService;
@@ -109,6 +109,8 @@
moneyCardUse.setVipId(order.getVipId());
List<MoneyCardUse> cards = cardUseService.findByModel(moneyCardUse);
+ WebUtil.getRequest().setAttribute("orderParam", id);
+
WebUtil.getRequest().setAttribute("cards", cards);
return "admin/hive-erp/order/orderXq-form";
}
@@ -153,7 +155,7 @@
temp.add(item.getOrderNo());
temp.add(item.getVipName());
temp.add(item.getVipPhone());
- temp.add(DateUtils.dateToString(item.getOrderTime(), DateUtils.DATE_FORMAT_MM));
+ temp.add(DateUtil.dateToString(item.getOrderTime(), DateUtil.DATE_FORMAT_MM));
temp.add(item.getTotal());
temp.add(item.getZkTotal());
temp.add(item.getCashPay());
--
Gitblit v1.9.1