feat: lab6

src/main/java/com/seecoder/BlueWhale/configure/AlipayTools.java

@@ -10,9 +10,6 @@ import lombok.Setter;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Component;
 
-import javax.servlet.http.HttpServletResponse;
-import java.util.UUID;
-
 @ConfigurationProperties(prefix = "alipay")
 @Component
 @Getter
@@ -35,34 +32,6 @@ public class AlipayTools {
 
     private static String signType="RSA2";
 
-    /**
-     * @Author: DingXiaoyu
-     * @Date: 16:02 2024/1/27
-     * 用来测试支付宝沙箱
-    */
-    public void testPay(String name , Double price, HttpServletResponse httpResponse){
-        AlipayClient alipayClient = new DefaultAlipayClient(serverUrl,appId,appPrivateKey,format,charset,alipayPublicKey,signType);
-        AlipayTradePagePayRequest request = new AlipayTradePagePayRequest();
-        request.setNotifyUrl(notifyUrl);
-        String replace = UUID.randomUUID().toString().replace("-", "");
-        JSONObject bizContent = new JSONObject();
-        bizContent.put("out_trade_no", replace);
-        bizContent.put("total_amount", price);
-        bizContent.put("subject", name);
-        bizContent.put("product_code", "FAST_INSTANT_TRADE_PAY");
-        request.setBizContent(bizContent.toString());
-        String form;
-        try  {
-            form = alipayClient.pageExecute(request).getBody();
-            System.out.println(form);
-            httpResponse.setContentType("text/html;charset=" + charset);
-            httpResponse.getWriter().write(form);
-            httpResponse.getWriter().flush();
-            httpResponse.getWriter().close();
-        }  catch  (Exception e) {
-            e.printStackTrace();
-        }
-    }
     /**
      * @Author: DingXiaoyu
      * @Date: 11:25 2024/1/31

src/main/java/com/seecoder/BlueWhale/configure/CorsFilter.java

@@ -51,7 +51,4 @@ public class CorsFilter implements Filter {
     public void init(FilterConfig filterConfig) {
     }
 
-    @Override
-    public void destroy() {
-    }
 }

src/main/java/com/seecoder/BlueWhale/controller/AliPayController.java

@@ -1,19 +1,16 @@
 package com.seecoder.BlueWhale.controller;
 
-import com.seecoder.BlueWhale.configure.AlipayTools;
 import com.seecoder.BlueWhale.enums.OrderStatusEnum;
 import com.seecoder.BlueWhale.po.Coupon;
 import com.seecoder.BlueWhale.po.Order;
 import com.seecoder.BlueWhale.repository.CouponRepository;
 import com.seecoder.BlueWhale.repository.OrderRepository;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -21,9 +18,6 @@ import java.util.Map;
 @RequestMapping("/api/ali")
 public class AliPayController {
 
-    @Autowired
-    AlipayTools alipayTools;
-
     @Autowired
     OrderRepository orderRepository;
 
@@ -54,8 +48,4 @@ public class AliPayController {
         }
     }
 
-    @GetMapping("/test")
-    public void test(HttpServletResponse httpServletResponse){
-        alipayTools.testPay("test",666.0,httpServletResponse);
-    }
 }

src/main/java/com/seecoder/BlueWhale/service/OrderService.java

@@ -6,11 +6,19 @@ import java.util.List;
 
 public interface OrderService {
     OrderVO create(OrderVO orderVO);
+
     List<OrderVO> getAllOrders();
+
     OrderVO getOrder(Integer id);
+
     String pay(Integer orderId,Integer couponId);
+
     Boolean deliver(Integer orderId);
+
     Boolean get(Integer orderId);
+
     Boolean comment(Integer orderId, String comment, Integer rating);
+
     Double calculate(Integer orderId, Integer couponId);
+
 }

src/main/java/com/seecoder/BlueWhale/service/ProductService.java

@@ -8,8 +8,11 @@ import com.seecoder.BlueWhale.vo.ProductVO;
 
 public interface ProductService {
     Boolean create(ProductVO productVO);
+
     Boolean addStock(Integer id, Integer number);
+
     List<ProductVO> getAllProducts(Integer storeId);
+
     ProductVO getProduct(Integer id);
 
     List<ProductVO> getProductsWithCondition(String name, CategoryEnum category, Double price);

src/main/java/com/seecoder/BlueWhale/serviceImpl/UserServiceImpl.java

@@ -90,9 +90,6 @@ public class UserServiceImpl implements UserService {
             return userVO;
         }
         Store store = storeRepository.findById(storeId).get();
-        if (store==null){
-            return userVO;
-        }
         userVO.setStoreName(store.getName());
         return userVO;
     }

src/main/resources/application.yml

@@ -12,14 +12,14 @@ server:
 
 aliyun:
   oss:
-    endpoint: https://oss-cn-hangzhou.aliyuncs.com
-    accessKeyId: LTAI4Fi1qmL4iuhH8t7G7r2H
-    accessKeySecret: 7tJWyQqa0cMkQGaPMMvtH6c0VLiOO2
-    bucketName: seec-portal
+    endpoint:
+    accessKeyId:
+    accessKeySecret:
+    bucketName:
 
 alipay:
-  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://xg2j6q.natappfree.cc/api/ali/notify
-  serverUrl: https://openapi-sandbox.dl.alipaydev.com/gateway.do
+  appId:
+  appPrivateKey:
+  alipayPublicKey:
+  notifyUrl:
+  serverUrl: