修改部分接口价格

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<String, String> 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));
+        String tokenString = HttpUtils.sendGetRequest("http://47.114.150.226:88/Handler/apichyHelper.ashx?t=apiGetToken");
         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;
+        ShengDaTokenVo huaFangTokenVo = JSONObject.parseObject(tokenString, ShengDaTokenVo.class);
+        return huaFangTokenVo.getResult();
     }
 
     public static HuaFangPriceResultVo getPrice(HuaFangPriceRequstVo params) {

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 () {

src/main/webapp/views/product/keychain.jsp

@@ -87,8 +87,8 @@
                             <option value="方形钥匙扣银色">方形钥匙扣银色</option>
                             <option value="猫头钥匙扣金色">猫头钥匙扣金色</option>
                             <option value="猫头钥匙扣银色">猫头钥匙扣银色</option>
-                            <option value="猫钥匙扣金色">猫钥匙扣金色</option>
-                            <option value="猫钥匙扣银色">猫钥匙扣银色</option>
+                            <option value="猫身钥匙扣金色">猫身钥匙扣金色</option>
+                            <option value="猫身钥匙扣银色">猫身钥匙扣银色</option>
                             <option value="D字扣银色">D字扣银色</option>
                             <option value="挂绳">挂绳</option>
                             <option value="小樱花钥匙扣金色">小樱花钥匙扣金色</option>

src/main/webapp/views/product/yafen.jsp

@@ -44,7 +44,7 @@
                     <option value="200">200</option>
                     <option value="500">500</option>
                     <option value="1000">1000</option>
-                    <option value="1000">2000</option>
+                    <option value="2000">2000</option>
                     <option value="3000">3000</option>
                     <option value="5000">5000</option>
                     <option value="10000">10000</option>