1
0
chillqi 2 лет назад
Родитель
Сommit
2596a7959e

+ 1 - 1
src/main/java/com/seecoder/BlueWhale/enums/CategoryEnum.java

@@ -1,5 +1,5 @@
 package com.seecoder.BlueWhale.enums;
 
 public enum CategoryEnum {
-    FOOD,CLOTHES,FURNITURE,ELECTRONICS,ENTERTAINMENT,SPORTS,LUXURY;
+    FOOD,CLOTHES,FURNITURE,ELECTRONICS,ENTERTAINMENT,SPORTS,LUXURY,ALL;
 }

+ 6 - 5
src/main/java/com/seecoder/BlueWhale/serviceImpl/ProductServiceImpl.java

@@ -85,19 +85,20 @@ public class ProductServiceImpl implements ProductService {
     public List<ProductVO> getProductsWithCondition(String name, CategoryEnum category, Double price) {
         String condition="SELECT p FROM Product p WHERE 1=1";
         if (name!=null && name.length()>0){
-            condition=condition.concat(" AND name = :name");
+            condition=condition.concat("AND name LIKE :name");
+
         }
-        if (category!=null){
-            condition=condition.concat(" AND category = :category");
+        if (category!=CategoryEnum.ALL){
+            condition = condition.concat(" AND category = :category");
         }
         if (price!=null && price>0){
             condition=condition.concat(" AND price <= :price");
         }
         Query query=entityManager.createQuery(condition);
         if (name!=null && name.length()>0){
-            query.setParameter("name",name);
+            query.setParameter("name","%" + name + "%");
         }
-        if (category!=null){
+        if (category!=CategoryEnum.ALL){
             query.setParameter("category",category);
         }
         if (price!=null && price>0){

+ 9 - 9
src/main/resources/application.yml

@@ -12,14 +12,14 @@ server:
 
 aliyun:
   oss:
-    endpoint:
-    accessKeyId:
-    accessKeySecret:
-    bucketName:
+    endpoint: https://oss-cn-hangzhou.aliyuncs.com
+    accessKeyId: LTAI4Fi1qmL4iuhH8t7G7r2H
+    accessKeySecret: 7tJWyQqa0cMkQGaPMMvtH6c0VLiOO2
+    bucketName: seec-portal
 
 alipay:
-  appId:
-  appPrivateKey:
-  alipayPublicKey:
-  notifyUrl:
-  serverUrl:
+  appId: 9021000134634835
+  appPrivateKey: MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCb6f5ANvvjb9fGNLZIjy1APbXSAgwAFdu5YNgsA11VE0erxyN8doYX/nslKxcz79C8hM8cpFzpfe6LCK7hX2WiKcYQjMrJcXkfwqVhjyKy6wNEZBOryq4JEo8dMBmLqFpNRx2RYFXjFZRYKVTcGjvWtLEwmXd33rKBmORe+HLx6Kc1E5lLBsKCvtIbdcs12F1Dk9LIjQL+qq6MkO9fZEA3UayIOvW9BqkZcImIBHeH49TeFtY5xPeDhG/rI2ik4VEcO9HP8SNjomE2o+iYVHwJLfdDdVC1tABJVcj4MNiafmW8YzLGs9FLnF5q9DVxBh49X6NkKI9iSlVuGwKbRVshAgMBAAECggEANNwJGiZKEdraUdWPM1xvYAdL/G47OVAv1VKzF4DwhKZrtx5lto3MepgJkhlg3Xfh0fhI65IB+ht642JHQBuCro7xGq1RFyjEgvMP9Np9TiGFUwuG68hkZqkHIkMrdgDW1LpWmPILTFkFmToyDglK3kkWhb6SFW7IIE4Apv4eokrOG0FnlugKZYj4E/a+GTVGFvpe57Bb+n4I0ZiCYE1FNipJM0PfjFZxVItdLgp2heHjOkiXtPYUfFe2DooJwy3C/xtJywz8evWP1KJx/T9awrynjvuM7wbnSOc18o+8IQi/xgtWAw5ySzwL/Ja8iiEWe5aFu9b1idkB/NJMucfAAQKBgQD8+HDxZmGpVfRroy3dpiU5e9LWKZYm3HL9LyMUXubtj5i8HhjHn7cyz3Syg6FmjwdWpLAeT3UCdbogQDYYG8qKt0q7rqfkCIhQxdRxOcBGXdQSAN3O5a1o4inS8mbShaUfGnuQNchw5QV28Gdrw9RzNLaxj5molPU7MBMwkkSZIQKBgQCdx/7gh7QwMEn78+kamaCNSATxZe3RuEOdOrXmmz29iWRDHFyEOZuT+wGXp6FPtxRQdUr/VOzAIUVqaBa1XuP8RWpIt8AKk2J697/BS8h7vjr6wJGKMZfXbmDqlY9qpS6ef8PNTpV6fU5oRasuNGTCeP8E871IkNB3iQWUNX6CAQKBgG8JJZnv1GIdZmFwiItHiANJRGvYaR25mYdkD0O7vCT96I55r2q/wgu9X32TpV583T28n8lOGw/vWLkbNiMy354vgdALg4nl7N93Vh40uR6pxJH6a2GLEqh8zNrYpyU0oBuc5iuQT+Ctxc5FC0AT/sZqlt4tJ8cFSvalzWZ+bTnBAoGBAJXU5TIdTDxyrt9HObab6v4fRSpkDBoa7IJzzWdHRrMltIOSfDzIY/h75YA5nJMRnYXmTKj54bV2IvAwFlh32vKmjI6vh/vDCEMT4BHUQHdaJ7IVil/8RmA7HmfGTSIN6J51X+AoXwSp1/pnJm7DLGgM9MekGry9YGoTQawDvLYBAoGBAPrdP7mIIypubwnDmgbX8Ke5qZb4gYlqL1/geKLZWlJiSUOhuJqxdB18m7fynqWUIenN/L3ilRzhyAuKw/6kl7d3C5F3xTr+5lA5Klh+EUPY/GbY/IUPpXQPqLwOuTQTZKOit8c0wRMvbx7fTxzHSsHdQSwwdKQ6yrmXOLwTWmMS
+  alipayPublicKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjMaVjki3OlqoBGZDRPPcP3CsR0Ge9ni1YI/uwRiOMXlqdx69K+/O9nnfRTf9Lbwxz0dhgyMzd4sYkidcCMawmb8Ex2GWHDHJxKVWtq/III3HIRKCYeicqRxLmMV75CduwfFVRUyWU3F5PxKEVwc4HqF9cVB8WAK8pONAer21UiG+Ca4gbZR7HLgeVjWBZrVsrVl3zVSc+DqXGTiZPNj65P29N498tMwvy5wNxLWGle7hlA31UK5Q1boREsuvPJoTIc6rggD1Nb8etFVUq50sVe6SyfyQTJN532VVTJ8KUo2pqgA1iDbMO6aX/dGo5ZpBnAPZqUudmxeA9Yh6BQMgxwIDAQAB
+  notifyUrl: http://j5hvc5.natappfree.cc/api/ali/notify
+  serverUrl: https://openapi-sandbox.dl.alipaydev.com/gateway.do