修改拼多多话说

src/main/java/lingtao/net/service/ProductService.java

@@ -815,7 +815,7 @@ public class ProductService {
                                 carft_price += Math.ceil((danjia * product.getCount()));
                             }
                         }
-                        carft_price = Math.ceil(carft_price * number);
+                        carft_price = Math.ceil(carft_price * dto.getNumber());
                         //腰封的模切费单独计算
                         product.setPrice(Math.ceil((product.getPrice() + carft_price)));
                         product.setWeight(df.format(number * length / 100 * width / 100 * product.getCount() * 0.3 * 0.86));

src/main/java/lingtao/net/service/QuoteLogService.java

@@ -287,11 +287,13 @@ public class QuoteLogService {
         List<String> remarkJudgeData = quoteDataMapper.getQuoteDataByMinutes(user.getUsername());
         endTime2 = System.currentTimeMillis();
         System.out.println("【getQuoteDataByMinutes】使用的时间:" + (endTime2 - startTime2));
-        for (String remarkJudge : remarkJudgeData) {
-            if (remarkJudge.equals(remark_judge)) {
-                // 如果3分钟内报过相同数据
-                flag = true;
-                break;
+        if (remarkJudgeData != null && remarkJudgeData.size() > 0) {
+            for (String remarkJudge : remarkJudgeData) {
+                if (remarkJudge != null && remarkJudge.equals(remark_judge)) {
+                    // 如果3分钟内报过相同数据
+                    flag = true;
+                    break;
+                }
             }
         }
         // 插入数据（给客服数据新增用的）
@@ -302,6 +304,7 @@ public class QuoteLogService {
             quoteData.setUsername(user.getUsername());
             quoteData.setRealname(user.getRealname());
             quoteData.setPrice((double) 0);
+            quoteData.setProTypeLabel("");
             quoteData.setRole(user.getRole());
             // 默认都是没选择店铺
             quoteData.setIsSelect("0");