980 360 发卷

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

@@ -82,9 +82,12 @@ public class CommuneNotifyService extends AbstractNotifyService {
 		            		}
 		            	}
 		            }
-		          //执行发券
-		            BuyVoucherActivity buyVoucherActivity = buyVoucherActivityDao.findById(communeOrderItem.getActivityId());
-		            voucherService.sendVoucherForPlaceOrderByConfig(uid, order.getOrderId()+"", true, buyVoucherActivity.getVoucherConfig());
+		            if(communeOrderItem.getActivityId() == null){
+		                //执行发券
+			            BuyVoucherActivity buyVoucherActivity = buyVoucherActivityDao.findById(communeOrderItem.getActivityId());
+			            voucherService.sendVoucherForPlaceOrderByConfig(uid, order.getOrderId()+"", true, buyVoucherActivity.getVoucherConfig());
+		            }
+		      
 	            }
 
             }