From 1bb16954b0630bd078483c06b26e835918ab7946 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Fri, 15 Jan 2021 12:49:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/api' into api
---
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/YuyueAction.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/YuyueAction.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/YuyueAction.java
index 05fc425..8530bcd 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/YuyueAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/YuyueAction.java
@@ -17,7 +17,7 @@
import com.matrix.system.hive.dao.*;
import com.matrix.system.hive.plugin.message.StringUtil;
import com.matrix.system.hive.plugin.util.CollectionUtils;
-import com.matrix.system.hive.plugin.util.DateUtils;
+import com.matrix.core.tools.DateUtil;
import com.matrix.system.hive.service.CodeService;
import com.matrix.system.hive.service.SysProjUseService;
import com.matrix.system.hive.service.SysWorkBeatuistaffService;
@@ -194,7 +194,8 @@
* @return
*/
@RequestMapping(value = "/getUserPro/{phone}")
- public @ResponseBody
+ @ResponseBody
+ public
AjaxResult getUserPro(@PathVariable String phone) {
SysVipInfo vipInfo = vipDap.selectByPhone(phone);
// 根据时间获取一段排班码
@@ -209,7 +210,7 @@
List<SysProjUse> sysProjUseList = projUseService.findByModel(sysProjUse);
for (int i = 0; i < sysProjUseList.size(); i++) {
if (sysProjUseList.get(i).getTaocanId() != null) {
- String flag = sysProjUseList.get(i).getPlatformFlag();
+ String flag = sysProjUseList.get(i).getOrderItemId()+"";
if (taocanProjMap.keySet().contains(flag)) {
((UserProjInfo) taocanProjMap.get(flag)).getChildPro().add(coversion(sysProjUseList.get(i)));
} else {
@@ -217,7 +218,6 @@
UserProjInfo taocan = new UserProjInfo();
taocan.setId(pru.getId());
taocan.setName(pru.getProjName());
- taocan.setType(pru.getType());
if (pru.getSurplusCount() > 10000) {
taocan.setSurplusCount("不限");
} else {
@@ -375,7 +375,7 @@
private int dateToCodeInt(Date date) {
- return Integer.parseInt(DateUtils.dateToString(date, DateUtils.HHmm));
+ return Integer.parseInt(DateUtil.dateToString(date, DateUtil.HHmm));
}
--
Gitblit v1.9.1