修改会员充值的发券规则

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

@@ -158,9 +158,12 @@ public class CommuneOrderService extends AbstractOrderService<CommuneOrderBean,
     		Date sendEndTime = DateUtil.parseDateTime(jsobj.getString("sendEndTime"));
     		Date now = new Date();
     		if(sendBeginTime.getTime()<now.getTime()&&now.getTime()<sendEndTime.getTime()){
-    	    	VoucherRule voucherRule = this.getVoucherRuleDao().findById(Integer.parseInt(jsobj.getString("id")));
+    			String[] ids = jsobj.getString("id").split(",");
+    			for(String id:ids){
+        	    	VoucherRule voucherRule = this.getVoucherRuleDao().findById(Integer.parseInt(id));
         	    	this.getVoucherDao().sendVoucherToSpecificUsers(voucherRule, "'"+uid+"'", voucherRule.getQuantity());
     			}
+    		}
 		} catch (ParseException e) {
 			e.printStackTrace();
 		}

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

@@ -61,12 +61,14 @@ public class CommuneNotifyService extends AbstractNotifyService {
 	            		//1:执行充值人的小程序优惠
 	            		communeOrderService.executeOrderActive(uid, "chongzhiren_voucher_send_980");
 	            		//1:执行推荐人的小程序优惠
+	            		if(recommendUid!=null&&!"".equals(recommendUid)){
 	            			communeOrderService.executeOrderActive(recommendUid, "tuijianren_voucher_send_980");
+	            		}
 	            	}else if(order.getAmount().intValue()==360){
 	            		//1:执行充值人的小程序优惠
 	            		communeOrderService.executeOrderActive(uid, "chongzhiren_voucher_send_360");
 	            		//1:执行推荐人的小程序优惠
-	            		communeOrderService.executeOrderActive(recommendUid, "tuijianren_voucher_send_360");	            		
+	            		//communeOrderService.executeOrderActive(recommendUid, "tuijianren_voucher_send_360");	            		
 	            	}
 	            }
             }