WebSVN – SmartDukaan – Diff – /trunk/PaymentService/src/main/java/in/shop2020/payment/service/handler/PaymentServiceHandler.java

 			payment.setStatus(status.getValue());
 			if(status.equals(PaymentStatus.SUCCESS))
 				payment.setSuccessTimestamp(new Date());
 			else if(status.equals(PaymentStatus.FAILED)) {
 			    payment.setErrorTimestamp(new Date());
-			    persistPaymentRequiringExtraProcessing(payment);
+			    persistPaymentRequiringExtraProcessing(payment, ExtraPaymentProcessingType.FAILED_PAYMENTS);
+			}
+			else if (status.equals(PaymentStatus.PROVISIONALLY_CAPTURED)) {
+			    // FIXME different column to note provisional capture timestamp
+			    // FIXME Requires extra processing at Crm end for actual manual capture
+			    payment.setProvisionalCaptureTimestamp(new Date());
+			    persistPaymentRequiringExtraProcessing(payment, ExtraPaymentProcessingType.PENDING_CAPTURE);
+			}
+		}
 		payment.setGatewayTxnDate(gatewayTxnDate);
 	 * Persists a given payment Id in another table for future processing by CRM etc.
 	 * Failed payments generally require a follow-up to help customers through our
 	 * CRM-Outbound team.
+	 *
 	 * @param payment  the payment object that failed.
+	 * @param type TODO
 	 */
-	private void persistPaymentRequiringExtraProcessing(in.shop2020.payment.domain.Payment payment) {
+	private void persistPaymentRequiringExtraProcessing(in.shop2020.payment.domain.Payment payment, ExtraPaymentProcessingType type) {
 	    try {
-            paymentRequiringExtraProcessingHandler.insert(payment.getId(), ExtraPaymentProcessingType.FAILED_PAYMENTS);
+            paymentRequiringExtraProcessingHandler.insert(payment.getId(), type);
         } catch (Exception e) {
             logger.error("Could not persist payment: " + payment.getId(), e);
+        }
+    }
             return false;
         case INIT:
             logger.warn("Attempt to capture a non-authorized payment");
             return false;
         case AUTHORIZED:
+        case CAPTURE_IN_PROCESS:
             //Actual work to be done in this case. Let the call proceed.
             break;
+        case PROVISIONALLY_CAPTURED:
+            logger.info("Attempting to capture a payment that is provisonally captured but we can let the client proceed.");
+            return true;
         case SUCCESS:
             logger.warn("Attempting to capture an already captured payment but we can let the client proceed.");
             return true;
         case FAILED:
             logger.error("Attempting to capture a failed payment");
      * don't retry or anything. We'll add the support of multiple attempts later
      * on.
+     *
      * @param payment The payment which has to be captured.
      * @return True if the payment attempt is successful, false if not.
+     * @throws PaymentException
      */
-    private boolean captureAndUpdateHdfcPayment(in.shop2020.payment.domain.Payment payment){
+    private boolean captureAndUpdateHdfcPayment(in.shop2020.payment.domain.Payment payment) throws PaymentException {
         long merchantPaymentId = payment.getId();
         logger.info("Capturing HDFC payment with id: " + merchantPaymentId);
         Map<String, String> captureResult = HdfcPaymentHandler.capturePayment(payment);
         String captureStatus = captureResult.get(IPaymentHandler.STATUS);
         String gatewayStatus = captureResult.get(IPaymentHandler.GATEWAY_STATUS);
             String description = captureResult.get(IPaymentHandler.ERROR);
             String errorCode = captureResult.get(IPaymentHandler.ERR_CODE);
             payment.setDescription(description);
             payment.setErrorCode(errorCode);
-            payment.setStatus(PaymentStatus.FAILED.getValue());
             payment.setErrorTimestamp(new Date());
+            if (IPaymentHandler.Errors.CONN_FAILURE.code.equals(errorCode)) {
+                payment.setStatus(PaymentStatus.CAPTURE_IN_PROCESS.getValue());
-            paymentHandler.updatePayment(payment, attrMap);
+                paymentHandler.updatePayment(payment, attrMap);
+                throw new PaymentException(106, "Could not capture due to connection issue");
+            }
+            else {
+                payment.setStatus(PaymentStatus.FAILED.getValue());
+                paymentHandler.updatePayment(payment, attrMap);
-            persistPaymentRequiringExtraProcessing(payment);
+                persistPaymentRequiringExtraProcessing(payment, ExtraPaymentProcessingType.FAILED_PAYMENTS);
+            }
             return false;
         } else {
             // Success
             logger.info("Capture attempt successful for HDFC payment with id: " + merchantPaymentId);
             payment.setDescription("Payment Captured");
      * on.
+     *
      * @param payment
      *            The payment which has to be captured.
      * @return True if the payment attempt is successful, false if not.
+     * @throws PaymentException
      */
-    private boolean captureAndUpdateHdfcEmiPayment(in.shop2020.payment.domain.Payment payment){
+    private boolean captureAndUpdateHdfcEmiPayment(in.shop2020.payment.domain.Payment payment) throws PaymentException{
         long merchantPaymentId = payment.getId();
         logger.info("Capturing HDFC payment with id: " + merchantPaymentId);
         Map<String, String> captureResult = HdfcEmiPaymentHandler.capturePayment(payment);
         String captureStatus = captureResult.get(IPaymentHandler.STATUS);
         String gatewayStatus = captureResult.get(IPaymentHandler.GATEWAY_STATUS);
             String description = captureResult.get(IPaymentHandler.ERROR);
             String errorCode = captureResult.get(IPaymentHandler.ERR_CODE);
             payment.setDescription(description);
             payment.setErrorCode(errorCode);
+            payment.setErrorTimestamp(new Date());
+            // Not marking payments as failed in case of connection issues
+            if (IPaymentHandler.Errors.CONN_FAILURE.code.equals(errorCode)) {
-            payment.setStatus(PaymentStatus.FAILED.getValue());
+                payment.setStatus(PaymentStatus.CAPTURE_IN_PROCESS.getValue());
+                paymentHandler.updatePayment(payment, attrMap);
+                throw new PaymentException(106, "Could not capture due to connection issue");
+            }
+            else {
-            payment.setErrorTimestamp(new Date());
+                payment.setStatus(PaymentStatus.FAILED.getValue());
-            paymentHandler.updatePayment(payment, attrMap);
+                paymentHandler.updatePayment(payment, attrMap);
-            persistPaymentRequiringExtraProcessing(payment);
+                persistPaymentRequiringExtraProcessing(payment, ExtraPaymentProcessingType.FAILED_PAYMENTS);
+            }
             return false;
         } else {
             // Success
             logger.info("Capture attempt successful for HDFC payment with id: " + merchantPaymentId);
             payment.setDescription("Payment Captured");
             payment.setGatewayTxnStatus(gatewayStatus);
             payment.setStatus(PaymentStatus.SUCCESS.getValue());
             payment.setSuccessTimestamp(new Date());
             attrMap.put(IPaymentHandler.CAPTURE_TXN_ID, captureResult.get(IPaymentHandler.CAPTURE_TXN_ID));
             attrMap.put(IPaymentHandler.CAPTURE_REF_ID, captureResult.get(IPaymentHandler.CAPTURE_REF_ID));
             attrMap.put(IPaymentHandler.CAPTURE_AUTH_ID, captureResult.get(IPaymentHandler.CAPTURE_AUTH_ID));
      * don't retry or anything. We'll add the support of multiple attempts later
      * on.
+     *
      * @param payment The payment which has to be captured.
      * @return True if the payment attempt is successful, false if not.
+     * @throws PaymentException
      */
-    private boolean captureAndUpdateEbsPayment(in.shop2020.payment.domain.Payment payment){
+    private boolean captureAndUpdateEbsPayment(in.shop2020.payment.domain.Payment payment) throws PaymentException{
         Map<String, String> captureResult = EbsPaymentHandler.capturePayment(payment);
         String captureStatus = captureResult.get(EbsPaymentHandler.STATUS);
         Map<String, String> attrMap = new HashMap<String, String>();
         if("".equals(captureStatus)){
             //Failure
             logger.error("Capture attempt failed for EBS payment with id: " + payment.getId());
             String description = captureResult.get(EbsPaymentHandler.ERROR);
             String errorCode = captureResult.get(EbsPaymentHandler.ERR_CODE);
             payment.setDescription(description);
             payment.setErrorCode(errorCode);
-            payment.setStatus(PaymentStatus.FAILED.getValue());
             payment.setErrorTimestamp(new Date());
+            if (IPaymentHandler.Errors.CONN_FAILURE.code.equals(errorCode)) {
+                payment.setStatus(PaymentStatus.CAPTURE_IN_PROCESS.getValue());
-            paymentHandler.updatePayment(payment, attrMap);
+                paymentHandler.updatePayment(payment, attrMap);
+                throw new PaymentException(106, "Could not capture due to connection issue");
+            }
+            else {
+                payment.setStatus(PaymentStatus.FAILED.getValue());
+                paymentHandler.updatePayment(payment, attrMap);
-            persistPaymentRequiringExtraProcessing(payment);
+                persistPaymentRequiringExtraProcessing(payment, ExtraPaymentProcessingType.FAILED_PAYMENTS);
+            }
             return false;
         }else{
             //Success
             logger.info("Capture attempt successful for EBS payment with id: " + payment.getId());
             payment.setGatewayTxnStatus(captureStatus);

Subversion Repositories SmartDukaan

(root)/trunk/PaymentService/src/main/java/in/shop2020/payment/service/handler/PaymentServiceHandler.java – Rev 4253 → 4421