删除多余模块

Jiang
1 parent 59bd76fb
Showing 32 changed files with 181 additions and 4570 deletions
diligrp-website-dao/pom.xml
diligrp-website-manager/src/main/java/com/diligrp/website/manager/MailManager.java
diligrp-website-manager/src/main/java/com/diligrp/website/manager/MemberCenterAuthenManager.java
diligrp-website-manager/src/main/java/com/diligrp/website/manager/MemberManager.java
diligrp-website-manager/src/main/java/com/diligrp/website/manager/OpenShopApplyManager.java
diligrp-website-manager/src/main/java/com/diligrp/website/manager/ProductManager.java
diligrp-website-manager/src/main/java/com/diligrp/website/manager/SMSManager.java
diligrp-website-manager/src/main/java/com/diligrp/website/manager/ShopCloseHistoryManager.java
diligrp-website-manager/src/main/java/com/diligrp/website/manager/ShopNameModifyManager.java
diligrp-website-manager/src/main/java/com/diligrp/website/manager/UserManager.java
diligrp-website-manager/src/main/java/com/diligrp/website/manager/cache/ProductCache.java
diligrp-website-manager/src/main/java/com/diligrp/website/manager/impl/MailManagerImpl.java
diligrp-website-manager/src/main/java/com/diligrp/website/manager/impl/MemberCenterAuthenManagerImpl.java
diligrp-website-manager/src/main/java/com/diligrp/website/manager/impl/MemberManagerImpl.java
diligrp-website-manager/src/main/java/com/diligrp/website/manager/impl/OpenShopApplyManagerImpl.java
diligrp-website-manager/src/main/java/com/diligrp/website/manager/impl/ProductManagerImpl.java
diligrp-website-manager/src/main/java/com/diligrp/website/manager/impl/SMSManagerImpl.java
diligrp-website-manager/src/main/java/com/diligrp/website/manager/impl/ShopCloseHistoryManagerImpl.java
diligrp-website-manager/src/main/java/com/diligrp/website/manager/impl/ShopNameModifyManagerImpl.java
diligrp-website-manweb/pom.xml
@@ -4,7 +4,7 @@
 	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>com..website.web</groupId>
+		<groupId>com.b2c.website.web</groupId>
 		<artifactId>diligrp-website</artifactId>
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
@@ -17,7 +17,7 @@
 	</properties>
 	<dependencies>
 		<dependency>
-			<groupId>com..website.web</groupId>
+			<groupId>com.b2c.website.web</groupId>
 			<artifactId>diligrp-website-domain</artifactId>
 			<version>0.0.1-SNAPSHOT</version>
 		</dependency>
-package com.diligrp.website.manager;
-
-import com.diligrp.website.domain.Mail;
-import com.diligrp.website.util.dao.BaseQuery;
-import com.diligrp.website.util.web.PageTemplate;
-
-
-public interface MailManager {
-    
-    public boolean saveMail(Mail mh);
-
-    public PageTemplate queryMail(BaseQuery query);
-
-}
-package com.diligrp.website.manager;
-
-/**
- * <B>Description</B> TODO <br />
- * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />
- * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
- * <B>Company</B> 地利集团
- * @createTime 2014年6月20日 下午12:03:15
- * @author liujie
- */
-public interface MemberCenterAuthenManager {
-    /**
-     * 
-     * this method is 查询认证用户列表信息
-     * @param bq
-     * @return
-     * @createTime 2014年6月20日 下午3:59:18
-     * @author liujie
-     */
-    //public PageTemplate  getAuthenInfo(BaseQuery bq)throws Exception;
-    /**
-     * 
-     * this method is 获取认证用户信息
-     * @param userId
-     * @return
-     * @createTime 2014年6月20日 下午3:58:06
-     * @author liujie
-     */
-    //public UserExtension getUserInfoById(Long userId)throws Exception;
-    /**
-     * 
-     * this method is 获取认真企业用户信息
-     * @param companyId
-     * @return
-     * @createTime 2014年6月20日 下午3:58:18
-     * @author liujie
-     */
-    //public EnterpriseInfo getEnterpriseInfoById(Long companyId)throws Exception;
-    /**
-     * 
-     * this method is 审批认真用户信息
-     * @param userId
-     * @param userType
-     * @param authState
-     * @param auditReson
-     * @return
-     * @createTime 2014年6月20日 下午3:58:32
-     * @author liujie
-     */
-    //boolean approveAuthen(Long userId, Integer userType, Integer authState, String auditReson,Long operatorId)throws Exception;
-}
-package com.diligrp.website.manager;
-
-import java.util.List;
-
-import com.diligrp.website.util.dao.BaseQuery;
-import com.diligrp.website.util.web.PageTemplate;
-import com.yqyw.user.rpc.client.domain.input.CreditLimitReq;
-import com.yqyw.user.rpc.client.domain.input.FavoriteInfo;
-import com.yqyw.user.rpc.client.domain.input.LockMemberReq;
-import com.yqyw.user.rpc.client.domain.output.DefaultResp;
-import com.yqyw.user.rpc.client.domain.output.EnterpriseInfoResp;
-import com.yqyw.user.rpc.client.domain.output.ListFavoriteByPagingResp;
-import com.yqyw.user.rpc.client.domain.output.LockMemberResp;
-import com.yqyw.user.rpc.client.domain.output.MemberCreditInfoResp;
-import com.yqyw.user.rpc.client.domain.output.MemberCreditOptionLogResp;
-import com.yqyw.user.rpc.client.domain.output.UserExtensionResp;
-import com.yqyw.user.rpc.client.domain.output.UserInfoResp;
-
-
-public interface MemberManager {
-
-    PageTemplate query(BaseQuery bq);
-
-    LockMemberResp getLockUser(Long id);
-
-    boolean lockMember(LockMemberReq req);
-
-    boolean unlockMember(LockMemberReq req);
-
-    List<MemberCreditOptionLogResp> getCreditHistory(Long memberId);
-
-    MemberCreditInfoResp getCreditInfo(Long memberId);
-
-    DefaultResp updateCreditLimit(CreditLimitReq req);
-
-//    ListBrowseHistoryResp historyList(Integer type,Long userId, BaseQuery bq);
-
-    UserInfoResp getMemberInfo(Long uid);
-
-    UserExtensionResp getMemberExtension(Long uid);
-
-    EnterpriseInfoResp getEnterpriseByUserId(Long uid);
-
-    ListFavoriteByPagingResp getMemberFavorite(FavoriteInfo info,
-            Integer currPage, Integer pageSize);
-
-}
-package com.diligrp.website.manager;
-
-import com.diligrp.pnr.sdk.domain.Shop;
-import com.diligrp.website.util.web.PageTemplate;
-import com.yqyw.user.rpc.client.domain.output.MemberQueryResp;
-
-
-/**
- * <B>Description</B> TODO <br />
- * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />
- * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
- * <B>Company</B> 地利集团
- *
- * @author liujie
- * @createTime 2014年6月5日 下午3:41:26
- */
-public interface OpenShopApplyManager {
-    /**
-     * this method is 获取所有的开店申请详细信息
-     *
-     * @param
-     * @return
-     * @createTime 2014年6月18日 下午5:29:39
-     * @author liujie
-     */
-    public PageTemplate getUserInfo(Integer pageSize, Integer pageIndex, String shopName, String member, String contactPhone, Long startTime, Long endTime, Integer state, String shopId, String cityId, String shopSource);
-
-    Shop getShopInfoByShopId(Long shopId);
-
-    boolean shopAudit(Long shopId, String auditRemark, Integer shopState);
-
-    MemberQueryResp getUserAuthInfo(Long userId);
-}
-package com.diligrp.website.manager;
-
-import java.util.List;
-
-import com.diligrp.titan.sdk.domain.Product;
-
-
-/**
- * <B>Description</B> 商品相关
- * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />
- * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
- * <B>Company</B> 地利集团
- * @createTime 2014年5月21日 下午6:18:14
- * @author mengxf
- */
-public interface ProductManager {
-
-
-    /**
-     * 查询多个商品详情
-     * 
-     * @param pids
-     * @return
-     * @createTime 2014年6月26日 下午2:37:07
-     * @author Wang22
-     */
-    public List<Product> getProductInfos(List<Long> pids);
-    
-}
-package com.diligrp.website.manager;
-
-import com.diligrp.website.domain.MobMessage;
-
-public interface SMSManager {
-
-    /**
-     * 
-     * 发送短信
-     * @param mm
-     * @return
-     * @createTime 2014年6月4日 下午5:48:27
-     * @author Wang22
-     */
-    public boolean sendSMS(MobMessage mm);
-
-}
-package com.diligrp.website.manager;
-
-import com.diligrp.website.domain.ShopCloseHistory;
-import com.diligrp.website.util.dao.BaseQuery;
-import com.diligrp.website.util.web.PageTemplate;
-
-
-public interface ShopCloseHistoryManager {
-
-    PageTemplate query(BaseQuery query);
-
-    boolean save(ShopCloseHistory shopCloseHistory);
-
-    ShopCloseHistory getShopCloseHistoryById(Long id);
-
-    ShopCloseHistory getAuditShopCloseHistoryByShopId(Long shopId);
-
-    boolean edit(ShopCloseHistory shopCloseHistory);
-}
-package com.diligrp.website.manager;
-
-import com.diligrp.website.domain.ShopNameModify;
-import com.diligrp.website.util.dao.BaseQuery;
-import com.diligrp.website.util.web.PageTemplate;
-
-import java.util.List;
-
-
-public interface ShopNameModifyManager {
-
-    PageTemplate query(BaseQuery query);
-
-    boolean save(ShopNameModify shopNameModify);
-
-    boolean edit(ShopNameModify shopNameModify);
-
-    List<ShopNameModify> getShopNameModifyByShopId(Long shopId);
-
-    ShopNameModify getShopNameModifyById(Long id);
-
-    ShopNameModify getShopNameModifyByNewShopName(String newShopName);
-}
-package com.diligrp.website.manager;
-
-import java.util.List;
-
-import com.diligrp.website.rpc.util.exception.GwException;
-import com.yqyw.user.rpc.client.domain.input.BrowseHistoryReq;
-import com.yqyw.user.rpc.client.domain.input.ConsigneeInfo;
-import com.yqyw.user.rpc.client.domain.input.FavoriteInfo;
-import com.yqyw.user.rpc.client.domain.output.MemberCreditInfoResp;
-import com.yqyw.user.rpc.client.domain.output.ShoppingCartResp;
-import com.yqyw.user.rpc.client.domain.output.UserInfoResp;
-
-
-/**
- * <B>Description</B>用户
- * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />
- * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
- * <B>Company</B> 地利集团
- * @createTime 2014年5月29日 下午3:18:09
- * @author mengxf
- */
-public interface UserManager {
-
-    /**
-     * 
-     * this method is 增加提货人信息
-     * @param consigneeInfo
-     * @return
-     * @createTime 2014年5月29日 下午3:20:16
-     * @author mengxf
-     */
-    public long addConsignee(ConsigneeInfo consigneeInfo);
-    
-    /**
-     * 
-     * this method is 删除提货人信息
-     * @param ConsigneeId
-     * @return
-     * @createTime 2014年5月29日 下午3:20:45
-     * @author mengxf
-     */
-    public boolean delConsignee(long consigneeId,long userId);
-    
-    /**
-     * 
-     * this method is 修改提货人信息
-     * @param ConsigneeId
-     * @return
-     * @createTime 2014年5月29日 下午3:20:45
-     * @author mengxf
-     */
-    public boolean updateConsignee(ConsigneeInfo consigneeInfo);
-    
-    /**
-     * 
-     * this method is 根据用户ID获取提货人信息列表
-     * @param UserId
-     * @return
-     * @createTime 2014年5月29日 下午3:20:56
-     * @author mengxf
-     */
-    public List<ConsigneeInfo> getConsignees(long userId);
-    
-    /**
-     * 
-     * this method is 增加收藏夹信息
-     * @param favoriteInfo
-     * @return
-     * @createTime 2014年6月3日 下午3:20:16
-     * @author jiangchengyong
-     */
-    public long addFavoriteInfo(FavoriteInfo favoriteInfo);
-    
-    /**
-     * 
-     * this method is 设置提货人为默认
-     * @param consigneeId
-     * @param UserId
-     * @return
-     * @createTime 2014年6月6日 上午11:34:23
-     * @author mengxf
-     */
-    public boolean setDefault(long consigneeId,long userId);
-    
-    /**
-     * 
-     * this method is 查询用下该类型的收藏数据
-     * @param userId
-     * @param type
-     * @return
-     * @createTime 2014年6月24日 下午4:45:40
-     * @author mengxf
-     */
-    public List<FavoriteInfo> getFavoriteByUserIdAndType(long userId, int type);
-    
-    /**
-     * 
-     * this method is 增加用户浏览记录
-     * @param browseHistoryReq
-     * @return
-     * @createTime 2014年6月13日 下午2:10:11
-     * @author mengxf
-     */
-    public boolean addUserBrowseHistory(BrowseHistoryReq browseHistoryReq);
-    
-    /**
-     * 移除用户的cookie
-     * this method is TODO
-     * @param userId
-     * @return
-     * @createTime 2014年6月20日 下午5:39:41
-     * @author ipangy
-     */
-    public boolean removeAllCookie(Long userId);
-    
-    /**
-     * 
-     * this method is 根据用户ID查询用户信息
-     * @param userId
-     * @return
-     * @createTime 2014年6月20日 下午6:13:11
-     * @author mengxf
-     */
-    public UserInfoResp getUserInfoById(long userId);
-    
-    /**
-     * 
-     * this method is 获取用户信用额度
-     * @param userId
-     * @return
-     * @createTime 2014年6月24日 下午12:02:56
-     * @author mengxf
-     */
-    public MemberCreditInfoResp getUserCreditInfo(long userId);
-    
-    /**
-     * 
-     * this method is 获取用户已删除的记录
-     * @param userId
-     * @param count
-     * @return
-     * @throws GwException
-     * @createTime 2014年7月1日 上午11:12:46
-     * @author jiangchengyong
-     */
-    public List<ShoppingCartResp>  getHistoryProduct(long userId,int count);
-    
-    
-}
-package com.diligrp.website.manager.cache;
-
-import java.util.List;
-
-import javax.annotation.Resource;
-
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Service;
-
-import com.alibaba.fastjson.JSON;
-import com.diligrp.titan.sdk.domain.Product;
-import com.diligrp.website.domain.common.Constant;
-import com.diligrp.website.rpc.ProductRPCService;
-import com.diligrp.website.rpc.util.exception.GwException;
-import com.diligrp.website.util.redis.RedisUtil;
-
-
-/**
- * <B>Description</B> 商品相关缓存
- * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />
- * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
- * <B>Company</B> 地利集团
- *
- * @author mengxf
- * @createTime 2014年5月21日 下午5:48:23
- */
-@Service
-public class ProductCache {
-
-    private static final Logger log = LoggerFactory.getLogger(ProductCache.class);
-    
-    @Resource
-    private RedisUtil redisUtils;
-    
-    @Resource
-    private ProductRPCService productRPCService;
-    
-    public List<Product> getProductInfos(List<Long> pids) {
-        if(CollectionUtils.isEmpty(pids)){
-            log.error("ProductCache.getProductInfos() 传递的pids为空！");
-            return null;
-        }
-        String key = Constant.PRODUCT_CACHE_KEY + "pids_" + pids;
-        String jsonList = redisUtils.getString(key);
-        List<Product> list = null;
-        if(StringUtils.isNotEmpty(jsonList)){
-            list = JSON.parseArray(jsonList, Product.class);
-        }
-        if(CollectionUtils.isEmpty(list)){
-            try {
-                list = productRPCService.getProductInfos(pids);
-                if (CollectionUtils.isEmpty(list)) {
-                    log.error("ProductCache.getProductInfos( pids : " + JSON.toJSONString(pids) + ") ：批量获取商品接口为空！");
-                } else {
-                    redisUtils.setStringByExpire(key, JSON.toJSONString(list),Constant.CACHE_EXPIRE_TIME_MINUTE_ONE);
-                }
-            } catch (GwException e) {
-                log.error("ProductCache.getProductInfos( pids : " + JSON.toJSONString(pids) + ") ： 批量获取商品接口异常" + e);
-            }
-        }else{
-            log.info("ProductCache.getProductInfos( pids : " + JSON.toJSONString(pids)+ ") ：获取获取服务器中购物车列表成功！");
-        }
-        return list;
-    }
-
-}
-package com.diligrp.website.manager.impl;
-
-import java.util.List;
-
-import javax.annotation.Resource;
-
-import org.springframework.stereotype.Component;
-
-import com.diligrp.website.dao.MailDao;
-import com.diligrp.website.domain.Mail;
-import com.diligrp.website.domain.SysConfig;
-import com.diligrp.website.manager.MailManager;
-import com.diligrp.website.util.dao.BaseQuery;
-import com.diligrp.website.util.web.PageTemplate;
-
-@Component("mailManager")
-public class MailManagerImpl implements MailManager {
-
-    @Resource
-    private MailDao mailDao;
-
-    @Override
-    public boolean saveMail(Mail mh) {
-        return mailDao.save(mh);
-    }
-
-    @Override
-    public PageTemplate queryMail(BaseQuery query) {
-        Integer totalSize = mailDao.getMailCount(query);
-        List<SysConfig> list = mailDao.getMailList(query);
-        return PageTemplate.create(query, totalSize, list);
-    }
-
-}
-package com.diligrp.website.manager.impl;
-
-import javax.annotation.Resource;
-
-import org.springframework.stereotype.Component;
-
-import com.diligrp.website.manager.MemberCenterAuthenManager;
-import com.diligrp.website.rpc.MemberCenterAuthenRpcService;
-
-
-/**
- * <B>Description</B> TODO <br />
- * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />
- * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
- * <B>Company</B> 地利集团
- * @createTime 2014年6月20日 下午12:03:39
- * @author liujie
- */
-@Component
-public class MemberCenterAuthenManagerImpl implements MemberCenterAuthenManager {
-    @Resource
-    private MemberCenterAuthenRpcService memberCenterAuthenRpcService;
-
-    /* (non-Javadoc)
-     * @see com.diligrp.website.manager.MemberCenterAuthenManager#getAuthenInfo(com.diligrp.website.util.dao.BaseQuery)
-     */
-//    @Override
-//    public PageTemplate getAuthenInfo(BaseQuery bq) throws Exception{
-//
-//        return memberCenterAuthenRpcService.getAuthenInfo(bq);
-//    }
-//
-//    /* (non-Javadoc)
-//     * @see com.diligrp.website.manager.MemberCenterAuthenManager#getUserInfoById(java.lang.Long)
-//     */
-//    @Override
-//    public UserExtension getUserInfoById(Long userId)throws Exception {
-//        return memberCenterAuthenRpcService.getUserInfoById(userId);
-//    }
-//
-//    /* (non-Javadoc)
-//     * @see com.diligrp.website.manager.MemberCenterAuthenManager#getEnterpriseInfoById(java.lang.Long)
-//     */
-//    @Override
-//    public EnterpriseInfo getEnterpriseInfoById(Long companyId)throws Exception {
-//        return memberCenterAuthenRpcService.getEnterpriseInfoById(companyId);
-//    }
-//
-//    /* (non-Javadoc)
-//     * @see com.diligrp.website.manager.MemberCenterAuthenManager#approveAuthen(java.lang.Long, java.lang.Integer, java.lang.Integer, java.lang.String)
-//     */
-//    @Override
-//    public boolean approveAuthen(Long userId, Integer userType,
-//            Integer authState, String auditReson,Long operatorId)throws Exception {
-//        return memberCenterAuthenRpcService.approveAuthen(userId, userType, authState, auditReson, operatorId);
-//    }
-}
-package com.diligrp.website.manager.impl;
-
-import java.util.List;
-
-import javax.annotation.Resource;
-
-import org.springframework.stereotype.Component;
-
-import com.diligrp.website.manager.MemberManager;
-import com.diligrp.website.rpc.MemberRPCService;
-import com.diligrp.website.util.dao.BaseQuery;
-import com.diligrp.website.util.web.PageTemplate;
-import com.yqyw.user.rpc.client.domain.input.CreditLimitReq;
-import com.yqyw.user.rpc.client.domain.input.FavoriteInfo;
-import com.yqyw.user.rpc.client.domain.input.LockMemberReq;
-import com.yqyw.user.rpc.client.domain.output.DefaultResp;
-import com.yqyw.user.rpc.client.domain.output.EnterpriseInfoResp;
-import com.yqyw.user.rpc.client.domain.output.ListFavoriteByPagingResp;
-import com.yqyw.user.rpc.client.domain.output.LockMemberResp;
-import com.yqyw.user.rpc.client.domain.output.MemberCreditInfoResp;
-import com.yqyw.user.rpc.client.domain.output.MemberCreditOptionLogResp;
-import com.yqyw.user.rpc.client.domain.output.UserExtensionResp;
-import com.yqyw.user.rpc.client.domain.output.UserInfoResp;
-
-@Component("memberManager")
-public class MemberManagerImpl implements MemberManager {
-
-    @Resource
-    private MemberRPCService memberRPCService;
-
-    @Override
-    public PageTemplate query(BaseQuery bq) {
-        return memberRPCService.query(bq);
-    }
-
-    @Override
-    public LockMemberResp getLockUser(Long id) {
-        return memberRPCService.getLockUser(id);
-    }
-
-    @Override
-    public boolean lockMember(LockMemberReq req) {
-        return memberRPCService.lockMember(req);
-    }
-
-    @Override
-    public boolean unlockMember(LockMemberReq req) {
-        return memberRPCService.unlockMember(req);
-    }
-
-    @Override
-    public List<MemberCreditOptionLogResp> getCreditHistory(Long memberId) {
-        return memberRPCService.getCreditHistory(memberId);
-    }
-
-    @Override
-    public MemberCreditInfoResp getCreditInfo(Long memberId) {
-        return memberRPCService.getCreditInfo(memberId);
-    }
-
-    @Override
-    public DefaultResp updateCreditLimit(CreditLimitReq req) {
-        return memberRPCService.updateCreditLimit(req);
-    }
-
-//    @Override
-//    public ListBrowseHistoryResp historyList(Integer type,Long userId, BaseQuery bq) {
-//        return memberRPCService.historyList(type, userId, bq);
-//    }
-
-    @Override
-    public UserInfoResp getMemberInfo(Long uid) {
-        return memberRPCService.getMemberInfo(uid);
-    }
-
-    @Override
-    public UserExtensionResp getMemberExtension(Long uid) {
-        return memberRPCService.getMemberExtension(uid);
-    }
-
-    @Override
-    public EnterpriseInfoResp getEnterpriseByUserId(Long uid) {
-        return memberRPCService.getEnterpriseByUserId(uid);
-    }
-
-    @Override
-    public ListFavoriteByPagingResp getMemberFavorite(FavoriteInfo info,
-            Integer currPage, Integer pageSize) {
-        return memberRPCService.getMemberFavorite(info, currPage, pageSize);
-    }
-
-}
-package com.diligrp.website.manager.impl;
-
-import javax.annotation.Resource;
-
-import org.springframework.stereotype.Service;
-
-import com.diligrp.pnr.sdk.domain.Shop;
-import com.diligrp.website.manager.OpenShopApplyManager;
-import com.diligrp.website.rpc.OpenShopApplyRpcService;
-import com.diligrp.website.util.web.PageTemplate;
-import com.yqyw.user.rpc.client.domain.output.MemberQueryResp;
-
-
-/**
- * <B>Description</B> TODO <br />
- * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />
- * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
- * <B>Company</B> 地利集团
- * @createTime 2014年6月5日 下午3:42:29
- * @author liujie
- */
-@Service
-public class OpenShopApplyManagerImpl implements OpenShopApplyManager{
-    @Resource
-    private OpenShopApplyRpcService openShopApplyRpcService;
-
-    /* (non-Javadoc)
-     * @see com.diligrp.website.manager.AuthenticationManageManager#getUserInfo(com.diligrp.user.rpc.client.domain.input.ShopAuthenReq)
-     */
-    @Override
-    public PageTemplate getUserInfo(Integer pageSize, Integer pageIndex, String shopName, String member, String contactPhone, Long startTime, Long endTime, Integer state, String shopId,String cityId,String shopSource) {
-        return openShopApplyRpcService.getUserInfo(pageSize,pageIndex,shopName,member,contactPhone,startTime,endTime,state,shopId,cityId,shopSource);
-    }
-
-    /* (non-Javadoc)
-     * @see com.diligrp.website.manager.OpenShopApplyManager#getShopInfoByShopIdAndUserId(java.lang.Long, java.lang.Long)
-     */
-    @Override
-    public Shop getShopInfoByShopId(Long shopId) {
-        return openShopApplyRpcService.getShopInfoByShopId(shopId);
-    }
-
-    /* (non-Javadoc)
-     * @see com.diligrp.website.manager.OpenShopApplyManager#updateShopStatus(java.lang.Long, java.lang.String, java.lang.String)
-     */
-    @Override
-    public boolean shopAudit(Long shopId, String auditRemark,Integer shopState) {
-        return openShopApplyRpcService.shopAudit(shopId, auditRemark, shopState);
-    }
-
-    @Override
-    public MemberQueryResp getUserAuthInfo(Long userId){
-        return openShopApplyRpcService.getUserAuthInfo(userId);
-    }
-
-}
-package com.diligrp.website.manager.impl;
-
-import java.util.List;
-
-import javax.annotation.Resource;
-
-import org.springframework.stereotype.Service;
-
-import com.diligrp.titan.sdk.domain.Product;
-import com.diligrp.website.manager.ProductManager;
-import com.diligrp.website.manager.cache.ProductCache;
-
-
-/**
- * <B>Description</B>  <br />
- * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />
- * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
- * <B>Company</B> 地利集团
- *
- * @author mengxf
- * @createTime 2014年5月21日 下午6:20:36
- */
-@Service
-public class ProductManagerImpl implements ProductManager {
-    
-    @Resource
-    private ProductCache productCahce;
-
-
-    @Override
-    public List<Product> getProductInfos(List<Long> pids) {
-        return productCahce.getProductInfos(pids);
-    }
-
-
-}
-package com.diligrp.website.manager.impl;
-
-import javax.annotation.Resource;
-
-import org.springframework.stereotype.Component;
-
-import com.diligrp.website.domain.MobMessage;
-import com.diligrp.website.manager.SMSManager;
-import com.diligrp.website.rpc.SMSRPCService;
-
-@Component("smsManager")
-public class SMSManagerImpl implements SMSManager {
-
-    @Resource(name = "smsRpcService")
-    private SMSRPCService smsRpcService;
-
-    @Override
-    public boolean sendSMS(MobMessage mm) {
-        return smsRpcService.sendSMS(mm);
-    }
-
-}
-package com.diligrp.website.manager.impl;
-
-import com.diligrp.website.dao.ShopCloseHistoryDao;
-import com.diligrp.website.domain.ShopCloseHistory;
-import com.diligrp.website.manager.ShopCloseHistoryManager;
-import com.diligrp.website.util.dao.BaseQuery;
-import com.diligrp.website.util.web.PageTemplate;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import java.sql.Timestamp;
-import java.util.List;
-
-@Component("shopCloseHistoryManager")
-public class ShopCloseHistoryManagerImpl implements ShopCloseHistoryManager {
-
-    @Resource
-    private ShopCloseHistoryDao shopCloseHistoryDao;
-
-    @Override
-    public PageTemplate query(BaseQuery query) {
-        Integer totalSize = shopCloseHistoryDao.getShopCloseHistoryCount(query);
-        List<ShopCloseHistory> list = shopCloseHistoryDao.getShopCloseHistoryList(query);
-        return PageTemplate.create(query, totalSize, list);
-    }
-
-    @Override
-    public boolean save(ShopCloseHistory shopCloseHistory) {
-        shopCloseHistory.setCreated(new Timestamp(System.currentTimeMillis()));
-        shopCloseHistory.setModified(shopCloseHistory.getCreated());
-        shopCloseHistory.setYn(1);
-        return shopCloseHistoryDao.save(shopCloseHistory);
-    }
-
-    @Override
-    public ShopCloseHistory getShopCloseHistoryById(Long id){
-        return shopCloseHistoryDao.getShopCloseHistoryById(id);
-    }
-
-    @Override
-    public ShopCloseHistory getAuditShopCloseHistoryByShopId(Long shopId){
-        return shopCloseHistoryDao.getAuditShopCloseHistoryByShopId(shopId);
-    }
-
-    @Override
-    public boolean edit(ShopCloseHistory shopCloseHistory) {
-        shopCloseHistory.setModified(new Timestamp(System.currentTimeMillis()));
-        return shopCloseHistoryDao.update(shopCloseHistory);
-    }
-}
-package com.diligrp.website.manager.impl;
-
-import com.diligrp.website.dao.ShopNameModifyDao;
-import com.diligrp.website.domain.ShopNameModify;
-import com.diligrp.website.manager.ShopNameModifyManager;
-import com.diligrp.website.util.dao.BaseQuery;
-import com.diligrp.website.util.web.PageTemplate;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import java.sql.Timestamp;
-import java.util.List;
-
-@Component("shopNameModifyManager")
-public class ShopNameModifyManagerImpl implements ShopNameModifyManager {
-
-    @Resource
-    private ShopNameModifyDao shopNameModifyDao;
-
-    @Override
-    public PageTemplate query(BaseQuery query) {
-        Integer totalSize = shopNameModifyDao.getShopNameModifyCount(query);
-        List<ShopNameModify> list = shopNameModifyDao.getShopNameModifyList(query);
-        return PageTemplate.create(query, totalSize, list);
-    }
-
-    @Override
-    public boolean save(ShopNameModify shopNameModify) {
-        shopNameModify.setCreated(new Timestamp(System.currentTimeMillis()));
-        shopNameModify.setModified(shopNameModify.getCreated());
-        shopNameModify.setYn(1);
-        return shopNameModifyDao.save(shopNameModify);
-    }
-
-    @Override
-    public boolean edit(ShopNameModify shopNameModify) {
-        shopNameModify.setModified(new Timestamp(System.currentTimeMillis()));
-        return shopNameModifyDao.update(shopNameModify);
-    }
-
-    @Override
-    public List<ShopNameModify> getShopNameModifyByShopId(Long shopId) {
-        return shopNameModifyDao.getShopNameModifyByShopId(shopId);
-    }
-
-    @Override
-    public ShopNameModify getShopNameModifyById(Long id){
-        return shopNameModifyDao.getShopNameModifyById(id);
-    }
-
-    @Override
-    public ShopNameModify getShopNameModifyByNewShopName(String newShopName){
-        return shopNameModifyDao.getShopNameModifyByNewShopName(newShopName);
-    }
-}
@@ -39,155 +39,45 @@
  
 	<profiles>
 		<profile>
-			<id>development</id>
-			<properties>
-				<!-- 显示模板 -->
-				<project.view.VMDefault>layout/default_content</project.view.VMDefault>
-
-				<!-- redis 配置 -->
-				<project.redis.host1>10.28.6.152</project.redis.host1>
-				<project.redis.port1>6379</project.redis.port1>
-
-				<!-- 商品详情链接地址 -->
-				<project.product.detail.path>http://www.nong12.com/product/</project.product.detail.path>
-
-				<!-- 后台默认静态资源地址 -->
-				<project.default.assets.path>http://static.nong12.com/static/ace1.3/assets</project.default.assets.path>
-
-				<!-- 公共样式引用 -->
-				<project.default.assets.common.path>http://static.nong12.com/static/</project.default.assets.common.path>
-
-				<!-- 本地资源地址 -->
-				<project.default.local.path>/</project.default.local.path>
-
-				<!-- 店铺域名 -->
-				<project.shop.domain>http://shop.nong12.com</project.shop.domain>
-
-				<!-- sms.webchina.cn 短信发送接口的配置 -->
-				<project.sms.webchina.SMSKey>2cf3264488ee3beef224</project.sms.webchina.SMSKey>
-				<project.sms.webchina.userName>itly</project.sms.webchina.userName>
-				<project.sms.webchina.postURL>http://gbk.sms.webchinese.cn</project.sms.webchina.postURL>
-
-				<!-- interface user -->
-				<website.user.baseUrl>http://user.nong12.com</website.user.baseUrl>
-				<website.user.token>token</website.user.token>
-
-				<!-- interface titan -->
-				<website.titan.accesskey>accesskey</website.titan.accesskey>
-				<website.titan.secretkey>secretkey</website.titan.secretkey>
-
-				<!-- 登录拦截器开关 -->
-				<project.manger.enabled>true</project.manger.enabled>
-
-				<!-- 图片服务器地址配置 -->
-				<project.image.server.domain>nong12.com</project.image.server.domain>
-				<project.image.server.host>http://10.28.6.153</project.image.server.host>
-
-				<!-- 数据库连接池配置文件 -->
-				<db.dbpool.jdbc.driver>org.mariadb.jdbc.Driver</db.dbpool.jdbc.driver>
-				<db.dbpool.jdbc.url>jdbc:mysql://10.28.6.151:3307/dili_website?useUnicode=true&amp;characterEncoding=utf8</db.dbpool.jdbc.url>
-				<db.dbpool.jdbc.username>root</db.dbpool.jdbc.username>
-				<db.dbpool.jdbc.password>123456</db.dbpool.jdbc.password>
-
-				<db.dbpool.init.initial.size>5</db.dbpool.init.initial.size>
-				<db.dbpool.init.min.idle>3</db.dbpool.init.min.idle>
-				<db.dbpool.init.max.active>5</db.dbpool.init.max.active>
-
-				<db.dbpool.max.wait>60000</db.dbpool.max.wait>
-				<db.dbpool.time.between.millis>60000</db.dbpool.time.between.millis>
-				<db.dbpool.min.idle.time>300000</db.dbpool.min.idle.time>
-
-				<!--权限相关配置 -->
-				<conf.manage.enable>false</conf.manage.enable>
-				<conf.manage.spider>true</conf.manage.spider>
-				<conf.manage.system>manweb</conf.manage.system>
-				<conf.manage.domain>http://manage.nong12.com/</conf.manage.domain>
-				<conf.manage.includes>^/$,^$,^/.*\.do</conf.manage.includes>
-				<conf.manage.excludes>^/noAccess.do$,^/welcome.do$,^/loginControl/.*,^/api/.*,^/city/.*,^/assets/.*</conf.manage.excludes>
-
-				<!-- 短信发送开关 -->
-				<sms.switch>false</sms.switch>
-
-				<!-- passport 注册配置 -->
-				<passport.register.url>http://passport.api.nong12.com/api/register/register.html</passport.register.url>
-				<passport.interface.sign>MTIzNDU2Nzg5</passport.interface.sign>
-				<passport.interface.pwd>nongfengwang</passport.interface.pwd>
-
-				<!-- 店铺接口签名 -->
-				<manage.shopClient.sign>FzZGZxd2VycXdlYXNzZHZzdnp4Y3Z</manage.shopClient.sign>
-
-				<!-- MQ -->
-				<conf.mq.namesrvAddr>10.28.6.124:9876</conf.mq.namesrvAddr>
-				<conf.mq.producerGroup>manweb_change</conf.mq.producerGroup>
-
-				<!-- 物流 -->
-				<wl.url>http://wl.nong12.com/</wl.url>
-				<wl.sign>TqExJO5spMVhZLvr17FBR1MlNvMOc</wl.sign>
-
-			</properties>
-		</profile>
-
-		<profile>
-			<id>zmq-dev</id>
+			<id>dev</id>
 			<activation>
 				<activeByDefault>true</activeByDefault>
 			</activation>
 			<properties>
 				<!-- 系统域名 -->
-				<project.system.domain>http://manweb.1n4j.com</project.system.domain>
+				<project.system.domain>http://manweb.zandeapp.com</project.system.domain>
 				<!-- 显示模板 -->
 				<project.view.VMDefault>layout/default_content</project.view.VMDefault>
  
 				<!-- redis 配置 -->
-				<project.redis.host1>10.28.10.208</project.redis.host1>
+				<project.redis.host1>10.28.11.205</project.redis.host1>
 				<project.redis.port1>6379</project.redis.port1>
  
 				<!-- 商品详情链接地址 -->
-				<project.product.detail.path>http://www.1n4j.com/product/</project.product.detail.path>
+				<project.product.detail.path>http://www.zandeapp.com/product/</project.product.detail.path>
  
 				<!-- 后台默认静态资源地址 -->
-				<project.default.assets.path>http://static.1n4j.com/static/ace1.3/assets</project.default.assets.path>
+				<project.default.assets.path>http://static.zandeapp.com/static/common/ace1.3/assets</project.default.assets.path>
  
 				<!-- 公共样式引用 -->
-				<project.default.assets.common.path>http://static.1n4j.com/static/</project.default.assets.common.path>
+				<project.default.assets.common.path>http://static.zandeapp.com/static/common/</project.default.assets.common.path>
  
 				<!-- 本地资源地址 -->
 				<project.default.local.path>/</project.default.local.path>
  
-				<!-- 店铺域名 -->
-				<project.shop.domain>http://shop.1n4j.com</project.shop.domain>
-				<manage.shopClient.url>http://shop.1n4j.com</manage.shopClient.url>
-				<manage.shopClient.system>manweb</manage.shopClient.system>
-				<!-- 店铺接口签名 -->
-				<manage.shopClient.sign>FzZGZxd2VycXdlYXNzZHZzdnp4Y3Z</manage.shopClient.sign>
-
-				<!-- sms.webchina.cn 短信发送接口的配置 -->
-				<project.sms.webchina.SMSKey>2cf3264488ee3beef224</project.sms.webchina.SMSKey>
-				<project.sms.webchina.userName>itly</project.sms.webchina.userName>
-				<project.sms.webchina.postURL>http://gbk.sms.webchinese.cn</project.sms.webchina.postURL>
-
-				<!-- interface user -->
-				<website.user.baseUrl>http://user.1n4j.com</website.user.baseUrl>
-				<website.user.token>token</website.user.token>
-
-				<!-- interface titan -->
-				<website.titan.accesskey>accesskey</website.titan.accesskey>
-				<website.titan.secretkey>secretkey</website.titan.secretkey>
-
 				<!-- 登录拦截器开关 -->
 				<project.manger.enabled>true</project.manger.enabled>
  
 				<!-- 图片服务器地址配置 -->
-				<project.image.server.domain>1n4j.com</project.image.server.domain>
-				<!-- <project.image.server.host>http://10.28.6.153</project.image.server.host> -->
-				<project.image.server.host>up.1n4j.com</project.image.server.host>
+				<project.image.server.domain>zandeapp.com</project.image.server.domain>
+				<project.image.server.host>up.zandeapp.com</project.image.server.host>
 				<project.image.server.bucketname>free_trade_zone</project.image.server.bucketname>
 				<project.image.server.accesskey>d6a300418bd6fa2178b3bbb06a421f32</project.image.server.accesskey>
 				<project.image.server.secretkey>8d2d1ac5541dcfbbd78ac1793ce4f782</project.image.server.secretkey>
  
 				<!-- 数据库连接池配置文件 -->
 				<db.dbpool.jdbc.driver>org.mariadb.jdbc.Driver</db.dbpool.jdbc.driver>
-				<db.dbpool.jdbc.url>jdbc:mysql://10.28.10.188:3306/website?useUnicode=true&amp;characterEncoding=utf8</db.dbpool.jdbc.url>
+				<db.dbpool.jdbc.url>jdbc:mysql://10.28.11.162:3306/manweb?useUnicode=true&amp;characterEncoding=utf8</db.dbpool.jdbc.url>
 				<db.dbpool.jdbc.username>root</db.dbpool.jdbc.username>
 				<db.dbpool.jdbc.password>123456</db.dbpool.jdbc.password>
  
@@ -203,669 +93,17 @@
 				<conf.manage.enable>false</conf.manage.enable>
 				<conf.manage.spider>true</conf.manage.spider>
 				<conf.manage.system>manweb</conf.manage.system>
-				<conf.manage.domain>http://manage.1n4j.com/</conf.manage.domain>
+				<conf.manage.domain>http://manage.zandeapp.com/</conf.manage.domain>
 				<conf.manage.includes>^/$,^$,^/.*\.do</conf.manage.includes>
 				<conf.manage.excludes>^/noAccess.do$,^/welcome.do$,^/loginControl/.*,^/api/.*,^/city/.*,^/assets/.*</conf.manage.excludes>
  
 				<!-- 短信发送开关 -->
 				<sms.switch>false</sms.switch>
  
-				<!-- passport 注册配置 -->
-				<passport.register.url>http://passport.api.1n4j.com/api/register/register.html</passport.register.url>
-				<passport.interface.sign>MTIzNDU2Nzg5</passport.interface.sign>
-				<passport.interface.pwd>nongfengwang</passport.interface.pwd>
-
 				<!-- MQ -->
 				<conf.mq.namesrvAddr>10.28.6.124:9876</conf.mq.namesrvAddr>
 				<conf.mq.producerGroup>manweb_change</conf.mq.producerGroup>
  
-				<!-- 物流 -->
-				<wl.url>http://wl.1n4j.com/</wl.url>
-				<wl.sign>TqExJO5spMVhZLvr17FBR1MlNvMOc</wl.sign>
-
-			</properties>
-		</profile>
-
-		<profile>
-			<id>zmq-init-sql</id>
-			<properties>
-				<!-- 系统域名 -->
-				<project.system.domain>http://manweb.1n4j.com</project.system.domain>
-				<!-- 显示模板 -->
-				<project.view.VMDefault>layout/default_content</project.view.VMDefault>
-
-				<!-- redis 配置 -->
-				<project.redis.host1>10.28.10.208</project.redis.host1>
-				<project.redis.port1>6379</project.redis.port1>
-
-				<!-- 商品详情链接地址 -->
-				<project.product.detail.path>http://www.1n4j.com/product/</project.product.detail.path>
-
-				<!-- 后台默认静态资源地址 -->
-				<project.default.assets.path>http://static.1n4j.com/static/ace1.3/assets</project.default.assets.path>
-
-				<!-- 公共样式引用 -->
-				<project.default.assets.common.path>http://static.1n4j.com/static/</project.default.assets.common.path>
-
-				<!-- 本地资源地址 -->
-				<project.default.local.path>/</project.default.local.path>
-
-				<!-- 店铺域名 -->
-				<project.shop.domain>http://shop.1n4j.com</project.shop.domain>
-				<manage.shopClient.url>http://shop.1n4j.com</manage.shopClient.url>
-				<manage.shopClient.system>manweb</manage.shopClient.system>
-				<!-- 店铺接口签名 -->
-				<manage.shopClient.sign>FzZGZxd2VycXdlYXNzZHZzdnp4Y3Z</manage.shopClient.sign>
-
-				<!-- sms.webchina.cn 短信发送接口的配置 -->
-				<project.sms.webchina.SMSKey>2cf3264488ee3beef224</project.sms.webchina.SMSKey>
-				<project.sms.webchina.userName>itly</project.sms.webchina.userName>
-				<project.sms.webchina.postURL>http://gbk.sms.webchinese.cn</project.sms.webchina.postURL>
-
-				<!-- interface user -->
-				<website.user.baseUrl>http://user.1n4j.com</website.user.baseUrl>
-				<website.user.token>token</website.user.token>
-
-				<!-- interface titan -->
-				<website.titan.accesskey>accesskey</website.titan.accesskey>
-				<website.titan.secretkey>secretkey</website.titan.secretkey>
-
-				<!-- 登录拦截器开关 -->
-				<project.manger.enabled>true</project.manger.enabled>
-
-				<!-- 图片服务器地址配置 -->
-				<project.image.server.domain>1n4j.com</project.image.server.domain>
-				<!-- <project.image.server.host>http://10.28.6.153</project.image.server.host> -->
-				<project.image.server.host>up.1n4j.com</project.image.server.host>
-				<project.image.server.bucketname>free_trade_zone</project.image.server.bucketname>
-				<project.image.server.accesskey>d6a300418bd6fa2178b3bbb06a421f32</project.image.server.accesskey>
-				<project.image.server.secretkey>8d2d1ac5541dcfbbd78ac1793ce4f782</project.image.server.secretkey>
-
-				<!-- 数据库连接池配置文件 -->
-				<db.dbpool.jdbc.driver>org.mariadb.jdbc.Driver</db.dbpool.jdbc.driver>
-				<db.dbpool.jdbc.url>jdbc:mysql://10.28.10.188:3306/test_website?useUnicode=true&amp;characterEncoding=utf8</db.dbpool.jdbc.url>
-				<db.dbpool.jdbc.username>root</db.dbpool.jdbc.username>
-				<db.dbpool.jdbc.password>123456</db.dbpool.jdbc.password>
-
-				<db.dbpool.init.initial.size>5</db.dbpool.init.initial.size>
-				<db.dbpool.init.min.idle>3</db.dbpool.init.min.idle>
-				<db.dbpool.init.max.active>5</db.dbpool.init.max.active>
-
-				<db.dbpool.max.wait>60000</db.dbpool.max.wait>
-				<db.dbpool.time.between.millis>60000</db.dbpool.time.between.millis>
-				<db.dbpool.min.idle.time>300000</db.dbpool.min.idle.time>
-
-				<!--权限相关配置 -->
-				<conf.manage.enable>false</conf.manage.enable>
-				<conf.manage.spider>true</conf.manage.spider>
-				<conf.manage.system>manweb</conf.manage.system>
-				<conf.manage.domain>http://manage.1n4j.com/</conf.manage.domain>
-				<conf.manage.includes>^/$,^$,^/.*\.do</conf.manage.includes>
-				<conf.manage.excludes>^/noAccess.do$,^/welcome.do$,^/loginControl/.*,^/api/.*,^/city/.*,^/assets/.*</conf.manage.excludes>
-
-				<!-- 短信发送开关 -->
-				<sms.switch>false</sms.switch>
-
-				<!-- passport 注册配置 -->
-				<passport.register.url>http://passport.api.1n4j.com/api/register/register.html</passport.register.url>
-				<passport.interface.sign>MTIzNDU2Nzg5</passport.interface.sign>
-				<passport.interface.pwd>nongfengwang</passport.interface.pwd>
-
-				<!-- MQ -->
-				<conf.mq.namesrvAddr>10.28.6.124:9876</conf.mq.namesrvAddr>
-				<conf.mq.producerGroup>manweb_change</conf.mq.producerGroup>
-
-				<!-- 物流 -->
-				<wl.url>http://wl.1n4j.com/</wl.url>
-				<wl.sign>TqExJO5spMVhZLvr17FBR1MlNvMOc</wl.sign>
-
-			</properties>
-		</profile>
-
-		<profile>
-			<id>zmq-test</id>
-			<properties>
-				<!-- 系统域名 -->
-				<project.system.domain>http://manweb.1n4j.com</project.system.domain>
-				<!-- 显示模板 -->
-				<project.view.VMDefault>layout/default_content</project.view.VMDefault>
-
-				<!-- redis 配置 -->
-				<project.redis.host1>10.28.10.207</project.redis.host1>
-				<project.redis.port1>6379</project.redis.port1>
-
-				<!-- 商品详情链接地址 -->
-				<project.product.detail.path>http://www.1n4j.com/product/</project.product.detail.path>
-
-				<!-- 后台默认静态资源地址 -->
-				<project.default.assets.path>http://static.1n4j.com/static/ace1.3/assets</project.default.assets.path>
-
-				<!-- 公共样式引用 -->
-				<project.default.assets.common.path>http://static.1n4j.com/static/</project.default.assets.common.path>
-
-				<!-- 本地资源地址 -->
-				<project.default.local.path>/</project.default.local.path>
-
-				<!-- 店铺域名 -->
-				<project.shop.domain>http://shop.1n4j.com</project.shop.domain>
-				<manage.shopClient.url>http://shop.1n4j.com</manage.shopClient.url>
-				<manage.shopClient.system>manweb</manage.shopClient.system>
-				<!-- 店铺接口签名 -->
-				<manage.shopClient.sign>FzZGZxd2VycXdlYXNzZHZzdnp4Y3Z</manage.shopClient.sign>
-
-				<!-- sms.webchina.cn 短信发送接口的配置 -->
-				<project.sms.webchina.SMSKey>2cf3264488ee3beef224</project.sms.webchina.SMSKey>
-				<project.sms.webchina.userName>itly</project.sms.webchina.userName>
-				<project.sms.webchina.postURL>http://gbk.sms.webchinese.cn</project.sms.webchina.postURL>
-
-				<!-- interface user -->
-				<website.user.baseUrl>http://user.1n4j.com</website.user.baseUrl>
-				<website.user.token>token</website.user.token>
-
-				<!-- interface titan -->
-				<website.titan.accesskey>accesskey</website.titan.accesskey>
-				<website.titan.secretkey>secretkey</website.titan.secretkey>
-
-				<!-- 登录拦截器开关 -->
-				<project.manger.enabled>true</project.manger.enabled>
-
-				<!-- 图片服务器地址配置 -->
-				<project.image.server.host>up.1n4j.com</project.image.server.host>
-				<project.image.server.bucketname>free_trade_zone</project.image.server.bucketname>
-				<project.image.server.accesskey>d6a300418bd6fa2178b3bbb06a421f32</project.image.server.accesskey>
-				<project.image.server.secretkey>8d2d1ac5541dcfbbd78ac1793ce4f782</project.image.server.secretkey>
-
-				<!-- 数据库连接池配置文件 -->
-				<db.dbpool.jdbc.driver>org.mariadb.jdbc.Driver</db.dbpool.jdbc.driver>
-				<db.dbpool.jdbc.url>jdbc:mysql://10.28.6.55:3307/agriez_website?useUnicode=true&amp;characterEncoding=utf8</db.dbpool.jdbc.url>
-				<db.dbpool.jdbc.username>root</db.dbpool.jdbc.username>
-				<db.dbpool.jdbc.password>123456</db.dbpool.jdbc.password>
-
-				<db.dbpool.init.initial.size>5</db.dbpool.init.initial.size>
-				<db.dbpool.init.min.idle>3</db.dbpool.init.min.idle>
-				<db.dbpool.init.max.active>5</db.dbpool.init.max.active>
-
-				<db.dbpool.max.wait>60000</db.dbpool.max.wait>
-				<db.dbpool.time.between.millis>60000</db.dbpool.time.between.millis>
-				<db.dbpool.min.idle.time>300000</db.dbpool.min.idle.time>
-
-				<!--权限相关配置 -->
-				<conf.manage.enable>false</conf.manage.enable>
-				<conf.manage.spider>true</conf.manage.spider>
-				<conf.manage.system>manweb</conf.manage.system>
-				<conf.manage.domain>http://manage.1n4j.com/</conf.manage.domain>
-				<conf.manage.includes>^/$,^$,^/.*\.do</conf.manage.includes>
-				<conf.manage.excludes>^/noAccess.do$,^/welcome.do$,^/loginControl/.*,^/api/.*,^/city/.*,^/assets/.*</conf.manage.excludes>
-
-				<!-- 短信发送开关 -->
-				<sms.switch>false</sms.switch>
-
-				<!-- passport 注册配置 -->
-				<passport.register.url>http://passport.api.1n4j.com/api/register/register.html</passport.register.url>
-				<passport.interface.sign>MTIzNDU2Nzg5</passport.interface.sign>
-				<passport.interface.pwd>nongfengwang</passport.interface.pwd>
-
-				<!-- MQ -->
-				<conf.mq.namesrvAddr>10.28.10.230:9876</conf.mq.namesrvAddr>
-				<conf.mq.producerGroup>manweb_change</conf.mq.producerGroup>
-
-				<!-- 物流 -->
-				<wl.url>http://wl.1n4j.com/</wl.url>
-				<wl.sign>TqExJO5spMVhZLvr17FBR1MlNvMOc</wl.sign>
-
-			</properties>
-		</profile>
-		
-		<profile>
-			<id>pre-online</id>
-			<properties>
-				<!-- 系统域名 -->
-				<project.system.domain>http://manweb.1n4j.com</project.system.domain>
-				<!-- 显示模板 -->
-				<project.view.VMDefault>layout/default_content</project.view.VMDefault>
-
-				<!-- redis 配置 -->
-				<project.redis.host1>redis.1n4j.com</project.redis.host1>
-				<project.redis.port1>6379</project.redis.port1>
-
-				<!-- 商品详情链接地址 -->
-				<project.product.detail.path>http://www.1n4j.com/product/</project.product.detail.path>
-
-				<!-- 后台默认静态资源地址 -->
-				<project.default.assets.path>http://static.1n4j.com/static/ace1.3/assets</project.default.assets.path>
-
-				<!-- 公共样式引用 -->
-				<project.default.assets.common.path>http://static.1n4j.com/static/</project.default.assets.common.path>
-
-				<!-- 本地资源地址 -->
-				<project.default.local.path>/</project.default.local.path>
-
-				<!-- 店铺域名 -->
-				<project.shop.domain>http://shop.1n4j.com</project.shop.domain>
-				<manage.shopClient.url>http://shop.1n4j.com</manage.shopClient.url>
-				<manage.shopClient.system>manweb</manage.shopClient.system>
-				<!-- 店铺接口签名 -->
-				<manage.shopClient.sign>FzZGZxd2VycXdlYXNzZHZzdnp4Y3Z</manage.shopClient.sign>
-
-				<!-- sms.webchina.cn 短信发送接口的配置 -->
-				<project.sms.webchina.SMSKey>2cf3264488ee3beef224</project.sms.webchina.SMSKey>
-				<project.sms.webchina.userName>itly</project.sms.webchina.userName>
-				<project.sms.webchina.postURL>http://gbk.sms.webchinese.cn</project.sms.webchina.postURL>
-
-				<!-- interface user -->
-				<website.user.baseUrl>http://user.1n4j.com</website.user.baseUrl>
-				<website.user.token>token</website.user.token>
-
-				<!-- interface titan -->
-				<website.titan.accesskey>accesskey</website.titan.accesskey>
-				<website.titan.secretkey>secretkey</website.titan.secretkey>
-
-				<!-- 登录拦截器开关 -->
-				<project.manger.enabled>true</project.manger.enabled>
-
-				<!-- 图片服务器地址配置 -->
-				<project.image.server.domain>1n4j.com</project.image.server.domain>
-				<!-- <project.image.server.host>http://10.28.6.153</project.image.server.host> -->
-				<project.image.server.host>up.1n4j.com</project.image.server.host>
-				<project.image.server.bucketname>free_trade_zone</project.image.server.bucketname>
-				<project.image.server.accesskey>d6a300418bd6fa2178b3bbb06a421f32</project.image.server.accesskey>
-				<project.image.server.secretkey>8d2d1ac5541dcfbbd78ac1793ce4f782</project.image.server.secretkey>
-
-				<!-- 数据库连接池配置文件 -->
-				<db.dbpool.jdbc.driver>org.mariadb.jdbc.Driver</db.dbpool.jdbc.driver>
-				<db.dbpool.jdbc.url>jdbc:mysql://manweb.db.1n4j.com:3306/agriez_manweb?useUnicode=true&amp;characterEncoding=utf8</db.dbpool.jdbc.url>
-				<db.dbpool.jdbc.username>root</db.dbpool.jdbc.username>
-				<db.dbpool.jdbc.password>123456</db.dbpool.jdbc.password>
-
-				<db.dbpool.init.initial.size>5</db.dbpool.init.initial.size>
-				<db.dbpool.init.min.idle>3</db.dbpool.init.min.idle>
-				<db.dbpool.init.max.active>5</db.dbpool.init.max.active>
-
-				<db.dbpool.max.wait>60000</db.dbpool.max.wait>
-				<db.dbpool.time.between.millis>60000</db.dbpool.time.between.millis>
-				<db.dbpool.min.idle.time>300000</db.dbpool.min.idle.time>
-
-				<!--权限相关配置 -->
-				<conf.manage.enable>false</conf.manage.enable>
-				<conf.manage.spider>true</conf.manage.spider>
-				<conf.manage.system>manweb</conf.manage.system>
-				<conf.manage.domain>http://manage.1n4j.com/</conf.manage.domain>
-				<conf.manage.includes>^/$,^$,^/.*\.do</conf.manage.includes>
-				<conf.manage.excludes>^/noAccess.do$,^/welcome.do$,^/loginControl/.*,^/api/.*,^/city/.*,^/assets/.*</conf.manage.excludes>
-
-				<!-- 短信发送开关 -->
-				<sms.switch>false</sms.switch>
-
-				<!-- passport 注册配置 -->
-				<passport.register.url>http://passport.api.1n4j.com/api/register/register.html</passport.register.url>
-				<passport.interface.sign>MTIzNDU2Nzg5</passport.interface.sign>
-				<passport.interface.pwd>nongfengwang</passport.interface.pwd>
-
-				<!-- MQ -->
-				<conf.mq.namesrvAddr>20.28.6.51:9876</conf.mq.namesrvAddr>
-				<conf.mq.producerGroup>manweb_change</conf.mq.producerGroup>
-
-				<!-- 物流 -->
-				<wl.url>http://wl.1n4j.com/</wl.url>
-				<wl.sign>TqExJO5spMVhZLvr17FBR1MlNvMOc</wl.sign>
-
-			</properties>
-		</profile>
-
-		<profile>
-			<id>online</id>
-			<properties>
-				<!-- 系统域名 -->
-				<project.system.domain>http://manweb.1n4j.com</project.system.domain>
-				<!-- 显示模板 -->
-				<project.view.VMDefault>layout/default_content</project.view.VMDefault>
-
-				<!-- redis 配置 -->
-				<project.redis.host1>redis.1n4j.com</project.redis.host1>
-				<project.redis.port1>6379</project.redis.port1>
-
-				<!-- 商品详情链接地址 -->
-				<project.product.detail.path>http://www.1n4j.com/product/</project.product.detail.path>
-
-				<!-- 后台默认静态资源地址 -->
-				<project.default.assets.path>http://static.1n4j.com/static/ace1.3/assets</project.default.assets.path>
-
-				<!-- 公共样式引用 -->
-				<project.default.assets.common.path>http://static.1n4j.com/static/</project.default.assets.common.path>
-
-				<!-- 本地资源地址 -->
-				<project.default.local.path>/</project.default.local.path>
-
-				<!-- 店铺域名 -->
-				<project.shop.domain>http://shop.1n4j.com</project.shop.domain>
-				<manage.shopClient.url>http://shop.1n4j.com</manage.shopClient.url>
-				<manage.shopClient.system>manweb</manage.shopClient.system>
-				<!-- 店铺接口签名 -->
-				<manage.shopClient.sign>FzZGZxd2VycXdlYXNzZHZzdnp4Y3Z</manage.shopClient.sign>
-
-				<!-- sms.webchina.cn 短信发送接口的配置 -->
-				<project.sms.webchina.SMSKey>2cf3264488ee3beef224</project.sms.webchina.SMSKey>
-				<project.sms.webchina.userName>itly</project.sms.webchina.userName>
-				<project.sms.webchina.postURL>http://gbk.sms.webchinese.cn</project.sms.webchina.postURL>
-
-				<!-- interface user -->
-				<website.user.baseUrl>http://user.1n4j.com</website.user.baseUrl>
-				<website.user.token>token</website.user.token>
-
-				<!-- interface titan -->
-				<website.titan.accesskey>accesskey</website.titan.accesskey>
-				<website.titan.secretkey>secretkey</website.titan.secretkey>
-
-				<!-- 登录拦截器开关 -->
-				<project.manger.enabled>true</project.manger.enabled>
-
-				<!-- 图片服务器地址配置 -->
-				<project.image.server.domain>1n4j.com</project.image.server.domain>
-				<!-- <project.image.server.host>http://10.28.6.153</project.image.server.host> -->
-				<project.image.server.host>up.1n4j.com</project.image.server.host>
-				<project.image.server.bucketname>free_trade_zone</project.image.server.bucketname>
-				<project.image.server.accesskey>d6a300418bd6fa2178b3bbb06a421f32</project.image.server.accesskey>
-				<project.image.server.secretkey>8d2d1ac5541dcfbbd78ac1793ce4f782</project.image.server.secretkey>
-
-				<!-- 数据库连接池配置文件 -->
-				<db.dbpool.jdbc.driver>org.mariadb.jdbc.Driver</db.dbpool.jdbc.driver>
-				<db.dbpool.jdbc.url>jdbc:mysql://manweb.db.1n4j.com:3306/agriez_manweb?useUnicode=true&amp;characterEncoding=utf8</db.dbpool.jdbc.url>
-				<db.dbpool.jdbc.username>appAccPayor</db.dbpool.jdbc.username>
-				<db.dbpool.jdbc.password>iTDYVBtI6MX4NQ3Er2Oh</db.dbpool.jdbc.password>
-
-				<db.dbpool.init.initial.size>5</db.dbpool.init.initial.size>
-				<db.dbpool.init.min.idle>3</db.dbpool.init.min.idle>
-				<db.dbpool.init.max.active>5</db.dbpool.init.max.active>
-
-				<db.dbpool.max.wait>60000</db.dbpool.max.wait>
-				<db.dbpool.time.between.millis>60000</db.dbpool.time.between.millis>
-				<db.dbpool.min.idle.time>300000</db.dbpool.min.idle.time>
-
-				<!--权限相关配置 -->
-				<conf.manage.enable>false</conf.manage.enable>
-				<conf.manage.spider>true</conf.manage.spider>
-				<conf.manage.system>manweb</conf.manage.system>
-				<conf.manage.domain>http://manage.1n4j.com/</conf.manage.domain>
-				<conf.manage.includes>^/$,^$,^/.*\.do</conf.manage.includes>
-				<conf.manage.excludes>^/noAccess.do$,^/welcome.do$,^/loginControl/.*,^/api/.*,^/city/.*,^/assets/.*</conf.manage.excludes>
-
-				<!-- 短信发送开关 -->
-				<sms.switch>false</sms.switch>
-
-				<!-- passport 注册配置 -->
-				<passport.register.url>http://passport.api.1n4j.com/api/register/register.html</passport.register.url>
-				<passport.interface.sign>MTIzNDU2Nzg5</passport.interface.sign>
-				<passport.interface.pwd>nongfengwang</passport.interface.pwd>
-
-				<!-- MQ -->
-				<conf.mq.namesrvAddr>192.168.60.62:9876;192.168.60.63:9876</conf.mq.namesrvAddr>
-				<conf.mq.producerGroup>manweb_change</conf.mq.producerGroup>
-
-				<!-- 物流 -->
-				<wl.url>http://wl.1n4j.com/</wl.url>
-				<wl.sign>TqExJO5spMVhZLvr17FBR1MlNvMOc</wl.sign>
-
-			</properties>
-		</profile>
-
-		<profile>
-			<id>test</id>
-			<properties>
-				<!-- 显示模板 -->
-				<project.view.VMDefault>layout/default_content</project.view.VMDefault>
-
-				<!-- redis 配置 -->
-				<project.redis.host1>10.28.6.54</project.redis.host1>
-				<project.redis.port1>6379</project.redis.port1>
-
-				<!-- 商品详情链接地址 -->
-				<project.product.detail.path>http://www.nong12.com/product/</project.product.detail.path>
-
-				<!-- 后台默认静态资源地址 -->
-				<project.default.assets.path>http://static.nong12.com/static/ace1.3/assets</project.default.assets.path>
-
-				<!-- 公共样式引用 -->
-				<project.default.assets.common.path>http://static.nong12.com/static/</project.default.assets.common.path>
-
-				<!-- 本地资源地址 -->
-				<project.default.local.path>/</project.default.local.path>
-
-				<!-- 店铺域名 -->
-				<project.shop.domain>http://shop.nong12.com</project.shop.domain>
-
-				<!-- sms.webchina.cn 短信发送接口的配置 -->
-				<project.sms.webchina.SMSKey>2cf3264488ee3beef224</project.sms.webchina.SMSKey>
-				<project.sms.webchina.userName>itly</project.sms.webchina.userName>
-				<project.sms.webchina.postURL>http://gbk.sms.webchinese.cn</project.sms.webchina.postURL>
-
-				<!-- interface user -->
-				<website.user.baseUrl>http://user.nong12.com</website.user.baseUrl>
-				<website.user.token>token</website.user.token>
-
-				<!-- interface titan -->
-				<website.titan.accesskey>accesskey</website.titan.accesskey>
-				<website.titan.secretkey>secretkey</website.titan.secretkey>
-
-				<!-- 登录拦截器开关 -->
-				<project.manger.enabled>true</project.manger.enabled>
-
-				<!-- 图片服务器地址配置 -->
-				<project.image.server.domain>nong12.com</project.image.server.domain>
-				<project.image.server.host>http://10.28.6.153</project.image.server.host>
-
-
-				<!-- 数据库连接池配置文件 -->
-				<db.dbpool.jdbc.driver>org.mariadb.jdbc.Driver</db.dbpool.jdbc.driver>
-				<db.dbpool.jdbc.url>jdbc:mysql://10.28.6.55:3307/dili_website?useUnicode=true&amp;characterEncoding=utf8</db.dbpool.jdbc.url>
-				<db.dbpool.jdbc.username>root</db.dbpool.jdbc.username>
-				<db.dbpool.jdbc.password>123456</db.dbpool.jdbc.password>
-
-				<db.dbpool.init.initial.size>5</db.dbpool.init.initial.size>
-				<db.dbpool.init.min.idle>3</db.dbpool.init.min.idle>
-				<db.dbpool.init.max.active>5</db.dbpool.init.max.active>
-
-				<db.dbpool.max.wait>60000</db.dbpool.max.wait>
-				<db.dbpool.time.between.millis>60000</db.dbpool.time.between.millis>
-				<db.dbpool.min.idle.time>300000</db.dbpool.min.idle.time>
-
-				<!--权限相关配置 -->
-				<conf.manage.enable>true</conf.manage.enable>
-				<conf.manage.spider>true</conf.manage.spider>
-				<conf.manage.system>manweb</conf.manage.system>
-				<conf.manage.domain>http://manage.nong12.com/</conf.manage.domain>
-				<conf.manage.includes>^/.*\.do</conf.manage.includes>
-				<conf.manage.excludes>^/noAccess.do$,^/welcome.do$,^/loginControl/.*,^/api/.*,^/city/.*,^/assets/.*</conf.manage.excludes>
-
-				<!-- 短信发送开关 -->
-				<sms.switch>false</sms.switch>
-
-				<!-- passport 注册配置 -->
-				<passport.register.url>http://passport.api.nong12.com/api/register/register.html</passport.register.url>
-				<passport.interface.sign>MTIzNDU2Nzg5</passport.interface.sign>
-				<passport.interface.pwd>nongfengwang</passport.interface.pwd>
-
-				<!-- 店铺接口签名 -->
-				<manage.shopClient.sign>FzZGZxd2VycXdlYXNzZHZzdnp4Y3Z</manage.shopClient.sign>
-
-				<!-- MQ -->
-				<conf.mq.namesrvAddr>10.28.6.54:9876</conf.mq.namesrvAddr>
-				<conf.mq.producerGroup>manweb_change</conf.mq.producerGroup>
-
-				<!-- 物流 -->
-				<wl.url>http://wl.nong12.com/</wl.url>
-				<wl.sign>TqExJO5spMVhZLvr17FBR1MlNvMOc</wl.sign>
-			</properties>
-		</profile>
-
-
-		<profile>
-			<id>product</id>
-			<properties>
-				<!-- 显示模板 -->
-				<project.view.VMDefault>layout/default_content</project.view.VMDefault>
-
-				<!-- redis 配置 -->
-				<project.redis.host1>udlredis.nong12.com</project.redis.host1>
-				<project.redis.port1>6379</project.redis.port1>
-
-				<!-- 商品详情链接地址 -->
-				<project.product.detail.path>http://www.nong12.com/product/</project.product.detail.path>
-
-				<!-- 后台默认静态资源地址 -->
-				<project.default.assets.path>http://static.nong12.com/static/ace1.3/assets</project.default.assets.path>
-
-				<!-- 公共样式引用 -->
-				<project.default.assets.common.path>http://static.nong12.com/static/</project.default.assets.common.path>
-
-				<!-- 本地资源地址 -->
-				<project.default.local.path>/</project.default.local.path>
-
-				<!-- 店铺域名 -->
-				<project.shop.domain>http://shop.nong12.com</project.shop.domain>
-
-				<!-- sms.webchina.cn 短信发送接口的配置 -->
-				<project.sms.webchina.SMSKey>c0978121c3893cf9ddbc</project.sms.webchina.SMSKey>
-				<project.sms.webchina.userName>zhuxuegang@diligrp.com</project.sms.webchina.userName>
-				<project.sms.webchina.postURL>http://gbk.sms.webchinese.cn</project.sms.webchina.postURL>
-
-				<!-- interface user -->
-				<website.user.baseUrl>http://user.nong12.com</website.user.baseUrl>
-				<website.user.token>token</website.user.token>
-
-				<!-- interface titan -->
-				<website.titan.accesskey>accesskey</website.titan.accesskey>
-				<website.titan.secretkey>secretkey</website.titan.secretkey>
-
-				<!-- 登录拦截器开关 -->
-				<project.manger.enabled>true</project.manger.enabled>
-
-				<!-- 图片服务器地址配置 -->
-				<project.image.server.domain>nong12.com</project.image.server.domain>
-				<project.image.server.host>http://imageServer.nong12.com:8000</project.image.server.host>
-
-				<!-- 数据库连接池配置文件 -->
-				<db.dbpool.jdbc.driver>org.mariadb.jdbc.Driver</db.dbpool.jdbc.driver>
-				<db.dbpool.jdbc.url>jdbc:mysql://dili_website.db.nong12.com:3306/dili_website?useUnicode=true&amp;characterEncoding=utf8</db.dbpool.jdbc.url>
-				<db.dbpool.jdbc.username>FG_yunwei</db.dbpool.jdbc.username>
-				<db.dbpool.jdbc.password>vtA]7xU2h~ne_b</db.dbpool.jdbc.password>
-
-				<db.dbpool.init.initial.size>5</db.dbpool.init.initial.size>
-				<db.dbpool.init.min.idle>3</db.dbpool.init.min.idle>
-				<db.dbpool.init.max.active>5</db.dbpool.init.max.active>
-
-				<db.dbpool.max.wait>60000</db.dbpool.max.wait>
-				<db.dbpool.time.between.millis>60000</db.dbpool.time.between.millis>
-				<db.dbpool.min.idle.time>300000</db.dbpool.min.idle.time>
-
-				<!--权限相关配置 -->
-				<conf.manage.enable>true</conf.manage.enable>
-				<conf.manage.spider>false</conf.manage.spider>
-				<conf.manage.system>manweb</conf.manage.system>
-				<conf.manage.domain>http://manage.nong12.com/</conf.manage.domain>
-				<conf.manage.includes>^/.*\.do</conf.manage.includes>
-				<conf.manage.excludes>^/noAccess.do$,^/welcome.do$,^/loginControl/.*,^/api/.*,^/city/.*,^/assets/.*</conf.manage.excludes>
-
-				<!-- 短信发送开关 -->
-				<sms.switch>true</sms.switch>
-
-				<!-- passport 注册配置 -->
-				<passport.register.url>http://passport.api.nong12.com/api/register/register.html</passport.register.url>
-				<passport.interface.sign>TkdqQUhyUFprVGdJM2U3UzZvUWdrQjZwYnpibmRK</passport.interface.sign>
-				<passport.interface.pwd>nongfengwang</passport.interface.pwd>
-
-				<!-- 店铺接口签名 -->
-				<manage.shopClient.sign>FzZGZxd2VycXdlYXNzZHZzdnp4Y3Z</manage.shopClient.sign>
-
-				<!-- MQ -->
-				<conf.mq.namesrvAddr>192.168.28.34:9876;192.168.28.35:9876</conf.mq.namesrvAddr>
-				<conf.mq.producerGroup>manweb_change</conf.mq.producerGroup>
-
-				<!-- 物流 -->
-				<wl.url>http://wl.nong12.com/</wl.url>
-				<wl.sign>TqExJO5spMVhZLvr17FBR1MlNvMOc</wl.sign>
-
-			</properties>
-		</profile>
-
-		<profile>
-			<id>pnr-clone</id>
-			<properties>
-				<!-- 显示模板 -->
-				<project.view.VMDefault>layout/default_content</project.view.VMDefault>
-
-				<!-- redis 配置 -->
-				<project.redis.host1>10.28.5.200</project.redis.host1>
-				<project.redis.port1>6379</project.redis.port1>
-
-				<!-- 商品详情链接地址 -->
-				<project.product.detail.path>http://www.nong12.com/product/</project.product.detail.path>
-
-				<!-- 后台默认静态资源地址 -->
-				<project.default.assets.path>http://static.nong12.com/static/ace1.3/assets</project.default.assets.path>
-
-				<!-- 公共样式引用 -->
-				<project.default.assets.common.path>http://static.nong12.com/static/</project.default.assets.common.path>
-
-				<!-- 本地资源地址 -->
-				<project.default.local.path>/</project.default.local.path>
-
-				<!-- 店铺域名 -->
-				<project.shop.domain>http://shop.nong12.com</project.shop.domain>
-
-				<!-- sms.webchina.cn 短信发送接口的配置 -->
-				<project.sms.webchina.SMSKey>2cf3264488ee3beef224</project.sms.webchina.SMSKey>
-				<project.sms.webchina.userName>itly</project.sms.webchina.userName>
-				<project.sms.webchina.postURL>http://gbk.sms.webchinese.cn</project.sms.webchina.postURL>
-
-				<!-- interface user -->
-				<website.user.baseUrl>http://user.nong12.com</website.user.baseUrl>
-				<website.user.token>token</website.user.token>
-
-				<!-- interface titan -->
-				<website.titan.accesskey>accesskey</website.titan.accesskey>
-				<website.titan.secretkey>secretkey</website.titan.secretkey>
-
-				<!-- 登录拦截器开关 -->
-				<project.manger.enabled>true</project.manger.enabled>
-
-				<!-- 图片服务器地址配置 -->
-				<project.image.server.domain>nong12.com</project.image.server.domain>
-				<project.image.server.host>http://upload.nong12.com</project.image.server.host>
-
-				<!-- 数据库连接池配置文件 -->
-				<db.dbpool.jdbc.driver>org.mariadb.jdbc.Driver</db.dbpool.jdbc.driver>
-				<db.dbpool.jdbc.url>jdbc:mysql://10.28.5.201:3306/dili_website?useUnicode=true&amp;characterEncoding=utf8</db.dbpool.jdbc.url>
-				<db.dbpool.jdbc.username>root</db.dbpool.jdbc.username>
-				<db.dbpool.jdbc.password>123456</db.dbpool.jdbc.password>
-
-				<db.dbpool.init.initial.size>5</db.dbpool.init.initial.size>
-				<db.dbpool.init.min.idle>3</db.dbpool.init.min.idle>
-				<db.dbpool.init.max.active>5</db.dbpool.init.max.active>
-
-				<db.dbpool.max.wait>60000</db.dbpool.max.wait>
-				<db.dbpool.time.between.millis>60000</db.dbpool.time.between.millis>
-				<db.dbpool.min.idle.time>300000</db.dbpool.min.idle.time>
-
-
-				<!--权限相关配置 -->
-				<conf.manage.enable>false</conf.manage.enable>
-				<conf.manage.spider>true</conf.manage.spider>
-				<conf.manage.system>manweb</conf.manage.system>
-				<conf.manage.domain>http://manage.nong12.com/</conf.manage.domain>
-				<conf.manage.includes>^/$,^$,^/.*\.do</conf.manage.includes>
-				<conf.manage.excludes>^/noAccess.do$,^/welcome.do$,^/loginControl/.*,^/api/.*,^/city/.*,^/assets/.*</conf.manage.excludes>
-
-				<!-- 短信发送开关 -->
-				<sms.switch>false</sms.switch>
-
-				<!-- passport 注册配置 -->
-				<passport.register.url>http://passport.api.nong12.com/api/register/register.html</passport.register.url>
-				<passport.interface.sign>MTIzNDU2Nzg5</passport.interface.sign>
-				<passport.interface.pwd>nongfengwang</passport.interface.pwd>
-
-				<!-- 店铺接口签名 -->
-				<manage.shopClient.sign>FzZGZxd2VycXdlYXNzZHZzdnp4Y3Z</manage.shopClient.sign>
-
 			</properties>
 		</profile>
  
@@ -890,18 +128,15 @@
 		<dependency>
 			<groupId>com.b2c.website.web</groupId>
 			<artifactId>diligrp-website-api</artifactId>
-			<version>1.0.2-SNAPSHOT</version>
+			<version>1.0.5-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>com.diligrp.store</groupId>
 			<artifactId>diligrp-store-sdk</artifactId>
 			<version>0.0.1-SNAPSHOT</version>
 		</dependency>
-		<dependency>
-			<groupId>com.b2c</groupId>
-			<artifactId>passport-client</artifactId>
-			<version>0.0.10-SNAPSHOT</version>
-		</dependency>
+		<!-- <dependency> <groupId>com.b2c</groupId> <artifactId>passport-client</artifactId> 
+			<version>0.0.10-SNAPSHOT</version> </dependency> -->
  
 		<!--<dependency> -->
 		<!--<groupId>com.diligrp.pnr.shop</groupId> -->
-package com.diligrp.website.manweb.controller;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.lang.StringUtils;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.ClientProtocolException;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.util.EntityUtils;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.servlet.ModelAndView;
-
-import com.alibaba.fastjson.JSON;
-import com.diligrp.website.domain.vo.RegResult;
-import com.diligrp.website.util.http.HttpClientManager;
-import com.diligrp.website.util.web.BaseController;
-
-/**
- * 批量处理
- * @author Wang22
- *
- */
-@Controller
-@RequestMapping("batch")
-public class BatchRegister extends BaseController {
-    
-    @Resource(name="passportRegUrl")
-    private String passportRegUrl;
-    
-    @Resource(name="passportRegSign")
-    private String passportRegSign;
-    
-    @Resource(name="passportRegPwd")
-    private String passportRegPwd;
-    
-    private static Pattern MOBILE_PATTERN = Pattern.compile("^1(3[0-9]|5[0-3]|45|47|5[5-9]|8[0-9]|70|7[6-8])\\d{8}$");
-    
-    @RequestMapping("register")
-    public ModelAndView register() {
-
-        return toVM("batch/register");
-    }
-    
-    /**
-     * 批量注册
-     * @throws IOException 
-     * @throws InterruptedException 
-     */
-    @RequestMapping("doRegister")
-    public void doRegister(@RequestParam("mobiles") String mobiles, HttpServletResponse resp) throws IOException, InterruptedException {
-        PrintWriter out = resp.getWriter();
-        if(StringUtils.isEmpty(mobiles)){
-            out.println("手机号码为空，无法注册");
-            out.flush();
-            out.close();
-            return ;
-        }
-        String[] mobs = mobiles.replace(",,", ",").split(",");
-        for (String m : mobs) {
-            Matcher mat = MOBILE_PATTERN.matcher(m);
-            if (mat.matches()) {
-                String json = reg(m, passportRegPwd);
-                RegResult rst = JSON.parseObject(json, RegResult.class);
-                if (rst.getCode() == RegResult.SUCCESS) {
-                    out.println(m + " - 注册成功");
-                } else if (rst.getCode() == RegResult.REGISTERD) {
-                    out.println(m + " - 号码已被注册，无法完成注册");
-                } else {
-                    out.println(m + " - " + rst.getCode() + " " + rst.getMsg());
-                }
-                
-            } else {
-                out.println(m + " - 不是正确的手机号码，无法注册");
-            }
-            // 停顿20毫秒，避免连接暴增
-            Thread.sleep(20);
-        }
-        out.flush();
-        out.close();
-    }
-
-    public String reg(String mobile,String pwd) throws ClientProtocolException, IOException {
-        HttpPost post = new HttpPost(passportRegUrl);
-        post.setHeader("sign", passportRegSign);
-
-        // modify 2015-07-29 wzp ： 将注册来源修改为6（批量注册）
-        String json = "{\"mobile\": \"" + mobile + "\",\"password\": \"" + pwd + "\",\"userType\":1,\"source\":6}";
-
-        StringEntity bodyEntity = new StringEntity(json, "utf-8");
-        bodyEntity.setContentType("application/json");
-
-        post.setEntity(bodyEntity);
-
-        HttpResponse response = HttpClientManager.getHttpClient().execute(post);
-        if (response.getStatusLine().getStatusCode() != 200) {
-            HttpEntity entity = response.getEntity();
-            String result = EntityUtils.toString(entity);
-            System.out.println("接口调用失败：" + result);
-            throw new IllegalStateException(response.getStatusLine().toString());
-        }
-        HttpEntity entity = response.getEntity();
-        String result = EntityUtils.toString(entity);
-        post.releaseConnection();
-        return result;
-    }
-}
@@ -20,16 +20,17 @@ import com.diligrp.website.domain.DataDictionaryValue;
 import com.diligrp.website.service.CityService;
 import com.diligrp.website.service.DataDictionaryService;
 import com.diligrp.website.util.domain.Result;
-import com.diligrp.website.util.hbase.HBaseUtils;
 import com.diligrp.website.util.web.BaseController;
 import com.diligrp.website.web.interfaces.domain.output.CityResp;
  
 /**
  * 
  * <B>Description</B> 城市级联 <br />
- * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />
+ * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved.
+ * <br />
  * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
  * <B>Company</B> 地利集团
+ * 
  * @createTime 2014年5月14日 下午4:02:52
  * @author Wang22
  */
@@ -37,198 +38,167 @@ import com.diligrp.website.web.interfaces.domain.output.CityResp;
 @RequestMapping("city")
 public class CityController extends BaseController {
  
-    @Resource
-    private CityService cityService;
-
-    @Resource
-    private HBaseUtils hbaseUtils;
-    
-    @Resource
-    private DataDictionaryService dataDictionaryService;
-    
-    private final static String COUNTRY_CODE = "DIC_COUNTRY";
-    
-    @RequestMapping("getCityList")
-    public ModelAndView getCityList(
-            @RequestParam(value = "parentId", defaultValue = "0") int parentId) {
-
-        Result rst = cityService.getCityListByParentId(parentId);
-
-        if (rst.isSuccess()) {
-            return toVM("content/city", rst.getAllResult());
-        }
-        return null;
-
-    }
-
-    @SuppressWarnings("unchecked")
-    @RequestMapping("getCityJsonList")
-    public void getCityJsonList(
-            @RequestParam(value = "parentId", defaultValue = "0") int parentId,
-            HttpServletResponse resp) {
-
-        Result rst = cityService.getCityListByParentId(parentId);
-
-        if (rst.isSuccess()) {
-            List<City> city = (List<City>) rst.getResult("city");
-            writeJSON(resp, city);
-        }
-
-    }
-
-    @SuppressWarnings("unchecked")
-    @RequestMapping("getCityJsonpList")
-    public void getCityJsonpList(
-            @RequestParam(value = "parentId", defaultValue = "0") int parentId,
-            @RequestParam(value = "callback") String callback,
-            HttpServletResponse resp) {
-
-        Result rst = cityService.getCityListByParentId(parentId);
-
-        if (rst.isSuccess()) {
-            List<City> city = (List<City>) rst.getResult("city");
-            String jsonData = JSON.toJSONString(city);
-            String json = callback + "(" + jsonData + ")";
-            write(resp, json, "text/javascript;charset=utf-8");
-        }
-
-    }
-
-    @SuppressWarnings("unchecked")
-    @RequestMapping("getParentCityJsonpList")
-    public void getParentCityJsonpList(
-            @RequestParam(value = "cityId", defaultValue = "1") int cityId,
-            @RequestParam(value = "callback") String callback,
-            HttpServletResponse resp) {
-
-        Result rst = cityService.getCityList(cityId);
-        List<City> cityList = (List<City>) rst.getResult("city");
-        String jsonData = JSON.toJSONString(cityList);
-        String json = callback + "(" + jsonData + ")";
-        write(resp, json, "text/javascript;charset=utf-8");
-    }
-    
-    @SuppressWarnings({ "unchecked", "rawtypes" })
-    @RequestMapping("getCityInfo")
-    @ResponseBody
-    public List<City> getCityInfo(
-            @RequestParam(value = "parentId", defaultValue = "0") int parentId) {
-        Result rst = cityService.getCityListByParentId(parentId);
-        Map map = rst.getAllResult();
-        List<City> list = (List<City>) map.get("city");
-        return list;
-    }
-    
-    @SuppressWarnings("unchecked")
-    @RequestMapping("getCountryJsonpList")
-    public void getCountryJsonpList(
-            @RequestParam(value = "parentId", defaultValue = "0") int parentId,
-            @RequestParam(value = "callback") String callback,
-            HttpServletResponse response) {
-
-        List<CityResp> cityOut = new ArrayList<CityResp>();
-        if (parentId == 0) {
-            DataDictionary datad = dataDictionaryService.getDataDictionaryByCode(COUNTRY_CODE);
-            List<DataDictionaryValue> values = dataDictionaryService.getDataDictionaryValue(datad.getId());
-            if (values.size() > 0) {
-                for (DataDictionaryValue c : values) {
-                    CityResp resp = new CityResp();
-                    Integer code = 0 - Integer.parseInt(c.getCode());
-                    resp.setRegionId(code);
-                    resp.setRegionName(c.getName());
-                    resp.setSort(c.getSort());
-                    resp.setParentId(-9999);
-                    cityOut.add(resp);
-                }
-            }
-        } else if (parentId == -10) {
-            Result rst = cityService.getCityListByParentId(0);
-            List<City> cityList = (List<City>) rst.getResult("city");
-            cityOut = convertCity2Output(cityList);
-        } else if (parentId > 0) {
-            Result rst = cityService.getCityListByParentId(parentId);
-            List<City> cityList = (List<City>) rst.getResult("city");
-            cityOut = convertCity2Output(cityList);
-        }
-        String jsonData = JSON.toJSONString(cityOut);
-        String json = callback + "(" + jsonData + ")";
-        write(response, json, "text/javascript;charset=utf-8");
-    }
-    
-    private List<CityResp> convertCity2Output(List<City> cityList) {
-        List<CityResp> cityOut = null;
-        if (cityList == null) {
-            return cityOut;
-        }
-        cityOut = new ArrayList<CityResp>();
-        for (City city : cityList) {
-            CityResp out = new CityResp();
-            out.setRegionId(city.getRegionId());
-            out.setRegionName(city.getRegionName());
-            out.setLevel(city.getLevel());
-            out.setParentId(city.getParentId());
-            out.setSort(city.getSort());
-            cityOut.add(out);
-        }
-        return cityOut;
-    }
-    
-    
-    @SuppressWarnings("unchecked")
-    @RequestMapping("getParentCountryJsonpList")
-    public void getParentCountryJsonp(   @RequestParam(value = "cityId", defaultValue = "0") int cityId,
-            @RequestParam(value = "callback") String callback,
-            HttpServletResponse response){
-        Result rst = cityService.getCityList(cityId);
-        if(cityId<0){
-            List<CityResp> cityOut = new ArrayList<CityResp>();
-            DataDictionary datad = dataDictionaryService
-                    .getDataDictionaryByCode(COUNTRY_CODE);
-            List<DataDictionaryValue> values = dataDictionaryService
-                    .getDataDictionaryValue(datad.getId());
-            if (values.size() > 0) {
-                for (DataDictionaryValue c : values) {
-                    CityResp resp = new CityResp();
-                    Integer code = 0 - Integer.parseInt(c.getCode());
-                    if( cityId==code){
-                        resp.setRegionId(code);
-                        resp.setRegionName(c.getName());
-                        resp.setSort(c.getSort());
-                        resp.setParentId(-9999);
-                        cityOut.add(resp);
-                        String jsonData = JSON.toJSONString(cityOut);
-                        String json = callback + "(" + jsonData + ")";
-                        write(response, json, "text/javascript;charset=utf-8");
-                    }
-                }
-            }
-        }else{
-            City c= new City();
-            c.setRegionId(-10);
-            c.setRegionName("中国");
-            c.setSort(10);
-            List<City> cityList = (List<City>) rst.getResult("city");
-            cityList.add(c);
-            List<CityResp> cityOut = convertCity2Output(cityList);
-            String jsonData = JSON.toJSONString(cityOut);
-            String json = callback + "(" + jsonData + ")";
-            write(response, json, "text/javascript;charset=utf-8");
-        }
-       
-    }
+	@Resource
+	private CityService cityService;
+
+	@Resource
+	private DataDictionaryService dataDictionaryService;
+
+	private final static String COUNTRY_CODE = "DIC_COUNTRY";
+
+	@RequestMapping("getCityList")
+	public ModelAndView getCityList(@RequestParam(value = "parentId", defaultValue = "0") int parentId) {
+
+		Result rst = cityService.getCityListByParentId(parentId);
+
+		if (rst.isSuccess()) {
+			return toVM("content/city", rst.getAllResult());
+		}
+		return null;
+
+	}
+
+	@SuppressWarnings("unchecked")
+	@RequestMapping("getCityJsonList")
+	public void getCityJsonList(@RequestParam(value = "parentId", defaultValue = "0") int parentId,
+			HttpServletResponse resp) {
+
+		Result rst = cityService.getCityListByParentId(parentId);
+
+		if (rst.isSuccess()) {
+			List<City> city = (List<City>) rst.getResult("city");
+			writeJSON(resp, city);
+		}
+
+	}
+
+	@SuppressWarnings("unchecked")
+	@RequestMapping("getCityJsonpList")
+	public void getCityJsonpList(@RequestParam(value = "parentId", defaultValue = "0") int parentId,
+			@RequestParam(value = "callback") String callback, HttpServletResponse resp) {
+
+		Result rst = cityService.getCityListByParentId(parentId);
+
+		if (rst.isSuccess()) {
+			List<City> city = (List<City>) rst.getResult("city");
+			String jsonData = JSON.toJSONString(city);
+			String json = callback + "(" + jsonData + ")";
+			write(resp, json, "text/javascript;charset=utf-8");
+		}
+
+	}
+
+	@SuppressWarnings("unchecked")
+	@RequestMapping("getParentCityJsonpList")
+	public void getParentCityJsonpList(@RequestParam(value = "cityId", defaultValue = "1") int cityId,
+			@RequestParam(value = "callback") String callback, HttpServletResponse resp) {
+
+		Result rst = cityService.getCityList(cityId);
+		List<City> cityList = (List<City>) rst.getResult("city");
+		String jsonData = JSON.toJSONString(cityList);
+		String json = callback + "(" + jsonData + ")";
+		write(resp, json, "text/javascript;charset=utf-8");
+	}
+
+	@SuppressWarnings({ "unchecked", "rawtypes" })
+	@RequestMapping("getCityInfo")
+	@ResponseBody
+	public List<City> getCityInfo(@RequestParam(value = "parentId", defaultValue = "0") int parentId) {
+		Result rst = cityService.getCityListByParentId(parentId);
+		Map map = rst.getAllResult();
+		List<City> list = (List<City>) map.get("city");
+		return list;
+	}
+
+	@SuppressWarnings("unchecked")
+	@RequestMapping("getCountryJsonpList")
+	public void getCountryJsonpList(@RequestParam(value = "parentId", defaultValue = "0") int parentId,
+			@RequestParam(value = "callback") String callback, HttpServletResponse response) {
+
+		List<CityResp> cityOut = new ArrayList<CityResp>();
+		if (parentId == 0) {
+			DataDictionary datad = dataDictionaryService.getDataDictionaryByCode(COUNTRY_CODE);
+			List<DataDictionaryValue> values = dataDictionaryService.getDataDictionaryValue(datad.getId());
+			if (values.size() > 0) {
+				for (DataDictionaryValue c : values) {
+					CityResp resp = new CityResp();
+					Integer code = 0 - Integer.parseInt(c.getCode());
+					resp.setRegionId(code);
+					resp.setRegionName(c.getName());
+					resp.setSort(c.getSort());
+					resp.setParentId(-9999);
+					cityOut.add(resp);
+				}
+			}
+		} else if (parentId == -10) {
+			Result rst = cityService.getCityListByParentId(0);
+			List<City> cityList = (List<City>) rst.getResult("city");
+			cityOut = convertCity2Output(cityList);
+		} else if (parentId > 0) {
+			Result rst = cityService.getCityListByParentId(parentId);
+			List<City> cityList = (List<City>) rst.getResult("city");
+			cityOut = convertCity2Output(cityList);
+		}
+		String jsonData = JSON.toJSONString(cityOut);
+		String json = callback + "(" + jsonData + ")";
+		write(response, json, "text/javascript;charset=utf-8");
+	}
+
+	private List<CityResp> convertCity2Output(List<City> cityList) {
+		List<CityResp> cityOut = null;
+		if (cityList == null) {
+			return cityOut;
+		}
+		cityOut = new ArrayList<CityResp>();
+		for (City city : cityList) {
+			CityResp out = new CityResp();
+			out.setRegionId(city.getRegionId());
+			out.setRegionName(city.getRegionName());
+			out.setLevel(city.getLevel());
+			out.setParentId(city.getParentId());
+			out.setSort(city.getSort());
+			cityOut.add(out);
+		}
+		return cityOut;
+	}
+
+	@SuppressWarnings("unchecked")
+	@RequestMapping("getParentCountryJsonpList")
+	public void getParentCountryJsonp(@RequestParam(value = "cityId", defaultValue = "0") int cityId,
+			@RequestParam(value = "callback") String callback, HttpServletResponse response) {
+		Result rst = cityService.getCityList(cityId);
+		if (cityId < 0) {
+			List<CityResp> cityOut = new ArrayList<CityResp>();
+			DataDictionary datad = dataDictionaryService.getDataDictionaryByCode(COUNTRY_CODE);
+			List<DataDictionaryValue> values = dataDictionaryService.getDataDictionaryValue(datad.getId());
+			if (values.size() > 0) {
+				for (DataDictionaryValue c : values) {
+					CityResp resp = new CityResp();
+					Integer code = 0 - Integer.parseInt(c.getCode());
+					if (cityId == code) {
+						resp.setRegionId(code);
+						resp.setRegionName(c.getName());
+						resp.setSort(c.getSort());
+						resp.setParentId(-9999);
+						cityOut.add(resp);
+						String jsonData = JSON.toJSONString(cityOut);
+						String json = callback + "(" + jsonData + ")";
+						write(response, json, "text/javascript;charset=utf-8");
+					}
+				}
+			}
+		} else {
+			City c = new City();
+			c.setRegionId(-10);
+			c.setRegionName("中国");
+			c.setSort(10);
+			List<City> cityList = (List<City>) rst.getResult("city");
+			cityList.add(c);
+			List<CityResp> cityOut = convertCity2Output(cityList);
+			String jsonData = JSON.toJSONString(cityOut);
+			String json = callback + "(" + jsonData + ")";
+			write(response, json, "text/javascript;charset=utf-8");
+		}
+
+	}
 }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-package com.diligrp.website.manweb.controller;
-
-import javax.annotation.Resource;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.servlet.ModelAndView;
-
-import com.diligrp.website.service.MailService;
-import com.diligrp.website.util.dao.BaseQuery;
-import com.diligrp.website.util.web.BaseController;
-import com.diligrp.website.util.web.PageTemplate;
-
-/**
- * 
- * <B>Description</B> 邮件服务 <br />
- * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />
- * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
- * <B>Company</B> 地利集团
- * @createTime 2014年6月3日 下午3:22:15
- * @author Wang22
- */
-@Controller
-@RequestMapping("mail")
-public class MailController extends BaseController {
-    
-    @Resource
-    private MailService mailService;
-
-    @RequestMapping("list")
-    public ModelAndView list(BaseQuery query){
-        PageTemplate page = mailService.queryMail(query);
-        return toVM("mail/list",page);
-    }
-
-}
-package com.diligrp.website.manweb.controller;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import com.diligrp.website.util.web.BaseController;
-
-/**
- * <B>Description</B> <br />
- * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />
- * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
- * <B>Company</B> 地利集团
- * @createTime 2014年6月20日 下午2:03:54
- * @author liujie
- */
-@Controller
-@RequestMapping("memberCenterAuthen")
-public class MemberCenterAuthenController extends BaseController {
-
-//    @Resource
-//    private MemberCenterAuthenService memberCenterAuthenService;
-//    @Resource
-//    private OperateLogService operateLogService;
-//    @Resource
-//    private OperateLog operateLog;
-//    private static Map<Integer, String> typeMap = new HashMap<Integer, String>();
-//    private static Map<Integer, String> statusMap = new HashMap<Integer, String>();
-//    static {
-//        typeMap.put(0, "全部 ");
-//        typeMap.put(1, "实名认证 ");
-//        typeMap.put(2, "企业认证");
-//        statusMap.put(0, "全部 ");
-//        statusMap.put(2, "审核中");
-//        statusMap.put(1, "审核通过 ");
-//        statusMap.put(3, "审核未通过 ");
-//    }
-//    /**
-//     *
-//     * this method is 查询认证管理列表信息
-//     * @param request
-//     * @param bq
-//     * @param model
-//     * @return
-//     * @createTime 2014年6月20日 下午6:19:53
-//     * @author liujie
-//     */
-//    @RequestMapping(value = "list")
-//    public ModelAndView list(HttpServletRequest request, BaseQuery bq,
-//            Model model) {
-//        Map<String,String> map= bq.getParam();
-//        if(!map.isEmpty()){
-//            if(map.get("state").equals("0")){
-//                map.put("state", "");
-//            }
-//            if(map.get("userType").equals("0")){
-//                map.put("userType", "");
-//            }
-//            bq.setParam(map);
-//        }
-//        // 获取界面参数
-//        PageTemplate page = memberCenterAuthenService.getAuthenInfo(bq);
-//        if(page == null){
-//            page = PageTemplate.create(bq, 0, null);
-//        }
-//        model.addAttribute("typeMap", typeMap);
-//        model.addAttribute("statusMap", statusMap);
-//        model.addAttribute("page", page);
-//        model.addAttribute("param", bq.getParam());
-//        return toVM("member/authenList", model);
-//    }
-//
-//    /**
-//     * this method is 获取条件查询输入参数
-//     * @return
-//     * @createTime 2014年6月20日 下午2:33:23
-//     * @author liujie
-//     */
-//    /*private Map<String, String> getArguments(HttpServletRequest request) {
-//        String authenId = request.getParameter("authenId");
-//        String accountName = request.getParameter("accountName");
-//        String startTime = request.getParameter("startTime");
-//        String endTime = request.getParameter("endTime");
-//        String userType = request.getParameter("userType");
-//        String state = request.getParameter("state");
-//        Map<String, String> map = new HashMap<String, String>();
-//        map.put("authenticationStateId", authenId);
-//        map.put("realName", accountName);
-//        map.put("state", state);
-//        map.put("userType", userType);
-//        map.put("startSubmitTime", startTime);
-//        map.put("endSubmitTime", endTime);
-//        return map;
-//    }*/
-//    /**
-//     *
-//     * this method is 获取认证管理详细信息
-//     * @param authenId
-//     * @param userType
-//     * @param applyTime
-//     * @param account
-//     * @param model
-//     * @return
-//     * @createTime 2014年6月20日 下午6:20:30
-//     * @author liujie
-//     */
-//    @RequestMapping(value = "getAuthenInfo")
-//    public ModelAndView getAuthenInfo(@RequestParam("authenId") Long authenId,@RequestParam("userId") Long userId,
-//            @RequestParam("userType") Long userType, Model model) {
-//
-//        List<OperateLog> log =  operateLogService.getOperateLog(userId,StateTypesUtil.authenManagerType);
-//        if(log.size()>0){
-//            model.addAttribute("operateLog", log.get(0));
-//        }
-//        if (userType == 1) {
-//            UserExtension user = memberCenterAuthenService
-//                    .getUserInfoById(userId);
-//            model.addAttribute("authen", user);
-//            return toVM("member/showAuthen", model);
-//        }else{
-//            EnterpriseInfo enterpriseInfo =   memberCenterAuthenService.getEnterpriseInfoById(userId);
-//            model.addAttribute("authen", enterpriseInfo);
-//            System.out.println(enterpriseInfo);
-//            return toVM("member/showCompany", model);
-//        }
-//
-//
-//    }
-//    @RequestMapping(value = "approveAuthenInfo")
-//    @ResponseBody
-//    public boolean approveAuthen(@RequestParam("userId") Long userId,
-//            @RequestParam("userType") Integer userType,
-//            @RequestParam("authState") Integer authState,
-//            @RequestParam("auditReson") String auditReson){
-//        boolean flag = false;
-//        SessionContext session = SessionContext.getSessionContext();
-//        UserTicket user = session.getUserTicket();
-//        if(authState==3&&StringUtils.isBlank(auditReson)){
-//            return false;
-//        }
-//        if(auditReson.trim().length()>62){return false;}
-//        flag = memberCenterAuthenService.approveAuthen(userId, userType, authState, auditReson.trim(),  user.getId());
-//    if(flag){
-//        operateLog.setOperateDataId(userId);
-//        operateLog.setOperateId(user.getId());
-//        operateLog.setOperateRemark(auditReson.trim());
-//        operateLog.setOperateType(StateTypesUtil.authenManagerType);
-//        operateLog.setOperateName(user.getRealName());
-//        operateLogService.saveOperateLog(operateLog);
-//    }
-//        return   flag;
-//    }
-}
-package com.diligrp.website.manweb.controller;
-
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.collections.MapUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.servlet.ModelAndView;
-
-import com.diligrp.log.util.LogData;
-import com.diligrp.log.util.LogUtils;
-import com.diligrp.manage.sdk.domain.UserTicket;
-import com.diligrp.manage.sdk.session.SessionContext;
-import com.diligrp.website.domain.AjaxResult;
-import com.diligrp.website.service.MemberService;
-import com.diligrp.website.util.dao.BaseQuery;
-import com.diligrp.website.util.domain.Result;
-import com.diligrp.website.util.format.MoneyUtils;
-import com.diligrp.website.util.web.BaseController;
-import com.diligrp.website.util.web.PageTemplate;
-import com.google.common.collect.Maps;
-import com.yqyw.user.rpc.client.domain.input.CreditLimitReq;
-import com.yqyw.user.rpc.client.domain.input.LockMemberReq;
-import com.yqyw.user.rpc.client.domain.output.DefaultResp;
-import com.yqyw.user.rpc.client.domain.output.EnterpriseInfoResp;
-import com.yqyw.user.rpc.client.domain.output.LockMemberResp;
-import com.yqyw.user.rpc.client.domain.output.MemberCreditInfoResp;
-import com.yqyw.user.rpc.client.domain.output.MemberCreditOptionLogResp;
-import com.yqyw.user.rpc.client.domain.output.UserExtensionResp;
-import com.yqyw.user.rpc.client.domain.output.UserInfoResp;
-
-/**
- * 
- * <B>Description</B> 会员中心Controller <br />
- * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved.
- * <br />
- * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
- * <B>Company</B> 地利集团
- * 
- * @createTime 2014年6月12日 下午2:17:32
- * @author Wang22
- */
-@Controller
-@RequestMapping("member")
-public class MemberController extends BaseController {
-
-	@Value("${project.system.domain}")
-	private String domain;
-
-	@Resource
-	private MemberService memberService;
-
-	private static final String permanent = "9999-MM-dd";
-
-	@RequestMapping("list")
-	public ModelAndView list(BaseQuery bq) {
-		PageTemplate page = memberService.query(bq);
-		Map<String, Object> param = Maps.newHashMap();
-		param.put("model", page);
-		param.put("getLockUserFlag",
-				SessionContext.hasAccess("get", this.domain + "/member/getLockUser.do#getLockUser"));
-		param.put("lockUserFlag", SessionContext.hasAccess("get", this.domain + "/member/lockUser.do#lockUser"));
-		param.put("unlockUserFlag", SessionContext.hasAccess("get", this.domain + "/member/unlockUser.do#unlockUser"));
-		param.put("memberFavoriteFlag",
-				SessionContext.hasAccess("get", this.domain + "/member/memberFavorite.do#memberFavorite"));
-		return toVM("member/list", param);
-	}
-
-	@RequestMapping("getLockUser")
-	public ModelAndView getLockUser(@RequestParam("uid") Long id, @RequestParam("accountName") String accountName) {
-		LockMemberResp resp = memberService.getLockUser(id);
-		Map<String, Object> param = Maps.newHashMap();
-		param.put("model", resp);
-		param.put("accountName", accountName);
-		param.put("userId", id);
-		if (resp == null || !resp.getLockStatus().equals(1)) {
-			return toVM("member/lock", param);
-		}
-		// 计算时间差
-		int day = dayDiff(resp.getStartLockTime(), resp.getEndLockTime());
-		param.put("day", day);
-		return toVM("member/unlock", param);
-	}
-
-	@RequestMapping("lockUser")
-	@ResponseBody
-	public AjaxResult lockUser(@RequestParam("date") String date, @RequestParam("reason") String reason,
-			@RequestParam("userId") Long userId, @RequestParam("accountName") String accountName) {
-
-		Date curr = new Date();
-		Date endDate = null;
-		int days = 0;
-		try {
-			if (!permanent.equals(date)) {
-				endDate = new SimpleDateFormat("yyyy-MM-dd").parse(date);
-				days = dayDiff(curr, endDate);
-			}
-		} catch (ParseException e) {
-			// 类型转换失败，调回列表页~！
-			return new AjaxResult(false, "类型转换失败，无法识别的日期类型！");
-		}
-
-		LockMemberReq req = new LockMemberReq();
-		req.setLockType(LockMemberReq.LOCK_IS_LOCK);
-		req.setLockReason(reason);
-		req.setDays(days);
-		req.setUserId(userId);
-		SessionContext session = SessionContext.getSessionContext();
-		UserTicket user = session.getUserTicket();
-		req.setOperateId(user.getId());
-		req.setOperateName(user.getRealName());
-
-		boolean flag = memberService.lockMember(req);
-
-		AjaxResult result = null;
-
-		if (flag) {
-			LogUtils.log(LogData.builder(user.getUserName(), "会员中心", userId + "").model("会员管理").operation("锁定")
-					.dataName(accountName).build());
-			result = new AjaxResult(true, AjaxResult.MSG_SUCC);
-		} else {
-			result = new AjaxResult(false, "锁定用户失败");
-		}
-
-		return result;
-	}
-
-	@RequestMapping("unlockUser")
-	@ResponseBody
-	public AjaxResult unlockUser(@RequestParam("userId") Long userId, @RequestParam("accountName") String accountName) {
-		if (userId == null || userId < 1) {
-			return new AjaxResult(false, "用户ID错误！");
-		}
-
-		LockMemberReq req = new LockMemberReq();
-		req.setUserId(userId);
-		req.setLockType(LockMemberReq.LOCK_UNLOCK);
-
-		SessionContext session = SessionContext.getSessionContext();
-		UserTicket user = session.getUserTicket();
-		req.setOperateId(user.getId());
-		req.setOperateName(user.getRealName());
-
-		boolean flag = memberService.unlockMember(req);
-
-		// ModelAndView model = null;
-		AjaxResult result = null;
-
-		if (flag) {
-			result = new AjaxResult(true, AjaxResult.MSG_SUCC);
-			LogUtils.log(LogData.builder(user.getUserName(), "会员中心", userId + "").model("会员管理").operation("解锁")
-					.dataName(accountName).build());
-		} else {
-			result = new AjaxResult(true, "解锁用户失败！");
-		}
-
-		return result;
-	}
-
-	@RequestMapping("getCredit")
-	public ModelAndView getCredit(@RequestParam("uid") Long memberId) {
-		if (memberId == null || memberId < 0) {
-			return new ModelAndView("redirect:/member/list.do?succ=false");
-		}
-		MemberCreditInfoResp infoResp = memberService.getCreditInfo(memberId);
-		// 接口数据异常
-		if (infoResp != null && infoResp.getCode() == MemberCreditInfoResp.CODE_EXCEPTION) {
-			return new ModelAndView("redirect:/member/list.do?succ=false");
-		}
-		List<MemberCreditOptionLogResp> logResp = memberService.getCreditHistory(memberId);
-
-		String money = MoneyUtils.centToYuan(infoResp.getLimitValue());
-
-		Map<String, Object> param = Maps.newHashMap();
-		param.put("info", infoResp);
-		param.put("log", logResp);
-		param.put("uid", memberId);
-		param.put("money", money);
-
-		return toVM("member/credit", param);
-	}
-
-	@RequestMapping("updateCreditLimit")
-	public ModelAndView updateCreditLimit(@RequestParam("uid") Long uid, @RequestParam("credit") String credit,
-			HttpServletResponse resp) {
-
-		if (uid == null || uid < 0 || StringUtils.isEmpty(credit)) {
-			return new ModelAndView("redirect:/member/list.do?succ=false");
-		}
-
-		CreditLimitReq req = new CreditLimitReq();
-		req.setCreditLimt(credit);
-		req.setMembeId(uid);
-
-		SessionContext sessionContext = SessionContext.getSessionContext();
-		UserTicket user = sessionContext.getUserTicket();
-		if (user != null) {
-			req.setOpertorId(user.getId());
-			req.setOpertorName(user.getUserName());
-		}
-
-		DefaultResp result = memberService.updateCreditLimit(req);
-		Map<String, Object> param = Maps.newHashMap();
-
-		param.put("result", result.getCode() == DefaultResp.CODE_SUCCESS);
-		writeJSON(resp, param);
-
-		return null;
-	}
-
-	@RequestMapping("memberInfo")
-	public ModelAndView memberInfo(@RequestParam("userId") Long uid) {
-		UserInfoResp userInfo = memberService.getMemberInfo(uid);
-		UserExtensionResp userExt = memberService.getMemberExtension(uid);
-
-		Map<String, Object> param = Maps.newHashMap();
-		param.put("model", userInfo);
-		param.put("userExt", userExt);
-
-		if (userInfo.getUserType() == UserInfoResp.USER_TYPE_COMPANY) {
-			EnterpriseInfoResp enterResp = memberService.getEnterpriseByUserId(uid);
-			param.put("enter", enterResp);
-		}
-
-		return toVM("member/memberInfo", param);
-	}
-
-	@RequestMapping("memberFavorite")
-	public ModelAndView memberFavorite(@RequestParam("userId") Long uid,
-			@RequestParam(value = "dateType", defaultValue = "1") Integer type,
-			@RequestParam(value = "currPage", defaultValue = "0") Integer currPage,
-			@RequestParam(value = "pageSize", defaultValue = "20") Integer pageSize) {
-
-		Result result = memberService.getMemberFavorite(uid, type, currPage, pageSize);
-
-		Map<String, Object> param = result.getAllResult();
-
-		if (MapUtils.isEmpty(param)) {
-			param = Maps.newHashMap();
-			param.put("type", type);
-		}
-
-		return toVM("member/favorite", param);
-	}
-
-	// @RequestMapping("memberBrowerHistory")
-	// public ModelAndView memberBrowerHistory(
-	// @RequestParam("userId") Long uid,
-	// @RequestParam(value = "dateType", defaultValue = "1") Integer type,
-	// @RequestParam(value = "currPage", defaultValue = "0") Integer currPage,
-	// @RequestParam(value = "pageSize", defaultValue = "20") Integer pageSize)
-	// {
-	//
-	// BaseQuery bq = new BaseQuery();
-	// bq.setCurrPage(currPage);
-	// bq.setPageSize(pageSize);
-	// bq.addParam("userId", String.valueOf(uid));
-	//
-	// Result result = memberService.historyList(type, uid, bq);
-	//
-	// return toVM("member/history", result.getAllResult());
-	// }
-
-	/**
-	 * 
-	 * 计算时间差
-	 * 
-	 * @return
-	 * @createTime 2014年6月20日 下午2:01:39
-	 * @author Wang22
-	 */
-	private int dayDiff(Date start, Date end) {
-		if (start == null || end == null) {
-			return Integer.MAX_VALUE;
-		}
-		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-		try {
-			start = sdf.parse(sdf.format(start));
-			end = sdf.parse(sdf.format(end));
-		} catch (ParseException e) {
-			return -1;
-		}
-		Calendar cal = Calendar.getInstance();
-		cal.setTime(start);
-		long time1 = cal.getTimeInMillis();
-		cal.setTime(end);
-		long time2 = cal.getTimeInMillis();
-		long betweenDays = (time2 - time1) / (1000 * 3600 * 24);
-
-		return Integer.parseInt(String.valueOf(betweenDays));
-	}
-
-}
-package com.diligrp.website.manweb.controller;
-
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.lang3.StringUtils;
-import org.nutz.lang.meta.Pair;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.servlet.ModelAndView;
-
-import com.diligrp.log.util.LogData;
-import com.diligrp.log.util.LogUtils;
-import com.diligrp.manage.sdk.domain.UserTicket;
-import com.diligrp.manage.sdk.session.SessionContext;
-import com.diligrp.pnr.sdk.domain.Shop;
-import com.diligrp.titan.sdk.domain.Category;
-import com.diligrp.website.domain.City;
-import com.diligrp.website.domain.DataDictionary;
-import com.diligrp.website.domain.DataDictionaryValue;
-import com.diligrp.website.domain.OperateLog;
-import com.diligrp.website.domain.PickUpPointDomain;
-import com.diligrp.website.manweb.utils.StateTypesUtil;
-import com.diligrp.website.manweb.utils.WebUtils;
-import com.diligrp.website.rpc.ProductRPCService;
-import com.diligrp.website.service.CityService;
-import com.diligrp.website.service.DataDictionaryService;
-import com.diligrp.website.service.OpenShopApplyService;
-import com.diligrp.website.service.OperateLogService;
-import com.diligrp.website.service.PickUpPointService;
-import com.diligrp.website.service.ShopCloseHistoryService;
-import com.diligrp.website.util.dao.BaseQuery;
-import com.diligrp.website.util.domain.Result;
-import com.diligrp.website.util.web.BaseController;
-import com.diligrp.website.util.web.PageTemplate;
-import com.google.common.collect.Maps;
-import com.yqyw.user.rpc.client.domain.output.MemberQueryResp;
-
-/**
- * <B>Description</B> TODO <br />
- * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved.
- * <br />
- * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
- * <B>Company</B> 地利集团
- *
- * @author liujie
- * @createTime 2014年6月4日 上午11:57:51
- */
-@Controller
-@RequestMapping("openStore")
-public class OpenShopApplyController extends BaseController {
-	private static final Logger logger = LoggerFactory.getLogger(OpenShopApplyController.class);
-
-	private static Map<Integer, String> typeMap = new HashMap<Integer, String>();
-
-	static {
-		typeMap.put(0, "全部 ");
-		typeMap.put(1, "待审核");
-		typeMap.put(2, "审核通过 ");
-		typeMap.put(3, "审核未通过");
-	}
-
-	@Value("${project.system.domain}")
-	private String domain;
-	@Resource
-	private OpenShopApplyService openShopApplyService;
-	@Resource
-	private OperateLogService operateLogService;
-	@Resource
-	private OperateLog operateLog;
-	@Resource
-	private DataDictionaryService dataDictionaryService;
-	@Resource
-	private CityService cityService;
-	@Resource
-	private PickUpPointService pickUpPointService;
-	@Resource
-	private ProductRPCService productRPCService;
-	@Resource
-	private ShopCloseHistoryService shopCloseHistoryService;
-	private static final String SHOP_SOURCE = "SHOP_SOURCE";
-
-	/**
-	 * this method is 获取用户店铺信息列表
-	 *
-	 * @param request
-	 * @param bq
-	 * @param model
-	 * @return
-	 * @createTime 2014年6月19日 下午3:50:03
-	 * @author liujie
-	 */
-	@RequestMapping(value = "list")
-	public ModelAndView list(HttpServletRequest request, BaseQuery bq, Model model) {
-		String shopId = request.getParameter("shopId");
-		String shopName = request.getParameter("shopName");
-		String telephone = request.getParameter("telephone");
-		String stateStr = request.getParameter("state");
-		String accountName = request.getParameter("accountName");
-		String startTimeStr = request.getParameter("startTime");
-		String endTimeStr = request.getParameter("endTime");
-		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-		Long startTime = null;
-		Long endTime = null;
-		Integer state = null;
-		if (!StringUtils.isEmpty(startTimeStr)) {
-			try {
-				startTime = sdf.parse(startTimeStr + " " + "00:00:00").getTime();
-			} catch (ParseException e) {
-				e.printStackTrace();
-			}
-		}
-		if (!StringUtils.isEmpty(endTimeStr)) {
-			try {
-				endTime = sdf.parse(endTimeStr + " " + "23:59:59").getTime();
-			} catch (ParseException e) {
-				e.printStackTrace();
-			}
-		}
-		if (!StringUtils.isEmpty(stateStr)) {
-			state = Integer.parseInt(stateStr);
-		}
-		if ("0".equals(stateStr)) {
-			state = null;
-		}
-		SessionContext session = SessionContext.getSessionContext();
-		// 获取指定数据权限的所有集合
-		List<Pair<String>> cityIds = session.dataAuth("city");
-		String cityId = "";
-		if (cityIds != null && cityIds.size() > 0) {
-			for (int i = 0; i < cityIds.size(); i++) {
-				cityId += cityIds.get(i).getName() + ",";
-			}
-			cityId = cityId.substring(0, cityId.length() - 1);
-			if ("-1".equals(cityId)) {
-				cityId = null;// 查全部
-			}
-		} else {
-			cityId = "-1";// 无权限
-		}
-		DataDictionary dd = this.dataDictionaryService.getDataDictionaryByCode(SHOP_SOURCE);
-		List<DataDictionaryValue> ddValues = null;
-		if (dd != null) {
-			ddValues = this.dataDictionaryService.getDataDictionaryValue(dd.getId());
-		}
-		String shopSource = "";
-		if (ddValues != null && !CollectionUtils.isEmpty(ddValues)) {
-			for (int i = 0; i < ddValues.size(); i++) {
-				shopSource += ddValues.get(i).getCode() + ",";
-			}
-			shopSource = shopSource.substring(0, shopSource.length() - 1);
-			if ("-1".equals(shopSource)) {
-				shopSource = null;// 查全部
-			}
-		} else {
-			shopSource = "-1";// 无权限
-		}
-		PageTemplate page = openShopApplyService.getUserInfo(shopId, shopName, telephone, accountName, state, startTime,
-				endTime, bq.getCurrPage() + 1, bq.getPageSize(), cityId, shopSource);
-		model.addAttribute("page", page);
-		model.addAttribute("type", typeMap);
-		model.addAttribute("shopId", shopId);
-		model.addAttribute("shopName", shopName);
-		model.addAttribute("telephone", telephone);
-		model.addAttribute("accountName", accountName);
-		model.addAttribute("startTime", startTimeStr);
-		model.addAttribute("endTime", endTimeStr);
-		model.addAttribute("state", stateStr);
-		model.addAttribute("viewFlag",
-				SessionContext.hasAccess("get", this.domain + "/openStore/getShopInfo.do#getShopInfo"));
-		model.addAttribute("auditFlag",
-				SessionContext.hasAccess("get", this.domain + "/openStore/shopAudit.do#shopAudit"));
-		return toVM("authen/list", model);
-	}
-
-	/**
-	 * this method is 获取用户店铺详细信息
-	 *
-	 * @param userId
-	 * @param shopId
-	 * @param model
-	 * @return
-	 * @createTime 2014年6月19日 下午3:49:46
-	 * @author liujie
-	 */
-	@RequestMapping(value = "getShopInfo")
-	public ModelAndView getShopInfo(@RequestParam("userId") Long userId, @RequestParam("shopId") Long shopId,
-			Model model) {
-		Shop shop = openShopApplyService.getShopInfoByShopId(shopId);
-		if (shop != null) {
-			boolean flag1 = false;
-			boolean flag2 = false;
-			SessionContext session = SessionContext.getSessionContext();
-			// 获取指定数据权限的所有集合
-			List<Pair<String>> cityIds = session.dataAuth("city");
-			if (cityIds != null && cityIds.size() > 0) {
-				for (int i = 0; i < cityIds.size(); i++) {
-					if ("-1".equals(cityIds.get(i).getName())) {
-						flag1 = true;
-						break;
-					}
-					if (cityIds.get(i).getName().equals(shop.getCityId().toString())) {
-						flag1 = true;
-					}
-				}
-			}
-			DataDictionary dd = this.dataDictionaryService.getDataDictionaryByCode(SHOP_SOURCE);
-			List<DataDictionaryValue> ddValues = null;
-			if (dd != null) {
-				ddValues = this.dataDictionaryService.getDataDictionaryValue(dd.getId());
-			}
-			if (ddValues != null && !CollectionUtils.isEmpty(ddValues)) {
-				for (int i = 0; i < ddValues.size(); i++) {
-					if ("-1".equals(ddValues.get(i).getCode())) {
-						flag2 = true;
-						break;
-					}
-					if (ddValues.get(i).getCode().equals(shop.getShopSource().toString())) {
-						flag2 = true;
-					}
-				}
-			}
-			if (flag1 == false || flag2 == false) {
-				return new ModelAndView("redirect:/shop/list.do");
-			}
-			// 1批发商户 2产地商户 3农户商户 4 零售商户 5代购商户 6物流商户
-			if (shop.getShopSource() == 1 || shop.getShopSource() == 2 || shop.getShopSource() == 3
-					|| shop.getShopSource() == 4) {
-				// 经营类型
-				DataDictionary dataDictionary = dataDictionaryService.getDataDictionaryByCode("SHOP_MANAGE_TYPE");
-				if (dataDictionary != null) {
-					List<DataDictionaryValue> list = dataDictionaryService
-							.getDataDictionaryValue(dataDictionary.getId());
-					if (list != null && list.size() > 0) {
-						for (int i = 0; i < list.size(); i++) {
-							DataDictionaryValue dataDictionaryValue = list.get(i);
-							if (dataDictionaryValue.getCode().equals(shop.getManageType().toString())) {
-								model.addAttribute("manageType", dataDictionaryValue.getName());
-								break;
-							}
-						}
-					}
-				}
-			}
-			if (shop.getShopSource() == 1) {
-				// 店铺所在批发市场
-				PickUpPointDomain pickUpPointDomain = pickUpPointService
-						.getPickUpPointDomainInfo(shop.getMarketId().longValue());
-				if (pickUpPointDomain != null) {
-					model.addAttribute("pickName", pickUpPointDomain.getPickName());
-				}
-			}
-			// 零售商户
-			if (shop.getShopSource() == 4) {
-				// 店铺商户类型
-				DataDictionary dataDictionary = dataDictionaryService.getDataDictionaryByCode("SHOP_MERCHANT_TYPE");
-				if (dataDictionary != null) {
-					List<DataDictionaryValue> list = dataDictionaryService
-							.getDataDictionaryValue(dataDictionary.getId());
-					if (list != null && list.size() > 0) {
-						for (int i = 0; i < list.size(); i++) {
-							DataDictionaryValue dataDictionaryValue = list.get(i);
-							if (dataDictionaryValue.getCode().equals(shop.getMerchantType().toString())) {
-								model.addAttribute("merchantType", dataDictionaryValue.getName());
-								break;
-							}
-						}
-					}
-				}
-			}
-			// 代购商户
-			if (shop.getShopSource() == 5) {
-				List<Long> buyAreaList = shop.getBuyArea();
-				if (buyAreaList != null && buyAreaList.size() > 0) {
-					List cityAreaList = new ArrayList();
-					for (int j = 0; j < buyAreaList.size(); j++) {
-						Long buyAreaId = buyAreaList.get(j);
-						// 代购辐射区域
-						Result cityResult = cityService.getCityList(buyAreaId.intValue());
-						List<City> cityList = (List) cityResult.getAllResult().get("city");
-						if (cityList != null && cityList.size() > 0) {
-							String cityAreaP = "";
-							String cityAreaC = "";
-							String cityAreaA = "";
-							for (int i = 0; i < cityList.size(); i++) {
-								City city = cityList.get(i);
-								if (city.getLevel() == 1) {
-									cityAreaP = city.getRegionName();
-								}
-								if (city.getLevel() == 2) {
-									cityAreaC = city.getRegionName();
-								}
-								if (city.getLevel() == 3) {
-									cityAreaA = city.getRegionName();
-								}
-							}
-							String cityArea = cityAreaP + cityAreaC + cityAreaA;
-							cityAreaList.add(cityArea);
-							model.addAttribute("cityAreaList", cityAreaList);
-						}
-					}
-				}
-				// 代购品类
-				List<Category> buyCategoryList = productRPCService.listCategoriesInfo(shop.getBuyCategory());
-				model.addAttribute("buyCategoryList", buyCategoryList);
-				// 代购市场
-				List<Long> buyMarketList = shop.getBuyMarket();
-				if (buyMarketList != null && buyMarketList.size() > 0) {
-					List buyMarketNameList = new ArrayList();
-					for (int k = 0; k < buyMarketList.size(); k++) {
-						PickUpPointDomain pickUpPointDomain = pickUpPointService
-								.getPickUpPointDomainInfo(buyMarketList.get(k));
-						if (pickUpPointDomain != null) {
-							buyMarketNameList.add(pickUpPointDomain.getPickName());
-						}
-					}
-					model.addAttribute("buyMarketNameList", buyMarketNameList);
-				}
-			}
-			// 物流商户
-			if (shop.getShopSource() == 6) {
-				DataDictionary dataDictionary = dataDictionaryService.getDataDictionaryByCode("SHOP_LOGISTICS_TYPE_ID");
-				if (dataDictionary != null) {
-					List<DataDictionaryValue> list = dataDictionaryService
-							.getDataDictionaryValue(dataDictionary.getId());
-					if (list != null && list.size() > 0) {
-						for (int i = 0; i < list.size(); i++) {
-							DataDictionaryValue dataDictionaryValue = list.get(i);
-							if (shop.getLogisticsTypeId() != null
-									&& dataDictionaryValue.getCode().equals(shop.getLogisticsTypeId().toString())) {
-								model.addAttribute("logistics", dataDictionaryValue.getName());
-								break;
-							}
-						}
-					}
-				}
-			}
-		}
-		MemberQueryResp userAuth = openShopApplyService.getUserAuthInfo(userId);
-		List<OperateLog> log = operateLogService.getOperateLog(shopId, StateTypesUtil.shopAuthenTyupe);
-		if (log.size() > 0) {
-			model.addAttribute("operateLog", log.get(0));
-		}
-		String detailAddress = "";
-		String address = shop.getAddressText();
-		DataDictionary dataDictionary = dataDictionaryService.getDataDictionaryByCode("DIC_SHOP_CHECK_REASON");
-		List<DataDictionaryValue> list = dataDictionaryService.getDataDictionaryValue(dataDictionary.getId());
-		if (!StringUtils.isBlank(address)) {
-			String addr[] = address.split("/");
-			if (addr.length != 0) {
-				address = addr[0];
-				if (addr.length > 1) {
-					detailAddress = addr[1];
-				}
-			}
-		}
-		shop.setAddressText(address);
-		if (shop.getAddressId() != null) {
-			String countryAddress = cityService.getCountryAddress(Integer.parseInt(shop.getAddressId().toString()));
-			model.addAttribute("countryAddress", countryAddress);
-		}
-		model.addAttribute("shopInfo", shop);
-		model.addAttribute("userId", userId);
-		model.addAttribute("list", list);
-		model.addAttribute("detailAddress", detailAddress);
-		model.addAttribute("userAuth", userAuth);
-		return toVM("authen/show", model);
-	}
-
-	/**
-	 * this method is 审批用户开店申请信息
-	 *
-	 * @param auditRemark
-	 * @param shopState
-	 * @param shopId
-	 * @return
-	 * @createTime 2014年6月19日 下午3:49:31
-	 * @author liujie
-	 */
-	@RequestMapping(value = "shopAudit")
-	@ResponseBody
-	public void shopAudit(@RequestParam("auditRemark") String auditRemark, @RequestParam("status") String shopState,
-			@RequestParam("shopName") String shopName, @RequestParam("shopId") Long shopId, HttpServletResponse resp) {
-		SessionContext session = SessionContext.getSessionContext();
-		UserTicket user = session.getUserTicket();
-		Shop shop = openShopApplyService.getShopInfoByShopId(shopId);
-		Map<String, Object> param = Maps.newHashMap();
-		if (shop.getShopState() != 1) {
-			logger.info("该条记录已经被操作过了,不能再进行操作!");
-			param.put("msg", "该条记录已经被操作过了,不能再进行操作!");
-			writeJSON(resp, param);
-			return;
-		}
-		try {
-			if (auditRemark.trim().length() > 60) {
-				logger.info("审批用户描述信息超过指定字符串长度（60个）");
-				param.put("msg", "审批用户描述信息超过指定字符串长度（60个）!");
-				writeJSON(resp, param);
-				return;
-			}
-			logger.info("审批用户开店申请信息");
-			boolean flag = openShopApplyService.shopAudit(shopId, auditRemark.trim(), Integer.parseInt(shopState));
-			if (flag) {
-				if (shopState.equals("2")) {
-					LogUtils.log(LogData.builder(WebUtils.getCurrentUserName(), "会员中心", shopId + "").model("开店申请")
-							.operation("审核通过").dataName(shopName).build());
-				} else {
-					BaseQuery bq = new BaseQuery();
-					bq.addParam("shopId", shopId + "");
-					bq.addParam("state", "2");
-					bq.addParam("closeType", "4");
-					PageTemplate pageTemplate = shopCloseHistoryService.getShopCloseHistoryList(bq);
-					if (pageTemplate != null) {
-						if (pageTemplate.getList() != null && pageTemplate.getList().size() > 0) {
-							openShopApplyService.shopAudit(shopId, auditRemark.trim(), 4);
-						}
-					}
-					LogUtils.log(LogData.builder(WebUtils.getCurrentUserName(), "会员中心", shopId + "").model("开店申请")
-							.operation("审核拒绝").dataName(shopName).build());
-				}
-				logger.info("记录用户操作信息");
-				operateLog.setOperateName(user.getRealName());
-				operateLog.setOperateId(user.getId());
-				operateLog.setOperateDataId(shopId);
-				operateLog.setOperateType(StateTypesUtil.shopAuthenTyupe);
-				operateLog.setOperateRemark(auditRemark.trim());
-				operateLogService.saveOperateLog(operateLog);
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-			logger.info("审批用户开店申请信息失败", e);
-		}
-	}
-
-}
-package com.diligrp.website.manweb.controller;
-
-import com.alibaba.fastjson.JSONObject;
-import com.diligrp.log.util.LogData;
-import com.diligrp.log.util.LogUtils;
-import com.diligrp.manage.sdk.domain.UserTicket;
-import com.diligrp.manage.sdk.session.SessionContext;
-import com.diligrp.website.domain.*;
-import com.diligrp.website.manweb.utils.StateTypesUtil;
-import com.diligrp.website.manweb.utils.WebUtils;
-import com.diligrp.website.rpc.LogicRPCService;
-import com.diligrp.website.rpc.OrdersRPCService;
-import com.diligrp.website.rpc.PurchasingRPCService;
-import com.diligrp.website.rpc.ShopRPCService;
-import com.diligrp.website.service.DataDictionaryService;
-import com.diligrp.website.service.OperateLogService;
-import com.diligrp.website.service.ShopCloseHistoryService;
-import com.diligrp.website.service.ShopNameModifyService;
-import com.diligrp.website.util.dao.BaseQuery;
-import com.diligrp.website.util.domain.Result;
-import com.diligrp.website.util.web.BaseController;
-import com.diligrp.website.util.web.PageTemplate;
-import com.google.common.collect.Maps;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.servlet.ModelAndView;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * <B>Description</B> <br />
- * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved.
- * <br />
- * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
- * <B>Company</B> 地利集团
- *
- * @author LaiKui
- * @createTime 2015年11月3日
- */
-@Controller
-@RequestMapping("shopCloseHistory")
-public class ShopCloseHistoryController extends BaseController {
-
-	@Value("${project.system.domain}")
-	private String domain;
-	@Resource
-	private ShopCloseHistoryService shopCloseHistoryService;
-	@Resource
-	private ShopRPCService shopRPCService;
-	@Resource
-	private OperateLogService operateLogService;
-	@Resource
-	private OrdersRPCService ordersRPCService;
-	@Resource
-	private LogicRPCService logicRPCService;
-	@Resource
-	private DataDictionaryService dataDictionaryService;
-	@Resource
-	private ShopNameModifyService shopNameModifyService;
-	@Resource
-	private PurchasingRPCService purchasingRPCService;
-
-	private static Map<Integer, String> typeMap = new HashMap<Integer, String>();
-
-	private static Map<Integer, String> closeTypeMap = new HashMap<Integer, String>();
-
-	static {
-		typeMap.put(0, "全部");
-		typeMap.put(1, "待审核");
-		typeMap.put(2, "审核通过");
-		typeMap.put(3, "审核未通过");
-		closeTypeMap.put(0, "全部");
-		closeTypeMap.put(4, "关闭");
-		closeTypeMap.put(5, "注销");
-	}
-
-	@RequestMapping(value = "list")
-	public ModelAndView list(HttpServletRequest request, BaseQuery bq, Model model) {
-		String id = request.getParameter("id");
-		String shopName = request.getParameter("shopName");
-		String mobile = request.getParameter("mobile");
-		String stateStr = request.getParameter("state");
-		String closeTypeStr = request.getParameter("closeType");
-		String startTime = request.getParameter("startTime");
-		String endTime = request.getParameter("endTime");
-		if (StringUtils.isNotBlank(startTime)) {
-			bq.addParam("startTime", startTime + " " + "00:00:00");
-		}
-		if (StringUtils.isNotBlank(endTime)) {
-			bq.addParam("endTime", endTime + " " + "23:59:59");
-		}
-		if (StringUtils.isNotBlank(stateStr)) {
-			if ("0".equals(stateStr)) {
-				bq.addParam("state", null);
-			} else {
-				Integer state = Integer.parseInt(stateStr);
-				bq.addParam("state", state + "");
-			}
-		}
-		if (StringUtils.isNotBlank(closeTypeStr)) {
-			if ("0".equals(closeTypeStr)) {
-				bq.addParam("closeType", null);
-			} else {
-				Integer closeType = Integer.parseInt(closeTypeStr);
-				bq.addParam("closeType", closeType + "");
-			}
-		}
-		if (StringUtils.isNotBlank(mobile)) {
-			bq.addParam("mobile", mobile);
-		}
-		if (StringUtils.isNotBlank(id)) {
-			bq.addParam("id", id);
-		}
-		if (StringUtils.isNotBlank(shopName)) {
-			bq.addParam("shopName", shopName);
-		}
-		PageTemplate page = shopCloseHistoryService.getShopCloseHistoryList(bq);
-		model.addAttribute("page", page);
-		model.addAttribute("type", typeMap);
-		model.addAttribute("closeTypeMap", closeTypeMap);
-		model.addAttribute("mobile", mobile);
-		model.addAttribute("startTime", startTime);
-		model.addAttribute("endTime", endTime);
-		model.addAttribute("state", stateStr);
-		model.addAttribute("closeType", closeTypeStr);
-		model.addAttribute("shopName", shopName);
-		model.addAttribute("id", id);
-		model.addAttribute("reasonViewFlag",
-				SessionContext.hasAccess("get", this.domain + "/shopCloseHistory/reasonView.do#reasonView"));
-		model.addAttribute("auditFlag",
-				SessionContext.hasAccess("get", this.domain + "/shopCloseHistory/audit.do#audit"));
-		return toVM("shopCloseHistory/list", model);
-	}
-
-	@RequestMapping("getAuditShopCloseHistoryByShopId")
-	@ResponseBody
-	public void getAuditShopCloseHistoryByShopId(@RequestParam Long shopId, HttpServletResponse resp) {
-		ShopCloseHistory shopCloseHistory = shopCloseHistoryService.getAuditShopCloseHistoryByShopId(shopId);
-		Map<String, Object> param = Maps.newHashMap();
-		if (shopCloseHistory != null) {
-			param.put("msg", "此店铺已经提交过关店/注销申请,请等待审核结果!");
-			writeJSON(resp, param);
-		}
-	}
-
-	@RequestMapping("audit")
-	@ResponseBody
-	public void audit(@RequestParam("id") Long id, @RequestParam("state") Integer state,
-			@RequestParam("refuseReason") String refuseReason, HttpServletResponse resp) {
-		ShopCloseHistory shopCloseHistory = shopCloseHistoryService.getShopCloseHistoryById(id);
-		Map<String, Object> param = Maps.newHashMap();
-		if (shopCloseHistory.getState() != 1) {
-			param.put("msg", "该条记录已经被操作过了,不能再进行操作!");
-			writeJSON(resp, param);
-			return;
-		}
-		shopCloseHistory.setState(state);
-		shopCloseHistory.setRefuseReason(refuseReason);
-		Result rst = shopCloseHistoryService.editShopCloseHistory(shopCloseHistory);
-		OperateLog operateLog = new OperateLog();
-		operateLog.setOperateDataId(shopCloseHistory.getShopId());
-		SessionContext session = SessionContext.getSessionContext();
-		UserTicket user = session.getUserTicket();
-		operateLog.setOperateId(user.getId());
-		operateLog.setOperateName(user.getRealName());
-		operateLog.setOperateType(StateTypesUtil.shopAuthenTyupe);
-		String reasonCode = "967";
-		String otherCode = "967";
-		if (StringUtils.isNotEmpty(shopCloseHistory.getReason())) {
-			reasonCode = shopCloseHistory.getReason();
-		}
-		if (StringUtils.isNotEmpty(shopCloseHistory.getOtherReason())) {
-			otherCode = shopCloseHistory.getOtherReason();
-		}
-		if (state == 2) {
-			shopRPCService.updateShopClose(shopCloseHistory.getShopId(), reasonCode, otherCode,
-					shopCloseHistory.getCloseType());
-			if (shopCloseHistory.getCloseType() == 4) {
-				operateLog.setOperateRemark("关店审核通过");
-			} else {
-				operateLog.setOperateRemark("注销审核通过");
-			}
-			BaseQuery bq = new BaseQuery();
-			bq.addParam("shopId", shopCloseHistory.getShopId() + "");
-			bq.addParam("state", "1");
-			PageTemplate pageTemplate = shopNameModifyService.getShopNameModifyList(bq);
-			if (pageTemplate != null) {
-				if (pageTemplate.getList() != null && pageTemplate.getList().size() > 0) {
-					ShopNameModify shopNameModify = (ShopNameModify) pageTemplate.getList().get(0);
-					shopNameModify.setYn(2);
-					shopNameModifyService.editShopNameModify(shopNameModify);
-				}
-			}
-		} else {
-			if (shopCloseHistory.getCloseType() == 4) {
-				operateLog.setOperateRemark("关店审核拒绝：" + refuseReason);
-			} else {
-				operateLog.setOperateRemark("注销审核拒绝：" + refuseReason);
-			}
-		}
-		operateLogService.saveOperateLog(operateLog);
-		param.put("success", rst.isSuccess());
-		param.put("code", rst.getCode());
-		LogUtils.log(LogData.builder(WebUtils.getCurrentUserName(), "会员中心", shopCloseHistory.getId() + "")
-				.model("关闭店铺申请").operation("修改").dataName(rst.getMsg()).build());
-		writeJSON(resp, param);
-	}
-
-	@RequestMapping("/reasonView")
-	@ResponseBody
-	public void reasonView(@RequestParam("id") Long id, HttpServletResponse resp) {
-		ShopCloseHistory shopCloseHistory = shopCloseHistoryService.getShopCloseHistoryById(id);
-		Map<String, Object> param = Maps.newHashMap();
-		if (shopCloseHistory != null) {
-			if (shopCloseHistory.getCloseType() == 4) {
-				param.put("closeTypeText", "该店铺提交关闭申请的原因：");
-				param.put("refuseReasonText", "该店铺提交关闭申请后被拒绝的原因：");
-			} else {
-				param.put("closeTypeText", "该店铺提交注销申请的原因：");
-				param.put("refuseReasonText", "该店铺提交注销申请后被拒绝的原因：");
-			}
-			String reason = "";
-			if (StringUtils.isNotEmpty(shopCloseHistory.getReason())) {
-				String[] codeArray = shopCloseHistory.getReason().split(",");
-				DataDictionary dataDictionary = dataDictionaryService.getDataDictionaryByCode("SHOP_CLOSE_REASON");
-				if (dataDictionary != null) {
-					List<DataDictionaryValue> list = dataDictionaryService
-							.getDataDictionaryValue(dataDictionary.getId());
-					if (list != null && list.size() > 0) {
-						for (int i = 0; i < list.size(); i++) {
-							DataDictionaryValue dataDictionaryValue = list.get(i);
-							for (int j = 0; j < codeArray.length; j++) {
-								if (dataDictionaryValue.getCode().equals(codeArray[j])) {
-									reason += dataDictionaryValue.getName() + ";</br>";
-								}
-							}
-						}
-					}
-				}
-			}
-			if (shopCloseHistory.getState() == 3) {
-				if (StringUtils.isEmpty(shopCloseHistory.getReason())) {
-					param.put("reason", shopCloseHistory.getOtherReason());
-				} else if (StringUtils.isEmpty(shopCloseHistory.getOtherReason())) {
-					param.put("reason", reason);
-				} else {
-					param.put("reason", reason + shopCloseHistory.getOtherReason());
-				}
-				param.put("refuseReason", shopCloseHistory.getRefuseReason());
-				writeJSON(resp, param);
-			} else {
-				if (StringUtils.isEmpty(shopCloseHistory.getReason())) {
-					param.put("reason", shopCloseHistory.getOtherReason());
-				} else if (StringUtils.isEmpty(shopCloseHistory.getOtherReason())) {
-					param.put("reason", reason);
-				} else {
-					param.put("reason", reason + shopCloseHistory.getOtherReason());
-				}
-				writeJSON(resp, param);
-			}
-		}
-	}
-
-	@RequestMapping("getValidOrderNumByShop")
-	@ResponseBody
-	public void getValidOrderNumByShop(@RequestParam Long shopId, @RequestParam Integer shopSource,
-			HttpServletResponse resp) {
-		Map<String, Object> param = Maps.newHashMap();
-		// 物流
-		if (shopSource == 6) {
-			JSONObject losJson = logicRPCService.shopLosOrdersCount(shopId);
-			if (losJson != null) {
-				Object code = losJson.get("code");
-				if ("200".equals(code.toString())) {
-					int losNum = losJson.getIntValue("count");
-					if (losNum != 0) {
-						param.put("msg", "此店铺还存在未完结的订单,不能提交注销申请!");
-					}
-				}
-			} else {
-				param.put("msg", "获取数据出错!");
-			}
-			// 代购
-		} else if (shopSource == 5) {
-			Integer orderNum = purchasingRPCService.getValidOrderNumByShop(shopId);
-			if (orderNum == null) {
-				param.put("msg", "获取数据出错!");
-			} else {
-				if (orderNum != 0) {
-					param.put("msg", "此店铺还存在未完结的订单,不能提交注销申请!");
-				}
-			}
-		} else {
-			Integer orderNum = ordersRPCService.getValidOrderNumByShop(shopId);
-			if (orderNum == null) {
-				param.put("msg", "获取数据出错!");
-			} else {
-				if (orderNum != 0) {
-					param.put("msg", "此店铺还存在未完结的订单,不能提交注销申请!");
-				}
-			}
-		}
-		writeJSON(resp, param);
-	}
-
-}
-package com.diligrp.website.manweb.controller;
-
-import java.net.URLEncoder;
-import java.sql.Timestamp;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.lang3.StringUtils;
-import org.nutz.lang.meta.Pair;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Controller;
-import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.servlet.ModelAndView;
-
-import com.diligrp.log.util.LogData;
-import com.diligrp.log.util.LogUtils;
-import com.diligrp.manage.sdk.domain.UserTicket;
-import com.diligrp.manage.sdk.session.SessionContext;
-import com.diligrp.pnr.sdk.domain.PageResult;
-import com.diligrp.pnr.sdk.domain.Shop;
-import com.diligrp.pnr.sdk.domain.ShopGrade;
-import com.diligrp.pnr.sdk.resp.BaseResp;
-import com.diligrp.website.domain.AuthLevel;
-import com.diligrp.website.domain.City;
-import com.diligrp.website.domain.DataDictionary;
-import com.diligrp.website.domain.DataDictionaryValue;
-import com.diligrp.website.domain.OperateLog;
-import com.diligrp.website.domain.PickUpPointDomain;
-import com.diligrp.website.domain.ShopCloseHistory;
-import com.diligrp.website.manweb.utils.StateTypesUtil;
-import com.diligrp.website.manweb.utils.WebUtils;
-import com.diligrp.website.rpc.input.ShopInfoListInput;
-import com.diligrp.website.rpc.input.ShopProductCategoryListInput;
-import com.diligrp.website.rpc.input.ShopProductRecommendListInput;
-import com.diligrp.website.service.AuthLevelService;
-import com.diligrp.website.service.CityService;
-import com.diligrp.website.service.DataDictionaryService;
-import com.diligrp.website.service.MemberService;
-import com.diligrp.website.service.OperateLogService;
-import com.diligrp.website.service.PickUpPointService;
-import com.diligrp.website.service.ShopCloseHistoryService;
-import com.diligrp.website.service.ShopService;
-import com.diligrp.website.util.domain.Result;
-import com.diligrp.website.util.format.DateFormatUtils;
-import com.diligrp.website.util.web.BaseController;
-import com.google.common.collect.Maps;
-import com.yqyw.user.rpc.client.domain.output.UserInfoResp;
-
-/**
- * <p>
- * Title: 〈标题〉
- * </p>
- * <p>
- * Description: 〈描述〉
- * </p>
- * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved.
- * <br />
- * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
- * <B>Company</B> 地利集团
- * <p>
- * CreateTime：2014/6/19
- * </p>
- *
- * @author zhukai
- */
-@Controller
-@RequestMapping("/shop")
-public class ShopController extends BaseController {
-
-	@Value("${project.system.domain}")
-	private String domain;
-	@Autowired
-	private ShopService shopService;
-	@Autowired
-	private CityService cityService;
-	@Autowired
-	private PickUpPointService pickUpPointService;
-	@Autowired
-	private AuthLevelService authLevelService;
-	@Autowired
-	private MemberService memberService;
-	@Autowired
-	private ShopCloseHistoryService shopCloseHistoryService;
-	@Autowired
-	private OperateLogService operateLogService;
-	@Autowired
-	private DataDictionaryService ddService;
-	private static final String SHOP_SOURCE = "SHOP_SOURCE";
-
-	private static Map<Integer, String> gradeMap = new HashMap<Integer, String>();
-	private static Map<Integer, String> dishonestyMap = new HashMap<Integer, String>();
-	private static Map<Integer, String> placeMap = new HashMap<Integer, String>();
-	private static Map<Integer, String> statisticsMarketMap = new HashMap<Integer, String>();
-	private static Map<Integer, String> shopStatusQueryMap = new HashMap<Integer, String>();
-
-	static {
-		gradeMap.put(0, "全部");
-		gradeMap.put(1, "否");
-		gradeMap.put(2, "是");
-		dishonestyMap.put(0, "全部");
-		dishonestyMap.put(1, "否");
-		dishonestyMap.put(2, "是");
-		placeMap.put(0, "全部");
-		placeMap.put(1, "否");
-		placeMap.put(2, "是");
-		statisticsMarketMap.put(0, "全部");
-		statisticsMarketMap.put(1, "否");
-		statisticsMarketMap.put(2, "是");
-		shopStatusQueryMap.put(0, "全部");
-		shopStatusQueryMap.put(4, "关闭");
-		shopStatusQueryMap.put(2, "正常");
-	}
-
-	@RequestMapping("/list")
-	public ModelAndView list(ShopInfoListInput in, Integer currPage, HttpServletRequest req) throws Exception {
-		String listQuery = req.getQueryString();
-		if (currPage != null) {
-			in.setCurrentPage(currPage + 1);
-		} else {
-			in.setCurrentPage(currPage);
-		}
-		in.setPageDataSize(20);
-		String startTimeStr = req.getParameter("startTime");
-		String endTimeStr = req.getParameter("endTime");
-		String mobile = req.getParameter("mobile");
-		String gradeStateStr = req.getParameter("gradeState");
-		String isDishonestyStr = req.getParameter("isDishonesty");
-		String isSoptauthStr = req.getParameter("isSoptauth");
-		String levelStateStr = req.getParameter("levelState");
-		String marketStr = req.getParameter("market");
-		String statisticsMarketStr = req.getParameter("statisticsMarket");
-		String shopStatusStr = req.getParameter("shopStatus");
-		if (!StringUtils.isEmpty(shopStatusStr)) {
-			Integer shopStatus = Integer.parseInt(shopStatusStr);
-			in.setShopStatus(shopStatus);
-		}
-		if (!StringUtils.isEmpty(marketStr)) {
-			Integer market = Integer.parseInt(marketStr);
-			in.setMarket(market);
-		}
-		if (!StringUtils.isEmpty(statisticsMarketStr)) {
-			Integer statisticsMarket = Integer.parseInt(statisticsMarketStr);
-			in.setStatisticsMarket(statisticsMarket);
-		}
-		if (!StringUtils.isEmpty(gradeStateStr)) {
-			Integer gradeState = Integer.parseInt(gradeStateStr);
-			in.setGradeState(gradeState);
-		}
-		if (!StringUtils.isEmpty(isDishonestyStr)) {
-			Integer isDishonesty = Integer.parseInt(isDishonestyStr);
-			in.setIsDishonesty(isDishonesty);
-		}
-		if (!StringUtils.isEmpty(isSoptauthStr)) {
-			Integer isSoptauth = Integer.parseInt(isSoptauthStr);
-			in.setIsSoptauth(isSoptauth);
-		}
-		if (!StringUtils.isEmpty(levelStateStr)) {
-			Integer levelState = Integer.parseInt(levelStateStr);
-			in.setLevelState(levelState);
-		}
-		if (!StringUtils.isEmpty(startTimeStr)) {
-			String startTime = startTimeStr + " " + "00:00:00";
-			in.setStartTime(startTime);
-		}
-		if (!StringUtils.isEmpty(endTimeStr)) {
-			String endTime = endTimeStr + " " + "23:59:59";
-			in.setEndTime(endTime);
-		}
-		if (!StringUtils.isEmpty(mobile)) {
-			in.setMobile(mobile);
-		}
-		SessionContext session = SessionContext.getSessionContext();
-		// 获取当前登录用户
-		// UserTicket user = session.getUserTicket();
-		// 获取指定数据权限的所有集合
-		List<Pair<String>> cityIds = session.dataAuth("city");
-		if (cityIds != null && cityIds.size() > 0) {
-			String cityId = "";
-			for (int i = 0; i < cityIds.size(); i++) {
-				cityId += cityIds.get(i).getName() + ",";
-			}
-			cityId = cityId.substring(0, cityId.length() - 1);
-			if ("-1".equals(cityId)) {
-				cityId = null;// 查全部
-			}
-			in.setCityId(cityId);
-		} else {
-			in.setCityId("-1");// 无权限
-		}
-		DataDictionary dd = this.ddService.getDataDictionaryByCode(SHOP_SOURCE);
-		List<DataDictionaryValue> ddValues = null;
-		if (dd != null) {
-			ddValues = this.ddService.getDataDictionaryValue(dd.getId());
-		}
-		if (ddValues != null && !CollectionUtils.isEmpty(ddValues)) {
-			String shopSource = "";
-			for (int i = 0; i < ddValues.size(); i++) {
-				shopSource += ddValues.get(i).getCode() + ",";
-			}
-			shopSource = shopSource.substring(0, shopSource.length() - 1);
-			if ("-1".equals(shopSource)) {
-				shopSource = null;// 查全部
-			}
-			in.setShopSource(shopSource);
-		} else {
-			in.setShopSource("-1");// 无权限
-		}
-
-		Result result = shopService.list(in);
-
-		BaseResp resp = (BaseResp) result.getAllResult().get("model");
-		PageResult<Shop> pageResult = null;
-		if (resp != null) {
-			pageResult = resp.getPageResult(Shop.class);
-		}
-		List<Shop> list = null;
-		if (pageResult != null) {
-			list = pageResult.getList();
-		}
-		Map<Integer, String> levelType = new HashMap<Integer, String>();
-		List<AuthLevel> levelList = authLevelService.getAllAuthLevel();
-		levelType.put(0, "全部");
-		if (levelList != null && levelList.size() > 0) {
-			for (int i = 0; i < levelList.size(); i++) {
-				AuthLevel authLevelTemp = levelList.get(i);
-				levelType.put(authLevelTemp.getId().intValue(), authLevelTemp.getLevelName());
-			}
-		}
-		result.addResult("levelType", levelType);
-
-		List<PickUpPointDomain> marketList = new ArrayList<PickUpPointDomain>();
-		List<PickUpPointDomain> marketListTemp = pickUpPointService.getAllMarketPickUpInfo();
-		if (marketListTemp != null && marketListTemp.size() > 0) {
-			for (int i = 0; i < marketListTemp.size(); i++) {
-				PickUpPointDomain market = marketListTemp.get(i);
-				marketList.add(market);
-			}
-		}
-		result.addResult("marketList", marketList);
-
-		List<Shop> shopList = new ArrayList<Shop>();
-		if (list != null && list.size() > 0) {
-			for (int i = 0; i < list.size(); i++) {
-				Shop shop = list.get(i);
-				Long gradeId = shop.getGradeId();
-				if (gradeId == null) {
-					shop.setGradeName("未认证");
-				} else {
-					AuthLevel authLevel = authLevelService.getAuthLevelById(gradeId);
-					if (authLevel != null) {
-						shop.setGradeName(authLevel.getLevelName());
-					} else {
-						shop.setGradeName("未认证");
-					}
-				}
-				shopList.add(shop);
-			}
-		}
-		if (StringUtils.isNotBlank(listQuery)) {
-			result.addResult("listQuery", URLEncoder.encode(listQuery, "utf-8"));
-		}
-		result.addResult("showFlag", SessionContext.hasAccess("get", this.domain + "/shop/show.do#show"));
-		result.addResult("auditFlag",
-				SessionContext.hasAccess("get", this.domain + "/shop/shopAuthLevel.do#shopAuthLevel"));
-		result.addResult("productRecommendFlag",
-				SessionContext.hasAccess("get", this.domain + "/shop/productRecommend.do#productRecommend"));
-		result.addResult("categoryFlag", SessionContext.hasAccess("get", this.domain + "/shop/category.do#category"));
-		result.addResult("qualificationFlag",
-				SessionContext.hasAccess("get", this.domain + "/shop/qualification.do#qualification"));
-		result.addResult("relateMarketFlag",
-				SessionContext.hasAccess("get", this.domain + "/shop/relateMarket.do#relateMarket"));
-		result.addResult("belongFlag",
-				SessionContext.hasAccess("get", this.domain + "/shop/belongStatistics.do#belongStatistics"));
-		result.addResult("closeFlag", SessionContext.hasAccess("get", this.domain + "/shop/closeShop.do#closeShop"));
-		result.addResult("shopList", shopList);
-		if (!StringUtils.isEmpty(mobile)) {
-			result.addResult("mobile", mobile);
-		}
-		if (!StringUtils.isEmpty(startTimeStr)) {
-			result.addResult("startTime", startTimeStr);
-		}
-		if (!StringUtils.isEmpty(endTimeStr)) {
-			result.addResult("endTime", endTimeStr);
-		}
-		if (!StringUtils.isEmpty(in.getShopId())) {
-			result.addResult("shopId", in.getShopId());
-		}
-		if (!StringUtils.isEmpty(in.getShopName())) {
-			result.addResult("shopName", in.getShopName());
-		}
-		result.addResult("gradeStateMap", gradeMap);
-		result.addResult("dishonestyStateMap", dishonestyMap);
-		result.addResult("placeStateMap", placeMap);
-		result.addResult("statisticsMarketMap", statisticsMarketMap);
-		result.addResult("shopStatusQueryMap", shopStatusQueryMap);
-		result.addResult("gradeState", in.getGradeState());
-		result.addResult("isDishonesty", in.getIsDishonesty());
-		result.addResult("levelState", in.getLevelState());
-		result.addResult("isSoptauth", in.getIsSoptauth());
-		result.addResult("statisticsMarket", in.getStatisticsMarket());
-		result.addResult("shopStatus", in.getShopStatus());
-		result.addResult("market", in.getMarket());
-		return toVM("/shop/list", result.getAllResult());
-	}
-
-	@RequestMapping("/qualification")
-	public ModelAndView qualification(Long shopId) {
-		Result resultShop = shopService.getShopInfoById(shopId);
-		Shop shop = (Shop) resultShop.getAllResult().get("model");
-		if (shop != null) {
-			boolean flag1 = false;
-			boolean flag2 = false;
-			SessionContext session = SessionContext.getSessionContext();
-			// 获取指定数据权限的所有集合
-			List<Pair<String>> cityIds = session.dataAuth("city");
-			if (cityIds != null && cityIds.size() > 0) {
-				for (int i = 0; i < cityIds.size(); i++) {
-					if ("-1".equals(cityIds.get(i).getName())) {
-						flag1 = true;
-						break;
-					}
-					if (cityIds.get(i).getName().equals(shop.getCityId().toString())) {
-						flag1 = true;
-					}
-				}
-			}
-			DataDictionary dd = this.ddService.getDataDictionaryByCode(SHOP_SOURCE);
-			List<DataDictionaryValue> ddValues = null;
-			if (dd != null) {
-				ddValues = this.ddService.getDataDictionaryValue(dd.getId());
-			}
-			if (ddValues != null && !CollectionUtils.isEmpty(ddValues)) {
-				for (int i = 0; i < ddValues.size(); i++) {
-					if ("-1".equals(ddValues.get(i).getCode())) {
-						flag2 = true;
-						break;
-					}
-					if (ddValues.get(i).getCode().equals(shop.getShopSource().toString())) {
-						flag2 = true;
-					}
-				}
-			}
-			if (flag1 == false || flag2 == false) {
-				return new ModelAndView("redirect:/shop/list.do");
-			}
-		}
-		Result result = shopService.getShopQualificationsByShopId(shopId);
-		result.addResult("checkQualificationFlag",
-				SessionContext.hasAccess("get", this.domain + "/shop/checkQualification.do#checkQualification"));
-		return toVM("/shop/qualification", result.getAllResult());
-	}
-
-	@RequestMapping(value = "/checkQualification", method = { RequestMethod.POST,
-			RequestMethod.GET }, produces = "application/json")
-	@ResponseBody
-	public String checkQualification(Long qid, int audit) {
-		return shopService.checkShopQualification(qid, audit);
-	}
-
-	@RequestMapping(value = "/show", method = RequestMethod.GET)
-	public ModelAndView show(Long uid) {
-		Result result = shopService.show(uid);
-		Shop shop = (Shop) result.getAllResult().get("shop");
-		if (shop != null) {
-			boolean flag1 = false;
-			boolean flag2 = false;
-			SessionContext session = SessionContext.getSessionContext();
-			// 获取指定数据权限的所有集合
-			List<Pair<String>> cityIds = session.dataAuth("city");
-			if (cityIds != null && cityIds.size() > 0) {
-				for (int i = 0; i < cityIds.size(); i++) {
-					if ("-1".equals(cityIds.get(i).getName())) {
-						flag1 = true;
-						break;
-					}
-					if (cityIds.get(i).getName().equals(shop.getCityId().toString())) {
-						flag1 = true;
-					}
-				}
-			}
-			DataDictionary dd = this.ddService.getDataDictionaryByCode(SHOP_SOURCE);
-			List<DataDictionaryValue> ddValues = null;
-			if (dd != null) {
-				ddValues = this.ddService.getDataDictionaryValue(dd.getId());
-			}
-			if (ddValues != null && !CollectionUtils.isEmpty(ddValues)) {
-				for (int i = 0; i < ddValues.size(); i++) {
-					if ("-1".equals(ddValues.get(i).getCode())) {
-						flag2 = true;
-						break;
-					}
-					if (ddValues.get(i).getCode().equals(shop.getShopSource().toString())) {
-						flag2 = true;
-					}
-				}
-			}
-			if (flag1 == false || flag2 == false) {
-				return new ModelAndView("redirect:/shop/list.do");
-			}
-			Long addressId = shop.getAddressId();
-			Result res = cityService.getCityList(addressId.intValue());
-			List<City> cityList = (List) res.getAllResult().get("city");
-			String addressName = "";
-			String name1 = "";
-			String name2 = "";
-			String name3 = "";
-			if (cityList != null && cityList.size() > 0) {
-				for (int i = 0; i < cityList.size(); i++) {
-					City city = cityList.get(i);
-					if (city.getLevel() == 3) {
-						name3 = city.getRegionName();
-					}
-					if (city.getLevel() == 2) {
-						name2 = city.getRegionName();
-					}
-					if (city.getLevel() == 1) {
-						name1 = city.getRegionName();
-					}
-				}
-				addressName = name1 + name2 + name3 + shop.getAddressText();
-				result.addResult("addressName", addressName);
-			}
-		}
-		if (result.isSuccess()) {
-			return toVM("/shop/show", result.getAllResult());
-		} else {
-			ModelAndView view = new ModelAndView("redirect:/shop/list.do");
-			view.addObject("succ", false);
-			view.addObject("msg", result.getMsg());
-			return view;
-		}
-	}
-
-	@RequestMapping(value = "/getSopInfo", method = RequestMethod.GET)
-	@ResponseBody
-	public Map<?, ?> getSopInfo(Long uid) {
-		try {
-			Result result = shopService.show(uid);
-			Shop shop = (Shop) result.getAllResult().get("shop");
-			if (shop != null) {
-				boolean flag1 = false;
-				boolean flag2 = false;
-				SessionContext session = SessionContext.getSessionContext();
-				// 获取指定数据权限的所有集合
-				List<Pair<String>> cityIds = session.dataAuth("city");
-				if (cityIds != null && cityIds.size() > 0) {
-					for (int i = 0; i < cityIds.size(); i++) {
-						if ("-1".equals(cityIds.get(i).getName())) {
-							flag1 = true;
-							break;
-						}
-						if (cityIds.get(i).getName().equals(shop.getCityId().toString())) {
-							flag1 = true;
-						}
-					}
-				}
-				DataDictionary dd = this.ddService.getDataDictionaryByCode(SHOP_SOURCE);
-				List<DataDictionaryValue> ddValues = null;
-				if (dd != null) {
-					ddValues = this.ddService.getDataDictionaryValue(dd.getId());
-				}
-				if (ddValues != null && !CollectionUtils.isEmpty(ddValues)) {
-					for (int i = 0; i < ddValues.size(); i++) {
-						if ("-1".equals(ddValues.get(i).getCode())) {
-							flag2 = true;
-							break;
-						}
-						if (ddValues.get(i).getCode().equals(shop.getShopSource().toString())) {
-							flag2 = true;
-						}
-					}
-				}
-				if (flag1 == false || flag2 == false) {
-					return null;
-				}
-			}
-			if (result.isSuccess()) {
-				return result.getAllResult();
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return null;
-	}
-
-	/**
-	 * 商品推荐
-	 *
-	 * @return
-	 */
-	@SuppressWarnings("deprecation")
-	@RequestMapping(value = "/productRecommend")
-	public ModelAndView productRecommend(ShopProductRecommendListInput in, Integer dateType, String listQuery) {
-		Result resultShop = shopService.show(in.getUserId());
-		Shop shop = (Shop) resultShop.getAllResult().get("shop");
-		if (shop != null) {
-			boolean flag1 = false;
-			boolean flag2 = false;
-			SessionContext session = SessionContext.getSessionContext();
-			// 获取指定数据权限的所有集合
-			List<Pair<String>> cityIds = session.dataAuth("city");
-			if (cityIds != null && cityIds.size() > 0) {
-				for (int i = 0; i < cityIds.size(); i++) {
-					if ("-1".equals(cityIds.get(i).getName())) {
-						flag1 = true;
-						break;
-					}
-					if (cityIds.get(i).getName().equals(shop.getCityId().toString())) {
-						flag1 = true;
-					}
-				}
-			}
-			DataDictionary dd = this.ddService.getDataDictionaryByCode(SHOP_SOURCE);
-			List<DataDictionaryValue> ddValues = null;
-			if (dd != null) {
-				ddValues = this.ddService.getDataDictionaryValue(dd.getId());
-			}
-			if (ddValues != null && !CollectionUtils.isEmpty(ddValues)) {
-				for (int i = 0; i < ddValues.size(); i++) {
-					if ("-1".equals(ddValues.get(i).getCode())) {
-						flag2 = true;
-						break;
-					}
-					if (ddValues.get(i).getCode().equals(shop.getShopSource().toString())) {
-						flag2 = true;
-					}
-				}
-			}
-			if (flag1 == false || flag2 == false) {
-				return new ModelAndView("redirect:/shop/list.do");
-			}
-		}
-		if (dateType != null) {
-			Timestamp endTime = new Timestamp(System.currentTimeMillis());
-			Timestamp startTime = new Timestamp(System.currentTimeMillis());
-			switch (dateType) {
-			case 1:
-				startTime.setMonth(endTime.getMonth() - 1);
-				break;
-			case 2:
-				startTime.setMonth(endTime.getMonth() - 3);
-				break;
-			case 3:
-				startTime.setYear(endTime.getYear() - 1);
-				break;
-			default:
-				endTime = null;
-				startTime = null;
-				break;
-			}
-			in.setBeginTime(DateFormatUtils.format(startTime));
-			in.setEndTime(DateFormatUtils.format(endTime));
-		}
-		Result result = shopService.productRecommend(in);
-		result.addResult("dateType", dateType);
-		result.addResult("listQuery", listQuery);
-		return toVM("/shop/productRecommend", result.getAllResult());
-	}
-
-	/**
-	 * 商品分类
-	 *
-	 * @return
-	 */
-	@RequestMapping(value = "/category", method = RequestMethod.GET)
-	public ModelAndView category(ShopProductCategoryListInput in, String listQuery) {
-		Result resultShop = shopService.show(in.getUserId());
-		Shop shop = (Shop) resultShop.getAllResult().get("shop");
-		if (shop != null) {
-			boolean flag1 = false;
-			boolean flag2 = false;
-			SessionContext session = SessionContext.getSessionContext();
-			// 获取指定数据权限的所有集合
-			List<Pair<String>> cityIds = session.dataAuth("city");
-			if (cityIds != null && cityIds.size() > 0) {
-				for (int i = 0; i < cityIds.size(); i++) {
-					if ("-1".equals(cityIds.get(i).getName())) {
-						flag1 = true;
-						break;
-					}
-					if (cityIds.get(i).getName().equals(shop.getCityId().toString())) {
-						flag1 = true;
-					}
-				}
-			}
-			DataDictionary dd = this.ddService.getDataDictionaryByCode(SHOP_SOURCE);
-			List<DataDictionaryValue> ddValues = null;
-			if (dd != null) {
-				ddValues = this.ddService.getDataDictionaryValue(dd.getId());
-			}
-			if (ddValues != null && !CollectionUtils.isEmpty(ddValues)) {
-				for (int i = 0; i < ddValues.size(); i++) {
-					if ("-1".equals(ddValues.get(i).getCode())) {
-						flag2 = true;
-						break;
-					}
-					if (ddValues.get(i).getCode().equals(shop.getShopSource().toString())) {
-						flag2 = true;
-					}
-				}
-			}
-			if (flag1 == false || flag2 == false) {
-				return new ModelAndView("redirect:/shop/list.do");
-			}
-		}
-		Result result = shopService.productCategory(in);
-		result.addResult("listQuery", listQuery);
-		return toVM("/shop/category", result.getAllResult());
-	}
-
-	/**
-	 * this method is 关联店铺和市场
-	 *
-	 * @param shopId
-	 * @param marketId
-	 * @return
-	 * @createTime 2014年12月25日 下午6:39:39
-	 * @author liujie
-	 */
-	@RequestMapping(value = "/relateMarket", method = RequestMethod.POST)
-	@ResponseBody
-	public boolean relateMarket(@RequestParam Long shopId, @RequestParam Long marketId, @RequestParam String shopName) {
-		try {
-			boolean flag = shopService.relationMarketByStoreid(shopId, marketId);
-			LogUtils.log(LogData.builder(WebUtils.getCurrentUserName(), "会员中心", shopId + "").model("店铺管理")
-					.operation("修改").dataName(shopName).build());
-			return flag;
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return false;
-	}
-
-	@RequestMapping("/shopAuthLevel")
-	public ModelAndView shopAuthLevel(Long shopId, String listQuery) {
-		Result result = shopService.getShopAuthLevelById(shopId);
-		Result resultShop = shopService.getShopInfoById(shopId);
-		Shop shop = (Shop) resultShop.getAllResult().get("model");
-		if (shop != null) {
-			boolean flag1 = false;
-			boolean flag2 = false;
-			SessionContext session = SessionContext.getSessionContext();
-			// 获取指定数据权限的所有集合
-			List<Pair<String>> cityIds = session.dataAuth("city");
-			if (cityIds != null && cityIds.size() > 0) {
-				for (int i = 0; i < cityIds.size(); i++) {
-					if ("-1".equals(cityIds.get(i).getName())) {
-						flag1 = true;
-						break;
-					}
-					if (cityIds.get(i).getName().equals(shop.getCityId().toString())) {
-						flag1 = true;
-					}
-				}
-			}
-			DataDictionary dd = this.ddService.getDataDictionaryByCode(SHOP_SOURCE);
-			List<DataDictionaryValue> ddValues = null;
-			if (dd != null) {
-				ddValues = this.ddService.getDataDictionaryValue(dd.getId());
-			}
-			if (ddValues != null && !CollectionUtils.isEmpty(ddValues)) {
-				for (int i = 0; i < ddValues.size(); i++) {
-					if ("-1".equals(ddValues.get(i).getCode())) {
-						flag2 = true;
-						break;
-					}
-					if (ddValues.get(i).getCode().equals(shop.getShopSource().toString())) {
-						flag2 = true;
-					}
-				}
-			}
-			if (flag1 == false || flag2 == false) {
-				return new ModelAndView("redirect:/shop/list.do");
-			}
-		}
-		ShopGrade shopGrade = (ShopGrade) result.getAllResult().get("model");
-		Map<Integer, String> levelType = new HashMap<Integer, String>();
-		if (shopGrade.getGradeId() != null && shopGrade.getGradeId() != 0) {
-			AuthLevel authLevel = authLevelService.getAuthLevelById(shopGrade.getGradeId());
-			result.addResult("level", authLevel.getId());
-			levelType.put(authLevel.getId().intValue(), authLevel.getLevelName());
-		}
-		List<AuthLevel> levelList = authLevelService.getAllAuthLevel();
-		levelType.put(0, "请选择诚信认证");
-		if (levelList != null && levelList.size() > 0) {
-			for (int i = 0; i < levelList.size(); i++) {
-				AuthLevel authLevelTemp = levelList.get(i);
-				levelType.put(authLevelTemp.getId().intValue(), authLevelTemp.getLevelName());
-			}
-		}
-		result.addResult("shopGrade", shopGrade);
-		result.addResult("levelType", levelType);
-		result.addResult("shopId", shopId);
-		// 保存查询条件
-		result.addResult("listQuery", listQuery);
-		return toVM("/shop/authLevel", result.getAllResult());
-	}
-
-	@RequestMapping(value = "saveShopAuthLevel", method = RequestMethod.POST)
-	public ModelAndView saveShopAuthLevel(HttpServletRequest request, @RequestParam(value = "shopId") Long shopId,
-			@RequestParam(value = "level") Long levelId) {
-		String isDishonestyStr = request.getParameter("shopGrade.isDishonesty");
-		String isSoptauthStr = request.getParameter("shopGrade.isSoptauth");
-		String listQuery = request.getParameter("listQuery");
-		Integer isDishonesty = 1;
-		Integer isSoptauth = 1;
-		if (StringUtils.isNotEmpty(isDishonestyStr)) {
-			isDishonesty = 2;
-		}
-		if (StringUtils.isNotEmpty(isSoptauthStr)) {
-			isSoptauth = 2;
-		}
-		if (levelId == 0) {
-			levelId = null;
-		}
-		shopService.saveShopAuthLevel(shopId, levelId, isDishonesty, isSoptauth);
-		return new ModelAndView("redirect:/shop/list.do?" + listQuery);
-	}
-
-	@RequestMapping(value = "/shopNameShow", method = RequestMethod.GET)
-	public ModelAndView shopNameShow(Long uid) {
-		Result result = shopService.show(uid);
-		Shop shop = (Shop) result.getAllResult().get("shop");
-		if (shop != null) {
-			Long addressId = shop.getAddressId();
-			Result res = cityService.getCityList(addressId.intValue());
-			List<City> cityList = (List) res.getAllResult().get("city");
-			String addressName = "";
-			String name1 = "";
-			String name2 = "";
-			String name3 = "";
-			if (cityList != null && cityList.size() > 0) {
-				for (int i = 0; i < cityList.size(); i++) {
-					City city = cityList.get(i);
-					if (city.getLevel() == 3) {
-						name3 = city.getRegionName();
-					}
-					if (city.getLevel() == 2) {
-						name2 = city.getRegionName();
-					}
-					if (city.getLevel() == 1) {
-						name1 = city.getRegionName();
-					}
-				}
-				addressName = name1 + name2 + name3 + shop.getAddressText();
-				result.addResult("addressName", addressName);
-			}
-		}
-		if (result.isSuccess()) {
-			return toVM("/shop/show", result.getAllResult());
-		} else {
-			return new ModelAndView("redirect:/shopNameModify/list.do");
-		}
-	}
-
-	/**
-	 * this method is 统计归属
-	 *
-	 * @param shopId
-	 * @param marketId
-	 * @createTime 2015年10月20日 上午10:39:39
-	 * @author LaiKui
-	 */
-	@RequestMapping(value = "/belongStatistics", method = RequestMethod.POST)
-	@ResponseBody
-	public boolean belongStatistics(@RequestParam Long shopId, @RequestParam Long marketId,
-			@RequestParam String shopName) {
-		try {
-			boolean flag = shopService.belongStatistics(shopId, marketId);
-			LogUtils.log(LogData.builder(WebUtils.getCurrentUserName(), "会员中心", shopId + "").model("店铺管理")
-					.operation("修改").dataName(shopName).build());
-			return flag;
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return false;
-	}
-
-	/**
-	 * this method is 关闭店铺申请
-	 *
-	 * @param shopId
-	 * @createTime 2015年11月2日 上午10:39:39
-	 * @author LaiKui
-	 */
-	@RequestMapping(value = "/closeShop", method = RequestMethod.POST)
-	@ResponseBody
-	public void closeShop(@RequestParam Long shopId, @RequestParam String reason, @RequestParam String otherReason,
-			@RequestParam Integer closeType, HttpServletResponse resp) {
-		Result resultShop = shopService.getShopInfoById(shopId);
-		Shop shop = (Shop) resultShop.getAllResult().get("model");
-		Map<String, Object> param = Maps.newHashMap();
-		if (shop != null) {
-			ShopCloseHistory shopCloseHistory = new ShopCloseHistory();
-			shopCloseHistory.setState(1);
-			shopCloseHistory.setShopName(shop.getShopName());
-			shopCloseHistory.setShopId(shop.getId());
-			if (StringUtils.isNotEmpty(reason)) {
-				reason = reason.substring(0, reason.length() - 1);
-				shopCloseHistory.setReason(reason);
-			}
-			shopCloseHistory.setOtherReason(otherReason);
-			shopCloseHistory.setShopType(shop.getShopSource());
-			shopCloseHistory.setIsCredit(shop.getIsDishonesty());
-			shopCloseHistory.setPlaceAuth(shop.getIsSoptauth());
-			shopCloseHistory.setCloseType(closeType);
-			AuthLevel authLevel = authLevelService.getAuthLevelById(shop.getGradeId());
-			if (authLevel != null) {
-				shopCloseHistory.setCreditAuth(authLevel.getLevelName());
-			}
-			UserInfoResp userInfoResp = memberService.getMemberInfo(shop.getUserId());
-			if (userInfoResp != null) {
-				shopCloseHistory.setMobile(userInfoResp.getMobilePhone());
-			}
-			shopCloseHistory.setOpenTime(shop.getAuditTime());
-			shopCloseHistory.setReqCloseTime(new Timestamp(System.currentTimeMillis()));
-			shopCloseHistory.setCreated(new Timestamp(System.currentTimeMillis()));
-			shopCloseHistory.setYn(1);
-			shopCloseHistoryService.addShopCloseHistory(shopCloseHistory);
-			OperateLog operateLog = new OperateLog();
-			operateLog.setOperateDataId(shopId);
-			SessionContext session = SessionContext.getSessionContext();
-			UserTicket user = session.getUserTicket();
-			operateLog.setOperateId(user.getId());
-			operateLog.setOperateName(user.getRealName());
-			operateLog.setOperateType(StateTypesUtil.shopAuthenTyupe);
-			if (closeType == 4) {
-				operateLog.setOperateRemark("申请关店");
-			} else {
-				operateLog.setOperateRemark("申请注销");
-				param.put("msg", "您已经提交注销店铺的申请，为了能够审核通过，请您下架该卖家的所有商品，避免在售商品产生未完结的订单而导致您的此次申请被审核失败。");
-			}
-			operateLogService.saveOperateLog(operateLog);
-			LogUtils.log(LogData.builder(WebUtils.getCurrentUserName(), "会员中心", shopId + "").model("店铺管理")
-					.operation("提交关店/注销申请").dataName(shop.getShopName()).build());
-		}
-		param.put("res", "success");
-		writeJSON(resp, param);
-	}
-
-}
-package com.diligrp.website.manweb.controller;
-
-import java.sql.Timestamp;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.servlet.ModelAndView;
-
-import com.diligrp.log.util.LogData;
-import com.diligrp.log.util.LogUtils;
-import com.diligrp.manage.sdk.domain.UserTicket;
-import com.diligrp.manage.sdk.session.SessionContext;
-import com.diligrp.website.domain.ShopNameModify;
-import com.diligrp.website.manweb.utils.WebUtils;
-import com.diligrp.website.rpc.ShopRPCService;
-import com.diligrp.website.rpc.UserRPCService;
-import com.diligrp.website.service.ShopNameModifyService;
-import com.diligrp.website.util.dao.BaseQuery;
-import com.diligrp.website.util.domain.Result;
-import com.diligrp.website.util.web.BaseController;
-import com.diligrp.website.util.web.PageTemplate;
-import com.google.common.collect.Maps;
-import com.yqyw.user.rpc.client.domain.output.UserInfoResp;
-
-/**
- * <B>Description</B> <br />
- * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />
- * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
- * <B>Company</B> 地利集团
- *
- * @author LaiKui
- * @createTime 2015年7月7日
- */
-@Controller
-@RequestMapping("shopNameModify")
-public class ShopNameModifyController extends BaseController {
-
-	@Value("${project.system.domain}")
-	private String domain;
-    @Resource
-    private ShopNameModifyService shopNameModifyService;
-    @Resource
-    private UserRPCService userRPCService;
-    @Resource
-    private ShopRPCService shopRPCService;
-    private static Map<Integer, String> typeMap = new HashMap<Integer, String>();
-
-    static {
-        typeMap.put(0, "全部 ");
-        typeMap.put(1, "待审核");
-        typeMap.put(2, "审核通过 ");
-        typeMap.put(3, "审核未通过");
-    }
-
-    @RequestMapping(value = "list")
-    public ModelAndView list(HttpServletRequest request, BaseQuery bq,
-                             Model model) {
-        String mobile = request.getParameter("mobile");
-        String stateStr = request.getParameter("state");
-        String startTime = request.getParameter("startTime");
-        String endTime = request.getParameter("endTime");
-        if (StringUtils.isNotBlank(mobile)) {
-            Pattern p = Pattern.compile("^((13[0-9])|(15[^4,\\D])|(18[0,5-9]))\\d{8}$");
-            Matcher m = p.matcher(mobile);
-            if (m.matches()) {
-                UserInfoResp userInfoResp = userRPCService.getUserInfoByMobile(mobile);
-                bq.addParam("userId", userInfoResp.getId() + "");
-            } else {
-                bq.addParam("userId", "00000");
-            }
-        }
-        if (StringUtils.isNotBlank(startTime)) {
-            bq.addParam("startTime", startTime + " " + "00:00:00");
-        }
-        if (StringUtils.isNotBlank(endTime)) {
-            bq.addParam("endTime", endTime + " " + "23:59:59");
-        }
-        if (StringUtils.isNotBlank(stateStr)) {
-            if ("0".equals(stateStr)) {
-                bq.addParam("state", null);
-            } else {
-                Integer state = Integer.parseInt(stateStr);
-                bq.addParam("state", state + "");
-            }
-        }
-        PageTemplate page = shopNameModifyService.getShopNameModifyList(bq);
-        model.addAttribute("page", page);
-        model.addAttribute("type", typeMap);
-        model.addAttribute("mobile", mobile);
-        model.addAttribute("startTime", startTime);
-        model.addAttribute("endTime", endTime);
-        model.addAttribute("state", stateStr);
-        model.addAttribute("shopNameViewFlag", SessionContext.hasAccess("get", this.domain+"/openStore/getShopInfo.do#shopNameView"));
-        model.addAttribute("auditFlag", SessionContext.hasAccess("get", this.domain+"/shopNameModify/audit.do#audit"));
-        return toVM("shopNameModify/list", model);
-    }
-
-    @RequestMapping("audit")
-    @ResponseBody
-    public void audit(@RequestParam("id") Long id, @RequestParam("state") Integer state, @RequestParam("refuseReason") String refuseReason, HttpServletResponse resp) {
-        ShopNameModify shopNameModify = shopNameModifyService.getShopNameModifyById(id);
-        Map<String, Object> param = Maps.newHashMap();
-        if (shopNameModify.getState() != 1) {
-            param.put("msg", "该条记录已经被操作过了,不能再进行操作!");
-            writeJSON(resp, param);
-            return;
-        }
-        SessionContext session = SessionContext.getSessionContext();
-        //获取当前登录用户
-        UserTicket user = session.getUserTicket();
-        if (user != null) {
-            shopNameModify.setAuditUser(user.getRealName());
-        }
-        shopNameModify.setState(state);
-        shopNameModify.setRefuseReason(refuseReason);
-        shopNameModify.setAuditTime(new Timestamp(System.currentTimeMillis()));
-        Result rst = shopNameModifyService.editShopNameModify(shopNameModify);
-        if (state == 2) {
-            shopRPCService.updateShopName(shopNameModify.getShopId(), shopNameModify.getNewShopName());
-//            userRPCService.updateShopName(shopNameModify.getShopId(), shopNameModify.getNewShopName());
-        }
-        param.put("success", rst.isSuccess());
-        param.put("code", rst.getCode());
-        LogUtils.log(LogData.builder(WebUtils.getCurrentUserName(), "会员中心", shopNameModify.getId() + "").model("店铺名称修改申请").operation("修改").dataName(rst.getMsg()).build());
-        writeJSON(resp, param);
-    }
-
-}
-package com.diligrp.website.manweb.controller;
-
-import java.util.List;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.servlet.ModelAndView;
-
-import com.diligrp.website.service.WokerManWebService;
-import com.diligrp.website.util.dao.BaseQuery;
-import com.diligrp.website.util.web.BaseController;
-import com.yqyw.user.rpc.client.domain.output.SpringWokerInfoResp;
-
-/**
- * <B>Description</B> TODO <br />
- * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />
- * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
- * <B>Company</B> 地利集团
- * @createTime 2014年8月7日 上午11:23:22
- * @author liujie
- */
-@Controller
-@RequestMapping("woker")
-public class WokerController extends BaseController {
-
-    @Resource
-    private WokerManWebService wokerManWebService;
-    /**
-     * 
-     * this method is 获取定时任务列表
-     * @param request
-     * @param bq
-     * @param model
-     * @return
-     * @createTime 2014年8月8日 上午11:53:49
-     * @author liujie
-     */
-    @RequestMapping(value = "list")
-    public ModelAndView list(HttpServletRequest request, BaseQuery bq,
-            Model model) {
-        List<SpringWokerInfoResp> list = wokerManWebService.getWokerList();
-        model.addAttribute("list", list);
-        return toVM("woker/list", model);
-    }
-    /**
-     * 
-     * this method is 启动定时任务
-     * @param request
-     * @param bq
-     * @param model
-     * @return
-     * @createTime 2014年8月8日 上午11:54:00
-     * @author liujie
-     */
-    @RequestMapping(value = "start")
-    public String start(HttpServletRequest request, BaseQuery bq, Model model) {
-        String name = request.getParameter("jobName");
-        try {
-            boolean flag = wokerManWebService.startJob(name);
-            return "redirect:/woker/list.do";
-        } catch (Exception e) {
-            e.printStackTrace();
-            return null;
-        }
-
-    }
-    /**
-     * 
-     * this method is 停止定时任务
-     * @param request
-     * @param bq
-     * @param model
-     * @return
-     * @createTime 2014年8月8日 上午11:54:09
-     * @author liujie
-     */
-    @RequestMapping(value = "stop")
-    public String stop(HttpServletRequest request, BaseQuery bq, Model model) {
-        String name = request.getParameter("jobName");
-        try {
-            boolean flag = wokerManWebService.stopJob(name);
-            return "redirect:/woker/list.do";
-        } catch (Exception e) {
-            e.printStackTrace();
-            return null;
-        }
-    }
-    /**
-     * 
-     * this method is 执行一次定时任务
-     * @param request
-     * @param bq
-     * @param model
-     * @return
-     * @createTime 2014年8月8日 上午11:54:20
-     * @author liujie
-     */
-    @RequestMapping(value = "runningOnce")
-    public String runningOnce(HttpServletRequest request, BaseQuery bq,
-            Model model) {
-        String name = request.getParameter("jobName");
-        try {
-            boolean flag = wokerManWebService.runOnceJob(name);
-            return "redirect:/woker/list.do";
-        } catch (Exception e) {
-            e.printStackTrace();
-            return null;
-        }
-    }
-}
-package com.diligrp.website.manweb.controller.api;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import com.alibaba.fastjson.JSON;
-import com.diligrp.website.domain.Mail;
-import com.diligrp.website.service.MailService;
-import com.diligrp.website.util.code.ValidateUtils;
-import com.diligrp.website.util.format.DateFormatUtils;
-import com.diligrp.website.util.web.BaseController;
-import com.diligrp.website.web.interfaces.domain.input.MailReq;
-import com.diligrp.website.web.interfaces.domain.output.BaseResp;
-import com.diligrp.website.web.interfaces.domain.output.MailResp;
-
-/**
- * 
- * <B>Description</B> 邮件发送API <br />
- * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />
- * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
- * <B>Company</B> 地利集团
- * @createTime 2014年6月3日 上午11:30:51
- * @author Wang22
- */
-@Controller
-@RequestMapping("api/email")
-public class MailApiController extends BaseController {
-
-    @Resource
-    private MailService mailService;
-
-    @RequestMapping(value = "sendEmail", method = RequestMethod.POST)
-    public void sendEmail(@RequestParam("emailJson") String emailJson,
-            HttpServletResponse resp, HttpServletRequest req) {
-
-        BaseResp bresp = new BaseResp();
-
-        if (StringUtils.isEmpty(emailJson)) {
-            // 参数错误
-            bresp.setCode(BaseResp.CODE_ILLEGAL_PARAM);
-            bresp.setMsg("argument is illegal !");
-            writeJSON(resp, bresp);
-            return;
-        }
-        MailReq ereq = JSON.parseObject(emailJson, MailReq.class);
-        if (ereq == null) {
-            // 参数错误
-            bresp.setCode(BaseResp.CODE_ILLEGAL_PARAM);
-            bresp.setMsg("argument is illegal !");
-            writeJSON(resp, bresp);
-            return;
-        }
-
-        if (!ValidateUtils.isEmail(ereq.getAddressee())) {
-            // 不是邮件格式
-            bresp.setCode(BaseResp.CODE_ILLEGAL_PARAM);
-            bresp.setMsg("the email format error !");
-            writeJSON(resp, bresp);
-            return;
-        }
-
-        if (StringUtils.isEmpty(ereq.getSubject())
-                || StringUtils.isEmpty(ereq.getContent())) {
-            // 主题和内容为空
-            bresp.setCode(BaseResp.CODE_ILLEGAL_PARAM);
-            bresp.setMsg("the subject or content is empty !");
-            writeJSON(resp, bresp);
-            return;
-        }
-
-        Mail mh = makeMailHistoryByEamilReq(ereq, req.getRemoteAddr());
-        boolean flag = mailService.sendMail(mh);
-        if (flag) {
-            bresp.setCode(BaseResp.CODE_SUCCESS);
-        } else {
-            bresp.setCode(BaseResp.CODE_FAIL);
-            bresp.setMsg("send email is fail !");
-        }
-
-        writeJSON(resp, bresp);
-
-    }
-    
-    @RequestMapping(value = "sendMailByTemplate", method = RequestMethod.POST)
-    public void sendMailByTemplate(@RequestParam("emailJson") String emailJson,
-            @RequestParam("template") String template,
-            @RequestParam("paramJson") String paramJson,
-            HttpServletResponse resp, HttpServletRequest req) {
-        
-        MailResp bresp = new MailResp();
-
-        if (StringUtils.isEmpty(emailJson)) {
-            // 参数错误
-            bresp.setCode(BaseResp.CODE_ILLEGAL_PARAM);
-            bresp.setMsg("argument is illegal !");
-            writeJSON(resp, bresp);
-            return;
-        }
-        
-        MailReq ereq = JSON.parseObject(emailJson, MailReq.class);
-        if (ereq == null) {
-            // 参数错误
-            bresp.setCode(BaseResp.CODE_ILLEGAL_PARAM);
-            bresp.setMsg("argument is illegal !");
-            writeJSON(resp, bresp);
-            return;
-        }
-
-        if (!ValidateUtils.isEmail(ereq.getAddressee())) {
-            // 不是邮件格式
-            bresp.setCode(BaseResp.CODE_ILLEGAL_PARAM);
-            bresp.setMsg("the email format error !");
-            writeJSON(resp, bresp);
-            return;
-        }
-
-        if (StringUtils.isEmpty(ereq.getSubject())) {
-            // 主题为空
-            bresp.setCode(BaseResp.CODE_ILLEGAL_PARAM);
-            bresp.setMsg("the subject is empty !");
-            writeJSON(resp, bresp);
-            return;
-        }
-        @SuppressWarnings("unchecked")
-        Map<String, String> param = JSON.parseObject(paramJson, HashMap.class);
-        Mail mh = makeMailHistoryByEamilReq(ereq, req.getRemoteAddr());
-        bresp = mailService.sendMailByTemplate(mh, template, param);
-        writeJSON(resp, bresp);
-    }
-
-    private Mail makeMailHistoryByEamilReq(MailReq req, String ip) {
-        Mail mail = new Mail();
-        mail.setIp(ip);
-        mail.setAddressee(req.getAddressee());
-        mail.setSubject(req.getSubject());
-        mail.setContent(req.getContent());
-        mail.setCreated(DateFormatUtils.currTimestamp());
-        mail.setModified(DateFormatUtils.currTimestamp());
-        return mail;
-    }
-
-}
-package com.diligrp.website.manweb.controller.api;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-
-import com.dili.dd.monitor.MonitorLevel;
-import com.dili.dd.monitor.MonitorService;
-import com.dili.dd.monitor.UserMonitorType;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import com.alibaba.fastjson.JSON;
-import com.diligrp.website.domain.MobMessage;
-import com.diligrp.website.service.SMSService;
-import com.diligrp.website.util.web.BaseController;
-import com.diligrp.website.web.interfaces.domain.input.SMSReq;
-import com.diligrp.website.web.interfaces.domain.output.SMSResp;
-
-@Controller
-@RequestMapping("api/sms")
-public class SMSApiController extends BaseController {
-
-    private static final Logger logger = LoggerFactory.getLogger(SMSApiController.class);
-    @Resource
-    private SMSService smsService;
-    @Resource
-    private String monitorName;
-
-    /**
-     * 发送短信
-     *
-     * @createTime 2014年6月4日 下午5:24:22
-     * @author Wang22
-     */
-    @RequestMapping(value = "sendMSM", method = RequestMethod.POST)
-    public void sendMSM(@RequestParam("smsJson") String smsJson,
-                        HttpServletResponse resp) {
-        try {
-            SMSResp smsResp = new SMSResp();
-            if (StringUtils.isEmpty(smsJson)) {
-                // 非法参数
-                returnResp(resp, smsResp, SMSResp.CODE_ILLEGAL_PARAM);
-                return;
-            }
-
-            SMSReq smsReq = JSON.parseObject(smsJson, SMSReq.class);
-
-            if (smsReq == null) {
-                // 参数错误
-                returnResp(resp, smsResp, SMSResp.CODE_ILLEGAL_PARAM);
-                return;
-            }
-
-            if (smsReq.getSmsMob() == null || smsReq.getSmsMob().length == 0
-                    || StringUtils.isEmpty(smsReq.getSmsText())) {
-                // 手机号码为空，或短信内容错误
-                returnResp(resp, smsResp, SMSResp.CODE_ILLEGAL_PARAM);
-                return;
-            }
-
-            if (smsReq.getSmsMob().length > 100) {
-                // 手机号码超过最大数
-                returnResp(resp, smsResp, SMSResp.CODE_MOBILE_SIZE_TOO_MUCH);
-                return;
-            }
-
-            MobMessage mm = convertSMSToMobMessage(smsReq);
-            boolean flag = smsService.sendSMS(mm);
-            if (flag) {
-                returnResp(resp, smsResp, SMSResp.CODE_SUCCESS);
-            } else {
-                returnResp(resp, smsResp, SMSResp.CODE_FAIL);
-            }
-        } catch (Exception e) {
-            logger.error("发送短信接口异常，参数：" + smsJson, e);
-            MonitorService monitorService = MonitorService.getMonitorService(monitorName);
-            monitorService.monitor("136", UserMonitorType.ERROR, MonitorLevel.LEVEL5, SMSApiController.class, "sendMSM", "发送短信接口异常，参数：" + smsJson);
-        }
-    }
-
-    private MobMessage convertSMSToMobMessage(SMSReq req) {
-        MobMessage mm = new MobMessage();
-        mm.setSmsMob(req.getSmsMob());
-        mm.setSmsText(req.getSmsText());
-        return mm;
-    }
-
-    /**
-     * 发送返回
-     *
-     * @param resp
-     * @param smsResp
-     * @param errCode
-     * @createTime 2014年6月4日 下午5:36:10
-     * @author Wang22
-     */
-    private void returnResp(HttpServletResponse resp, SMSResp smsResp,
-                            int errCode) {
-        smsResp.setCode(errCode);
-        writeJSON(resp, smsResp);
-    }
-
-}