WebSVN – SmartDukaan – Diff – /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/V2CartController.java

 import com.spice.profitmandi.common.model.ProfitMandiConstants;
 import com.spice.profitmandi.common.model.UserInfo;
 import com.spice.profitmandi.dao.cart.CartService;
 import com.spice.profitmandi.dao.cart.v2.CartValidationService;
 import com.spice.profitmandi.dao.cart.v2.CheckoutValidationResult;
+import com.spice.profitmandi.dao.cart.v2.HydratedCart;
+import com.spice.profitmandi.dao.cart.v2.HydratedLine;
+import com.spice.profitmandi.dao.cart.v2.LineStatus;
 import com.spice.profitmandi.dao.cart.v2.OpenCartValidationResult;
+import com.spice.profitmandi.dao.cart.v2.PricingBreakup;
 import com.spice.profitmandi.dao.cart.v2.SaleType;
 import com.spice.profitmandi.dao.entity.catalog.Item;
 import com.spice.profitmandi.dao.entity.catalog.TagListing;
 import com.spice.profitmandi.dao.entity.fofo.PartnerType;
 import com.spice.profitmandi.dao.entity.user.CartLine;
 import org.springframework.http.ResponseEntity;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
     public ResponseEntity<?> openCart(HttpServletRequest request)
             throws ProfitMandiBusinessException {
         java.util.Optional<AuthCtx> auth = resolveAuth(request);
         if (!auth.isPresent()) return unauthorized();
         AuthCtx ctx = auth.get();
-        OpenCartValidationResult result = cartValidationService.validateForOpen(
+        OpenCartValidationResult result = validateAndApplyCarryBagPrice(
                 ctx.cartId, ctx.storeId);
         return ResponseEntity.ok(ApiResponse.success(result));
+    }
     /** STEP 2 — hard validation immediately before payment. Returns
         // Skip carry bag rebalance if user explicitly changed carry bag qty
         if (productId == ProfitMandiConstants.ITEM_CARRY_BAG) {
             enrichPrices(ctx, desired);
             cartService.addItemsToCart(ctx.cartId, desired);
             return ResponseEntity.ok(ApiResponse.success(
-                    cartValidationService.validateForOpen(ctx.cartId, ctx.storeId)));
+                    validateAndApplyCarryBagPrice(ctx.cartId, ctx.storeId)));
+        }
         return applyAndHydrate(ctx, desired);
+    }
     /** Remove a single line by productId. */
         // Skip carry bag rebalance if user explicitly removed the carry bag
         if (productId == ProfitMandiConstants.ITEM_CARRY_BAG) {
             enrichPrices(ctx, desired);
             cartService.addItemsToCart(ctx.cartId, desired);
             return ResponseEntity.ok(ApiResponse.success(
-                    cartValidationService.validateForOpen(ctx.cartId, ctx.storeId)));
+                    validateAndApplyCarryBagPrice(ctx.cartId, ctx.storeId)));
+        }
         return applyAndHydrate(ctx, desired);
+    }
     /** Clear the entire cart. */
         java.util.Optional<AuthCtx> auth = resolveAuth(request);
         if (!auth.isPresent()) return unauthorized();
         AuthCtx ctx = auth.get();
         cartService.clearCart(ctx.cartId);
         return ResponseEntity.ok(ApiResponse.success(
-                cartValidationService.validateForOpen(ctx.cartId, ctx.storeId)));
+                validateAndApplyCarryBagPrice(ctx.cartId, ctx.storeId)));
+    }
     /**
      * Enriches each desired CartItem with the live selling price, runs the
      * procurement carry-bag rebalance, applies the change, then returns a
             throws ProfitMandiBusinessException {
         enrichPrices(ctx, desired);
         rebalanceCarryBag(desired, ctx.storeId);
         cartService.addItemsToCart(ctx.cartId, desired);
         return ResponseEntity.ok(ApiResponse.success(
-                cartValidationService.validateForOpen(ctx.cartId, ctx.storeId)));
+                validateAndApplyCarryBagPrice(ctx.cartId, ctx.storeId)));
+    }
     /**
      * Populates {@link CartItem#setSellingPrice(double)} for each non-carry-bag item
      * with the live (MOP - scheme cashback) figure. Preserves the existing value on
             bag.setSellingPrice(resolveCarryBagPrice(fofoId));
             desired.add(bag);
+        }
+    }
+    /**
+     * Wraps {@link CartValidationService#validateForOpen} and overrides the
+     * carry-bag line's LivePrice + rolls up totals using the tier logic that
+     * v1's {@code CartServiceImpl.getCartValidation} already applies (lines
+     * 271-278). Needed because the shared v2 hydrator prices every line from
+     * {@code TagListing.getMop()} without a tier check, so premium partners
+     * would otherwise see MRP (₹15) instead of ₹1.
+     */
+    private OpenCartValidationResult validateAndApplyCarryBagPrice(int cartId, int fofoId)
+            throws ProfitMandiBusinessException {
+        OpenCartValidationResult result = cartValidationService.validateForOpen(cartId, fofoId);
+        if (result == null || result.getCart() == null || result.getCart().getLines() == null) {
+            return result;
+        }
+        HydratedCart cart = result.getCart();
+        BigDecimal tierPrice = BigDecimal.valueOf(resolveCarryBagPrice(fofoId))
+                .setScale(2, RoundingMode.HALF_UP);
+        boolean overridden = false;
+        for (HydratedLine line : cart.getLines()) {
+            if (line.getProductId() != ProfitMandiConstants.ITEM_CARRY_BAG) continue;
+            if (line.getPrice() == null) continue;
+            if (line.getPrice().getSelling() == null
+                    || line.getPrice().getSelling().compareTo(tierPrice) != 0) {
+                line.getPrice().setMrp(tierPrice);
+                line.getPrice().setSelling(tierPrice);
+                line.getPrice().setSchemeCashback(BigDecimal.ZERO);
+                overridden = true;
+            }
+        }
+        if (overridden && cart.getPricing() != null) {
+            // Mirrors CartHydrationServiceImpl.computePricing so grand total
+            // reflects the overridden carry-bag price.
+            BigDecimal subtotal = BigDecimal.ZERO;
+            BigDecimal discounts = BigDecimal.ZERO;
+            BigDecimal insuranceTotal = BigDecimal.ZERO;
+            for (HydratedLine line : cart.getLines()) {
+                if (line.getStatus() != LineStatus.ACTIVE || line.getPrice() == null) continue;
+                BigDecimal qty = BigDecimal.valueOf(line.getQuantity());
+                subtotal = subtotal.add(line.getPrice().getMrp().multiply(qty));
+                BigDecimal cashback = line.getPrice().getSchemeCashback() == null
+                        ? BigDecimal.ZERO : line.getPrice().getSchemeCashback();
+                discounts = discounts.add(cashback.multiply(qty));
+                if (line.getInsurance() != null && line.getInsurance().getPremium() != null) {
+                    insuranceTotal = insuranceTotal.add(line.getInsurance().getPremium());
+                }
+            }
+            PricingBreakup p = cart.getPricing();
+            p.setSubtotal(subtotal);
+            p.setLineDiscounts(discounts);
+            p.setTaxableBase(subtotal.subtract(discounts));
+            p.setGrandTotal(p.getTaxableBase().add(insuranceTotal));
+        }
+        return result;
+    }
     private float resolveCarryBagPrice(int fofoId) {
         PartnerType tier = null;
         try {
             tier = partnerTypeChangeService.getTypeOnDate(fofoId, LocalDate.now());
         } catch (Exception e) {

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/V2CartController.java – Rev 37015 → 37084