修改拼多多话说

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,13 +287,15 @@ public class QuoteLogService {
         List<String> remarkJudgeData = quoteDataMapper.getQuoteDataByMinutes(user.getUsername());
         endTime2 = System.currentTimeMillis();
         System.out.println("【getQuoteDataByMinutes】使用的时间:" + (endTime2 - startTime2));
+        if (remarkJudgeData != null && remarkJudgeData.size() > 0) {
             for (String remarkJudge : remarkJudgeData) {
-            if (remarkJudge.equals(remark_judge)) {
+                if (remarkJudge != null && remarkJudge.equals(remark_judge)) {
                     // 如果3分钟内报过相同数据
                     flag = true;
                     break;
                 }
             }
+        }
         // 插入数据（给客服数据新增用的）
         String role = user.getRole();
         // 客服报的且3分钟内没有同一个客户报的数据才插入
@@ -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");

src/main/resources/mapper/QuoteDataMapper.xml

@@ -162,7 +162,7 @@
    	<!-- 查询3分钟内的数据 -->
 	<select id="getQuoteDataByMinutes" parameterType="String" resultType="String">
 		SELECT
-		  remarkJudge
+		  remark
 		FROM
 		  tbl_quote_data
 		WHERE id >

src/main/webapp/views/main.jsp

@@ -594,11 +594,15 @@
     let role_list = [${sessionScope.USER_SESSION.role}];
     var system_isPdd = false;
     var system_isGai = false;
+    var system_isPddPrice = false;
     shop_list.forEach(shop_id => {
         if (role_list.includes(shop_id)) {
             system_isPdd = true;
         }
     })
+    if (role_list.includes(1045)) {
+        system_isPddPrice = true;
+    }
     // shop_list_gai.forEach(shop_id => {
     //     if (role_list.includes(shop_id)) {
     //         system_isGai = false;

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

@@ -443,8 +443,11 @@
                     }
 
                     span_result += '包邮，免费设计呢~（偏远地区需补邮费）'
-                        if(window.parent.system_isGai){
-                            span_result +="\n\n亲 现在下单可以参加淘宝活动8.5折折扣哦!"
+                    if (window.parent.system_isGai) {
+                        span_result += "\n\n亲 现在下单可以参加淘宝活动8.5折折扣哦!"
+                    }
+                    if (window.parent.system_isPddPrice) {
+                        span_result += "\n\n周年庆专属福利：亲亲  当天下单立享9折优惠  加购其他产品可享85折优惠"
                     }
                     addLog(span_result);
                     $("#span_result").val(span_result);

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

@@ -4137,7 +4137,6 @@
                                 data[i].number = number;
                             }
                         }
-                        ;
                         if (kind == "2") {
                             span_result += '配送吊绳\n'
                         }
@@ -4147,6 +4146,10 @@
                             span_result += "\n\n亲 现在下单可以参加淘宝活动8.5折折扣哦!"
                         }
 
+                        if (window.parent.system_isPddPrice) {
+                            span_result = span_result.replace("种子纸", "会发芽的纸");
+                        }
+
                         addLog(span_result);
                         $("#span_result").val(span_result);