commit

src/main/java/com/example/afrishop_v3/controllers/OrderController.java

@@ -33,15 +33,15 @@ import static org.springframework.data.domain.Sort.Order.desc;
 public class OrderController extends Controller {
     private final TbCfOrderRepository repository;
     private final TbCfCartRecordRRepository cartRepository;
-    private final TbCfCouponRepository couponRepository;
+    private final TbCfToicouponRepository toicouponRepository;
     private final TbCfStationItemRepository itemRepository;
     private final TbCfItemCommentRepository commentRepository;
     private final AuthenticationUser user;
 
-    public OrderController(TbCfOrderRepository repository, TbCfCartRecordRRepository cartRepository, TbCfCouponRepository couponRepository, TbCfStationItemRepository itemRepository, TbCfItemCommentRepository commentRepository, AuthenticationUser user) {
+    public OrderController(TbCfOrderRepository repository, TbCfCartRecordRRepository cartRepository, TbCfToicouponRepository toicouponRepository, TbCfStationItemRepository itemRepository, TbCfItemCommentRepository commentRepository, AuthenticationUser user) {
         this.repository = repository;
         this.cartRepository = cartRepository;
-        this.couponRepository = couponRepository;
+        this.toicouponRepository = toicouponRepository;
         this.itemRepository = itemRepository;
         this.commentRepository = commentRepository;
         this.user = user;
@@ -88,8 +88,13 @@ public class OrderController extends Controller {
         order.setCouponId(toitableId);
 
         if (toitableId != null && !toitableId.isEmpty()) {
-            Optional<TbCfCoupon> couponOptional = couponRepository.findById(toitableId);
-            couponOptional.ifPresent(order::setCoupon);
+            Optional<TbCfToicoupon> couponOptional = toicouponRepository.findById(toitableId);
+
+
+            if( couponOptional.isPresent() ){
+                TbCfCoupon coupon = couponOptional.get().getCoupon();
+                order.setCoupon(coupon);
+            }
         }
 
 
@@ -113,8 +118,13 @@ public class OrderController extends Controller {
         order.setCouponId(toitableId);
 
         if (toitableId != null && !toitableId.isEmpty()) {
-            Optional<TbCfCoupon> byId = couponRepository.findById(toitableId);
-            byId.ifPresent(order::setCoupon);
+            Optional<TbCfToicoupon> couponOptional = toicouponRepository.findById(toitableId);
+
+
+            if( couponOptional.isPresent() ){
+                TbCfCoupon coupon = couponOptional.get().getCoupon();
+                order.setCoupon(coupon);
+            }
         }
 
 
@@ -180,8 +190,13 @@ public class OrderController extends Controller {
         order.setCouponId(toitableId);
 
         if (toitableId != null && !toitableId.isEmpty()) {
-            Optional<TbCfCoupon> byId = couponRepository.findById(toitableId);
-            byId.ifPresent(order::setCoupon);
+            Optional<TbCfToicoupon> couponOptional = toicouponRepository.findById(toitableId);
+
+
+            if( couponOptional.isPresent() ){
+                TbCfCoupon coupon = couponOptional.get().getCoupon();
+                order.setCoupon(coupon);
+            }
         }
 
 

src/main/java/com/example/afrishop_v3/models/TbCfToicoupon.java

@@ -183,4 +183,9 @@ public class TbCfToicoupon {
     public Integer getEnableFlag() {
         return enableFlag;
     }
+
+
+    public TbCfCoupon getCoupon() {
+        return coupon;
+    }
 }