From ad0ec618318f3c1bc28fcc520d2ddf1cad2905e3 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Fri, 15 Jan 2021 12:49:03 +0800
Subject: [PATCH] 修改小程序预约接口1
---
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/YuyueAction.java | 6 +++---
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShopProduct.java | 3 ---
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShopProduct.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShopProduct.java
index 2b06093..6023fa5 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShopProduct.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShopProduct.java
@@ -161,9 +161,6 @@
if (CollectionUtils.isEmpty(shopProducts)) {
shopProduct.setDelFlag(AppConstance.DATA_USEABLE);
shopProduct.setStatus(AppConstance.IS_PUTAWAY);
- if(shopProduct.getIsService()==null){
- shopProduct.setIsService(2);
- }
shopProduct.setCompanyId(HostInterceptor.getCompanyId());
shopProducts = shopProductDao.selectByModelWx(shopProduct);
}
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 efcd693..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
@@ -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 {
--
Gitblit v1.9.1