手机号码验证

WebContent/web/merchant/merchantForm.jsp

@@ -79,6 +79,7 @@
 				        <option value="">请选择</option>
 				        <option value="信州区">信州区</option>
 				        <option value="上饶县">上饶县</option>
+				        <option value="广丰区">广丰区</option>
 			        </select>
 				</div>
 			</div>

src/com/mall/controller/user/UserOrderController.java

@@ -291,7 +291,14 @@ public class UserOrderController extends BaseController{
 		List<SysUser> listUser = SysUser.dao.findNeedSend();//获取需要接收消息的管理员
 		for(SysUser item : listUser){
 			if(!StrKit.isBlank(item.getStr("openid"))){
-				TemplateMsg.sendMsg1(record, item.getStr("openid"));
+				if("30".equals(item.getStr("type"))){
+                    Record record1 = UserOrderDetail.dao.getProductByMerchantId(model.getInt("id"),item.getInt("merchant_id"));
+                    if(record1!=null){
+                        TemplateMsg.sendMsg1(record, item.getStr("openid"));
+                    }
+                }else{
+                    TemplateMsg.sendMsg1(record, item.getStr("openid"));
+                }
 			}
 		}
 		ret.setData(model.getInt("id"));
@@ -485,7 +492,14 @@ public class UserOrderController extends BaseController{
 						List<SysUser> ls = SysUser.dao.findNeedSend();//获取需要接收消息的管理员
 						for(SysUser item:ls){
 							if(!StrKit.isBlank(item.getStr("openid"))){
-								TemplateMsg.sendMsg1(record, item.getStr("openid"));
+                                if("30".equals(item.getStr("type"))){
+                                    Record record1 = UserOrderDetail.dao.getProductByMerchantId(record.getInt("id"),item.getInt("merchant_id"));
+                                    if(record1!=null){
+                                        TemplateMsg.sendMsg1(record, item.getStr("openid"));
+                                    }
+                                }else{
+                                    TemplateMsg.sendMsg1(record, item.getStr("openid"));
+                                }
 							}
 						}
 						//通知客户

src/com/mall/model/user/UserOrderDetail.java

@@ -98,4 +98,10 @@ public class UserOrderDetail extends Model<UserOrderDetail>
 		UserOrderDetail record = findFirst("select * from user_order_detail where order_id=?",orderId);
 		return record;
 	}
+
+	public Record getProductByMerchantId(int orderId,int merchantId) {
+		Record record = Db.findFirst("select b.* from user_order_detail a ,product b where a.product_id = b.id " +
+				"and a.order_id=? and a.merchant_id=?",orderId,merchantId);
+		return record;
+	}
 }

src/log4j.properties

@@ -4,9 +4,8 @@ log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
 log4j.appender.stdout.layout.ConversionPattern=[%d{yyyy-MM-dd HH\:mm\:ss} %-5p] [%t] (%c\:%L) - %m%n
 
 # Output to the File
-log4j.appender.file=org.apache.log4j.FileAppender
-log4j.appender.file.DatePattern='_'yyyy-MM-dd'.log'
-log4j.appender.file.File=./buying.log
+log4j.appender.file=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.file.File=${catalina.home}/logs/buying/buying.log
 log4j.appender.file.layout=org.apache.log4j.PatternLayout
 log4j.appender.file.layout.ConversionPattern=[%d{yyyy-MM-dd HH\:mm\:ss} %-5p] [%t] (%c\:%L) - %m%n