Merge remote-tracking branch 'origin/div' into div

admin

2019-09-03 be19444704d40195c1355e471f1316f7419b930b

Merge remote-tracking branch 'origin/div' into div

 fanli/src/main/java/com/yeshi/fanli/controller/CallBackController.java

@@ -18,7 +18,7 @@
import com.yeshi.fanli.dto.push.PushContentDTO;

import com.yeshi.fanli.entity.bus.msg.MsgDeviceReadState;

import com.yeshi.fanli.entity.config.push.PushMsgFactory;

import com.yeshi.fanli.exception.PushException;

import com.yeshi.fanli.exception.push.PushException;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.config.ConfigService;

import com.yeshi.fanli.service.inter.msg.MsgDeviceReadStateService;


 fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java

@@ -38,7 +38,7 @@
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBriefExtra;

import com.yeshi.fanli.entity.taobao.TaoBaoSearchResult;

import com.yeshi.fanli.entity.taobao.TaoBaoUnionConfig;

import com.yeshi.fanli.exception.ShareGoodsException;

import com.yeshi.fanli.exception.share.ShareGoodsException;

import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.config.BusinessSystemService;


 fanli/src/main/java/com/yeshi/fanli/controller/admin/BoutiqueAutoRuleAdminController.java

@@ -18,7 +18,7 @@
import com.yeshi.fanli.entity.bus.clazz.TaoBaoClass;

import com.yeshi.fanli.entity.bus.lable.BoutiqueAutoRule;

import com.yeshi.fanli.entity.taobao.TaobaoMeterial;

import com.yeshi.fanli.exception.BoutiqueAutoRuleException;

import com.yeshi.fanli.exception.goods.quality.BoutiqueAutoRuleException;

import com.yeshi.fanli.service.inter.goods.GoodsClassService;

import com.yeshi.fanli.service.inter.goods.TaoBaoClassService;

import com.yeshi.fanli.service.inter.lable.BoutiqueAutoRuleService;


 fanli/src/main/java/com/yeshi/fanli/controller/admin/GoodsClassAdminCotroller.java

@@ -15,8 +15,8 @@
import com.google.gson.Gson;

import com.google.gson.reflect.TypeToken;

import com.yeshi.fanli.entity.bus.clazz.GoodsClass;

import com.yeshi.fanli.exception.FloatADException;

import com.yeshi.fanli.exception.GoodsClassException;

import com.yeshi.fanli.exception.goods.GoodsClassException;

import com.yeshi.fanli.exception.homemodule.FloatADException;

import com.yeshi.fanli.service.inter.config.BusinessSystemService;

import com.yeshi.fanli.service.inter.goods.GoodsClassService;

import com.yeshi.fanli.service.inter.goods.GoodsSecondClassService;


 fanli/src/main/java/com/yeshi/fanli/controller/admin/GoodsSubClassAdminController.java

@@ -20,7 +20,7 @@
import com.yeshi.fanli.entity.bus.clazz.GoodsSubClass;

import com.yeshi.fanli.entity.bus.clazz.GoodsSubClassLabelMap;

import com.yeshi.fanli.entity.bus.clazz.TaoBaoClass;

import com.yeshi.fanli.exception.FloatADException;

import com.yeshi.fanli.exception.homemodule.FloatADException;

import com.yeshi.fanli.service.inter.clazz.GoodsSubClassLabelService;

import com.yeshi.fanli.service.inter.goods.GoodsSubClassService;

import com.yeshi.fanli.service.inter.goods.TaoBaoClassService;


 fanli/src/main/java/com/yeshi/fanli/controller/admin/GoodsSubClassLabelAdminController.java

@@ -16,7 +16,7 @@
import com.google.gson.GsonBuilder;

import com.google.gson.reflect.TypeToken;

import com.yeshi.fanli.entity.bus.clazz.GoodsSubClassLabel;

import com.yeshi.fanli.exception.GoodsClassException;

import com.yeshi.fanli.exception.goods.GoodsClassException;

import com.yeshi.fanli.service.inter.clazz.GoodsSubClassLabelService;

import com.yeshi.fanli.tag.PageEntity;

import com.yeshi.fanli.util.StringUtil;


 fanli/src/main/java/com/yeshi/fanli/controller/admin/HelpCenterAdminController.java

@@ -19,8 +19,8 @@
import com.yeshi.fanli.entity.bus.help.HelpCenter;

import com.yeshi.fanli.entity.bus.help.HelpClass;

import com.yeshi.fanli.entity.bus.help.HelpInfo;

import com.yeshi.fanli.exception.HelpCenterException;

import com.yeshi.fanli.exception.HelpClassException;

import com.yeshi.fanli.exception.config.HelpCenterException;

import com.yeshi.fanli.exception.config.HelpClassException;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.help.HelpCenterService;

import com.yeshi.fanli.service.inter.help.HelpClassService;


 fanli/src/main/java/com/yeshi/fanli/controller/admin/LableAdminController.java

@@ -26,7 +26,7 @@
import com.google.gson.reflect.TypeToken;

import com.yeshi.fanli.entity.bus.lable.Label;

import com.yeshi.fanli.entity.common.AdminUser;

import com.yeshi.fanli.exception.LabelException;

import com.yeshi.fanli.exception.goods.quality.LabelException;

import com.yeshi.fanli.service.AdminUserService;

import com.yeshi.fanli.service.inter.config.ConfigService;

import com.yeshi.fanli.service.inter.lable.LabelGoodsService;


 fanli/src/main/java/com/yeshi/fanli/controller/admin/MessageController.java

@@ -11,7 +11,7 @@


import com.google.gson.Gson;

import com.yeshi.fanli.dto.msg.MsgCommonDTO;

import com.yeshi.fanli.exception.ConfigException;

import com.yeshi.fanli.exception.config.ConfigException;

import com.yeshi.fanli.service.inter.config.ConfigService;

import com.yeshi.fanli.service.inter.msg.MsgConfigService;




 fanli/src/main/java/com/yeshi/fanli/controller/admin/PushController.java

@@ -16,7 +16,7 @@
import com.google.gson.reflect.TypeToken;

import com.yeshi.fanli.entity.bus.msg.UserSystemMsg;

import com.yeshi.fanli.entity.bus.msg.UserSystemMsgTypeEnum;

import com.yeshi.fanli.exception.PushException;

import com.yeshi.fanli.exception.push.PushException;

import com.yeshi.fanli.service.inter.msg.UserSystemMsgService;

import com.yeshi.fanli.service.inter.push.PushService;

import com.yeshi.fanli.util.StringUtil;


 fanli/src/main/java/com/yeshi/fanli/controller/admin/PushCouponController.java

@@ -17,8 +17,8 @@
import com.google.gson.GsonBuilder;

import com.google.gson.reflect.TypeToken;

import com.yeshi.fanli.entity.push.PushCoupon;

import com.yeshi.fanli.exception.PushException;

import com.yeshi.fanli.exception.push.PushCouponException;

import com.yeshi.fanli.exception.push.PushException;

import com.yeshi.fanli.service.inter.push.PushCouponRecordService;

import com.yeshi.fanli.service.inter.push.PushCouponService;

import com.yeshi.fanli.tag.PageEntity;


 fanli/src/main/java/com/yeshi/fanli/controller/admin/PushGoodsController.java

@@ -20,7 +20,7 @@
import com.yeshi.fanli.entity.push.PushGoods;

import com.yeshi.fanli.entity.push.PushGoodsGroup;

import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;

import com.yeshi.fanli.exception.PushException;

import com.yeshi.fanli.exception.push.PushException;

import com.yeshi.fanli.exception.push.PushGoodsException;

import com.yeshi.fanli.service.AdminUserService;

import com.yeshi.fanli.service.inter.push.PushGoodsGroupService;


 fanli/src/main/java/com/yeshi/fanli/controller/admin/PushInfoController.java

@@ -14,7 +14,7 @@
import com.google.gson.GsonBuilder;

import com.google.gson.reflect.TypeToken;

import com.yeshi.fanli.entity.push.PushInfo;

import com.yeshi.fanli.exception.PushException;

import com.yeshi.fanli.exception.push.PushException;

import com.yeshi.fanli.exception.push.PushInfoException;

import com.yeshi.fanli.service.inter.push.PushInfoService;

import com.yeshi.fanli.tag.PageEntity;


 fanli/src/main/java/com/yeshi/fanli/controller/admin/QualityFactoryAdminController.java

@@ -25,7 +25,7 @@
import com.yeshi.fanli.entity.bus.lable.QualityFactory;

import com.yeshi.fanli.entity.common.AdminUser;

import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;

import com.yeshi.fanli.exception.QualityFactoryException;

import com.yeshi.fanli.exception.goods.quality.QualityFactoryException;

import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;

import com.yeshi.fanli.service.inter.lable.LabelGoodsService;

import com.yeshi.fanli.service.inter.lable.LabelService;


 fanli/src/main/java/com/yeshi/fanli/controller/admin/UserRankingsAdminController.java

@@ -33,7 +33,7 @@
import com.google.gson.reflect.TypeToken;

import com.yeshi.fanli.entity.bus.user.ShamUser;

import com.yeshi.fanli.entity.bus.user.UserRankings;

import com.yeshi.fanli.exception.UserRankingsException;

import com.yeshi.fanli.exception.user.UserRankingsException;

import com.yeshi.fanli.service.inter.user.ShamUserService;

import com.yeshi.fanli.service.inter.user.UserRankingsService;

import com.yeshi.fanli.tag.PageEntity;


 fanli/src/main/java/com/yeshi/fanli/controller/admin/customerservice/CustomerServiceCommonQuestionAdminController.java

@@ -17,7 +17,7 @@
import com.google.gson.GsonBuilder;

import com.google.gson.reflect.TypeToken;

import com.yeshi.fanli.entity.customerservice.CustomerServiceCommonQuestion;

import com.yeshi.fanli.exception.CustomerServiceCommonQuestionException;

import com.yeshi.fanli.exception.user.CustomerServiceCommonQuestionException;

import com.yeshi.fanli.service.AdminUserService;

import com.yeshi.fanli.service.inter.customerservice.CustomerServiceCommonQuestionService;

import com.yeshi.fanli.tag.PageEntity;


 fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/FloatADAdminController.java

@@ -16,7 +16,7 @@
import com.google.gson.GsonBuilder;

import com.google.gson.reflect.TypeToken;

import com.yeshi.fanli.entity.bus.homemodule.FloatAD;

import com.yeshi.fanli.exception.FloatADException;

import com.yeshi.fanli.exception.homemodule.FloatADException;

import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;

import com.yeshi.fanli.service.inter.homemodule.FloatADService;

import com.yeshi.fanli.tag.PageEntity;


 fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/SpecialCardAdminController.java

@@ -17,7 +17,7 @@
import com.google.gson.reflect.TypeToken;

import com.yeshi.fanli.entity.bus.homemodule.Special;

import com.yeshi.fanli.entity.bus.homemodule.SpecialCard;

import com.yeshi.fanli.exception.FloatADException;

import com.yeshi.fanli.exception.homemodule.FloatADException;

import com.yeshi.fanli.exception.homemodule.SpecialException;

import com.yeshi.fanli.service.inter.homemodule.SpecialCardService;

import com.yeshi.fanli.service.inter.homemodule.SpecialService;


 fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/SpecialPlaceAdminController.java

@@ -16,7 +16,7 @@
import com.google.gson.GsonBuilder;

import com.google.gson.reflect.TypeToken;

import com.yeshi.fanli.entity.bus.homemodule.SpecialPlace;

import com.yeshi.fanli.exception.SpecialPlaceException;

import com.yeshi.fanli.exception.homemodule.SpecialPlaceException;

import com.yeshi.fanli.service.inter.homemodule.SpecialPlaceService;

import com.yeshi.fanli.tag.PageEntity;

import com.yeshi.fanli.util.Constant;


 fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5HelpCenterController.java

@@ -12,7 +12,7 @@
import com.yeshi.fanli.entity.bus.help.HelpCenter;

import com.yeshi.fanli.entity.bus.help.HelpClass;

import com.yeshi.fanli.entity.bus.help.HelpInfo;

import com.yeshi.fanli.exception.HelpCenterException;

import com.yeshi.fanli.exception.config.HelpCenterException;

import com.yeshi.fanli.service.inter.help.HelpCenterService;

import com.yeshi.fanli.service.inter.help.HelpClassService;

import com.yeshi.fanli.tag.PageEntity;


 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/GoodsController.java

@@ -21,7 +21,7 @@
import com.yeshi.fanli.entity.taobao.TaoBaoLink;

import com.yeshi.fanli.entity.taobao.TaoBaoUnionConfig;

import com.yeshi.fanli.entity.taobao.TaoKeAppInfo;

import com.yeshi.fanli.exception.ShareGoodsException;

import com.yeshi.fanli.exception.share.ShareGoodsException;

import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;

import com.yeshi.fanli.exception.tlj.TaoLiJinCreateException;

import com.yeshi.fanli.log.LogHelper;


 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/SMSController.java

@@ -11,7 +11,7 @@


import com.yeshi.fanli.entity.accept.AcceptData;

import com.yeshi.fanli.entity.bus.user.UserInfo;

import com.yeshi.fanli.exception.SMSException;

import com.yeshi.fanli.exception.config.SMSException;

import com.yeshi.fanli.service.inter.user.ForbiddenUserIdentifyCodeService;

import com.yeshi.fanli.service.inter.user.SMSService;

import com.yeshi.fanli.service.inter.user.UserInfoService;


 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ShareController.java

@@ -34,8 +34,8 @@
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBriefExtra;

import com.yeshi.fanli.entity.taobao.TaoBaoLink;

import com.yeshi.fanli.entity.taobao.TaoKeAppInfo;

import com.yeshi.fanli.exception.ShareGoodsException;

import com.yeshi.fanli.exception.goods.ShareGoodsTextTemplateException;

import com.yeshi.fanli.exception.share.ShareGoodsException;

import com.yeshi.fanli.exception.share.UserShareGoodsRecordException;

import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;

import com.yeshi.fanli.exception.tlj.UserTaoLiJinRecordException;


 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserAccountController.java

@@ -28,9 +28,9 @@
import com.yeshi.fanli.entity.taobao.PidUser;

import com.yeshi.fanli.entity.taobao.TBPid;

import com.yeshi.fanli.entity.taobao.TaoBaoUnionConfig;

import com.yeshi.fanli.exception.AlipayAccountException;

import com.yeshi.fanli.exception.AlipayTransferException;

import com.yeshi.fanli.exception.UserAccountException;

import com.yeshi.fanli.exception.user.AlipayAccountException;

import com.yeshi.fanli.exception.user.AlipayTransferException;

import com.yeshi.fanli.exception.user.UserAccountException;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.config.BusinessSystemService;

import com.yeshi.fanli.service.inter.config.ConfigService;


 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserInfoController.java

@@ -64,10 +64,10 @@
import com.yeshi.fanli.entity.system.BusinessSystem;

import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;

import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBriefExtra;

import com.yeshi.fanli.exception.BindingAccountException;

import com.yeshi.fanli.exception.goods.CollectionGoodsException;

import com.yeshi.fanli.exception.taobao.TaoKeApiException;

import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;

import com.yeshi.fanli.exception.user.BindingAccountException;

import com.yeshi.fanli.exception.user.UserCustomSettingsException;

import com.yeshi.fanli.exception.user.UserInfoException;

import com.yeshi.fanli.exception.user.UserInfoExtraException;


 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ShareControllerV2.java

@@ -37,8 +37,8 @@
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;

import com.yeshi.fanli.entity.taobao.TaoBaoLink;

import com.yeshi.fanli.entity.taobao.TaoKeAppInfo;

import com.yeshi.fanli.exception.ShareGoodsException;

import com.yeshi.fanli.exception.goods.ShareGoodsTextTemplateException;

import com.yeshi.fanli.exception.share.ShareGoodsException;

import com.yeshi.fanli.exception.taobao.TaoKeApiException;

import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;

import com.yeshi.fanli.exception.tlj.UserTaoLiJinRecordException;


 fanli/src/main/java/com/yeshi/fanli/controller/h5/H5RecommendController.java

@@ -31,7 +31,7 @@
import com.yeshi.fanli.entity.taobao.TaoBaoLink;

import com.yeshi.fanli.entity.taobao.TaoBaoUnionConfig;

import com.yeshi.fanli.entity.taobao.TaoKeAppInfo;

import com.yeshi.fanli.exception.ShareGoodsException;

import com.yeshi.fanli.exception.share.ShareGoodsException;

import com.yeshi.fanli.exception.share.UserShareGoodsRecordException;

import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;

import com.yeshi.fanli.service.inter.config.BusinessSystemService;


 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/help/HelpCenterMapper.java

@@ -1,44 +1,44 @@
package com.yeshi.fanli.dao.mybatis.help;

import java.util.List;

import org.apache.ibatis.annotations.Param;

import com.yeshi.fanli.entity.bus.help.HelpCenter;
import com.yeshi.fanli.exception.HelpCenterException;

public interface HelpCenterMapper {

    int deleteByPrimaryKey(Long id);

    int insert(HelpCenter record);

    int insertSelective(HelpCenter record);

    HelpCenter selectByPrimaryKey(Long id);

    int updateByPrimaryKeySelective(HelpCenter record);

    int updateByPrimaryKey(HelpCenter record);
	
	
    List<HelpCenter> queryIdAndTitle(@Param("start") int start, @Param("count") int count, 
            @Param("key") String title, @Param("cid") Long cid);
	
	
    List<HelpCenter> query(@Param("start") int start, @Param("count") int count, 
            @Param("key") String title, @Param("cid") Long cid,
             @Param("orderMode") Integer orderMode);
	
    long countQuery(@Param("key") String title, @Param("cid") Long cid);
	
    /**
     * 批量删除
     * @param idList
     * @return
     * @throws HelpCenterException
     */
     int deleteBatchById(@Param("idList") List<String> idList);
	
	
package com.yeshi.fanli.dao.mybatis.help;



import java.util.List;



import org.apache.ibatis.annotations.Param;



import com.yeshi.fanli.entity.bus.help.HelpCenter;

import com.yeshi.fanli.exception.config.HelpCenterException;



public interface HelpCenterMapper {



    int deleteByPrimaryKey(Long id);



    int insert(HelpCenter record);



    int insertSelective(HelpCenter record);



    HelpCenter selectByPrimaryKey(Long id);



    int updateByPrimaryKeySelective(HelpCenter record);



    int updateByPrimaryKey(HelpCenter record);

	
	
    List<HelpCenter> queryIdAndTitle(@Param("start") int start, @Param("count") int count, 
            @Param("key") String title, @Param("cid") Long cid);

	
	
    List<HelpCenter> query(@Param("start") int start, @Param("count") int count, 
            @Param("key") String title, @Param("cid") Long cid,

             @Param("orderMode") Integer orderMode);

	
    long countQuery(@Param("key") String title, @Param("cid") Long cid);

	
    /**

     * 批量删除

     * @param idList

     * @return

     * @throws HelpCenterException

     */

     int deleteBatchById(@Param("idList") List<String> idList);

	
	
}

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/lable/LabelMapper.java

@@ -1,124 +1,124 @@
package com.yeshi.fanli.dao.mybatis.lable;

import java.util.List;
import java.util.Map;

import org.apache.ibatis.annotations.Param;

import com.yeshi.fanli.entity.bus.lable.Label;
import com.yeshi.fanli.entity.bus.lable.LabelGoods;
import com.yeshi.fanli.exception.LabelException;

public interface LabelMapper {

    int insert(Label record);

    int insertSelective(Label record);
	
    int updateByPrimaryKey(Label record);
	
    int updateByPrimaryKeySelective(Label record);
	
    int deleteByPrimaryKey(Long id);
	
    Label selectByPrimaryKey(Long id);
	
    List<Label> selectByTitle(@Param("title") String title);
	
	
    Label getByTitle(@Param("title") String title);
	
	
    /**
     * 多个标签查询
     * @param list
     * @return
     */
    List<Label> listByTitles(List<String> list);
	
	
    /**
     * 统计标签总数
     * @return
     */
    long getCount();
	
    /**
     * 统计今日方式 录入总数
     * @return
     */
    long getCountToday();
	
	
    Map<String, Object> getCountByEntryMode();
	
    /**
     * 批量删除
     * @param ids
     * @return
     */
    int deleteBatchByPrimaryKey(long[] ids);
	
    /**
     * 根据条件查询标签
     * @param start
     * @param count
     * @param title
     * @param startTime
     * @param endTime
     * @return
     */
    List<Label> query(@Param("start") long start, @Param("count") int count, @Param("key") String title,
            @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("orderMode") String orderMode);
	
    int getQueryCount(@Param("key") String title, @Param("startTime") String startTime,
            @Param("endTime") String endTime);
	
	
    /**
     * 商品标签添加候选项（已排除存在标签）
     * @param goodsId
     * @return
     * @throws LabelException
     */
    List<Label> queryGoodsCandidate(@Param("start") int start, @Param("count") int count, 
            @Param("key") String key, @Param("goodsId") Long goodsId);
    int getCountQueryGoodsCandidate(@Param("key") String key, @Param("goodsId") Long goodsId);
	
    /**
     * 查询一级分类 标签候选项
     * @param classId
     * @return
     */
    List<Label> queryClassCandidate(@Param("start") int start, @Param("count") int count, 
            @Param("key") String key, @Param("classId") Long classId);
    int getCountQueryClassCandidate(@Param("key") String key, @Param("classId") Long classId);
	
	
    /**
     * 查询子级分类 标签候选项
     * @param subClassId
     * @return
     */
    List<Label> querySubClassCandidate(@Param("start") int start, @Param("count") int count, 
            @Param("key") String key, @Param("subClassId") Long subClassId);
    int getCountQuerySubClassCandidate(@Param("key") String key, @Param("subClassId") Long subClassId);
	
	
	
    /**
     * 查询二级以下分类 标签列表
     * @param subClassId
     * @return
     */
    List<Label> getSecondClassLables(@Param("subClassId") Long subClassId);
	
	
    /**
     * 查询商品对应标签
     * @param goodsId
     * @return
     */
    List<LabelGoods> getByGoodsId(@Param("goodsId") Long goodsId);
	
package com.yeshi.fanli.dao.mybatis.lable;



import java.util.List;

import java.util.Map;



import org.apache.ibatis.annotations.Param;



import com.yeshi.fanli.entity.bus.lable.Label;

import com.yeshi.fanli.entity.bus.lable.LabelGoods;

import com.yeshi.fanli.exception.goods.quality.LabelException;



public interface LabelMapper {



    int insert(Label record);



    int insertSelective(Label record);

	
    int updateByPrimaryKey(Label record);

	
    int updateByPrimaryKeySelective(Label record);

	
    int deleteByPrimaryKey(Long id);

	
    Label selectByPrimaryKey(Long id);

	
    List<Label> selectByTitle(@Param("title") String title);

	
	
    Label getByTitle(@Param("title") String title);

	
	
    /**

     * 多个标签查询

     * @param list

     * @return

     */

    List<Label> listByTitles(List<String> list);

	
	
    /**

     * 统计标签总数

     * @return

     */

    long getCount();

	
    /**

     * 统计今日方式 录入总数

     * @return

     */

    long getCountToday();

	
	
    Map<String, Object> getCountByEntryMode();

	
    /**

     * 批量删除

     * @param ids

     * @return

     */

    int deleteBatchByPrimaryKey(long[] ids);

	
    /**

     * 根据条件查询标签

     * @param start

     * @param count

     * @param title

     * @param startTime

     * @param endTime

     * @return

     */

    List<Label> query(@Param("start") long start, @Param("count") int count, @Param("key") String title,

            @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("orderMode") String orderMode);

	
    int getQueryCount(@Param("key") String title, @Param("startTime") String startTime,

            @Param("endTime") String endTime);

	
	
    /**

     * 商品标签添加候选项（已排除存在标签）

     * @param goodsId

     * @return

     * @throws LabelException

     */

    List<Label> queryGoodsCandidate(@Param("start") int start, @Param("count") int count, 
            @Param("key") String key, @Param("goodsId") Long goodsId);

    int getCountQueryGoodsCandidate(@Param("key") String key, @Param("goodsId") Long goodsId);

	
    /**

     * 查询一级分类 标签候选项

     * @param classId

     * @return

     */

    List<Label> queryClassCandidate(@Param("start") int start, @Param("count") int count, 
            @Param("key") String key, @Param("classId") Long classId);

    int getCountQueryClassCandidate(@Param("key") String key, @Param("classId") Long classId);

	
	
    /**

     * 查询子级分类 标签候选项

     * @param subClassId

     * @return

     */

    List<Label> querySubClassCandidate(@Param("start") int start, @Param("count") int count, 
            @Param("key") String key, @Param("subClassId") Long subClassId);

    int getCountQuerySubClassCandidate(@Param("key") String key, @Param("subClassId") Long subClassId);

	
	
	
    /**

     * 查询二级以下分类 标签列表

     * @param subClassId

     * @return

     */

    List<Label> getSecondClassLables(@Param("subClassId") Long subClassId);

	
	
    /**

     * 查询商品对应标签

     * @param goodsId

     * @return

     */

    List<LabelGoods> getByGoodsId(@Param("goodsId") Long goodsId);

	
}

 fanli/src/main/java/com/yeshi/fanli/exception/ActivityException.java

@@ -1,32 +1,14 @@
package com.yeshi.fanli.exception;

public class ActivityException extends Exception {
    /**
     * 
     */
    private static final long serialVersionUID = 1L;
    private int code;
    private String msg;

    public int getCode() {
        return code;
    }

    public String getMsg() {
        return msg;
    }

    public ActivityException(int code, String msg) {
        this.code = code;
        this.msg = msg;
    }

    public ActivityException() {
    }

    @Override
    public String getMessage() {
        return this.msg;
    }

}
package com.yeshi.fanli.exception;



public class ActivityException extends BaseException {

	 
    private static final long serialVersionUID = 1L;

	
    public ActivityException(int code, String msg) {

        super(code, msg);

    }



    public ActivityException() {

        super();

    }

}


 fanli/src/main/java/com/yeshi/fanli/exception/AdminLimitException.java

File was deleted

 fanli/src/main/java/com/yeshi/fanli/exception/AlipayAccountException.java

File was deleted

 fanli/src/main/java/com/yeshi/fanli/exception/BaseException.java

@@ -18,6 +18,10 @@
        this.msg = msg;

    }



    public BaseException(String msg) {

        this.msg = msg;

    }

	
    public BaseException() {

    }




 fanli/src/main/java/com/yeshi/fanli/exception/BoutiqueAutoRuleException.java

File was deleted

 fanli/src/main/java/com/yeshi/fanli/exception/ConfigException.java

File was deleted

 fanli/src/main/java/com/yeshi/fanli/exception/CustomerServiceCommonQuestionException.java

File was deleted

 fanli/src/main/java/com/yeshi/fanli/exception/ExtractException.java

@@ -1,30 +1,14 @@
package com.yeshi.fanli.exception;



public class ExtractException extends Exception {

public class ExtractException extends BaseException {



    private static final long serialVersionUID = 572112205824229000L;



    private int code;

    private String msg;

	
    public ExtractException(int code, String msg) {

        super(code, msg);

    }



    public ExtractException() {

    }



    public ExtractException(int code, String msg) {

        this.code = code;

        this.msg = msg;

    }



    public int getCode() {

        return code;

    }



    public String getMsg() {

        return msg;

    }



    @Override

    public String getMessage() {

        return this.msg;

        super();

    }

}


 fanli/src/main/java/com/yeshi/fanli/exception/FloatADException.java

File was deleted

 fanli/src/main/java/com/yeshi/fanli/exception/GoodsClassException.java

File was deleted

 fanli/src/main/java/com/yeshi/fanli/exception/GoodsSubClassException.java

File was deleted

 fanli/src/main/java/com/yeshi/fanli/exception/HelpCenterException.java

File was deleted

 fanli/src/main/java/com/yeshi/fanli/exception/HelpClassException.java

File was deleted

 fanli/src/main/java/com/yeshi/fanli/exception/HongBaoException.java

File was deleted

 fanli/src/main/java/com/yeshi/fanli/exception/HongBaoManageException.java

File was deleted

 fanli/src/main/java/com/yeshi/fanli/exception/LabelClassException.java

File was deleted

 fanli/src/main/java/com/yeshi/fanli/exception/LabelException.java

File was deleted

 fanli/src/main/java/com/yeshi/fanli/exception/LabelGoodsException.java

File was deleted

 fanli/src/main/java/com/yeshi/fanli/exception/MergeClassException.java

File was deleted

 fanli/src/main/java/com/yeshi/fanli/exception/NotExistObjectException.java

@@ -1,6 +1,6 @@
package com.yeshi.fanli.exception;



public class NotExistObjectException extends Exception {

public class NotExistObjectException extends BaseException {



    private static final long serialVersionUID = 572112205824229000L;




 fanli/src/main/java/com/yeshi/fanli/exception/OrderItemException.java

File was deleted

 fanli/src/main/java/com/yeshi/fanli/exception/PushException.java

File was deleted

 fanli/src/main/java/com/yeshi/fanli/exception/QualityFactoryException.java

File was deleted

 fanli/src/main/java/com/yeshi/fanli/exception/QualityFlashSaleException.java

File was deleted

 fanli/src/main/java/com/yeshi/fanli/exception/SMSException.java

File was deleted

 fanli/src/main/java/com/yeshi/fanli/exception/ShareGoodsException.java

File was deleted

 fanli/src/main/java/com/yeshi/fanli/exception/SpecialPlaceException.java

File was deleted

 fanli/src/main/java/com/yeshi/fanli/exception/TaoBaoOrderException.java

File was deleted

 fanli/src/main/java/com/yeshi/fanli/exception/TaoBaoWeiQuanException.java

File was deleted

 fanli/src/main/java/com/yeshi/fanli/exception/ThreeSaleException.java

File was deleted

 fanli/src/main/java/com/yeshi/fanli/exception/UserAccountException.java

File was deleted

 fanli/src/main/java/com/yeshi/fanli/exception/UserRankingsException.java

File was deleted

 fanli/src/main/java/com/yeshi/fanli/exception/config/ConfigException.java

New file
@@ -0,0 +1,18 @@
package com.yeshi.fanli.exception.config;



import com.yeshi.fanli.exception.BaseException;



public class ConfigException extends BaseException {



    public final static int CODE_VERIFY = 1;



    private static final long serialVersionUID = 1L;

	
    public ConfigException(int code, String msg) {

        super(code, msg);

    }



    public ConfigException() {

        super();

    }

}


 fanli/src/main/java/com/yeshi/fanli/exception/config/HelpCenterException.java

New file
@@ -0,0 +1,16 @@
package com.yeshi.fanli.exception.config;



import com.yeshi.fanli.exception.BaseException;



public class HelpCenterException extends BaseException {

	 
    private static final long serialVersionUID = 1L;

	
    public HelpCenterException(int code, String msg) {

        super(code, msg);

    }



    public HelpCenterException() {

        super();

    }

}


 fanli/src/main/java/com/yeshi/fanli/exception/config/HelpClassException.java

New file
@@ -0,0 +1,16 @@
package com.yeshi.fanli.exception.config;



import com.yeshi.fanli.exception.BaseException;



public class HelpClassException extends BaseException {

	 
    private static final long serialVersionUID = 1L;

	
    public HelpClassException(int code, String msg) {

        super(code, msg);

    }



    public HelpClassException() {

        super();

    }

}


 fanli/src/main/java/com/yeshi/fanli/exception/config/SMSException.java

New file
@@ -0,0 +1,16 @@
package com.yeshi.fanli.exception.config;



import com.yeshi.fanli.exception.BaseException;



public class SMSException extends BaseException {

	 
    private static final long serialVersionUID = 1L;

	
    public SMSException(int code, String msg) {

        super(code, msg);

    }



    public SMSException() {

        super();

    }

}


 fanli/src/main/java/com/yeshi/fanli/exception/goods/GoodsClassException.java

New file
@@ -0,0 +1,16 @@
package com.yeshi.fanli.exception.goods;



import com.yeshi.fanli.exception.BaseException;



public class GoodsClassException extends BaseException {

 
    private static final long serialVersionUID = 1L;

	
    public GoodsClassException(int code, String msg) {

        super(code, msg);

    }



    public GoodsClassException() {

        super();

    }

}


 fanli/src/main/java/com/yeshi/fanli/exception/goods/GoodsSubClassException.java

New file
@@ -0,0 +1,16 @@
package com.yeshi.fanli.exception.goods;



import com.yeshi.fanli.exception.BaseException;



public class GoodsSubClassException extends BaseException {

	 
    private static final long serialVersionUID = 1L;

	
    public GoodsSubClassException(int code, String msg) {

        super(code, msg);

    }



    public GoodsSubClassException() {

        super();

    }

}


 fanli/src/main/java/com/yeshi/fanli/exception/goods/MergeClassException.java

New file
@@ -0,0 +1,16 @@
package com.yeshi.fanli.exception.goods;



import com.yeshi.fanli.exception.BaseException;



public class MergeClassException extends BaseException {

	
    private static final long serialVersionUID = 1L;

	
    public MergeClassException(int code, String msg) {

        super(code, msg);

    }



    public MergeClassException() {

        super();

    }

}


 fanli/src/main/java/com/yeshi/fanli/exception/goods/quality/BoutiqueAutoRuleException.java

New file
@@ -0,0 +1,16 @@
package com.yeshi.fanli.exception.goods.quality;



import com.yeshi.fanli.exception.BaseException;



public class BoutiqueAutoRuleException extends BaseException {

 
    private static final long serialVersionUID = 1L;

	
    public BoutiqueAutoRuleException(int code, String msg) {

        super(code, msg);

    }



    public BoutiqueAutoRuleException() {

        super();

    }

}


 fanli/src/main/java/com/yeshi/fanli/exception/goods/quality/LabelClassException.java

New file
@@ -0,0 +1,17 @@
package com.yeshi.fanli.exception.goods.quality;



import com.yeshi.fanli.exception.BaseException;



public class LabelClassException extends BaseException {

	
	
    private static final long serialVersionUID = 1L;

	
    public LabelClassException(int code, String msg) {

        super(code, msg);

    }



    public LabelClassException() {

        super();

    }

}


 fanli/src/main/java/com/yeshi/fanli/exception/goods/quality/LabelException.java

New file
@@ -0,0 +1,16 @@
package com.yeshi.fanli.exception.goods.quality;



import com.yeshi.fanli.exception.BaseException;



public class LabelException extends BaseException {

	 
    private static final long serialVersionUID = 1L;

	
    public LabelException(int code, String msg) {

        super(code, msg);

    }



    public LabelException() {

        super();

    }

}


 fanli/src/main/java/com/yeshi/fanli/exception/goods/quality/LabelGoodsException.java

New file
@@ -0,0 +1,16 @@
package com.yeshi.fanli.exception.goods.quality;



import com.yeshi.fanli.exception.BaseException;



public class LabelGoodsException extends BaseException {

	
    private static final long serialVersionUID = 1L;

	
    public LabelGoodsException(int code, String msg) {

        super(code, msg);

    }



    public LabelGoodsException() {

        super();

    }

}


 fanli/src/main/java/com/yeshi/fanli/exception/goods/quality/QualityFactoryException.java

New file
@@ -0,0 +1,16 @@
package com.yeshi.fanli.exception.goods.quality;



import com.yeshi.fanli.exception.BaseException;



public class QualityFactoryException extends BaseException {

	
    private static final long serialVersionUID = 1L;

	
    public QualityFactoryException(int code, String msg) {

        super(code, msg);

    }



    public QualityFactoryException() {

        super();

    }

}


 fanli/src/main/java/com/yeshi/fanli/exception/goods/quality/QualityFlashSaleException.java

New file
@@ -0,0 +1,16 @@
package com.yeshi.fanli.exception.goods.quality;



import com.yeshi.fanli.exception.BaseException;



public class QualityFlashSaleException extends BaseException {

	
    private static final long serialVersionUID = 1L;

	
    public QualityFlashSaleException(int code, String msg) {

        super(code, msg);

    }



    public QualityFlashSaleException() {

        super();

    }

}


 fanli/src/main/java/com/yeshi/fanli/exception/homemodule/FloatADException.java

New file
@@ -0,0 +1,16 @@
package com.yeshi.fanli.exception.homemodule;



import com.yeshi.fanli.exception.BaseException;



public class FloatADException extends BaseException {

	 
    private static final long serialVersionUID = 1L;

	
    public FloatADException(int code, String msg) {

        super(code, msg);

    }



    public FloatADException() {

        super();

    }

}


 fanli/src/main/java/com/yeshi/fanli/exception/homemodule/SpecialPlaceException.java

New file
@@ -0,0 +1,16 @@
package com.yeshi.fanli.exception.homemodule;



import com.yeshi.fanli.exception.BaseException;



public class SpecialPlaceException extends BaseException {

	 
    private static final long serialVersionUID = 1L;

	
    public SpecialPlaceException(int code, String msg) {

        super(code, msg);

    }



    public SpecialPlaceException() {

        super();

    }

}


 fanli/src/main/java/com/yeshi/fanli/exception/order/HongBaoException.java

New file
@@ -0,0 +1,16 @@
package com.yeshi.fanli.exception.order;



import com.yeshi.fanli.exception.BaseException;



public class HongBaoException extends BaseException {

	 
    private static final long serialVersionUID = 1L;

	
    public HongBaoException(int code, String msg) {

        super(code, msg);

    }



    public HongBaoException() {

        super();

    }

}


 fanli/src/main/java/com/yeshi/fanli/exception/order/HongBaoManageException.java

New file
@@ -0,0 +1,16 @@
package com.yeshi.fanli.exception.order;



import com.yeshi.fanli.exception.BaseException;



public class HongBaoManageException extends BaseException {

	 
    private static final long serialVersionUID = 1L;

	
    public HongBaoManageException(int code, String msg) {

        super(code, msg);

    }



    public HongBaoManageException() {

        super();

    }

}


 fanli/src/main/java/com/yeshi/fanli/exception/order/OrderItemException.java

New file
@@ -0,0 +1,16 @@
package com.yeshi.fanli.exception.order;



import com.yeshi.fanli.exception.BaseException;



public class OrderItemException extends BaseException {

	 
    private static final long serialVersionUID = 1L;

	
    public OrderItemException(int code, String msg) {

        super(code, msg);

    }



    public OrderItemException() {

        super();

    }

}


 fanli/src/main/java/com/yeshi/fanli/exception/order/TaoBaoOrderException.java

New file
@@ -0,0 +1,19 @@
package com.yeshi.fanli.exception.order;



import com.yeshi.fanli.exception.BaseException;



public class TaoBaoOrderException extends BaseException {



    public final static int CODE_VERIFY = 1;



	 
    private static final long serialVersionUID = 1L;

	
    public TaoBaoOrderException(int code, String msg) {

        super(code, msg);

    }



    public TaoBaoOrderException() {

        super();

    }

}


 fanli/src/main/java/com/yeshi/fanli/exception/order/TaoBaoWeiQuanException.java

New file
@@ -0,0 +1,22 @@
package com.yeshi.fanli.exception.order;



import com.yeshi.fanli.exception.BaseException;



public class TaoBaoWeiQuanException extends BaseException {



    /**

     * 需要更新订单的内容

     */

    public final static int CODE_NEDD_UPDATE_ORDER=1001;



	 
    private static final long serialVersionUID = 1L;

	
    public TaoBaoWeiQuanException(int code, String msg) {

        super(code, msg);

    }



    public TaoBaoWeiQuanException() {

        super();

    }

}


 fanli/src/main/java/com/yeshi/fanli/exception/push/PushException.java

New file
@@ -0,0 +1,16 @@
package com.yeshi.fanli.exception.push;



import com.yeshi.fanli.exception.BaseException;



public class PushException extends BaseException {

	 
    private static final long serialVersionUID = 1L;

	
    public PushException(int code, String msg) {

        super(code, msg);

    }



    public PushException() {

        super();

    }

}


 fanli/src/main/java/com/yeshi/fanli/exception/share/ShareGoodsException.java

New file
@@ -0,0 +1,16 @@
package com.yeshi.fanli.exception.share;



import com.yeshi.fanli.exception.BaseException;



public class ShareGoodsException extends BaseException {

	 
    private static final long serialVersionUID = 1L;

	
    public ShareGoodsException(int code, String msg) {

        super(code, msg);

    }



    public ShareGoodsException() {

        super();

    }

}


 fanli/src/main/java/com/yeshi/fanli/exception/user/AlipayAccountException.java

New file
@@ -0,0 +1,31 @@
package com.yeshi.fanli.exception.user;



import com.yeshi.fanli.exception.BaseException;



public class AlipayAccountException extends BaseException {



    // 无余额

    public static int CODE_NO_MONEY = 1;



    // 提现次数超限

    public static int CODE_TIMES_LIMIT = 2;



    // 参数错误

    public static int CODE_NO_PARAMS = 3;



    // 已经被绑定

    public static int CODE_ALREADY_BIND = 4;



    /**

     * 支付宝账号异常

     */

    private static final long serialVersionUID = 1L;

	
    public AlipayAccountException(int code, String msg) {

        super(code, msg);

    }



    public AlipayAccountException() {

        super();

    }

}


 fanli/src/main/java/com/yeshi/fanli/exception/user/AlipayTransferException.java

File was renamed from fanli/src/main/java/com/yeshi/fanli/exception/AlipayTransferException.java
@@ -1,39 +1,39 @@
package com.yeshi.fanli.exception;

public class AlipayTransferException extends Exception {
    public AlipayTransferException() {

    }

    /**
     * 支付宝转账异常
     */
    private static final long serialVersionUID = 1L;
    private int code;
    private String subCode;
    private String msg;

    public int getCode() {
        return code;
    }

    public String getMsg() {
        return msg;
    }

    public String getSubCode() {
        return subCode;
    }

    public AlipayTransferException(int code, String subCode, String msg) {
        this.code = code;
        this.msg = msg;
        this.subCode = subCode;
    }

    @Override
    public String getMessage() {
        return this.msg;
    }

}
package com.yeshi.fanli.exception.user;



public class AlipayTransferException extends Exception {

    public AlipayTransferException() {



    }



    /**

     * 支付宝转账异常

     */

    private static final long serialVersionUID = 1L;

    private int code;

    private String subCode;

    private String msg;



    public int getCode() {

        return code;

    }



    public String getMsg() {

        return msg;

    }



    public String getSubCode() {

        return subCode;

    }



    public AlipayTransferException(int code, String subCode, String msg) {

        this.code = code;

        this.msg = msg;

        this.subCode = subCode;

    }



    @Override

    public String getMessage() {

        return this.msg;

    }



}


 fanli/src/main/java/com/yeshi/fanli/exception/user/BindingAccountException.java

File was renamed from fanli/src/main/java/com/yeshi/fanli/exception/BindingAccountException.java
@@ -1,6 +1,8 @@
package com.yeshi.fanli.exception;

package com.yeshi.fanli.exception.user;



public class BindingAccountException extends Exception {

import com.yeshi.fanli.exception.BaseException;



public class BindingAccountException extends BaseException {

    private static final long serialVersionUID = 9044535997260029818L;



    // 账户不可抵达

@@ -12,26 +14,16 @@
    // 其他未知错误

    public static int CODE_OTHER_ERROR = 3;



    private int code;

    private String msg;



    public int getCode() {

        return code;

    }



    public String getMsg() {

        return msg;

    }



    public BindingAccountException() {

    public BindingAccountException(int code, String msg) {

        super(code, msg);

    }



    public BindingAccountException(String msg) {

        super(msg);

    }



    public BindingAccountException(int code, String msg) {

        this.code = code;

        this.msg = msg;

	
    public BindingAccountException() {

        super();

    }

	
}


 fanli/src/main/java/com/yeshi/fanli/exception/user/CustomerServiceCommonQuestionException.java

New file
@@ -0,0 +1,16 @@
package com.yeshi.fanli.exception.user;



import com.yeshi.fanli.exception.BaseException;



public class CustomerServiceCommonQuestionException extends BaseException {



    private static final long serialVersionUID = 1L;

	
    public CustomerServiceCommonQuestionException(int code, String msg) {

        super(code, msg);

    }



    public CustomerServiceCommonQuestionException() {

        super();

    }

}


 fanli/src/main/java/com/yeshi/fanli/exception/user/ForbiddenUserIdentifyCodeException.java

@@ -1,32 +1,17 @@
package com.yeshi.fanli.exception.user;

public class ForbiddenUserIdentifyCodeException extends Exception {
    /**
     * 
     */
    private static final long serialVersionUID = 1L;
    private int code;
    private String msg;

    public int getCode() {
        return code;
    }

    public String getMsg() {
        return msg;
    }

    public ForbiddenUserIdentifyCodeException(int code, String msg) {
        this.code = code;
        this.msg = msg;
    }

    public ForbiddenUserIdentifyCodeException() {
    }

    @Override
    public String getMessage() {
        return this.msg;
    }

}
package com.yeshi.fanli.exception.user;



import com.yeshi.fanli.exception.BaseException;



public class ForbiddenUserIdentifyCodeException extends BaseException {

    /**

     * 
     */

    private static final long serialVersionUID = 1L;

    public ForbiddenUserIdentifyCodeException(int code, String msg) {

        super(code, msg);

    }



    public ForbiddenUserIdentifyCodeException() {

        super();

    }

}


 fanli/src/main/java/com/yeshi/fanli/exception/user/ThreeSaleException.java

New file
@@ -0,0 +1,16 @@
package com.yeshi.fanli.exception.user;



import com.yeshi.fanli.exception.BaseException;



public class ThreeSaleException extends BaseException {

	 
    private static final long serialVersionUID = 1L;

	
    public ThreeSaleException(int code, String msg) {

        super(code, msg);

    }



    public ThreeSaleException() {

        super();

    }

}


 fanli/src/main/java/com/yeshi/fanli/exception/user/TokenRecordException.java

@@ -1,32 +1,16 @@
package com.yeshi.fanli.exception.user;



public class TokenRecordException extends Exception {

    /**

     * 
     */

import com.yeshi.fanli.exception.BaseException;



public class TokenRecordException extends BaseException {

	 
    private static final long serialVersionUID = 1L;

    private int code;

    private String msg;



    public int getCode() {

        return code;

    }



    public String getMsg() {

        return msg;

    }



	
    public TokenRecordException(int code, String msg) {

        this.code = code;

        this.msg = msg;

        super(code, msg);

    }



    public TokenRecordException() {

        super();

    }



    @Override

    public String getMessage() {

        return this.msg;

    }



}


 fanli/src/main/java/com/yeshi/fanli/exception/user/UserAccountException.java

New file
@@ -0,0 +1,16 @@
package com.yeshi.fanli.exception.user;



import com.yeshi.fanli.exception.BaseException;



public class UserAccountException extends BaseException {

	 
    private static final long serialVersionUID = 1L;

	
    public UserAccountException(int code, String msg) {

        super(code, msg);

    }



    public UserAccountException() {

        super();

    }

}


 fanli/src/main/java/com/yeshi/fanli/exception/user/UserComplaintException.java

@@ -1,32 +1,17 @@
package com.yeshi.fanli.exception.user;

public class UserComplaintException extends Exception {
    /**
     * 
     */
    private static final long serialVersionUID = 1L;
    private int code;
    private String msg;

    public int getCode() {
        return code;
    }

    public String getMsg() {
        return msg;
    }

    public UserComplaintException(int code, String msg) {
        this.code = code;
        this.msg = msg;
    }

    public UserComplaintException() {
    }

    @Override
    public String getMessage() {
        return this.msg;
    }

}
package com.yeshi.fanli.exception.user;



import com.yeshi.fanli.exception.BaseException;



public class UserComplaintException extends BaseException {

    /**

     * 
     */

    private static final long serialVersionUID = 1L;

    public UserComplaintException(int code, String msg) {

        super(code, msg);

    }



    public UserComplaintException() {

        super();

    }

}


 fanli/src/main/java/com/yeshi/fanli/exception/user/UserCustomSettingsException.java

@@ -1,32 +1,16 @@
package com.yeshi.fanli.exception.user;

public class UserCustomSettingsException extends Exception {
    /**
     * 
     */
    private static final long serialVersionUID = 1L;
    private int code;
    private String msg;

    public int getCode() {
        return code;
    }

    public String getMsg() {
        return msg;
    }

    public UserCustomSettingsException(int code, String msg) {
        this.code = code;
        this.msg = msg;
    }

    public UserCustomSettingsException() {
    }

    @Override
    public String getMessage() {
        return this.msg;
    }

}
package com.yeshi.fanli.exception.user;



import com.yeshi.fanli.exception.BaseException;



public class UserCustomSettingsException extends BaseException {

	 
    private static final long serialVersionUID = 1L;

	
    public UserCustomSettingsException(int code, String msg) {

        super(code, msg);

    }



    public UserCustomSettingsException() {

        super();

    }

}


 fanli/src/main/java/com/yeshi/fanli/exception/user/UserExtraTaoBaoInfoException.java

@@ -1,32 +1,16 @@
package com.yeshi.fanli.exception.user;

public class UserExtraTaoBaoInfoException extends Exception {
    /**
     * 
     */
    private static final long serialVersionUID = 1L;
    private int code;
    private String msg;

    public int getCode() {
        return code;
    }

    public String getMsg() {
        return msg;
    }

    public UserExtraTaoBaoInfoException(int code, String msg) {
        this.code = code;
        this.msg = msg;
    }

    public UserExtraTaoBaoInfoException() {
    }

    @Override
    public String getMessage() {
        return this.msg;
    }

}
package com.yeshi.fanli.exception.user;



import com.yeshi.fanli.exception.BaseException;



public class UserExtraTaoBaoInfoException extends BaseException {

	 
    private static final long serialVersionUID = 1L;

	
    public UserExtraTaoBaoInfoException(int code, String msg) {

        super(code, msg);

    }



    public UserExtraTaoBaoInfoException() {

        super();

    }

}


 fanli/src/main/java/com/yeshi/fanli/exception/user/UserGoodsStorageException.java

@@ -1,32 +1,16 @@
package com.yeshi.fanli.exception.user;

public class UserGoodsStorageException extends Exception {
    /**
     * 
     */
    private static final long serialVersionUID = 1L;
    private int code;
    private String msg;

    public int getCode() {
        return code;
    }

    public String getMsg() {
        return msg;
    }

    public UserGoodsStorageException(int code, String msg) {
        this.code = code;
        this.msg = msg;
    }

    public UserGoodsStorageException() {
    }

    @Override
    public String getMessage() {
        return this.msg;
    }

}
package com.yeshi.fanli.exception.user;



import com.yeshi.fanli.exception.BaseException;



public class UserGoodsStorageException extends BaseException {

	 
    private static final long serialVersionUID = 1L;

	
    public UserGoodsStorageException(int code, String msg) {

        super(code, msg);

    }



    public UserGoodsStorageException() {

        super();

    }

}


 fanli/src/main/java/com/yeshi/fanli/exception/user/UserInfoException.java

@@ -1,32 +1,16 @@
package com.yeshi.fanli.exception.user;

public class UserInfoException extends Exception {
    /**
     * 
     */
    private static final long serialVersionUID = 1L;
    private int code;
    private String msg;

    public int getCode() {
        return code;
    }

    public String getMsg() {
        return msg;
    }

    public UserInfoException(int code, String msg) {
        this.code = code;
        this.msg = msg;
    }

    public UserInfoException() {
    }

    @Override
    public String getMessage() {
        return this.msg;
    }

}
package com.yeshi.fanli.exception.user;



import com.yeshi.fanli.exception.BaseException;



public class UserInfoException extends BaseException {

	 
    private static final long serialVersionUID = 1L;

	
    public UserInfoException(int code, String msg) {

        super(code, msg);

    }



    public UserInfoException() {

        super();

    }

}


 fanli/src/main/java/com/yeshi/fanli/exception/user/UserInfoExtraException.java

@@ -1,32 +1,16 @@
package com.yeshi.fanli.exception.user;

public class UserInfoExtraException extends Exception {
    /**
     * 
     */
    private static final long serialVersionUID = 1L;
    private int code;
    private String msg;

    public int getCode() {
        return code;
    }

    public String getMsg() {
        return msg;
    }

    public UserInfoExtraException(int code, String msg) {
        this.code = code;
        this.msg = msg;
    }

    public UserInfoExtraException() {
    }

    @Override
    public String getMessage() {
        return this.msg;
    }

}
package com.yeshi.fanli.exception.user;



import com.yeshi.fanli.exception.BaseException;



public class UserInfoExtraException extends BaseException {

	 
    private static final long serialVersionUID = 1L;

	
    public UserInfoExtraException(int code, String msg) {

        super(code, msg);

    }



    public UserInfoExtraException() {

        super();

    }

}


 fanli/src/main/java/com/yeshi/fanli/exception/user/UserLotteryRecordException.java

@@ -1,32 +1,16 @@
package com.yeshi.fanli.exception.user;

public class UserLotteryRecordException extends Exception {
    /**
     * 
     */
    private static final long serialVersionUID = 1L;
    private int code;
    private String msg;

    public int getCode() {
        return code;
    }

    public String getMsg() {
        return msg;
    }

    public UserLotteryRecordException(int code, String msg) {
        this.code = code;
        this.msg = msg;
    }

    public UserLotteryRecordException() {
    }

    @Override
    public String getMessage() {
        return this.msg;
    }

}
package com.yeshi.fanli.exception.user;



import com.yeshi.fanli.exception.BaseException;



public class UserLotteryRecordException extends BaseException {

	 
    private static final long serialVersionUID = 1L;

	
    public UserLotteryRecordException(int code, String msg) {

        super(code, msg);

    }



    public UserLotteryRecordException() {

        super();

    }

}


 fanli/src/main/java/com/yeshi/fanli/exception/user/UserRankingsException.java

New file
@@ -0,0 +1,16 @@
package com.yeshi.fanli.exception.user;



import com.yeshi.fanli.exception.BaseException;



public class UserRankingsException extends BaseException {

	 
    private static final long serialVersionUID = 1L;

	
    public UserRankingsException(int code, String msg) {

        super(code, msg);

    }



    public UserRankingsException() {

        super();

    }

}


 fanli/src/main/java/com/yeshi/fanli/exception/user/UserSystemCouponException.java

@@ -1,32 +1,16 @@
package com.yeshi.fanli.exception.user;

public class UserSystemCouponException extends Exception {
    /**
     * 
     */
    private static final long serialVersionUID = 1L;
    private int code;
    private String msg;

    public int getCode() {
        return code;
    }

    public String getMsg() {
        return msg;
    }

    public UserSystemCouponException(int code, String msg) {
        this.code = code;
        this.msg = msg;
    }

    public UserSystemCouponException() {
    }

    @Override
    public String getMessage() {
        return this.msg;
    }

}
package com.yeshi.fanli.exception.user;



import com.yeshi.fanli.exception.BaseException;



public class UserSystemCouponException extends BaseException {

	 
    private static final long serialVersionUID = 1L;

	
    public UserSystemCouponException(int code, String msg) {

        super(code, msg);

    }



    public UserSystemCouponException() {

        super();

    }

}


 fanli/src/main/java/com/yeshi/fanli/job/IntegralTaskJob.java

@@ -10,8 +10,8 @@


import com.yeshi.fanli.entity.integral.IntegralTaskClass;

import com.yeshi.fanli.entity.integral.IntegralTaskClass.UniqueKeyEnum;

import com.yeshi.fanli.exception.push.PushException;

import com.yeshi.fanli.entity.integral.IntegralTaskRecord;

import com.yeshi.fanli.exception.PushException;

import com.yeshi.fanli.service.inter.integral.IntegralTaskClassService;

import com.yeshi.fanli.service.inter.integral.IntegralTaskRecordService;

import com.yeshi.fanli.service.inter.push.PushService;


 fanli/src/main/java/com/yeshi/fanli/mapping/ThreeSaleMapper.xml

@@ -83,6 +83,8 @@
    <select id="getByWorkerId" resultMap="BaseResultMap" parameterType="java.lang.Long">
        select     <include refid="Base_Column_List" /> from yeshi_ec_threeSale 
        where worker_id = #{0} AND state=0 AND (expire = 0 OR expire IS NULL)
        ORDER BY createTime DESC
        LIMIT 1
    </select>
    


 fanli/src/main/java/com/yeshi/fanli/service/impl/clazz/GoodsSubClassLabelServiceImpl.java

@@ -15,7 +15,7 @@
import com.yeshi.fanli.entity.bus.clazz.GoodsSubClass;

import com.yeshi.fanli.entity.bus.clazz.GoodsSubClassLabel;

import com.yeshi.fanli.entity.bus.clazz.GoodsSubClassLabelMap;

import com.yeshi.fanli.exception.GoodsClassException;

import com.yeshi.fanli.exception.goods.GoodsClassException;

import com.yeshi.fanli.service.inter.clazz.GoodsSubClassLabelService;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.vo.goods.GoodsSubClassLabelVO;


 fanli/src/main/java/com/yeshi/fanli/service/impl/customerservice/CustomerServiceCommonQuestionServiceImpl.java

@@ -12,7 +12,7 @@


import com.yeshi.fanli.dao.mybatis.customerservice.CustomerServiceCommonQuestionMapper;

import com.yeshi.fanli.entity.customerservice.CustomerServiceCommonQuestion;

import com.yeshi.fanli.exception.CustomerServiceCommonQuestionException;

import com.yeshi.fanli.exception.user.CustomerServiceCommonQuestionException;

import com.yeshi.fanli.service.inter.customerservice.CustomerServiceCommonQuestionService;



@Service


 fanli/src/main/java/com/yeshi/fanli/service/impl/goods/GoodsClassServiceImpl.java

@@ -22,7 +22,7 @@
import com.yeshi.fanli.entity.bus.clazz.GoodsClass;

import com.yeshi.fanli.entity.bus.clazz.GoodsSubClass;

import com.yeshi.fanli.entity.bus.clazz.TaoBaoClass;

import com.yeshi.fanli.exception.GoodsClassException;

import com.yeshi.fanli.exception.goods.GoodsClassException;

import com.yeshi.fanli.service.inter.goods.GoodsClassService;

import com.yeshi.fanli.service.inter.goods.GoodsSubClassService;

import com.yeshi.fanli.service.inter.goods.TaoBaoClassService;


 fanli/src/main/java/com/yeshi/fanli/service/impl/goods/GoodsSubClassServiceImpl.java

@@ -20,7 +20,7 @@
import com.yeshi.fanli.entity.bus.clazz.GoodsSubClass;

import com.yeshi.fanli.entity.bus.clazz.GoodsSubClassLabel;

import com.yeshi.fanli.entity.bus.clazz.GoodsSubClassLabelMap;

import com.yeshi.fanli.exception.GoodsSubClassException;

import com.yeshi.fanli.exception.goods.GoodsSubClassException;

import com.yeshi.fanli.service.inter.clazz.GoodsSubClassLabelService;

import com.yeshi.fanli.service.inter.goods.GoodsSubClassService;

import com.yeshi.fanli.service.inter.goods.TaoBaoClassService;


 fanli/src/main/java/com/yeshi/fanli/service/impl/goods/ShareGoodsServiceImpl.java

@@ -35,7 +35,7 @@
import com.yeshi.fanli.entity.taobao.TaoBaoUnionConfig;

import com.yeshi.fanli.entity.taobao.TaoKeAppInfo;

import com.yeshi.fanli.entity.taobao.UserTLJBuyHistory;

import com.yeshi.fanli.exception.ShareGoodsException;

import com.yeshi.fanli.exception.share.ShareGoodsException;

import com.yeshi.fanli.exception.taobao.TaoKeApiException;

import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;

import com.yeshi.fanli.exception.tlj.TaoLiJinCreateException;


 fanli/src/main/java/com/yeshi/fanli/service/impl/goods/TaoBaoGoodsBriefServiceImpl.java

@@ -16,7 +16,7 @@
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;

import com.yeshi.fanli.entity.taobao.TaoBaoUnionConfig;

import com.yeshi.fanli.entity.taobao.TaoKeAppInfo;

import com.yeshi.fanli.exception.ShareGoodsException;

import com.yeshi.fanli.exception.share.ShareGoodsException;

import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;

import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;

import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;


 fanli/src/main/java/com/yeshi/fanli/service/impl/help/HelpCenterServiceImpl.java

@@ -16,7 +16,7 @@
import com.yeshi.fanli.dao.mybatis.help.HelpCenterMapper;

import com.yeshi.fanli.entity.bus.help.HelpCenter;

import com.yeshi.fanli.entity.bus.help.HelpInfo;

import com.yeshi.fanli.exception.HelpCenterException;

import com.yeshi.fanli.exception.config.HelpCenterException;

import com.yeshi.fanli.service.inter.help.HelpCenterService;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.db.MongoDBManager;


 fanli/src/main/java/com/yeshi/fanli/service/impl/help/HelpClassServiceImpl.java

@@ -14,7 +14,7 @@


import com.yeshi.fanli.dao.mybatis.help.HelpClassMapper;

import com.yeshi.fanli.entity.bus.help.HelpClass;

import com.yeshi.fanli.exception.HelpClassException;

import com.yeshi.fanli.exception.config.HelpClassException;

import com.yeshi.fanli.service.inter.help.HelpClassService;

import com.yeshi.fanli.util.StringUtil;




 fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/FloatADServiceImpl.java

@@ -17,7 +17,7 @@
import com.yeshi.fanli.dao.mybatis.homemodule.FloatADMapper;

import com.yeshi.fanli.entity.bus.homemodule.FloatAD;

import com.yeshi.fanli.entity.common.JumpDetailV2;

import com.yeshi.fanli.exception.FloatADException;

import com.yeshi.fanli.exception.homemodule.FloatADException;

import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;

import com.yeshi.fanli.service.inter.homemodule.FloatADService;

import com.yeshi.fanli.util.StringUtil;


 fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialPlaceImpl.java

@@ -10,7 +10,7 @@


import com.yeshi.fanli.dao.mybatis.homemodule.SpecialPlaceMapper;

import com.yeshi.fanli.entity.bus.homemodule.SpecialPlace;

import com.yeshi.fanli.exception.SpecialPlaceException;

import com.yeshi.fanli.exception.homemodule.SpecialPlaceException;

import com.yeshi.fanli.service.inter.homemodule.SpecialPlaceService;



@Service


 fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoV2ServiceImpl.java

@@ -34,7 +34,7 @@
import com.yeshi.fanli.entity.order.HongBaoOrder;

import com.yeshi.fanli.entity.order.ShareGoodsActivityOrder;

import com.yeshi.fanli.entity.taobao.TaoBaoOrder;

import com.yeshi.fanli.exception.HongBaoException;

import com.yeshi.fanli.exception.order.HongBaoException;

import com.yeshi.fanli.exception.order.ShareGoodsActivityOrderException;

import com.yeshi.fanli.exception.share.UserShareGoodsRecordException;

import com.yeshi.fanli.log.LogHelper;


 fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/ThreeSaleSerivceImpl.java

@@ -19,7 +19,7 @@
import com.yeshi.fanli.entity.bus.user.ThreeSaleExtraInfo;

import com.yeshi.fanli.entity.bus.user.UserActiveLog;

import com.yeshi.fanli.entity.bus.user.UserInfo;

import com.yeshi.fanli.exception.ThreeSaleException;

import com.yeshi.fanli.exception.user.ThreeSaleException;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;

import com.yeshi.fanli.service.inter.hongbao.ThreeSaleExtraInfoSerivce;


 fanli/src/main/java/com/yeshi/fanli/service/impl/jd/JDOrderProcessServiceImpl.java

@@ -17,8 +17,8 @@
import com.yeshi.fanli.entity.jd.JDOrder;

import com.yeshi.fanli.entity.jd.JDOrderItem;

import com.yeshi.fanli.entity.order.CommonOrder;

import com.yeshi.fanli.exception.HongBaoException;

import com.yeshi.fanli.exception.order.CommonOrderException;

import com.yeshi.fanli.exception.order.HongBaoException;

import com.yeshi.fanli.exception.pdd.PDDOrderException;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.hongbao.HongBaoV2Service;


 fanli/src/main/java/com/yeshi/fanli/service/impl/lable/BoutiqueAutoRuleServiceImpl.java

@@ -13,7 +13,7 @@


import com.yeshi.fanli.dao.mybatis.lable.BoutiqueAutoRuleMapper;

import com.yeshi.fanli.entity.bus.lable.BoutiqueAutoRule;

import com.yeshi.fanli.exception.BoutiqueAutoRuleException;

import com.yeshi.fanli.exception.goods.quality.BoutiqueAutoRuleException;

import com.yeshi.fanli.job.QualityFactoryJob;

import com.yeshi.fanli.job.QuartzManager;

import com.yeshi.fanli.log.LogHelper;


 fanli/src/main/java/com/yeshi/fanli/service/impl/lable/LabelClassServiceImpl.java

@@ -16,7 +16,7 @@
import com.yeshi.fanli.entity.bus.clazz.GoodsSubClass;

import com.yeshi.fanli.entity.bus.lable.Label;

import com.yeshi.fanli.entity.bus.lable.LabelClass;

import com.yeshi.fanli.exception.LabelClassException;

import com.yeshi.fanli.exception.goods.quality.LabelClassException;

import com.yeshi.fanli.service.inter.lable.LabelClassService;

import com.yeshi.fanli.service.inter.lable.LabelService;




 fanli/src/main/java/com/yeshi/fanli/service/impl/lable/LabelGoodsServiceImpl.java

@@ -16,8 +16,8 @@
import com.yeshi.fanli.entity.bus.lable.LabelGoods;

import com.yeshi.fanli.entity.common.AdminUser;

import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;

import com.yeshi.fanli.exception.LabelClassException;

import com.yeshi.fanli.exception.LabelGoodsException;

import com.yeshi.fanli.exception.goods.quality.LabelClassException;

import com.yeshi.fanli.exception.goods.quality.LabelGoodsException;

import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;

import com.yeshi.fanli.service.inter.lable.LabelGoodsService;

import com.yeshi.fanli.service.inter.lable.LabelService;


 fanli/src/main/java/com/yeshi/fanli/service/impl/lable/LabelServiceImpl.java

@@ -23,7 +23,7 @@
import com.yeshi.fanli.entity.bus.lable.Label;

import com.yeshi.fanli.entity.bus.lable.LabelGoods;

import com.yeshi.fanli.entity.common.AdminUser;

import com.yeshi.fanli.exception.LabelException;

import com.yeshi.fanli.exception.goods.quality.LabelException;

import com.yeshi.fanli.service.inter.lable.LabelService;

import com.yeshi.fanli.util.StringUtil;




 fanli/src/main/java/com/yeshi/fanli/service/impl/lable/MergeClassServiceImpl.java

@@ -7,7 +7,7 @@


import com.yeshi.fanli.dao.mybatis.lable.MergeClassMapper;

import com.yeshi.fanli.entity.bus.lable.MergeClass;

import com.yeshi.fanli.exception.MergeClassException;

import com.yeshi.fanli.exception.goods.MergeClassException;

import com.yeshi.fanli.service.inter.lable.MergeClassService;



@Service


 fanli/src/main/java/com/yeshi/fanli/service/impl/lable/QualityFactoryServiceImpl.java

@@ -23,7 +23,7 @@
import com.yeshi.fanli.entity.bus.lable.QualityFlashSale;

import com.yeshi.fanli.entity.common.AdminUser;

import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;

import com.yeshi.fanli.exception.QualityFactoryException;

import com.yeshi.fanli.exception.goods.quality.QualityFactoryException;

import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;

import com.yeshi.fanli.exception.taobao.TaobaoGoodsUpdateException;

import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;


 fanli/src/main/java/com/yeshi/fanli/service/impl/lable/QualityFlashSaleServiceImpl.java

@@ -9,7 +9,7 @@


import com.yeshi.fanli.dao.mybatis.lable.QualityFlashSaleMapper;

import com.yeshi.fanli.entity.bus.lable.QualityFlashSale;

import com.yeshi.fanli.exception.QualityFlashSaleException;

import com.yeshi.fanli.exception.goods.quality.QualityFlashSaleException;

import com.yeshi.fanli.service.inter.lable.QualityFlashSaleService;



@Service


 fanli/src/main/java/com/yeshi/fanli/service/impl/msg/MsgConfigServiceImpl.java

@@ -9,7 +9,7 @@
import com.google.gson.Gson;

import com.yeshi.fanli.dto.msg.MsgCommonDTO;

import com.yeshi.fanli.entity.common.Config;

import com.yeshi.fanli.exception.ConfigException;

import com.yeshi.fanli.exception.config.ConfigException;

import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;

import com.yeshi.fanli.service.inter.config.ConfigService;

import com.yeshi.fanli.service.inter.msg.MsgConfigService;


 fanli/src/main/java/com/yeshi/fanli/service/impl/msg/UserInviteMsgNotificationServiceImpl.java

@@ -10,8 +10,8 @@
import com.yeshi.fanli.entity.bus.msg.MsgInviteDetail;

import com.yeshi.fanli.entity.bus.user.ThreeSale;

import com.yeshi.fanli.entity.config.push.PushMsgFactory;

import com.yeshi.fanli.exception.PushException;

import com.yeshi.fanli.exception.msg.MsgInviteDetailException;

import com.yeshi.fanli.exception.push.PushException;

import com.yeshi.fanli.service.inter.msg.MsgInviteDetailService;

import com.yeshi.fanli.service.inter.msg.UserInviteMsgNotificationService;

import com.yeshi.fanli.service.inter.push.PushService;


 fanli/src/main/java/com/yeshi/fanli/service/impl/msg/UserMoneyMsgNotificationServiceImpl.java

@@ -12,8 +12,8 @@
import com.yeshi.fanli.entity.bus.user.AlipayAccountValidNormalHistory;

import com.yeshi.fanli.entity.bus.user.Extract;

import com.yeshi.fanli.entity.config.push.PushMsgFactory;

import com.yeshi.fanli.exception.PushException;

import com.yeshi.fanli.exception.msg.MsgMoneyDetailException;

import com.yeshi.fanli.exception.push.PushException;

import com.yeshi.fanli.service.inter.msg.MsgMoneyDetailService;

import com.yeshi.fanli.service.inter.msg.UserMoneyMsgNotificationService;

import com.yeshi.fanli.service.inter.push.PushService;


 fanli/src/main/java/com/yeshi/fanli/service/impl/msg/UserOrderMsgNotificationServiceImpl.java

@@ -10,8 +10,8 @@
import com.yeshi.fanli.dto.push.PushContentDTO;

import com.yeshi.fanli.entity.bus.msg.MsgOrderDetail;

import com.yeshi.fanli.entity.config.push.PushMsgFactory;

import com.yeshi.fanli.exception.PushException;

import com.yeshi.fanli.exception.msg.MsgOrderDetailException;

import com.yeshi.fanli.exception.push.PushException;

import com.yeshi.fanli.service.inter.msg.MsgOrderDetailService;

import com.yeshi.fanli.service.inter.msg.UserOrderMsgNotificationService;

import com.yeshi.fanli.service.inter.push.PushService;


 fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java

@@ -41,11 +41,11 @@
import com.yeshi.fanli.entity.taobao.TaoBaoUnionConfig;

import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanDrawBack;

import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanOrder;

import com.yeshi.fanli.exception.HongBaoException;

import com.yeshi.fanli.exception.OrderItemException;

import com.yeshi.fanli.exception.TaoBaoWeiQuanException;

import com.yeshi.fanli.exception.money.UserMoneyDetailException;

import com.yeshi.fanli.exception.order.CommonOrderException;

import com.yeshi.fanli.exception.order.HongBaoException;

import com.yeshi.fanli.exception.order.OrderItemException;

import com.yeshi.fanli.exception.order.TaoBaoWeiQuanException;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.hongbao.AccountDetailsHongBaoMapService;

import com.yeshi.fanli.service.inter.hongbao.HongBaoV2Service;


 fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderRepairServiceImpl.java

@@ -41,9 +41,9 @@
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;

import com.yeshi.fanli.entity.taobao.TaoBaoOrder;

import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanOrder;

import com.yeshi.fanli.exception.HongBaoException;

import com.yeshi.fanli.exception.PushException;

import com.yeshi.fanli.exception.money.UserMoneyDetailException;

import com.yeshi.fanli.exception.order.HongBaoException;

import com.yeshi.fanli.exception.push.PushException;

import com.yeshi.fanli.exception.push.PushInfoException;

import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;

import com.yeshi.fanli.log.LogHelper;


 fanli/src/main/java/com/yeshi/fanli/service/impl/pdd/PDDOrderProcessServiceImpl.java

@@ -20,8 +20,8 @@
import com.yeshi.fanli.entity.pdd.PDDOrder;

import com.yeshi.fanli.entity.taobao.PidUser;

import com.yeshi.fanli.entity.taobao.TaoBaoUnionConfig;

import com.yeshi.fanli.exception.HongBaoException;

import com.yeshi.fanli.exception.order.CommonOrderException;

import com.yeshi.fanli.exception.order.HongBaoException;

import com.yeshi.fanli.exception.pdd.PDDOrderException;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.hongbao.HongBaoV2Service;


 fanli/src/main/java/com/yeshi/fanli/service/impl/push/HWPushServiceImpl.java

@@ -16,7 +16,7 @@
import com.yeshi.fanli.entity.bus.user.UserCustomSettings;

import com.yeshi.fanli.entity.bus.user.UserCustomSettings.UserSettingTypeEnum;

import com.yeshi.fanli.entity.push.DeviceTokenHW;

import com.yeshi.fanli.exception.PushException;

import com.yeshi.fanli.exception.push.PushException;

import com.yeshi.fanli.log.PushLogHelper;

import com.yeshi.fanli.service.inter.config.AppVersionService;

import com.yeshi.fanli.service.inter.push.DeviceTokenHWService;


 fanli/src/main/java/com/yeshi/fanli/service/impl/push/IOSPushServiceImpl.java

@@ -21,7 +21,7 @@
import com.yeshi.fanli.entity.system.SystemZnx;

import com.yeshi.fanli.entity.xinge.MessageInfo;

import com.yeshi.fanli.entity.xinge.PushRecord;

import com.yeshi.fanli.exception.PushException;

import com.yeshi.fanli.exception.push.PushException;

import com.yeshi.fanli.log.PushLogHelper;

import com.yeshi.fanli.service.inter.push.IOSPushService;

import com.yeshi.fanli.service.inter.user.UserCustomSettingsService;


 fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushCouponServiceImpl.java

@@ -14,8 +14,8 @@
import com.yeshi.fanli.entity.bus.user.UserSystemCoupon;

import com.yeshi.fanli.entity.push.PushCoupon;

import com.yeshi.fanli.entity.push.PushCouponRecord;

import com.yeshi.fanli.exception.PushException;

import com.yeshi.fanli.exception.push.PushCouponException;

import com.yeshi.fanli.exception.push.PushException;

import com.yeshi.fanli.service.inter.config.ConfigService;

import com.yeshi.fanli.service.inter.push.PushCouponRecordService;

import com.yeshi.fanli.service.inter.push.PushCouponService;


 fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushGoodsServiceImpl.java

@@ -16,7 +16,7 @@
import com.yeshi.fanli.entity.push.PushGoods;

import com.yeshi.fanli.entity.push.PushGoodsGroup;

import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;

import com.yeshi.fanli.exception.PushException;

import com.yeshi.fanli.exception.push.PushException;

import com.yeshi.fanli.exception.push.PushGoodsException;

import com.yeshi.fanli.service.inter.config.ConfigService;

import com.yeshi.fanli.service.inter.goods.CommonGoodsService;


 fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushInfoServiceImpl.java

@@ -18,7 +18,7 @@
import com.yeshi.fanli.entity.bus.msg.UserSystemMsgTypeEnum;

import com.yeshi.fanli.entity.push.PushInfo;

import com.yeshi.fanli.entity.push.PushInfo.PushTypeEnum;

import com.yeshi.fanli.exception.PushException;

import com.yeshi.fanli.exception.push.PushException;

import com.yeshi.fanli.exception.push.PushInfoException;

import com.yeshi.fanli.service.inter.config.ConfigService;

import com.yeshi.fanli.service.inter.msg.UserSystemMsgService;


 fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushServiceImpl.java

@@ -15,7 +15,7 @@
import com.yeshi.fanli.entity.bus.user.UserInfo;

import com.yeshi.fanli.entity.system.SystemZnx;

import com.yeshi.fanli.entity.xinge.PushRecord;

import com.yeshi.fanli.exception.PushException;

import com.yeshi.fanli.exception.push.PushException;

import com.yeshi.fanli.service.inter.config.AppVersionService;

import com.yeshi.fanli.service.inter.push.DeviceTokenHWService;

import com.yeshi.fanli.service.inter.push.HWPushService;


 fanli/src/main/java/com/yeshi/fanli/service/impl/push/XMPushServiceImpl.java

@@ -8,7 +8,7 @@
import com.yeshi.fanli.entity.system.SystemZnx;

import com.yeshi.fanli.entity.xinge.MessageInfo;

import com.yeshi.fanli.entity.xinge.PushRecord;

import com.yeshi.fanli.exception.PushException;

import com.yeshi.fanli.exception.push.PushException;

import com.yeshi.fanli.log.PushLogHelper;

import com.yeshi.fanli.service.inter.push.XMPushService;

import com.yeshi.fanli.util.Constant;


 fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoWeiQuanDrawBackServiceImpl.java

@@ -30,9 +30,9 @@
import com.yeshi.fanli.entity.taobao.TaoBaoOrder;

import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanDrawBack;

import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanOrder;

import com.yeshi.fanli.exception.TaoBaoWeiQuanException;

import com.yeshi.fanli.exception.money.UserMoneyDebtException;

import com.yeshi.fanli.exception.money.UserMoneyDetailException;

import com.yeshi.fanli.exception.order.TaoBaoWeiQuanException;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.money.UserMoneyDebtService;

import com.yeshi.fanli.service.inter.msg.UserMoneyMsgNotificationService;


 fanli/src/main/java/com/yeshi/fanli/service/impl/user/BindingAccountServiceImpl.java

@@ -27,11 +27,11 @@
import com.yeshi.fanli.entity.money.UserMoneyDebt;

import com.yeshi.fanli.entity.money.UserMoneyDebt.UserMoneyDebtTypeEnum;

import com.yeshi.fanli.entity.money.UserMoneyDetail;

import com.yeshi.fanli.exception.AlipayAccountException;

import com.yeshi.fanli.exception.AlipayTransferException;

import com.yeshi.fanli.exception.BindingAccountException;

import com.yeshi.fanli.exception.money.UserMoneyDebtException;

import com.yeshi.fanli.exception.money.UserMoneyDetailException;

import com.yeshi.fanli.exception.user.AlipayAccountException;

import com.yeshi.fanli.exception.user.AlipayTransferException;

import com.yeshi.fanli.exception.user.BindingAccountException;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.money.UserMoneyDebtService;

import com.yeshi.fanli.service.inter.msg.UserMoneyMsgNotificationService;


 fanli/src/main/java/com/yeshi/fanli/service/impl/user/SMSServiceImpl.java

@@ -9,7 +9,7 @@


import com.yeshi.fanli.dao.mybatis.SMSHistoryMapper;

import com.yeshi.fanli.entity.bus.user.SMSHistory;

import com.yeshi.fanli.exception.SMSException;

import com.yeshi.fanli.exception.config.SMSException;

import com.yeshi.fanli.service.inter.user.SMSService;

import com.yeshi.fanli.util.AliyunSMSUtil;

import com.yeshi.fanli.util.Constant;


 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserAccountServiceImpl.java

@@ -36,8 +36,8 @@
import com.yeshi.fanli.entity.bus.user.UserInfo;

import com.yeshi.fanli.entity.bus.user.UserInfoModifyRecord.ModifyTypeEnum;

import com.yeshi.fanli.entity.bus.user.WeiXinUser;

import com.yeshi.fanli.exception.UserAccountException;

import com.yeshi.fanli.exception.user.ForbiddenUserIdentifyCodeException;

import com.yeshi.fanli.exception.user.UserAccountException;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce;

import com.yeshi.fanli.service.inter.msg.UserAccountMsgNotificationService;


 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoExtraServiceImpl.java

@@ -22,7 +22,7 @@
import com.yeshi.fanli.entity.bus.user.UserRank;

import com.yeshi.fanli.entity.bus.user.UserRankRecord;

import com.yeshi.fanli.entity.bus.user.WeiXinUser;

import com.yeshi.fanli.exception.ThreeSaleException;

import com.yeshi.fanli.exception.user.ThreeSaleException;

import com.yeshi.fanli.exception.user.UserInfoExtraException;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.config.ConfigService;


 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoServiceImpl.java

@@ -47,7 +47,7 @@
import com.yeshi.fanli.entity.bus.user.UserInfoModifyRecord.ModifyTypeEnum;

import com.yeshi.fanli.entity.bus.user.WeiXinUser;

import com.yeshi.fanli.entity.system.BusinessSystem;

import com.yeshi.fanli.exception.ThreeSaleException;

import com.yeshi.fanli.exception.user.ThreeSaleException;

import com.yeshi.fanli.exception.user.UserInfoException;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.config.ConfigService;


 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserRankingsServiceImpl.java

@@ -26,7 +26,7 @@
import com.yeshi.fanli.dto.money.InviteGetMoney;

import com.yeshi.fanli.entity.bus.user.UserInfo;

import com.yeshi.fanli.entity.bus.user.UserRankings;

import com.yeshi.fanli.exception.UserRankingsException;

import com.yeshi.fanli.exception.user.UserRankingsException;

import com.yeshi.fanli.service.inter.count.HongBaoV2CountService;

import com.yeshi.fanli.service.inter.user.UserRankingsService;

import com.yeshi.fanli.util.StringUtil;


 fanli/src/main/java/com/yeshi/fanli/service/inter/clazz/GoodsSubClassLabelService.java

@@ -4,7 +4,7 @@


import com.yeshi.fanli.entity.bus.clazz.GoodsSubClassLabel;

import com.yeshi.fanli.entity.bus.clazz.GoodsSubClassLabelMap;

import com.yeshi.fanli.exception.GoodsClassException;

import com.yeshi.fanli.exception.goods.GoodsClassException;

import com.yeshi.fanli.vo.goods.GoodsSubClassLabelVO;



/**


 fanli/src/main/java/com/yeshi/fanli/service/inter/customerservice/CustomerServiceCommonQuestionService.java

@@ -3,7 +3,7 @@
import java.util.List;



import com.yeshi.fanli.entity.customerservice.CustomerServiceCommonQuestion;

import com.yeshi.fanli.exception.CustomerServiceCommonQuestionException;

import com.yeshi.fanli.exception.user.CustomerServiceCommonQuestionException;



public interface CustomerServiceCommonQuestionService {

    /**


 fanli/src/main/java/com/yeshi/fanli/service/inter/goods/GoodsClassService.java

@@ -6,7 +6,7 @@
import org.springframework.web.multipart.MultipartFile;



import com.yeshi.fanli.entity.bus.clazz.GoodsClass;

import com.yeshi.fanli.exception.GoodsClassException;

import com.yeshi.fanli.exception.goods.GoodsClassException;



public interface GoodsClassService {

    


 fanli/src/main/java/com/yeshi/fanli/service/inter/goods/GoodsSubClassService.java

@@ -7,7 +7,7 @@


import com.yeshi.fanli.entity.accept.AcceptData;

import com.yeshi.fanli.entity.bus.clazz.GoodsSubClass;

import com.yeshi.fanli.exception.GoodsSubClassException;

import com.yeshi.fanli.exception.goods.GoodsSubClassException;





public interface  GoodsSubClassService {


 fanli/src/main/java/com/yeshi/fanli/service/inter/goods/ShareGoodsService.java

@@ -4,7 +4,7 @@
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;

import com.yeshi.fanli.entity.taobao.TaoBaoLink;

import com.yeshi.fanli.entity.taobao.TaoKeAppInfo;

import com.yeshi.fanli.exception.ShareGoodsException;

import com.yeshi.fanli.exception.share.ShareGoodsException;

import com.yeshi.fanli.exception.tlj.TaoLiJinCreateException;



public interface ShareGoodsService {


 fanli/src/main/java/com/yeshi/fanli/service/inter/goods/TaoBaoGoodsBriefService.java

@@ -4,7 +4,7 @@
import java.util.List;



import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;

import com.yeshi.fanli.exception.ShareGoodsException;

import com.yeshi.fanli.exception.share.ShareGoodsException;



public interface TaoBaoGoodsBriefService {




 fanli/src/main/java/com/yeshi/fanli/service/inter/help/HelpCenterService.java

@@ -7,7 +7,7 @@


import com.yeshi.fanli.entity.bus.help.HelpCenter;

import com.yeshi.fanli.entity.bus.help.HelpInfo;

import com.yeshi.fanli.exception.HelpCenterException;

import com.yeshi.fanli.exception.config.HelpCenterException;



public interface HelpCenterService {

    


 fanli/src/main/java/com/yeshi/fanli/service/inter/help/HelpClassService.java

@@ -6,8 +6,8 @@
import org.springframework.web.multipart.MultipartFile;



import com.yeshi.fanli.entity.bus.help.HelpClass;

import com.yeshi.fanli.exception.HelpCenterException;

import com.yeshi.fanli.exception.HelpClassException;

import com.yeshi.fanli.exception.config.HelpCenterException;

import com.yeshi.fanli.exception.config.HelpClassException;



public interface HelpClassService {

    


 fanli/src/main/java/com/yeshi/fanli/service/inter/homemodule/FloatADService.java

@@ -6,8 +6,8 @@
import org.springframework.web.multipart.MultipartFile;



import com.yeshi.fanli.entity.bus.homemodule.FloatAD;

import com.yeshi.fanli.exception.FloatADException;

import com.yeshi.fanli.exception.banner.SwiperPictureException;

import com.yeshi.fanli.exception.homemodule.FloatADException;



public interface FloatADService {




 fanli/src/main/java/com/yeshi/fanli/service/inter/homemodule/SpecialPlaceService.java

@@ -3,7 +3,7 @@
import java.util.List;



import com.yeshi.fanli.entity.bus.homemodule.SpecialPlace;

import com.yeshi.fanli.exception.SpecialPlaceException;

import com.yeshi.fanli.exception.homemodule.SpecialPlaceException;



public interface SpecialPlaceService {




 fanli/src/main/java/com/yeshi/fanli/service/inter/hongbao/HongBaoV2Service.java

@@ -7,7 +7,7 @@
import com.yeshi.fanli.dto.HongBaoDTO;

import com.yeshi.fanli.entity.bus.user.HongBaoV2;

import com.yeshi.fanli.entity.order.CommonOrder;

import com.yeshi.fanli.exception.HongBaoException;

import com.yeshi.fanli.exception.order.HongBaoException;



public interface HongBaoV2Service {




 fanli/src/main/java/com/yeshi/fanli/service/inter/hongbao/ThreeSaleSerivce.java

@@ -4,7 +4,7 @@


import com.yeshi.fanli.entity.bus.user.ThreeSale;

import com.yeshi.fanli.entity.bus.user.UserInfo;

import com.yeshi.fanli.exception.ThreeSaleException;

import com.yeshi.fanli.exception.user.ThreeSaleException;



import net.sf.json.JSONObject;




 fanli/src/main/java/com/yeshi/fanli/service/inter/lable/BoutiqueAutoRuleService.java

@@ -16,7 +16,7 @@




import com.yeshi.fanli.entity.bus.lable.BoutiqueAutoRule;

import com.yeshi.fanli.exception.BoutiqueAutoRuleException;

import com.yeshi.fanli.exception.goods.quality.BoutiqueAutoRuleException;



public interface BoutiqueAutoRuleService {

    


 fanli/src/main/java/com/yeshi/fanli/service/inter/lable/LabelClassService.java

@@ -9,7 +9,7 @@
import com.yeshi.fanli.entity.bus.clazz.GoodsClass;

import com.yeshi.fanli.entity.bus.clazz.GoodsSubClass;

import com.yeshi.fanli.entity.bus.lable.LabelClass;

import com.yeshi.fanli.exception.LabelClassException;

import com.yeshi.fanli.exception.goods.quality.LabelClassException;



public interface LabelClassService {

    


 fanli/src/main/java/com/yeshi/fanli/service/inter/lable/LabelGoodsService.java

@@ -5,8 +5,8 @@
import com.yeshi.fanli.entity.bus.lable.LabelGoods;

import com.yeshi.fanli.entity.common.AdminUser;

import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;

import com.yeshi.fanli.exception.LabelClassException;

import com.yeshi.fanli.exception.LabelGoodsException;

import com.yeshi.fanli.exception.goods.quality.LabelClassException;

import com.yeshi.fanli.exception.goods.quality.LabelGoodsException;



public interface LabelGoodsService {




 fanli/src/main/java/com/yeshi/fanli/service/inter/lable/LabelService.java

@@ -10,7 +10,7 @@
import com.yeshi.fanli.entity.bus.lable.Label;

import com.yeshi.fanli.entity.bus.lable.LabelGoods;

import com.yeshi.fanli.entity.common.AdminUser;

import com.yeshi.fanli.exception.LabelException;

import com.yeshi.fanli.exception.goods.quality.LabelException;



public interface LabelService {

    


 fanli/src/main/java/com/yeshi/fanli/service/inter/lable/MergeClassService.java

@@ -5,7 +5,7 @@
import org.springframework.cache.annotation.Cacheable;



import com.yeshi.fanli.entity.bus.lable.MergeClass;

import com.yeshi.fanli.exception.MergeClassException;

import com.yeshi.fanli.exception.goods.MergeClassException;



public interface MergeClassService {

    


 fanli/src/main/java/com/yeshi/fanli/service/inter/lable/QualityFactoryService.java

@@ -8,7 +8,7 @@
import com.yeshi.fanli.entity.bus.lable.QualityFactory;

import com.yeshi.fanli.entity.common.AdminUser;

import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;

import com.yeshi.fanli.exception.QualityFactoryException;

import com.yeshi.fanli.exception.goods.quality.QualityFactoryException;

import com.yeshi.fanli.vo.quality.QualityFactoryVO;



public interface QualityFactoryService {


 fanli/src/main/java/com/yeshi/fanli/service/inter/lable/QualityFlashSaleService.java

@@ -4,7 +4,7 @@
import java.util.List;



import com.yeshi.fanli.entity.bus.lable.QualityFlashSale;

import com.yeshi.fanli.exception.QualityFlashSaleException;

import com.yeshi.fanli.exception.goods.quality.QualityFlashSaleException;



public interface QualityFlashSaleService {

    


 fanli/src/main/java/com/yeshi/fanli/service/inter/msg/MsgConfigService.java

@@ -1,7 +1,7 @@
package com.yeshi.fanli.service.inter.msg;



import com.yeshi.fanli.dto.msg.MsgCommonDTO;

import com.yeshi.fanli.exception.ConfigException;

import com.yeshi.fanli.exception.config.ConfigException;



public interface MsgConfigService {




 fanli/src/main/java/com/yeshi/fanli/service/inter/order/OrderProcessService.java

@@ -8,9 +8,9 @@
import com.yeshi.fanli.entity.pdd.PDDOrder;

import com.yeshi.fanli.entity.taobao.TaoBaoOrder;

import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanOrder;

import com.yeshi.fanli.exception.HongBaoException;

import com.yeshi.fanli.exception.OrderItemException;

import com.yeshi.fanli.exception.TaoBaoWeiQuanException;

import com.yeshi.fanli.exception.order.HongBaoException;

import com.yeshi.fanli.exception.order.OrderItemException;

import com.yeshi.fanli.exception.order.TaoBaoWeiQuanException;



/**

 * 订单处理服务


 fanli/src/main/java/com/yeshi/fanli/service/inter/push/BasePushService.java

@@ -2,7 +2,7 @@


import com.yeshi.fanli.entity.bus.user.AccountMessage;

import com.yeshi.fanli.entity.system.SystemZnx;

import com.yeshi.fanli.exception.PushException;

import com.yeshi.fanli.exception.push.PushException;



public interface BasePushService {

    /**


 fanli/src/main/java/com/yeshi/fanli/service/inter/push/HWPushService.java

@@ -2,7 +2,7 @@


import java.util.List;



import com.yeshi.fanli.exception.PushException;

import com.yeshi.fanli.exception.push.PushException;



/**

 * 华为推送服务


 fanli/src/main/java/com/yeshi/fanli/service/inter/push/IOSPushService.java

@@ -4,7 +4,7 @@


import com.yeshi.fanli.entity.push.DeviceTokenIOS;

import com.yeshi.fanli.entity.push.PushQueueRecord;

import com.yeshi.fanli.exception.PushException;

import com.yeshi.fanli.exception.push.PushException;



/**

 * IOS推送服务


 fanli/src/main/java/com/yeshi/fanli/service/inter/push/PushCouponService.java

@@ -3,8 +3,8 @@
import java.util.List;



import com.yeshi.fanli.entity.push.PushCoupon;

import com.yeshi.fanli.exception.PushException;

import com.yeshi.fanli.exception.push.PushCouponException;

import com.yeshi.fanli.exception.push.PushException;



public interface PushCouponService {




 fanli/src/main/java/com/yeshi/fanli/service/inter/push/PushGoodsService.java

@@ -4,7 +4,7 @@
import java.util.List;



import com.yeshi.fanli.entity.push.PushGoods;

import com.yeshi.fanli.exception.PushException;

import com.yeshi.fanli.exception.push.PushException;

import com.yeshi.fanli.exception.push.PushGoodsException;



public interface PushGoodsService {


 fanli/src/main/java/com/yeshi/fanli/service/inter/push/PushInfoService.java

@@ -3,8 +3,8 @@
import java.util.List;



import com.yeshi.fanli.entity.push.PushInfo;

import com.yeshi.fanli.exception.PushException;

import com.yeshi.fanli.exception.push.PushCouponException;

import com.yeshi.fanli.exception.push.PushException;

import com.yeshi.fanli.exception.push.PushInfoException;



public interface PushInfoService {


 fanli/src/main/java/com/yeshi/fanli/service/inter/push/PushService.java

@@ -2,7 +2,7 @@


import java.util.List;



import com.yeshi.fanli.exception.PushException;

import com.yeshi.fanli.exception.push.PushException;



public interface PushService {

    /**


 fanli/src/main/java/com/yeshi/fanli/service/inter/taobao/TaoBaoWeiQuanDrawBackService.java

@@ -1,7 +1,7 @@
package com.yeshi.fanli.service.inter.taobao;



import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanDrawBack;

import com.yeshi.fanli.exception.TaoBaoWeiQuanException;

import com.yeshi.fanli.exception.order.TaoBaoWeiQuanException;



public interface TaoBaoWeiQuanDrawBackService {




 fanli/src/main/java/com/yeshi/fanli/service/inter/user/BindingAccountService.java

@@ -4,9 +4,9 @@


import com.alipay.api.AlipayApiException;

import com.yeshi.fanli.entity.bus.user.BindingAccount;

import com.yeshi.fanli.exception.AlipayAccountException;

import com.yeshi.fanli.exception.AlipayTransferException;

import com.yeshi.fanli.exception.BindingAccountException;

import com.yeshi.fanli.exception.user.AlipayAccountException;

import com.yeshi.fanli.exception.user.AlipayTransferException;

import com.yeshi.fanli.exception.user.BindingAccountException;



public interface BindingAccountService {

    /**


 fanli/src/main/java/com/yeshi/fanli/service/inter/user/SMSService.java

@@ -2,7 +2,7 @@


import java.math.BigDecimal;



import com.yeshi.fanli.exception.SMSException;

import com.yeshi.fanli.exception.config.SMSException;



/**

 * 短信服务


 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserAccountService.java

@@ -5,7 +5,7 @@


import com.yeshi.fanli.entity.bus.user.LoginResult;

import com.yeshi.fanli.entity.bus.user.UserInfo;

import com.yeshi.fanli.exception.UserAccountException;

import com.yeshi.fanli.exception.user.UserAccountException;



/**

 * 登录服务


 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserRankingsService.java

@@ -7,7 +7,7 @@


import com.yeshi.fanli.dto.money.InviteGetMoney;

import com.yeshi.fanli.entity.bus.user.UserRankings;

import com.yeshi.fanli.exception.UserRankingsException;

import com.yeshi.fanli.exception.user.UserRankingsException;



public interface UserRankingsService {




 fanli/src/main/java/com/yeshi/fanli/util/AliyunSMSUtil.java

@@ -9,7 +9,7 @@
import com.aliyuncs.http.MethodType;

import com.aliyuncs.profile.DefaultProfile;

import com.aliyuncs.profile.IClientProfile;

import com.yeshi.fanli.exception.SMSException;

import com.yeshi.fanli.exception.config.SMSException;

import com.yeshi.fanli.log.LogHelper;



//腾讯短信发送


 fanli/src/main/java/com/yeshi/fanli/util/EmergencyUtil.java

@@ -3,7 +3,7 @@
import java.util.HashMap;

import java.util.Map;



import com.yeshi.fanli.exception.SMSException;

import com.yeshi.fanli.exception.config.SMSException;



/**

 * 紧急告警


 fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java

@@ -27,7 +27,7 @@
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;

import com.yeshi.fanli.entity.taobao.TaoBaoOrder;

import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanOrder;

import com.yeshi.fanli.exception.TaoBaoWeiQuanException;

import com.yeshi.fanli.exception.order.TaoBaoWeiQuanException;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.hongbao.HongBaoV2Service;

import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce;


 fanli/src/main/java/com/yeshi/fanli/util/TencentSMSUtil.java

@@ -7,7 +7,7 @@
import com.github.qcloudsms.SmsSingleSender;

import com.github.qcloudsms.SmsSingleSenderResult;

import com.github.qcloudsms.httpclient.HTTPException;

import com.yeshi.fanli.exception.SMSException;

import com.yeshi.fanli.exception.config.SMSException;



//腾讯短信发送

public class TencentSMSUtil {


 fanli/src/main/java/com/yeshi/fanli/util/push/HWPushUtil.java

@@ -21,7 +21,7 @@


import com.alibaba.fastjson.JSONObject;

import com.yeshi.fanli.entity.config.push.HWPushConfig;

import com.yeshi.fanli.exception.PushException;

import com.yeshi.fanli.exception.push.PushException;

import com.yeshi.fanli.service.inter.config.BusinessSystemService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.taobao.TaoBaoUtil;


 fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBao110Util.java

@@ -1,6 +1,6 @@
package com.yeshi.fanli.util.taobao;



import com.yeshi.fanli.exception.SMSException;

import com.yeshi.fanli.exception.config.SMSException;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.TencentSMSUtil;

import com.yeshi.fanli.util.email.MailSenderUtil;


 fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoOrderUtil.java

@@ -27,7 +27,7 @@
import com.yeshi.fanli.entity.taobao.TaoBaoOrder;

import com.yeshi.fanli.entity.taobao.TaoBaoUnionConfig;

import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanOrder;

import com.yeshi.fanli.exception.TaoBaoOrderException;

import com.yeshi.fanli.exception.order.TaoBaoOrderException;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.MoneyBigDecimalUtil;