Merge remote-tracking branch 'remotes/origin/developer' into developerA

src/main/java/com/caimei365/commodity/model/vo/ProductDetailVo.java

@@ -319,4 +319,8 @@ public class ProductDetailVo implements Serializable {
      * 超级会员优惠价标签
      */
     private String svipPriceTag;
+    /**
+     * 商品备注
+     */
+    private String productRemarks;
 }

src/main/java/com/caimei365/commodity/service/impl/PageServiceImpl.java

@@ -1148,7 +1148,7 @@ public class PageServiceImpl implements PageService {
         String ossName = archiveFile.getOssName();
         // 设置URL过期时间为1个小时
         Date expiration = new Date(System.currentTimeMillis() + 3600L * 1000);
-        /*SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         try {
             Date dateOne = format.parse("2021-06-01 00:00:00");
             Date dateTwo = format.parse("2021-09-17 18:00:00");
@@ -1159,8 +1159,9 @@ public class PageServiceImpl implements PageService {
             }
         } catch (ParseException e) {
             log.info("格式化时间错误", e);
-        }*/
-        String url = ossClient.generatePresignedUrl(bucketName, active + "/archiveFile/" + ossName, expiration).toString();
+        }
+//        String url = ossClient.generatePresignedUrl(bucketName, active + "/archiveFile/" + ossName, expiration).toString();
+        String url = ossClient.generatePresignedUrl(bucketName, ossName, expiration).toString();
         ossClient.shutdown();
         return url;
     }

src/main/java/com/caimei365/commodity/service/impl/SearchProductServiceImpl.java

@@ -92,9 +92,9 @@ public class SearchProductServiceImpl implements SearchProductService {
             }
             for (int i = 0; i < brandList.size(); i++) {
                 if (i == 0) {
-                    brandBuilder.append(brandList.get(i));
+                    brandBuilder.append("p_brand_id = ").append(brandList.get(i));
                 } else {
-                    brandBuilder.append(" OR ").append(brandList.get(i));
+                    brandBuilder.append(" OR ").append("p_brand_id = ").append(brandList.get(i));
                 }
             }
             String brandFilter = brandBuilder.toString();
@@ -255,9 +255,9 @@ public class SearchProductServiceImpl implements SearchProductService {
             }
             for (int i = 0; i < brandList.size(); i++) {
                 if (i == 0) {
-                    brandBuilder.append(brandList.get(i));
+                    brandBuilder.append("p_brand_id = ").append(brandList.get(i));
                 } else {
-                    brandBuilder.append(" OR ").append(brandList.get(i));
+                    brandBuilder.append(" OR ").append("p_brand_id = ").append(brandList.get(i));
                 }
             }
             String brandFilter = brandBuilder.toString();

src/main/resources/mapper/PageMapper.xml

@@ -177,7 +177,7 @@
             productCategory, serviceNumber, taxPoint, supplierTaxPoint, priceFlag, actFlag, ladderPriceFlag,
             addTime, hasSkuFlag, sellNumber, sortIndex, featuredFlag, costCheckFlag, recommendType, machineType,
             productCode, updateTime, validFlag, searchKey, allAreaFlag, step, costPrice, provinceIds, qualificationImg,
-            trainingMethod, trainingType ,trainingFee
+            trainingMethod, trainingType ,trainingFee, productRemarks
         from product
         where productID = #{productId}
     </select>