diff --git a/src/main/java/lingtao/net/util/HuaFangPriceUtil.java b/src/main/java/lingtao/net/util/HuaFangPriceUtil.java index 8fe92e9..75689ab 100644 --- a/src/main/java/lingtao/net/util/HuaFangPriceUtil.java +++ b/src/main/java/lingtao/net/util/HuaFangPriceUtil.java @@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject; import lingtao.net.vo.HuaFangPriceRequstVo; import lingtao.net.vo.HuaFangPriceResultVo; import lingtao.net.vo.HuaFangTokenVo; +import lingtao.net.vo.ShengDaTokenVo; import okhttp3.*; import java.io.IOException; @@ -21,26 +22,10 @@ public class HuaFangPriceUtil { public static String getToken() { - String token = ""; - LocalDateTime currentTime = LocalDateTime.now(); - String templateName = "HUAFANG_TOKEN"; - - if (!RedisUtil.exists(templateName)) { - Map params = new HashMap<>(); - params.put("userName", userName); - params.put("password", password); - - String tokenString = HttpUtils.sendPostRequest("http://ds.gw.chenghuiyin.com/ordering/api/User/GetToken", JSONObject.toJSONString(params)); - System.out.println("获取token返回:" + tokenString); - HuaFangTokenVo huaFangTokenVo = JSONObject.parseObject(tokenString, HuaFangTokenVo.class); - RedisUtil.set(templateName, huaFangTokenVo.getAccessToken(), huaFangTokenVo.getExpiresIn() - 50); - } - Object tokenObj = RedisUtil.get(templateName); - if (tokenObj != null) { - token = tokenObj.toString(); - } - System.out.println("获取token:" + token); - return token; + String tokenString = HttpUtils.sendGetRequest("http://47.114.150.226:88/Handler/apichyHelper.ashx?t=apiGetToken"); + System.out.println("获取token返回:" + tokenString); + ShengDaTokenVo huaFangTokenVo = JSONObject.parseObject(tokenString, ShengDaTokenVo.class); + return huaFangTokenVo.getResult(); } public static HuaFangPriceResultVo getPrice(HuaFangPriceRequstVo params) { diff --git a/src/main/webapp/views/product/coupon.jsp b/src/main/webapp/views/product/coupon.jsp index 9949c6d..e4f52c7 100644 --- a/src/main/webapp/views/product/coupon.jsp +++ b/src/main/webapp/views/product/coupon.jsp @@ -3881,6 +3881,17 @@ return false; } } else if (kind == 3 || kind == 4 || kind == 5 || kind == 7) { + if (kind == 3) { + const carft_nopei = ["单面局部UV", "双面局部UV", "双面星光膜", "双面镭射膜", "双面触感膜", "双面雪花膜"]; + const carftnopei = carft_nopei.filter(craft => arr.includes(craft)); + if (carftnopei.length > 0 && arr.includes("模切")) { + if ((size.split("*")[0] < 4 || size.split("*")[1] < 4)) { + layer.msg("模切小于4*4无法报价!", {offset: ['300px', '300px']}, function () { + }); + return false; + } + } + } /*if (min >= 6 && !(kindValue2 == 10 && kind == 3)) { if ($('input[class = mq]:checked').val() == "模切") { layer.msg("超过6位异形模切卡片请以[ 腰封 - 异形模切]报价!", {offset: ['300px', '300px']}, function () { diff --git a/src/main/webapp/views/product/keychain.jsp b/src/main/webapp/views/product/keychain.jsp index 649fde0..d80c721 100644 --- a/src/main/webapp/views/product/keychain.jsp +++ b/src/main/webapp/views/product/keychain.jsp @@ -87,8 +87,8 @@ - - + + diff --git a/src/main/webapp/views/product/yafen.jsp b/src/main/webapp/views/product/yafen.jsp index 68c8e72..3a348f5 100644 --- a/src/main/webapp/views/product/yafen.jsp +++ b/src/main/webapp/views/product/yafen.jsp @@ -44,7 +44,7 @@ - +