修改事务回滚异常

admin

2019-12-19 79ea414897eba7feca498ae96474349a03bb7b1c

修改事务回滚异常

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

@@ -124,7 +124,7 @@
     * @param out

     */

    @RequestMapping(value = "query")

    public void query(String callback, Integer pageIndex, Integer pageSize, String key, Integer keyType, Integer rank,

    public void query(String callback, Integer pageIndex, Integer pageSize, String key, Integer keyType, Integer rank,Integer userType,

            Integer days, String startTime, String endTime, Integer orderMode, Integer type, PrintWriter out) {



        try {

@@ -174,14 +174,14 @@
            }



            List<UserInfoVO> userList = userInfoService.query((pageIndex - 1) * pageSize, pageSize, type, key, keyType,

                    userRank, days, startTime, endTime, orderField, orderMode);

                    userRank, days, startTime, endTime, orderField, orderMode,userType);



            if (userList == null || userList.size() == 0) {

                JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("暂无相关数据"));

                return;

            }



            long count = userInfoService.queryCount(type, key, keyType, userRank, days, startTime, endTime);

            long count = userInfoService.queryCount(type, key, keyType, userRank, days, startTime, endTime,userType);



            int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);

            PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);


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

@@ -129,11 +129,9 @@


    @Resource

    private IntegralGetCacheManager integralGetCacheManager;

	
	


    @Resource

    private BrandInfoService brandInfoService;

	


    /**

     * 粘贴板信息推荐

@@ -261,17 +259,17 @@
            if (tb == null)// 淘宝是空值

            {

                String jdId = JDUtil.getJDGoodsId(text);

				


                // 微信链接

                if (StringUtil.isNullOrEmpty(jdId)) {

                    jdId = JDUtil.getJDGoodsIdByWeiXin(text);

                }

				


                // 领券短连接

                if (StringUtil.isNullOrEmpty(jdId) && text.contains("u.jd.com")) {

                    jdId = JDUtil.getJDGoodsIdByUJD(text);

                }

				


                if (!StringUtil.isNullOrEmpty(jdId)) {

                    JDGoods goods = JDApiUtil.getGoodsDetail(Long.parseLong(jdId));

                    if (goods != null) {

@@ -367,8 +365,9 @@
            Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())

                    .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();

            data.put("type", type);

            data.put("goods", gson.toJson(GoodsDetailVOFactory.convertCommonGoods(commonGoods,

                    new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,hongBaoManageService.getVIPFanLiRate()))));

            data.put("goods",

                    gson.toJson(GoodsDetailVOFactory.convertCommonGoods(commonGoods, new ConfigParamsDTO(fanLiRate,

                            shareRate, Constant.MAX_REWARD_RATE, hongBaoManageService.getVIPFanLiRate()))));

            out.print(JsonUtil.loadTrueResult(data));

            return;

        }

@@ -491,8 +490,10 @@


                        JSONObject data = new JSONObject();

                        data.put("type", 3);

                        data.put("goods", gson.toJson(GoodsDetailVOFactory.convertTaoBao(goodsBrief,

                                new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,hongBaoManageService.getVIPFanLiRate()))));

                        data.put("goods",

                                gson.toJson(GoodsDetailVOFactory.convertTaoBao(goodsBrief,

                                        new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,

                                                hongBaoManageService.getVIPFanLiRate()))));

                        out.print(JsonUtil.loadTrueResult(data));

                        return true;

                    }

@@ -764,7 +765,8 @@
        List<GoodsDetailVO> list = new ArrayList<GoodsDetailVO>();

        BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

        BigDecimal shareRate = hongBaoManageService.getShareRate();

        ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,hongBaoManageService.getVIPFanLiRate());

        ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,

                hongBaoManageService.getVIPFanLiRate());



        for (TaoBaoGoodsBrief goods : taoBaoGoodsBriefs) {

            list.add(GoodsDetailVOFactory.convertTaoBao(goods, paramsDTO));

@@ -782,7 +784,11 @@
            String version = acceptData.getVersion();

            if (("ios".equalsIgnoreCase(platform) && VersionUtil.greaterThan_2_1(platform, version))

                    || ("android".equalsIgnoreCase(platform) && VersionUtil.greaterThan_2_0_2(platform, version))) {

                BrandInfoVO brandInfoVO = brandInfoService.listByAlikeName(key);

                BrandInfoVO brandInfoVO = null;

                try {

                    brandInfoVO = brandInfoService.listByAlikeName(key);

                } catch (Exception e) {

                }

                if (brandInfoVO != null)

                    data.put("shop", JsonUtil.getApiCommonGson().toJson(brandInfoVO));

            } else {

@@ -791,7 +797,8 @@
                        && listShop.get(0).getListGoodsVO().size() > 2) {

                    TaoBaoShopVO taoBaoShop = listShop.get(0);

                    if (("ios".equalsIgnoreCase(platform) && VersionUtil.greaterThan_2_0(platform, version))

                       || ("android".equalsIgnoreCase(platform) && VersionUtil.greaterThan_2_0_1(platform, version))) {

                            || ("android".equalsIgnoreCase(platform)

                                    && VersionUtil.greaterThan_2_0_1(platform, version))) {

                        BrandInfoVO brandInfoVO = new BrandInfoVO();

                        brandInfoVO.setId(taoBaoShop.getId());

                        brandInfoVO.setName(taoBaoShop.getShopName());

@@ -804,7 +811,7 @@
                }

            }

        }

		


        out.print(JsonUtil.loadTrueResult(data));

    }



@@ -966,7 +973,8 @@
                BigDecimal shareRate = hongBaoManageService.getShareRate();

                Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())

                        .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();

                ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,hongBaoManageService.getVIPFanLiRate());

                ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,

                        hongBaoManageService.getVIPFanLiRate());



                for (JDGoods goods : goodsList) {

                    GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertJDGoods(goods, paramsDTO);

@@ -1050,7 +1058,8 @@
            if (goodsList != null && goodsList.size() > 0) {

                BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

                BigDecimal shareRate = hongBaoManageService.getShareRate();

                ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,hongBaoManageService.getVIPFanLiRate());

                ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,

                        hongBaoManageService.getVIPFanLiRate());



                for (PDDGoodsDetail goods : goodsList) {

                    GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertPDDGoods(goods, paramsDTO);


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

@@ -383,7 +383,7 @@
                }

            }



            out.print(JsonUtil.loadTrueResult(JsonUtil.getSimpleGson().toJson(shareInfo)));

            out.print(JsonUtil.loadTrueResult(JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder()).create().toJson(shareInfo)));



            final TaoBaoLink taobaoLink = taoBaoLink;

            // 异步操作

@@ -699,7 +699,7 @@
                e1.printStackTrace();

            }

        }

        out.print(JsonUtil.loadTrueResult(JsonUtil.getSimpleGson().toJson(shareInfo)));

        out.print(JsonUtil.loadTrueResult(JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder()).create().toJson(shareInfo)));



        // 异步操作

        final JDGoods goods = jdGoods;

@@ -824,7 +824,7 @@
                e1.printStackTrace();

            }

        }

        out.print(JsonUtil.loadTrueResult(JsonUtil.getSimpleGson().toJson(shareInfo)));

        out.print(JsonUtil.loadTrueResult(JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder()).create().toJson(shareInfo)));



        // 异步操作

        com.yeshi.fanli.util.ThreadUtil.run(new Runnable() {


 fanli/src/main/java/com/yeshi/fanli/dao/BaseDao.java

File was deleted

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/UserInfoMapper.java

@@ -94,11 +94,11 @@
    List<UserInfoVO> query(@Param("start") long start, @Param("count") int count, @Param("userState") Integer userState,

            @Param("key") String key, @Param("keyType") Integer keyType, @Param("userRank") String userRank,

            @Param("days") Integer days, @Param("startTime") String startTime, @Param("endTime") String endTime,

            @Param("orderField") Integer orderField, @Param("orderMode") Integer orderMode);

            @Param("orderField") Integer orderField, @Param("orderMode") Integer orderMode,@Param("userType") Integer userType);



    long queryCount(@Param("userState") Integer userState, @Param("key") String key, @Param("keyType") Integer keyType,

            @Param("userRank") String userRank, @Param("days") Integer days, @Param("startTime") String startTime,

            @Param("endTime") String endTime);

            @Param("endTime") String endTime,@Param("userType") Integer userType);



    /**

     * 统计当前查询结果总金额


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

@@ -278,8 +278,8 @@
        where wx_union_id=#{unionId} AND state = 0

        LIMIT 1

    </select>

	
	




    <select id="getEffectiveUserInfoByWXOpenId" resultMap="BaseResultMap">

        select

        <include refid="Base_Column_List" />

@@ -287,7 +287,7 @@
        where wx_open_id=#{wxOpenId} AND state = 0

        LIMIT 1

    </select>

	


    <select id="getMaxUid" resultType="java.lang.Long">select max(id) from

        yeshi_ec_user

    </select>

@@ -357,6 +357,11 @@
        <if test="userState == 2">

            AND u.`state` =2   <!-- 封禁用户 -->

        </if>



        <if test="userType!=null">

            AND u.type=#{userType}

        </if>



        <if test="startTime != null and startTime !='' ">

            AND DATE_FORMAT(FROM_UNIXTIME(u.createtime/1000),'%Y%m%d')<![CDATA[>=]]>

            DATE_FORMAT(#{startTime},'%Y%m%d')

@@ -427,6 +432,9 @@
        </if>

        <if test="userState == 2">

            AND u.`state` =2   <!-- 封禁用户 -->

        </if>

        <if test="userType!=null">

            AND u.type=#{userType}

        </if>

        <if test="startTime != null and startTime !='' ">

            AND DATE_FORMAT(FROM_UNIXTIME(u.createtime/1000),'%Y%m%d')<![CDATA[>=]]>

@@ -690,9 +698,12 @@
    </select>



    <select id="getUserInfoByInviteCode" resultMap="BaseResultMap">

        SELECT * FROM yeshi_ec_user u

        LEFT JOIN yeshi_ec_user_info_extra uf ON uf.`uie_uid` =    u.`id`

        WHERE uf.`uie_invite_code_vip` = #{inviteCode} OR uf.`uie_invite_code` = #{inviteCode}

        SELECT * FROM

        yeshi_ec_user u

        LEFT JOIN yeshi_ec_user_info_extra uf ON uf.`uie_uid` =

        u.`id`

        WHERE uf.`uie_invite_code_vip` = #{inviteCode} OR

        uf.`uie_invite_code` = #{inviteCode}

        LIMIT 1

    </select>



@@ -721,17 +732,19 @@
        AND u.`wx_open_id` NOT LIKE 'o_b9%'

        LIMIT #{start},#{count}

    </select>

	


    <select id="getAutoExtractUserTo1212" resultMap="BaseResultMap">

        SELECT u.* FROM (SELECT v2.`hb_uid` FROM `yeshi_ec_hongbao_v2` v2

        WHERE <![CDATA[v2.`hb_create_time` > '2019-01-01' AND v2.`hb_create_time` < '2019-06-18']]>

        GROUP BY hb_uid)h

        LEFT JOIN `yeshi_ec_user_info_extra` t ON t.`uie_uid` = h.hb_uid

        LEFT JOIN  `yeshi_ec_user` u ON u.`id` = t.`uie_uid`

        WHERE <![CDATA[ t.uie_active_time < '2019-06-19']]> AND (t.`uie_mark` IS NULL OR t.`uie_mark` = '') 
            AND u.`state` = 0 AND u.`my_hongBao`<![CDATA[> 1]]>

            AND u.`wx_open_id` IS NOT NULL AND <![CDATA[LENGTH(TRIM(u.`wx_open_id`)) > 0]]>

            AND u.`wx_open_id` NOT LIKE 'o_b9%'

        LEFT JOIN `yeshi_ec_user_info_extra` t ON t.`uie_uid`

        = h.hb_uid

        LEFT JOIN `yeshi_ec_user` u ON u.`id` = t.`uie_uid`

        WHERE <![CDATA[ t.uie_active_time < '2019-06-19']]>

        AND (t.`uie_mark` IS NULL OR t.`uie_mark` = '')

        AND u.`state` = 0 AND u.`my_hongBao`<![CDATA[> 1]]>

        AND u.`wx_open_id` IS NOT NULL AND <![CDATA[LENGTH(TRIM(u.`wx_open_id`)) > 0]]>

        AND u.`wx_open_id` NOT LIKE 'o_b9%'

        LIMIT #{start},#{count}

    </select>




 fanli/src/main/java/com/yeshi/fanli/service/impl/activity/ActivityServiceImpl.java

@@ -320,7 +320,7 @@
        return activityUserMapper.selectList();

    }



    @Transactional

    @Transactional(rollbackFor=Exception.class)

    @Override

    public RecommendActivity addShareGoodsRecommendActivity(Long activityUid, List<Long> goodsList,

            RecommendActivity activity) throws ActivityException , Exception{

@@ -397,7 +397,7 @@
        return activity;

    }



    @Transactional

    @Transactional(rollbackFor=Exception.class)

    @Override

    public RecommendActivity addInviteImgRecommendActivity(Long activityUid, RecommendActivity activity, String url,

             int px, int py, int erCodeSize) throws ActivityException, Exception {

@@ -446,7 +446,7 @@
        return activity;

    }



    @Transactional

    @Transactional(rollbackFor=Exception.class)

    @Override

    public RecommendActivity addTextAndImgRecommendActivity(Long activityUid,  List<String> imgList,

            RecommendActivity activity) throws ActivityException, Exception {

@@ -509,7 +509,7 @@
        return recommendActivityMapper.selectByPrimaryKey(id);

    }



    @Transactional

    @Transactional(rollbackFor=Exception.class)

    @Override

    public RecommendActivity updateShareGoodsRecommendActivity(Long activityUid,

            List<Long> goodsList, RecommendActivity activity) throws ActivityException , Exception{

@@ -592,7 +592,7 @@
        return activity;

    }



    @Transactional

    @Transactional(rollbackFor=Exception.class)

    @Override

    public RecommendActivity updateInviteImgRecommendActivity(Long activityUid, RecommendActivity activity, String url,

            int px, int py, int erCodeSize) throws ActivityException , Exception{

@@ -659,7 +659,7 @@
        return activity;

    }



    @Transactional

    @Transactional(rollbackFor=Exception.class)

    @Override

    public RecommendActivity updateTextAndImgRecommendActivity(Long activityUid, List<String> imgList, 

            RecommendActivity activity) throws ActivityException , Exception{

@@ -755,7 +755,7 @@
        return recommendActivityMapper.getRecommendActivityEffectiveCount();

    }



    @Transactional

    @Transactional(rollbackFor=Exception.class)

    @Override

    public void upgradeShareGoodsRecommendActivity(Long id) throws ActivityException {

        // 获取商品


 fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandClassShopServiceImpl.java

@@ -77,7 +77,7 @@
    }



    @Override

    @Transactional

    @Transactional(rollbackFor=Exception.class)

    public String saveShopInfo(Long cid, List<Long> list) throws BrandClassShopException {

        if (list == null || list.size() == 0) {

            throw new BrandClassShopException(1, "请选择店铺");

@@ -134,7 +134,7 @@
    }



    @Override

    @Transactional

    @Transactional(rollbackFor=Exception.class)

    public void changeShopInfo(MultipartFile file, Long id, Long cid, String shopName, Integer state, Integer top,

            String key) throws BrandClassShopException {




 fanli/src/main/java/com/yeshi/fanli/service/impl/config/SystemClientParamsServiceImpl.java

@@ -49,7 +49,7 @@
    }

    

    

    @Transactional

    @Transactional(rollbackFor=Exception.class)

    @Override

    public void saveAdd(SystemClientParams scp, List<Long> listId) throws Exception {

        


 fanli/src/main/java/com/yeshi/fanli/service/impl/elme/ElmeHongBaoOrderMapServiceImpl.java

@@ -24,7 +24,7 @@
    @Resource

    private ElmeHongBaoOrderMapMapper elmeHongBaoOrderMapMapper;



    @Transactional

    @Transactional(rollbackFor=Exception.class)

    @Override

    public void addHongBaoOrderMap(ElmeHongBaoOrderMap map) throws ElmeHongBaoOrderMapException {

        if (map.getElmeOrder() == null || map.getElmeOrder().getId() == null || map.getHongBao() == null


 fanli/src/main/java/com/yeshi/fanli/service/impl/elme/ElmeOrderProcessServiceImpl.java

@@ -52,7 +52,7 @@
    @Resource

    private UserExtraTaoBaoInfoService userExtraTaoBaoInfoService;



    @Transactional

    @Transactional(rollbackFor=Exception.class)

    @Override

    public void processOrder(ElmeOrder elmeOrder) throws ElmeOrderException {

        try {


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

@@ -35,7 +35,7 @@
    @Resource

    private CommonGoodsService commonGoodsService;



    @Transactional

    @Transactional(rollbackFor=Exception.class)

    @Override

    public void addCollection(Long uid, TaoBaoGoodsBrief goods) throws CollectionGoodsException {

        if (uid == null || uid == 0)

@@ -66,7 +66,7 @@
    }



    

    @Transactional

    @Transactional(rollbackFor=Exception.class)

    @Override

    public void addJDCollection(Long uid, JDGoods jdGoods) throws CollectionGoodsException {

        if (uid == null || uid == 0)

@@ -97,7 +97,7 @@
    }

    

    

    @Transactional

    @Transactional(rollbackFor=Exception.class)

    @Override

    public void addPDDCollection(Long uid, PDDGoodsDetail goods) throws CollectionGoodsException {

        if (uid == null || uid == 0)

@@ -149,7 +149,7 @@
        collectionGoodsV2Mapper.insertSelective(goods);

    }



    @Transactional

    @Transactional(rollbackFor=Exception.class)

    @Override

    public void cancelCollection(Long uid, Long id) throws CollectionGoodsException {

        if (uid == null || uid == 0)


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

@@ -139,7 +139,7 @@
    }



    @Override

    @Transactional

    @Transactional(rollbackFor=Exception.class)

    public void saveObject(MultipartFile file, GoodsClass record) throws GoodsClassException, Exception {



        String name = record.getName();

@@ -375,7 +375,7 @@
    }



    @Override

    @Transactional

    @Transactional(rollbackFor=Exception.class)

    public void updateOrder(Long id, Integer moveType) throws GoodsClassException {



        if (id == null || moveType == null || (!moveType.equals(1) && !moveType.equals(-1))) {


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

@@ -70,7 +70,7 @@
    }



    @Override

    @Transactional

    @Transactional(rollbackFor=Exception.class)

    public void deleteByRootId(Long id) throws Exception {



        List<GoodsSubClass> subClassList = goodsSubClassMapper.queryByRootId(id, null, null);

@@ -82,7 +82,7 @@
    }



    @Override

    @Transactional

    @Transactional(rollbackFor=Exception.class)

    public void deleteByPrimaryKeyBatch(List<String> recordIds) throws Exception {

        if (recordIds != null && recordIds.size() > 0) {

            for (String recordId : recordIds) {

@@ -92,7 +92,7 @@
    }



    @Override

    @Transactional

    @Transactional(rollbackFor=Exception.class)

    public void deleteSub(Long recordId) throws Exception {

        GoodsSubClass goodsSubClass = goodsSubClassMapper.selectByPrimaryKey(recordId);




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

@@ -30,7 +30,7 @@
    @Resource

    private CommonGoodsService commonGoodsService;



    @Transactional

    @Transactional(rollbackFor=Exception.class)

    @Override

    public void addRecommend(Long uid, String device, String recommendDesc, List<CommonGoods> goodsList)

            throws RecommendUserGoodsException {


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

@@ -110,7 +110,7 @@
        return null;

    }



    @Transactional

    @Transactional(rollbackFor=Exception.class)

    @Override

    public void saveCouponTemplate(Long uid, String template) throws ShareGoodsTextTemplateException {

        // 格式验证

@@ -132,7 +132,7 @@
        }

    }



    @Transactional

    @Transactional(rollbackFor=Exception.class)

    @Override

    public void saveCouponTemplateJD(Long uid, String template) throws ShareGoodsTextTemplateException {

        // 格式验证

@@ -154,7 +154,7 @@
        }

    }



    @Transactional

    @Transactional(rollbackFor=Exception.class)

    @Override

    public void saveCouponTemplatePDD(Long uid, String template) throws ShareGoodsTextTemplateException {

        // 格式验证

@@ -176,7 +176,7 @@
        }

    }



    @Transactional

    @Transactional(rollbackFor=Exception.class)

    @Override

    public void saveTaoLiJinTemplate(Long uid, String template) throws ShareGoodsTextTemplateException {




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

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

    

    @Override

    @Transactional

    @Transactional(rollbackFor=Exception.class)

    public void deleteInfoBatchById(List<String> idList) throws HelpCenterException {

        if (idList != null) {

            for (String id : idList) {


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

@@ -165,7 +165,7 @@
    }

    

    @Override

    @Transactional

    @Transactional(rollbackFor=Exception.class)

    public void updateOrder(Long id, Integer moveType) throws FloatADException {

        

        if (id == null || moveType == null || (!moveType.equals(1) && !moveType.equals(-1))) {

@@ -198,7 +198,7 @@
    }

    

    @Override

    @Transactional

    @Transactional(rollbackFor=Exception.class)

    public int deleteByPrimaryKeyList(List<Long> list) throws Exception{

        

        List<FloatAD> listSwiper = floatADMapper.ListByPrimaryKey(list);


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

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


    

    @Override

    @Transactional

    @Transactional(rollbackFor=Exception.class)

    public int deleteBatchByPrimaryKey(List<Long> list) throws Exception{

        specialService.deleteBatchByCardID(list);

        return specialCardMapper.deleteBatchByPrimaryKey(list);


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

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



    @Override

    @Transactional

    @Transactional(rollbackFor=Exception.class)

    public int deleteByPrimaryKeyList(List<Long> list) throws Exception{

        return specialPlaceMapper.deleteByPrimaryKeyList(list);

    }


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

@@ -285,7 +285,7 @@
    }



    @Override

    @Transactional

    @Transactional(rollbackFor=Exception.class)

    public void updateOrder(Long id, Integer moveType, Integer sex) throws SpecialException {



        if (id == null || moveType == null || (!moveType.equals(1) && !moveType.equals(-1)) || sex == null) {


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

@@ -68,7 +68,7 @@
    }



    @Override

    @Transactional

    @Transactional(rollbackFor=Exception.class)

    public int deleteBatchByPrimaryKey(List<Long> list) throws Exception {

        

        List<Long> listPicID = new ArrayList<Long>();


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

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


    @Cacheable(value = "jdSpecialCache", key = "'specialSearch-'+#page+'-'+#cid")

    @Override

    @Transactional

    @Transactional(rollbackFor=Exception.class)

    public List<JDGoods> specialSearch(Integer page, Long cid) throws JDGoodsException {

        if (cid == null) {

            throw new JDGoodsException(1, "分类id为空");


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

@@ -47,13 +47,13 @@
    }



    @Override

    @Transactional

    @Transactional(rollbackFor=Exception.class)

    public void deleteByPrimaryKey(Long id) throws BoutiqueAutoRuleException {

        boutiqueAutoRuleMapper.deleteByPrimaryKey(id);

    }



    @Override

    @Transactional

    @Transactional(rollbackFor=Exception.class)

    public void deleteBatchByPrimaryKey(List<Long> ids) throws BoutiqueAutoRuleException {

        for (Long id : ids) {

            boutiqueAutoRuleMapper.deleteByPrimaryKey(id);


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

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

    

    @Override

    @Transactional

    @Transactional(rollbackFor=Exception.class)

    public void addBatchClass(GoodsClass goodsClass,List<Long> labIdList) throws Exception {

        

        long recordId = goodsClass.getId();

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

    

    @Override

    @Transactional

    @Transactional(rollbackFor=Exception.class)

    public void addBatchSubClass(GoodsSubClass goodsSubClass,List<Long> labIdList) throws Exception {

        

        long recordId = goodsSubClass.getId();


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

@@ -53,14 +53,14 @@
    }

    

    @Override

    @Transactional

    @Transactional(rollbackFor=Exception.class)

    public int deleteBatchById(long[] ids) throws LabelGoodsException{

        return labelGoodsMapper.deleteBatchByPrimaryKey(ids);

    }

    



    @Override

    @Transactional

    @Transactional(rollbackFor=Exception.class)

    public void deleteByGoodsId(List<String> ids) throws LabelGoodsException {

        

        if (ids != null && ids.size() > 0) {

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

    

    @Override

    @Transactional

    @Transactional(rollbackFor=Exception.class)

    public void addBatchByLabId(TaoBaoGoodsBrief taoBaoGoodsBrief, List<String> labIdList, AdminUser admin) throws Exception {

        

        List<LabelGoods> addList  = new ArrayList<LabelGoods>();

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

    

    @Override

    @Transactional

    @Transactional(rollbackFor=Exception.class)

    public void batchGoodsAddLables(List<Long> goodsIdList, List<Long> labIdList, AdminUser admin) throws Exception {

        

        /* 商品id 为空  不处理   */ 

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



    @Override

    @Transactional

    @Transactional(rollbackFor=Exception.class)

    public void singleGoodsAddLables(Long goodsId, List<Long> labIdList, AdminUser admin) throws Exception {

        

        /* 商品id 为空  不处理   */ 


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

@@ -49,7 +49,7 @@
    }



    @Override

    @Transactional

    @Transactional(rollbackFor=Exception.class)

    public void insertList(List<Label>  records,AdminUser admin) throws LabelException{

        if (records != null && records.size() > 0) {

            for (Label label : records) {

@@ -96,7 +96,7 @@
    }

    

    @Override

    @Transactional

    @Transactional(rollbackFor=Exception.class)

    public void updateList(List<Label>  records) throws LabelException{

        if (records != null && records.size() > 0) {

            for (Label label : records) {

@@ -125,13 +125,13 @@


    

    @Override

    @Transactional

    @Transactional(rollbackFor=Exception.class)

    public int deleteBatchById(long[] ids) throws LabelException{

        return labelMapper.deleteBatchByPrimaryKey(ids);

    }



    @Override

    @Transactional

    @Transactional(rollbackFor=Exception.class)

    public void deleteBatchByPrimaryKey(List<Long> ids) throws LabelException {

        for (Long id : ids) {

            Label label = labelMapper.selectByPrimaryKey(id);


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

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


    

    @Override

    @Transactional

    @Transactional(rollbackFor=Exception.class)

    public void deleteByGoodsId(List<String> ids) throws QualityFactoryException {



        if (ids != null && ids.size() > 0) {

@@ -151,7 +151,7 @@
    }



    @Override

    @Transactional

    @Transactional(rollbackFor=Exception.class)

    public void addBatchTaoBaoGoods(List<TaoBaoGoodsBrief> listTaoBaoGoods, String lableNames, AdminUser admin)

            throws Exception {



@@ -277,7 +277,7 @@
    }



    @Override

    @Transactional

    @Transactional(rollbackFor=Exception.class)

    public void setWeightBatch(List<Long> idList, AdminUser admin, Integer weight, Integer weightSmall,

            Integer weightLarge) throws Exception {




 fanli/src/main/java/com/yeshi/fanli/service/impl/money/InviteOrderSubsidyDebtServiceImpl.java

@@ -25,7 +25,7 @@
    @Resource

    private InviteOrderSubsidyDebtRepayHistoryMapper inviteOrderSubsidyDebtRepayHistoryMapper;



    @Transactional

    @Transactional(rollbackFor=Exception.class)

    @Override

    public void addDebt(InviteOrderSubsidyDebt debt) throws InviteOrderSubsidyDebtException {

        if (debt == null || debt.getOriginMoney() == null || debt.getOriginMoney() == null || debt.getUid() == null) {

@@ -37,7 +37,7 @@
        inviteOrderSubsidyDebtMapper.insertSelective(debt);

    }



    @Transactional

    @Transactional(rollbackFor=Exception.class)

    @Override

    public void repayDebt(Long debtId, BigDecimal money) throws InviteOrderSubsidyDebtException {

        InviteOrderSubsidyDebt debt = inviteOrderSubsidyDebtMapper.selectByPrimaryKeyForUpdate(debtId);

@@ -62,7 +62,7 @@
        inviteOrderSubsidyDebtRepayHistoryMapper.insertSelective(record);

    }



    @Transactional

    @Transactional(rollbackFor=Exception.class)

    @Override

    public BigDecimal repayDebtByUid(Long uid, BigDecimal money) throws InviteOrderSubsidyDebtException {

        // 还钱


 fanli/src/main/java/com/yeshi/fanli/service/impl/money/UserMoneyDebtServiceImpl.java

@@ -94,7 +94,7 @@
        return userMoneyDebtMapper.selectByTypeAndSourceId(type, sourceId);

    }



    @Transactional

    @Transactional(rollbackFor=Exception.class)

    @Override

    public void repayDebt(UserMoneyDebt debt, BigDecimal money) throws UserMoneyDebtException {

        if (debt == null || debt.getId() == null)

@@ -207,7 +207,7 @@
        }

    }



    @Transactional

    @Transactional(rollbackFor=Exception.class)

    @Override

    public void repayDebt(Long uid) {

        // 查询是否有欠债


 fanli/src/main/java/com/yeshi/fanli/service/impl/money/extract/BindingAccountServiceImpl.java

@@ -117,7 +117,7 @@
        return bindingAccountMapper.deleteByPrimaryKey(id);

    }



    @Transactional

    @Transactional(rollbackFor=Exception.class)

    @Override

    public void validAlipayAccount(Long uid, String account, String name)

            throws AlipayTransferException, AlipayApiException, AlipayAccountException {

@@ -225,7 +225,7 @@
        }

    }



    @Transactional

    @Transactional(rollbackFor=Exception.class)

    @Override

    public BindingAccount changeAlipayBindingWithVerify(Long uid, String name, String account)

            throws AlipayTransferException, AlipayApiException, AlipayAccountException {


 fanli/src/main/java/com/yeshi/fanli/service/impl/money/extract/ExtractServiceImpl.java

@@ -188,7 +188,7 @@
        return null;

    }



    @Transactional

    @Transactional(rollbackFor=Exception.class)

    public synchronized void rejectExtract(long id, String reason, AdminUser admin)

            throws ObjectStateException, NotExistObjectException {

        Extract find = extractMapper.selectByPrimaryKey(id);

@@ -541,7 +541,7 @@
        return extractMapper.selectByPrimaryKey(id);

    }



    @Transactional

    @Transactional(rollbackFor=Exception.class)

    @Override

    public void checkExtract(Long uid) throws ExtractException {

        BigDecimal compensateMoney = extractMapper.computeCompensateByUid(uid);


 fanli/src/main/java/com/yeshi/fanli/service/impl/money/tb/TaoBaoWeiQuanDrawBackServiceImpl.java

@@ -96,7 +96,7 @@
                taoBaoWeiQuanDrawBack.getUser().getId());

    }



    @Transactional

    @Transactional(rollbackFor=Exception.class)

    private void addDebt(Long uid, Long hbId, BigDecimal money) throws UserMoneyDebtException {

        UserMoneyDebt debt = new UserMoneyDebt();

        debt.setBeiZhu(null);

@@ -124,7 +124,7 @@
        return money;

    }



    @Transactional

    @Transactional(rollbackFor=Exception.class)

    @Override

    public void doWeiQuanFanli(String orderId) throws TaoBaoWeiQuanException {

        if (StringUtil.isNullOrEmpty(orderId))

@@ -305,7 +305,7 @@
        return mainHongBaoList;

    }



    @Transactional

    @Transactional(rollbackFor=Exception.class)

    @Override

    public void doWeiQuanShare(String orderId) throws TaoBaoWeiQuanException {

        if (StringUtil.isNullOrEmpty(orderId))

@@ -444,7 +444,7 @@
        }

    }



    @Transactional

    @Transactional(rollbackFor=Exception.class)

    @Override

    public void doWeiQuanInvite(String orderId) throws TaoBaoWeiQuanException {

        if (StringUtil.isNullOrEmpty(orderId))


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

@@ -35,7 +35,7 @@
    @Resource

    private SystemZnxService systemZnxService;



    @Transactional

    @Transactional(rollbackFor=Exception.class)

    @Override

    public void addUserSystemMsg(Long uid, UserSystemMsgTypeEnum type, String title, String content, int timeTag,

            SystemZnx sz) throws UserSystemMsgException {


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

@@ -872,7 +872,7 @@
        return commonOrderMapper.listBySourceTypeAndOrderNo(sourceType, orderId);

    }



    @Transactional

    @Transactional(rollbackFor=Exception.class)

    @Override

    public List<CommonOrderAddResultDTO> addTaoBaoOrder(List<TaoBaoOrder> taoBaoOrders, Long uid)

            throws CommonOrderException {

@@ -934,7 +934,7 @@
        return commonOrderList;

    }



    @Transactional

    @Transactional(rollbackFor=Exception.class)

    @Override

    public List<CommonOrderAddResultDTO> addPDDOrder(List<PDDOrder> pddOrderList, Long uid)

            throws CommonOrderException {

@@ -984,7 +984,7 @@
        return commonOrderList;

    }



    @Transactional

    @Transactional(rollbackFor=Exception.class)

    @Override

    public List<CommonOrderAddResultDTO> addJDOrder(JDOrder jdOrder, Long uid) throws CommonOrderException {

        List<CommonOrderAddResultDTO> commonOrderList = new ArrayList<>();

@@ -1054,7 +1054,7 @@
     * 

     * @param commonOrder

     */

    @Transactional

    @Transactional(rollbackFor=Exception.class)

    private CommonOrderAddResultDTO addCommonOrder(CommonOrder commonOrder) throws CommonOrderException {

        // 判断商品是否存在

        if (commonOrder == null)


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

@@ -146,7 +146,7 @@
        return hongBaoV2Mapper.selectByPrimaryKey(id);

    }



    @Transactional

    @Transactional(rollbackFor=Exception.class)

    @Override

    public int addHongBao(List<CommonOrder> commonOrderList, int type) throws HongBaoException, UserAccountException {

        Set<Integer> stateSet = new HashSet<>();// 订单状态Set

@@ -276,7 +276,7 @@
        return CommonOrder.STATE_SX;

    }



    @Transactional

    @Transactional(rollbackFor=Exception.class)

    private boolean updateHongBao(HongBaoOrder hongBaoOrder, CommonOrder commonOrder, int type,

            Map<Integer, HongBaoOrder> notificationMap) throws HongBaoException, UserAccountException {

        System.out.println(commonOrder.getOrderNo());

@@ -663,7 +663,7 @@
        return true;

    }



    @Transactional

    @Transactional(rollbackFor=Exception.class)

    private void saveHongBao(CommonOrder commonOrder, int type, Map<Integer, HongBaoOrder> notificationMap)

            throws HongBaoException, UserAccountException {

        if (type == HongBaoV2.TYPE_ZIGOU) {// 获取自购的返利比例


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

@@ -65,7 +65,7 @@
        return inviteOrderSubsidyMapper.getByOrderNoAndTypeForUpdate(uid, orderNo, type);

    }



    @Transactional

    @Transactional(rollbackFor=Exception.class)

    private void addOrderSubsidy(InviteOrderSubsidy orderSubsidy) throws InviteOrderSubsidyException {

        if (orderSubsidy.getMoney() == null || StringUtil.isNullOrEmpty(orderSubsidy.getOrderNo())

                || orderSubsidy.getSourceType() == null || orderSubsidy.getUid() == null)

@@ -93,7 +93,7 @@
        }

    }



    @Transactional

    @Transactional(rollbackFor=Exception.class)

    @Override

    public void addOrUpdateByOrder(String orderId, int sourceType) throws InviteOrderSubsidyException {

        List<HongBaoOrder> list = hongBaoOrderService.listByOrderIdAndSourceType(orderId, sourceType);


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

@@ -114,7 +114,7 @@
    @Resource

    private HongBaoV2SettleTempService hongBaoV2SettleTempService;



    @Transactional

    @Transactional(rollbackFor=Exception.class)

    @Override

    public void inviteSettleTB(Long uid) throws OrderMoneySettleException {

        // 查询UID的一二级邀请赚

@@ -179,7 +179,7 @@
        System.out.println(new Gson().toJson(mqMsg));

    }



    @Transactional

    @Transactional(rollbackFor=Exception.class)

    @Override

    public void inviteSettleJD(Long uid) throws OrderMoneySettleException {

        // 查询UID的一二级邀请赚

@@ -238,7 +238,7 @@
        }

    }



    @Transactional

    @Transactional(rollbackFor=Exception.class)

    @Override

    public void inviteSettlePDD(Long uid) throws OrderMoneySettleException {

        // 查询UID的一二级邀请赚

@@ -297,7 +297,7 @@
        }

    }



    @Transactional

    @Transactional(rollbackFor=Exception.class)

    @Override

    public void shareSettleTB(Long uid) throws OrderMoneySettleException {

        /**

@@ -342,7 +342,7 @@
        }

    }



    @Transactional

    @Transactional(rollbackFor=Exception.class)

    @Override

    public void shareSettleJD(Long uid) throws OrderMoneySettleException {

        /**

@@ -383,7 +383,7 @@
        }

    }



    @Transactional

    @Transactional(rollbackFor=Exception.class)

    @Override

    public void shareSettlePDD(Long uid) throws OrderMoneySettleException {

        /**

@@ -424,7 +424,7 @@
        }

    }



    @Transactional

    @Transactional(rollbackFor=Exception.class)

    @Override

    public void ziGouSettle(String orderId, int sourceType, String taskKey) throws OrderMoneySettleException {

        // 查询同一订单号的红包

@@ -956,7 +956,7 @@
     * @param orderId

     * @param sourceType

     */

    @Transactional

    @Transactional(rollbackFor=Exception.class)

    @Override

    public void inviteSubsidySettle(Long uid, String taskKey) throws OrderMoneySettleException {

        // 查询key


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

@@ -417,7 +417,7 @@
    private HongBaoOrderMapper hongBaoOrderMapper;



    @Override

    @Transactional

    @Transactional(rollbackFor=Exception.class)

    public void fanli(HongBaoV2 hb1) throws TaoBaoWeiQuanException {

        // 查询最新的红包数据

        hb1 = hongBaoV2Mapper.selectByPrimaryKeyForUpdate(hb1.getId());


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

@@ -147,7 +147,7 @@
    @Resource

    private ExtractCheckCompensateMapper extractCheckCompensateMapper;



    @Transactional

    @Transactional(rollbackFor=Exception.class)

    @Override

    public void repairOrder(String orderId) throws Exception {

        // 比较CommonOrder与TaoBaoOrder的预估收益

@@ -391,7 +391,7 @@
    }



    // 修改订单信息

    @Transactional

    @Transactional(rollbackFor=Exception.class)

    private void updateOrderInfo(TaoBaoOrder taoBaoOrder, Long commonOrderId) throws Exception {

        HongBaoOrder hongBaoOrder = hongBaoOrderService.selectDetailByCommonOrderId(commonOrderId);

        CommonOrder newCommonOrder = TaoBaoOrderUtil.convert(taoBaoOrder);

@@ -598,7 +598,7 @@
        }

    }



    @Transactional

    @Transactional(rollbackFor=Exception.class)

    public void addOrder(CommonOrder commonOrder, int type, Long firstUid, Long secondUid) throws Exception {

        // 增加commonOrder

        commonOrder.setCreateTime(commonOrder.getThirdCreateTime());

@@ -960,7 +960,7 @@
        return orderInfoMap.get(orderId);

    }



    @Transactional

    @Transactional(rollbackFor=Exception.class)

    @Override

    public void repireFirstAndSecondLevel(String orderId) throws Exception {

        repireFirstShare(orderId);


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

@@ -125,6 +125,10 @@
            record.setState(0);

            record.setTradeId(order.getOrderItemId());

            record.setUid(hongBaoOrder.getHongBaoV2().getUserInfo().getId());



            if (record.getMoney().compareTo(hongBaoOrder.getHongBaoV2().getMoney()) > 0)

                record.setMoney(hongBaoOrder.getHongBaoV2().getMoney());



            userOrderWeiQuanRecordMapper.insertSelective(record);

        }

        List<HongBaoV2> children = hongBaoV2Service.listChildrenById(mainHongBao.getId());

@@ -139,6 +143,10 @@
                record.setState(0);

                record.setTradeId(order.getOrderItemId());

                record.setUid(v2.getUserInfo().getId());



                if (record.getMoney().compareTo(v2.getMoney()) > 0)

                    record.setMoney(v2.getMoney());



                userOrderWeiQuanRecordMapper.insertSelective(record);

            }

        }


 fanli/src/main/java/com/yeshi/fanli/service/impl/order/jd/JDOrderServiceImpl.java

@@ -22,7 +22,7 @@
    @Resource

    private JDOrderMapper jdOrderMapper;



    @Transactional

    @Transactional(rollbackFor=Exception.class)

    @Override

    public void addJDOrder(JDOrder order) throws JDOrderException {

        if (order == null)


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

@@ -110,7 +110,7 @@
    }



    @Override

    @Transactional

    @Transactional(rollbackFor=Exception.class)

    @Cacheable(value = "pddSpecialCache", key = "'specialSearch-'+#page+'-'+#cid")

    public List<PDDGoodsDetail> specialSearch(Integer page, Long cid) throws PDDOrderException {

        if (cid == null) {


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

@@ -326,7 +326,7 @@
     * 

     * @param json

     */

    @Transactional

    @Transactional(rollbackFor=Exception.class)

    public void addPushIOSQueue(MessageInfo info, String url, int type, String versionCodes) throws PushException {



        if (Constant.IS_TEST)


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

@@ -85,7 +85,7 @@
    }



    @Override

    @Transactional

    @Transactional(rollbackFor=Exception.class)

    public void save(PushCoupon record) throws PushCouponException,Exception {

        if (record == null) {

            throw new PushCouponException(1, "参数不正确");

@@ -153,7 +153,7 @@
    }



    @Override

    @Transactional

    @Transactional(rollbackFor=Exception.class)

    public void executePush(Long id) throws Exception, PushCouponException, PushException {



        PushCoupon pushCoupon = selectByPrimaryKey(id);


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

@@ -78,7 +78,7 @@
    }



    @Override

    @Transactional

    @Transactional(rollbackFor=Exception.class)

    public void save(PushGoods record, List<Long> goodsIds) throws PushGoodsException, Exception {



        // 定时时间

@@ -127,7 +127,7 @@
        saveGoodsInfo(isAdd, pushId, goodsIds);

    }



    @Transactional

    @Transactional(rollbackFor=Exception.class)

    public void saveGoodsInfo(boolean isAdd, Long pushId, List<Long> goodsIds) throws Exception {



        if (goodsIds == null || goodsIds.size() == 0) {

@@ -201,7 +201,7 @@
    }



    @Override

    @Transactional

    @Transactional(rollbackFor=Exception.class)

    public int deleteBatchByPrimaryKey(List<Long> list) throws Exception {



        /*List<PushGoods> lisState = pushGoodsMapper.listByPushState(list);


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

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

    

    @Override

    @Transactional

    @Transactional(rollbackFor=Exception.class)

    public void executePush(PushInfo record) throws Exception, PushInfoException, PushException {



        if (PushInfo.STATE_SUCCESS == record.getState()) {


 fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackWinInviteServiceImpl.java

@@ -252,7 +252,7 @@
     * @param orderNo

     * @param bossId

     */

    @Transactional

    @Transactional(rollbackFor=Exception.class)

    private void twoStageRewardToBoss(Long bossId, Long teamUid, Date oneStageTime, Integer source, String orderNo)

            throws Exception {

        // 第一阶段完成之后的90天内 ; 队友产生的订单中（自购+分享），邀请人累计产生≥1 元奖金

@@ -305,7 +305,7 @@
     * @param orderNo

     * @param bossId

     */

    @Transactional

    @Transactional(rollbackFor=Exception.class)

    private void threeStageRewardToBoss(Long bossId, Long teamUid, Date twoStageTime, Integer source, String orderNo)

            throws Exception {

        // 二、三阶段不可同月


 fanli/src/main/java/com/yeshi/fanli/service/impl/shop/BanLiShopGoodsSetPayServiceImpl.java

@@ -34,7 +34,7 @@
        return banLiShopGoodsSetsPayMapper.selectByPrimaryKey(id);

    }



    @Transactional

    @Transactional(rollbackFor=Exception.class)

    @Override

    public void addSetPay(BanLiShopGoodsSetsPay pay) throws BanLiShopGoodsSetPayException {

        if (pay.getId() == null)// 新增


 fanli/src/main/java/com/yeshi/fanli/service/impl/shop/BanLiShopGoodsSetServiceImpl.java

@@ -41,7 +41,7 @@
        return banLiShopGoodsSetsMapper.selectByPrimaryKey(id);

    }



    @Transactional

    @Transactional(rollbackFor=Exception.class)

    @Override

    public void addSet(BanLiShopGoodsSets set) throws BanLiShopGoodsSetException, BanLiShopGoodsSetPayException {

        if (set.getId() == null)// 添加


 fanli/src/main/java/com/yeshi/fanli/service/impl/shop/BanLiShopOrderPayServiceImpl.java

@@ -119,7 +119,7 @@
        }

    }



    @Transactional

    @Transactional(rollbackFor=Exception.class)

    @Override

    public void payOrderByMoney(Long orderId, BigDecimal money) throws BanLiShopOrderException {

        BanLiShopOrder order = banLiShopOrderService.selectByPrimaryKeyForUpdate(orderId);

@@ -164,7 +164,7 @@
    private void paySuccess(BanLiShopOrder order) {

    }



    @Transactional

    @Transactional(rollbackFor=Exception.class)

    @Override

    public void refund(Long orderId) throws BanLiShopOrderException {

        // 订单退款


 fanli/src/main/java/com/yeshi/fanli/service/impl/shop/BanLiShopOrderServiceImpl.java

@@ -96,7 +96,7 @@
    private RedPackForbidService redPackForbidService;

    



    @Transactional

    @Transactional(rollbackFor=Exception.class)

    @Override

    public void addOrder(BanLiShopOrder order) throws BanLiShopOrderException {

        // 查询必要的参数是否添加

@@ -224,7 +224,7 @@
        banLiShopOrderMapper.updateByPrimaryKeySelective(order);

    }



    @Transactional

    @Transactional(rollbackFor=Exception.class)

    @Override

    public void payOrderByHongBao(Long orderId) throws BanLiShopOrderException, RedPackBalanceException {

        BanLiShopOrder order = banLiShopOrderMapper.selectByPrimaryKeyForUpdate(orderId);


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

@@ -21,7 +21,7 @@
    @Resource

    private TaoBaoBuyRelationMapMapper taoBaoBuyRelationMapMapper;



    @Transactional

    @Transactional(rollbackFor=Exception.class)

    @Override

    public String getRelationId(Long uid) throws TaoBaoBuyRelationMapException {

        TaoBaoBuyRelationMap relationMap = taoBaoBuyRelationMapMapper.selectByUid(uid);


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

@@ -118,7 +118,7 @@
        shareHotGoodsService.deleteByGoodsId(auctionId);

    }



    @Transactional

    @Transactional(rollbackFor=Exception.class)

    @Override

    public void updateTaoBaoGoods(TaoBaoGoodsBrief goods) throws TaobaoGoodsUpdateException {

        if (goods == null)


 fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinNewbiesServiceImpl.java

@@ -345,7 +345,7 @@
    }

    

    

    @Transactional

    @Transactional(rollbackFor=Exception.class)

    private String createTaoLiJin(Long auctionId, BigDecimal perface, int totalNum, String pid) throws UserTaoLiJinNewbiesException {

        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");

        SimpleDateFormat formatStr = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");


 fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinRecordServiceImpl.java

@@ -124,7 +124,7 @@
        return userTaoLiJinRecordMapper.selectByPrimaryKey(id);

    }



    @Transactional

    @Transactional(rollbackFor=Exception.class)

    @Override

    public UserTaoLiJinRecord createSelfBuyTaoLiJin(Long uid, BigDecimal couplePrice, TaoBaoGoodsBrief goods)

            throws UserTaoLiJinRecordException {

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


    }



    @Transactional

    @Transactional(rollbackFor=Exception.class)

    @Override

    public UserTaoLiJinRecord createShareTaoLiJin(Long uid, int totalNum, TaoBaoGoodsBrief goods)

            throws UserTaoLiJinRecordException {

@@ -234,7 +234,7 @@
    }



    @Override

    @Transactional

    @Transactional(rollbackFor=Exception.class)

    public UserTaoLiJinRecord createUserTaoLiJin(int origin, Long uid, Long auctionId, BigDecimal perface, int totalNum,

            String name, Date sendStartTime, Date sendEndTime, Date useStartTime, Date useEndTime, String pid)

            throws UserTaoLiJinRecordException {


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

@@ -122,7 +122,7 @@
    @Resource

    private UserInfoModifyRecordService userInfoModifyRecordService;



    @Transactional

    @Transactional(rollbackFor=Exception.class)

    @Override

    public LoginResult login(HttpServletRequest request, AcceptData acceptData, Boolean first, String appId,

            String code, String phone, UserInfo tbUserInfo, boolean wxinstall, int loginType)

@@ -380,7 +380,7 @@
        }

    }



    @Transactional

    @Transactional(rollbackFor=Exception.class)

    @Override

    public LoginResult loginNoInstallWX(AcceptData acceptData, String appId, String code, String phone,

            UserInfo tbUserInfo, int loginType) throws UserAccountException {

@@ -503,7 +503,7 @@
        connectUsers(mainUser, lessUser);

    }



    @Transactional

    @Transactional(rollbackFor=Exception.class)

    @Override

    public void connectUsers(UserInfo mainUser, UserInfo lessUser) throws UserAccountException {

        mainUser = userInfoMapper.selectByPrimaryKeyForUpdate(mainUser.getId());

@@ -670,7 +670,7 @@
        userInfoMapper.updateByPrimaryKeySelective(userInfo);

    }



    @Transactional

    @Transactional(rollbackFor=Exception.class)

    @Override

    public void register(UserInfo userInfo) throws UserAccountException {

        if (!StringUtil.isNullOrEmpty(userInfo.getPhone())) {

@@ -975,7 +975,7 @@
        return user.getPortrait();

    }



    @Transactional

    @Transactional(rollbackFor=Exception.class)

    @Override

    public UserInfo loginPhone(HttpServletRequest request, int loginType, String vcode, String phone, String appId)

            throws UserAccountException {

@@ -1075,7 +1075,7 @@
        throw new UserAccountException(10, "请稍后再试");

    }



    @Transactional

    @Transactional(rollbackFor=Exception.class)

    @Override

    public UserInfo loginWinXin(HttpServletRequest request, AcceptData acceptData, int loginType, String code,

            String appId) throws UserAccountException {

@@ -1180,7 +1180,7 @@
        throw new UserAccountException(10, "请稍后再试");

    }



    @Transactional

    @Transactional(rollbackFor=Exception.class)

    @Override

    public UserInfo loginWeiXinNew(HttpServletRequest request, AcceptData acceptData, int loginType, String wxCode,

            String appId) throws UserAccountException {


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

@@ -217,7 +217,7 @@
    }



    @Override

    @Transactional

    @Transactional(rollbackFor=Exception.class)

    public void addCommonGoods(Long uid, Set<Long> ids) throws UserGoodsStorageException {



        if (uid == null) {


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

@@ -804,7 +804,7 @@
        userInfoExtraMapper.updateAutoExtract(days);

    }



    @Transactional

    @Transactional(rollbackFor=Exception.class)

    @Override

    public void updateInviteCodeVip(String inviteCodeVip, Long uid) throws UserInfoExtraException {

        if (inviteCodeVip == null || inviteCodeVip.length() < 4 || inviteCodeVip.length() > 12)


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

@@ -318,16 +318,16 @@


    @Override

    public long queryCount(Integer userState, String key, Integer keyType, String userRank, Integer days,

            String startTime, String endTime) {

        return userInfoMapper.queryCount(userState, key, keyType, userRank, days, startTime, endTime);

            String startTime, String endTime,Integer userType) {

        return userInfoMapper.queryCount(userState, key, keyType, userRank, days, startTime, endTime,userType);

    }



    @Override

    public List<UserInfoVO> query(long start, int count, Integer userState, String key, Integer keyType,

            String userRank, Integer days, String startTime, String endTime, Integer orderField, Integer orderMode) {

            String userRank, Integer days, String startTime, String endTime, Integer orderField, Integer orderMode,Integer userType) {



        List<UserInfoVO> userList = userInfoMapper.query(start, count, userState, key, keyType, userRank, days,

                startTime, endTime, orderField, orderMode);

                startTime, endTime, orderField, orderMode,userType);



        if (userList == null || userList.size() == 0) {

            return null;


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

@@ -62,7 +62,7 @@
    }



    @Override

    @Transactional

    @Transactional(rollbackFor=Exception.class)

    public int deleteBatchById(Long id) throws UserRankingsException {

        return userRankingsMapper.deleteByPrimaryKey(id);

    }

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




    @Override

    @Transactional

    @Transactional(rollbackFor=Exception.class)

    public int deleteBatchByPrimaryKey(List<Long> arrayID) throws UserRankingsException {

        for (Long id : arrayID) {



@@ -173,7 +173,7 @@
    }



    @Override

    @Transactional

    @Transactional(rollbackFor=Exception.class)

    public void setRewardtBatch(List<Long> idList, Integer type, Double reward, Double startReward, Double endReward) throws Exception {



        for (Long id : idList) {

@@ -210,7 +210,7 @@
    }



    @Override

    @Transactional

    @Transactional(rollbackFor=Exception.class)

    public void setStateBatch(List<Long> idList, Integer type, Integer state) throws Exception {



        for (Long id : idList) {

@@ -242,7 +242,7 @@
    }



    @Override

    @Transactional

    @Transactional(rollbackFor=Exception.class)

    public void uploadFile(File file) throws Exception {



        List<UserRankings> list = new ArrayList<UserRankings>();

@@ -278,7 +278,7 @@
    }



    @Override

    @Transactional

    @Transactional(rollbackFor=Exception.class)

    public void updateShowID(File file) throws Exception {

        List<String> listID = new ArrayList<String>();



@@ -304,7 +304,7 @@
    }



    @Override

    @Transactional

    @Transactional(rollbackFor=Exception.class)

    public void batchUpNickName(File file) throws Exception {

        List<String> listID = new ArrayList<String>();




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

@@ -329,7 +329,7 @@
     * @param userShareGoodsRecord

     * @param listGoods

     */

    @Transactional

    @Transactional(rollbackFor=Exception.class)

    public void multipleGoodsShareRecord(Long shareId, List<CommonGoods> listGoods)

            throws UserShareGoodsRecordException {

        // 分享记录

@@ -372,7 +372,7 @@
     * @param userShareGoodsRecord

     * @param listGoods

     */

    @Transactional

    @Transactional(rollbackFor=Exception.class)

    public FileUploadResult multipleGoodsShare(UserShareGoodsRecord userShareGoodsRecord,

            List<TaoBaoGoodsBrief> listGoods) throws UserShareGoodsRecordException {




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

@@ -230,7 +230,7 @@
    }



    @Override

    @Transactional

    @Transactional(rollbackFor=Exception.class)

    public UserSystemCoupon insertUserCoupon(Long uid, String couponType, String source, BigDecimal percent,

            Boolean needNotify) throws UserSystemCouponException, Exception {



@@ -344,7 +344,7 @@
        return userCoupon;

    }



    @Transactional

    @Transactional(rollbackFor=Exception.class)

    @Override

    public List<UserSystemCouponVO> getUserCouponVOList(long start, int count, Long uid, boolean changeJump)

            throws UserSystemCouponException, Exception {

@@ -610,7 +610,7 @@
        return hasCoupon;

    }



    @Transactional

    @Transactional(rollbackFor=Exception.class)

    @Override

    public List<UserSystemCouponVO> getOrderCouponList(Long uid) throws UserSystemCouponException, Exception {



@@ -633,7 +633,7 @@
        return getEnableListByCouponId(uid, 1, couponList);

    }



    @Transactional

    @Transactional(rollbackFor=Exception.class)

    @Override

    public List<UserSystemCouponVO> getGoodsCouponList(Long uid, Long auctionId)

            throws UserSystemCouponException, Exception {

@@ -955,7 +955,7 @@
        }

    }



    @Transactional

    @Transactional(rollbackFor=Exception.class)

    public void useRewardCouponCore(UserSystemCoupon userSystemCoupon, BigDecimal money, BigDecimal hongBao, Long uid,

            Order order) throws Exception {

        org.springframework.transaction.TransactionStatus transactionStatus = transactionManager

@@ -1358,7 +1358,7 @@
        }

    }



    @Transactional

    @Transactional(rollbackFor=Exception.class)

    @Override

    public void updateStateByDrawback(String orderNo) throws Exception {



@@ -1380,7 +1380,7 @@
        sendBackCoupon(record.getUserSystemCoupon(), record);

    }



    @Transactional

    @Transactional(rollbackFor=Exception.class)

    @Override

    public void updateStateByArrivalAccount(String orderNo) throws Exception {



@@ -1414,7 +1414,7 @@
        return userSystemCouponMapper.getCounponNowInvalid(count);

    }



    @Transactional

    @Transactional(rollbackFor=Exception.class)

    @Override

    public boolean updateCouponRecordUsed(Long uid, String orderNo, BigDecimal payment, Long auctionId)

            throws Exception {

@@ -1494,7 +1494,7 @@
    }



    @Override

    @Transactional

    @Transactional(rollbackFor=Exception.class)

    public void copyLotteryPrize(Long uid, int platform, String device) throws Exception {



        return;

@@ -1577,7 +1577,7 @@
    }



    @Override

    @Transactional

    @Transactional(rollbackFor=Exception.class)

    public void randomRewardCoupon(int num, Long uid, String source) throws Exception {

        if (num < 1) {

            return;

@@ -1717,7 +1717,7 @@
    }



    @Override

    @Transactional

    @Transactional(rollbackFor=Exception.class)

    public void exchangeCoupon(Long uid, String couponType, String source, BigDecimal percent)

            throws UserSystemCouponException, Exception {

        if (couponType == null || uid == null) {

@@ -1773,7 +1773,7 @@
        insertSelective(userCoupon);

    }



    @Transactional

    @Transactional(rollbackFor=Exception.class)

    @Override

    public List<UserSystemCouponVO> getCouponList(AcceptData acceptData, long start, int count, Long uid)

            throws UserSystemCouponException, Exception {


 fanli/src/main/java/com/yeshi/fanli/service/impl/user/integral/IntegralTaskClassServiceImpl.java

@@ -80,7 +80,7 @@
     * @param uid

     * @return

     */

    @Transactional

    @Transactional(rollbackFor=Exception.class)

    public Integer finishedDailySign(long uid) throws Exception{

        IntegralTaskClass taskClass = getByUniqueKey(UniqueKeyEnum.dailySign.name());

        if (taskClass == null || taskClass.getState() == null || taskClass.getState() != 1)


 fanli/src/main/java/com/yeshi/fanli/service/impl/user/integral/IntegralTaskRecordServiceImpl.java

@@ -252,7 +252,7 @@
        return totalGoldCoin + (userInfoExtra.getGoldCoin() == null ? 0 : userInfoExtra.getGoldCoin());

    }



    @Transactional

    @Transactional(rollbackFor=Exception.class)

    public boolean addDetail(Long uid, IntegralTaskRecord record) throws IntegralTaskRecordException {

        Long uid2 = record.getUid();

        if (uid2 == null || uid.longValue() != uid2.longValue())

@@ -350,7 +350,7 @@
        return integralTaskRecordMapper.countGetCountByTaskIdAndDay(taskId, uid, minTime, maxTime);

    }



    @Transactional

    @Transactional(rollbackFor=Exception.class)

    @Override

    public IntegralTaskRecord addRecord(IntegralTaskRecord record) throws IntegralTaskRecordException {

        if (record == null)


 fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/ThreeSaleSerivceImpl.java

@@ -86,7 +86,7 @@
        return threeSaleMapper.selectBoss(uid);

    }



    @Transactional

    @Transactional(rollbackFor=Exception.class)

    public void bind(UserInfo worker, UserInfo inviter) throws ThreeSaleException {

        if (worker == null || inviter == null)

            throw new ThreeSaleException(1, "用户信息为空");

@@ -500,7 +500,7 @@
    }



    @Override

    @Transactional

    @Transactional(rollbackFor=Exception.class)

    public void bindRelationshipByInviteCode(UserInfo invitee, UserInfo inviter) throws ThreeSaleException {

        if (invitee == null || inviter == null)

            throw new ThreeSaleException(1, "用户信息为空");

@@ -520,7 +520,7 @@
    }



    @Override

    @Transactional

    @Transactional(rollbackFor=Exception.class)

    public void bindRelationshipByWX(UserInfo invitee, Long inviterId)throws ThreeSaleException {

        if (invitee == null || inviterId == null)

            throw new ThreeSaleException(1, "用户信息为空");


 fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/UserGetIntegralFromOrderRecordServiceImpl.java

@@ -37,7 +37,7 @@
        return userGetIntegralFromOrderRecordMapper.countByRecordInfo(record);

    }



    @Transactional

    @Transactional(rollbackFor=Exception.class)

    @Override

    public void addRecord(UserGetIntegralFromOrderRecord record) throws UserGetIntegralFromOrderRecordException {

        if (record == null || record.getUid() == null || record.getEventType() == null


 fanli/src/main/java/com/yeshi/fanli/service/impl/user/tb/UserExtraTaoBaoInfoServiceImpl.java

@@ -33,7 +33,7 @@
    @Resource

    private UserAccountBindingHistoryService userAccountBindingHistoryService;



    @Transactional

    @Transactional(rollbackFor=Exception.class)

    @Override

    public void addRelationId(Long uid, String relationId, String taoBaoUid, String nickName, boolean valid)

            throws UserExtraTaoBaoInfoException {

@@ -77,7 +77,7 @@
        }

    }



    @Transactional

    @Transactional(rollbackFor=Exception.class)

    @Override

    public void addSpecialId(Long uid, String specialId, String taoBaoUid, String nickName, boolean valid)

            throws UserExtraTaoBaoInfoException {

@@ -121,7 +121,7 @@
        }

    }



    @Transactional

    @Transactional(rollbackFor=Exception.class)

    @Override

    public void saveUserTaoBaoInfo(Long uid, String relationId, String specialId, String taoBaoUid, String nickName,

            boolean valid) throws UserExtraTaoBaoInfoException {


 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserInfoService.java

@@ -81,10 +81,10 @@
     * @return

     */

    public List<UserInfoVO> query(long start, int count, Integer userState, String key, Integer keyType,

            String userRank, Integer days, String startTime, String endTime, Integer orderField, Integer orderMode);

            String userRank, Integer days, String startTime, String endTime, Integer orderField, Integer orderMode,Integer userType);



    public long queryCount(Integer userState, String key, Integer keyType, String userRank, Integer days,

            String startTime, String endTime);

            String startTime, String endTime,Integer userType);



    public double querySumMoney(String key, Integer userType, Integer days, String startTime, String endTime);




 fanli/src/main/java/com/yeshi/fanli/service/manger/HongBaoV2AddManager.java

@@ -213,7 +213,7 @@
        return CommonOrder.STATE_SX;

    }



    @Transactional

    @Transactional(rollbackFor=Exception.class)

    private boolean updateHongBao(HongBaoOrder hongBaoOrder, CommonOrder commonOrder, int type,

            Map<Integer, HongBaoOrder> notificationMap) throws HongBaoException, UserAccountException {

        System.out.println(commonOrder.getOrderNo());


 fanli/src/main/resource/rocket/consumer.xml

@@ -110,7 +110,7 @@
                        <bean class="com.aliyun.openservices.ons.api.bean.Subscription">

                            <property name="topic" value="TOPIC_USER" />

                            <property name="expression"

                                value="inviteSuccess||userAccountBinding||integralTaskFinish||redPackGift" />

                                value="inviteSuccess||userAccountBinding||integralTaskFinish||redPackGift||redPackGiftDrawback" />

                        </bean>

                    </key>

                </entry>


 fanli/src/main/resource/rocket/system-coupon-consumer.xml

@@ -32,7 +32,7 @@
                <entry value-ref="systemCouponMessageListener">

                    <key>

                        <bean class="com.aliyun.openservices.ons.api.bean.Subscription">

                            <property name="topic" value="GID_SYSTEM_COUPON" />

                            <property name="topic" value="TOPIC_USER" />

                            <property name="expression" value="systemCouponDrawback" />

                        </bean>

                    </key>