Subversion Repositories SmartDukaan

Rev

Hide changed files | Details | Compare with Previous | Blame | RSS feed

Filtering Options

Rev Age Author Path Log message Diff Changes
36790 42 d 19 h amit /trunk/profitmandi-dao/src/main/ Add PO_REJECTED status and release rejected-PO orders from pending indent

Rejected bulk-PO approvals refunded the wallet but left order rows in
status=0 (PAYMENT_PENDING) with billing/refund NULL, so they were counted
by pending indent forever and inflated the account-statement closing
balance with no matching wallet liability.

- OrderStatus.PO_REJECTED(91) new terminal status for approval rejection
- OrderRepository.cancelRejectedTransactionOrders sets status + refund_timestamp
on a rejected transaction's still-pending orders (side-effect free: wallet
already refunded at txn level, these never-processed orders hold no reservation)
- backfill_po_rejected_orders.sql releases 485 historically-stranded orders
(Group A: wallet already refunded). Deploy code before running.
 
/trunk/profitmandi-dao/src/main/resources/sql/backfill_po_rejected_orders.sql
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/OrderRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/OrderRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/in/shop2020/model/v1/order/OrderStatus.java
36619 57 d 20 h amit /trunk/profitmandi-dao/src/main/java/in/ refactor: migrate Thrift enums/models to profitmandi-dao under in.shop2020 package

Moved 22 enum files and 2 model classes (Address, OrderStatusGroups) from ThriftConfig
to profitmandi-dao with same package structure. Stripped all org.apache.thrift dependencies
(TEnum interface, TBase, read/write/validate methods). OrderStatusGroups rewritten as clean
POJO keeping only constructor defaults and getter methods used by callers.
 
/trunk/profitmandi-dao/src/main/java/in
/trunk/profitmandi-dao/src/main/java/in/shop2020
/trunk/profitmandi-dao/src/main/java/in/shop2020/config
/trunk/profitmandi-dao/src/main/java/in/shop2020/logistics
/trunk/profitmandi-dao/src/main/java/in/shop2020/logistics/DeliveryType.java
/trunk/profitmandi-dao/src/main/java/in/shop2020/logistics/PickUpType.java
/trunk/profitmandi-dao/src/main/java/in/shop2020/model
/trunk/profitmandi-dao/src/main/java/in/shop2020/model/v1
/trunk/profitmandi-dao/src/main/java/in/shop2020/model/v1/catalog
/trunk/profitmandi-dao/src/main/java/in/shop2020/model/v1/catalog/ItemCondition.java
/trunk/profitmandi-dao/src/main/java/in/shop2020/model/v1/catalog/status.java
/trunk/profitmandi-dao/src/main/java/in/shop2020/model/v1/inventory
/trunk/profitmandi-dao/src/main/java/in/shop2020/model/v1/inventory/InventoryType.java
/trunk/profitmandi-dao/src/main/java/in/shop2020/model/v1/inventory/WarehouseType.java
/trunk/profitmandi-dao/src/main/java/in/shop2020/model/v1/order
/trunk/profitmandi-dao/src/main/java/in/shop2020/model/v1/order/OrderStatus.java
/trunk/profitmandi-dao/src/main/java/in/shop2020/model/v1/order/OrderStatusGroups.java
/trunk/profitmandi-dao/src/main/java/in/shop2020/model/v1/order/ReceivedReturnType.java
/trunk/profitmandi-dao/src/main/java/in/shop2020/model/v1/order/RechargeOrderStatus.java
/trunk/profitmandi-dao/src/main/java/in/shop2020/model/v1/order/RefundType.java
/trunk/profitmandi-dao/src/main/java/in/shop2020/model/v1/order/ReplacementShippingType.java
/trunk/profitmandi-dao/src/main/java/in/shop2020/model/v1/order/ReturnTransactionStatus.java
/trunk/profitmandi-dao/src/main/java/in/shop2020/model/v1/order/ReturnTxnResolutionStatus.java
/trunk/profitmandi-dao/src/main/java/in/shop2020/model/v1/order/TaxType.java
/trunk/profitmandi-dao/src/main/java/in/shop2020/model/v1/order/TransactionStatus.java
/trunk/profitmandi-dao/src/main/java/in/shop2020/model/v1/order/WalletReferenceType.java
/trunk/profitmandi-dao/src/main/java/in/shop2020/model/v1/user
/trunk/profitmandi-dao/src/main/java/in/shop2020/model/v1/user/Address.java
/trunk/profitmandi-dao/src/main/java/in/shop2020/model/v1/user/CartStatus.java
/trunk/profitmandi-dao/src/main/java/in/shop2020/payments
/trunk/profitmandi-dao/src/main/java/in/shop2020/purchase
/trunk/profitmandi-dao/src/main/java/in/shop2020/purchase/POStatus.java
/trunk/profitmandi-dao/src/main/java/in/shop2020/purchase/TaxType.java
/trunk/profitmandi-dao/src/main/java/in/shop2020/utils
/trunk/profitmandi-dao/src/main/java/in/shop2020/warehouse
/trunk/profitmandi-dao/src/main/java/in/shop2020/warehouse/ScanType.java
/trunk/profitmandi-dao/src/main/java/in/shop2020/warehouse/TransferLotStatus.java