多次部分退款

src/main/java/com/ctrip/fun/golf/service/order/OpCourseOrderService.java

@@ -617,14 +617,18 @@ public class OpCourseOrderService extends AbstractOpOrderService<CourseOrderProc
                 }
             } else {
                 // 不需走在线退款 ：手动退款或没有退在线支付
-            	order.setProcessStatus(order.getProcessStatus() | OrderStatusBitEnum.REFUNDED.getValue());
+            	
                 if (order.getTotalAmount().subtract(order.getVipmemberDiscount()).subtract(refundAll.add(order.getOnPayAmount())).doubleValue() <= 0) {
                 	order.setProcessStatus(order.getProcessStatus() | OrderStatusBitEnum.REFUNDED.getValue());
+                	order.setProcessStatus(order.getProcessStatus() | OrderStatusBitEnum.REFUNDED.getValue());
                     order.setProcessStatus(order.getProcessStatus() | OrderStatusBitEnum.ALL_UNSUBSCRIBED.getValue());
                     order.setProcessStatus(order.getProcessStatus() | OrderStatusBitEnum.BARGAINED.getValue());
                     order.setOrderUserStatus(6);
                 } else {
-                	order.setProcessStatus(order.getProcessStatus() +3);
+                	if(order.getProcessStatus() != 275){
+                		order.setProcessStatus(order.getProcessStatus() +3);
+                	} 
+                	order.setProcessStatus(order.getProcessStatus() | OrderStatusBitEnum.REFUNDED.getValue());
                 	order.setProcessStatus(order.getProcessStatus() | OrderStatusBitEnum.REFUNDED.getValue());
                     order.setProcessStatus(order.getProcessStatus() | OrderStatusBitEnum.PART_UNSUBSCRIBED.getValue());
                     order.setOrderUserStatus(5);

src/main/java/com/ctrip/fun/golf/service/payment/AbstractNotifyService.java

@@ -232,7 +232,9 @@ public abstract class AbstractNotifyService extends CorePaymentService {
                NotifyRequestBean notifyRequestBean = new NotifyRequestBean();
                notifyRequestBean.setAmount(bigDecimal.divide(new BigDecimal("100")));
                if(!this.isAllRefund(notifyRequestBean, order)){
-            	   order.setProcessStatus(order.getProcessStatus()+3 ) ;
+            	   if(order.getProcessStatus() != 275){
+            		   order.setProcessStatus(order.getProcessStatus()+3 ) ;
+            	   } 
                }
                order.setProcessStatus(order.getProcessStatus()
                        | OrderStatusBitEnum.REFUNDED.getValue());
@@ -495,7 +497,9 @@ public abstract class AbstractNotifyService extends CorePaymentService {
         if (SUCCESS.equalsIgnoreCase(notifyRequestBean.getStatus())) {
         	
         	if(!this.isAllRefund(notifyRequestBean, order)){
-        		order.setProcessStatus(order.getProcessStatus()+3);
+        		if(order.getProcessStatus() != 275){
+        			order.setProcessStatus(order.getProcessStatus()+3);
+        		}	
         	}
             order.setProcessStatus(order.getProcessStatus()
                     | OrderStatusBitEnum.REFUNDED.getValue());