980 360 发卷

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

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