Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-09-17 00026c4255ed1b47961d17a5b4500fe788bfa9d8

Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

 fanli/.classpath

@@ -24,10 +24,6 @@
            <attribute name="maven.pomderived" value="true"/>

        </attributes>

    </classpathentry>

    <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">

        <attributes>

            <attribute name="maven.pomderived" value="true"/>

        </attributes>

    </classpathentry>

    <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.8.0_131"/>

    <classpathentry kind="output" path="target/classes"/>

</classpath>


 fanli/src/main/java/com/yeshi/fanli/aspect/ActiveUserAspect.java

@@ -19,9 +19,9 @@
import org.yeshi.utils.NumberUtil;



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

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

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

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

import com.yeshi.fanli.service.inter.user.integral.IntegralGetService;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.ThreadUtil;

import com.yeshi.fanli.util.annotation.UserActive;


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

@@ -13,22 +13,25 @@
import org.springframework.stereotype.Controller;

import org.springframework.web.bind.annotation.RequestMapping;



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

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

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

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

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

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

import com.yeshi.fanli.log.LogHelper;

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

import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionAuthRecordService;

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

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

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

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

import com.yeshi.fanli.service.inter.user.tb.TaoBaoUnionAuthRecordService;

import com.yeshi.fanli.service.inter.user.tb.UserExtraTaoBaoInfoService;

import com.yeshi.fanli.util.AESUtil;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.RedisManager;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.TaoBaoConstant;

import com.yeshi.fanli.util.ThreadUtil;

import com.yeshi.fanli.util.VersionUtil;

import com.yeshi.fanli.util.taobao.TaoKeApiUtil;



import net.sf.json.JSONObject;

@@ -57,6 +60,9 @@


    @Resource

    private RedisManager redisManager;



    @Resource

    private UserActiveLogService userActiveLogService;



    @RequestMapping(value = "tb")

    public void tb(String code, String state, HttpServletRequest request, HttpServletResponse response) {

@@ -283,35 +289,67 @@
            LogHelper.errorDetailInfo(e);

        }



        UserActiveLog activeLog = userActiveLogService.getUserLatestActiveInfo(uid);



        boolean isNewJump = false;

        if (activeLog != null) {

            String platform = null;

            String version = activeLog.getVersionCode();

            if (activeLog.getChannel().equalsIgnoreCase("appstore")) {

                platform = "ios";

            } else {

                platform = "android";

            }

            if (VersionUtil.greaterThan_2_0(platform, version)) {

                isNewJump = true;

            }

        }



        try {

            if (errCode == 0)// 成功

            {

                if ("share".equalsIgnoreCase(source)) {

                    // response.sendRedirect("http://apph5.yeshitv.com/apppage/flq_bonusState.html?code=0");

                    if (isNewJump)

                        response.sendRedirect("http://apph5.yeshitv.com/flqWeb/h5/tbauth/success.html");

                    else

                    closeWebPage(response.getWriter());

                } else if ("zigou".equalsIgnoreCase(source)) {

                    // response.sendRedirect("http://apph5.yeshitv.com/apppage/flq_rebateState.html?code=0");

                    if (isNewJump)

                        response.sendRedirect("http://apph5.yeshitv.com/flqWeb/h5/tbauth/success.html");

                    else

                    closeWebPage(response.getWriter());

                } else if ("bind".equalsIgnoreCase(source)) {

                    if (isNewJump)

                        response.sendRedirect("http://apph5.yeshitv.com/flqWeb/h5/tbauth/success.html");

                    else {

                    String script = String.format(

                            "<script>if(/(iPhone|iPad|iPod|iOS)/i.test(navigator.userAgent)) {window.location.href = 'yestv://toast#%s';setTimeout(function(){window.location.href = 'yestv://finishPage';},100);} else {yestv.toast(\"恭喜你，淘宝绑定成功\");yestv.finishPage();}</script>",

                            StringUtil.getBase64String("恭喜你，淘宝绑定成功"));

                    response.getWriter().print(script);

                }

                }

            } else {// 失败

                if ("share".equalsIgnoreCase(source)) {

                    // response.sendRedirect("http://apph5.yeshitv.com/apppage/flq_bonusState.html?code=1");

                    if (isNewJump)

                        response.sendRedirect("http://apph5.yeshitv.com/flqWeb/h5/tbauth/fail.html");

                    else

                    closeWebPage(response.getWriter());

                } else if ("zigou".equalsIgnoreCase(source)) {

                    // response.sendRedirect("http://apph5.yeshitv.com/apppage/flq_rebateState.html?code=1");

                    if (isNewJump)

                        response.sendRedirect("http://apph5.yeshitv.com/flqWeb/h5/tbauth/fail.html");

                    else

                    closeWebPage(response.getWriter());

                } else if ("bind".equalsIgnoreCase(source)) {

                    if (isNewJump)

                        response.sendRedirect("http://apph5.yeshitv.com/flqWeb/h5/tbauth/fail.html");

                    else {

                    String script = String.format(

                            "<script>if(/(iPhone|iPad|iPod|iOS)/i.test(navigator.userAgent)) {window.location.href = 'yestv://toast#%s';setTimeout(function(){window.location.href = 'yestv://finishPage';},100);} else {yestv.toast(\"抱歉，淘宝绑定失败\");yestv.finishPage();}</script>",

                            StringUtil.getBase64String("抱歉，淘宝绑定失败"));

                    response.getWriter().print(script);

                }

            }

            }

        } catch (Exception e) {



        }


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

@@ -51,12 +51,12 @@
import com.yeshi.fanli.service.inter.goods.ShareGoodsService;

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

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

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

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

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;

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

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

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

import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;

import com.yeshi.fanli.util.AESUtil;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.GsonUtil;

@@ -149,42 +149,18 @@
        return "coupon";

    }



    //该方法以及废弃

    @Deprecated

    @RequestMapping("findThreeFriendsCount")

    public void findThreeFriendsCount(long id, String callback, PrintWriter out) {

        int count1 = userInfoService.findFriendsCount(id, 1);

        int count2 = userInfoService.findFriendsCount(id, 2);

        JSONObject data = new JSONObject();

        data.put("count1", count1);

        data.put("count2", count2);



        if (!StringUtil.isNullOrEmpty(callback)) {

            out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(data)));

        } else {

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

        }

    }



    //该方法以及废弃

    @Deprecated

    @RequestMapping("findThreeFriends")

    public void findThreeFriends(long id, int type, int page, String callback, PrintWriter out) {

        int pageSize = 30;

        List<InviteUser> list = userInfoService.getFriendsList(id, type, page, pageSize);

        JSONArray array = new JSONArray();

        for (InviteUser user : list) {

            JSONObject item = JSONObject.fromObject(new GsonBuilder().create().toJson(user.getUserInfo()));

            item.put("valid", user.isValid());

            array.add(item);

        }



        long count = userInfoService.getFriendsListCount(id, type);



        JSONObject data = new JSONObject();

        data.put("list", array);

        data.put("pages", count % pageSize == 0 ? count / pageSize : count / pageSize + 1);

        if (!StringUtil.isNullOrEmpty(callback)) {

            out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(data)));

        } else {

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

        }

    }



    @RequestMapping(value = "getConpon", method = RequestMethod.POST)


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

@@ -56,7 +56,7 @@
import com.yeshi.fanli.service.inter.dynamic.DynamicInfoService;

import com.yeshi.fanli.service.inter.dynamic.InviteMaterialService;

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

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

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

import com.yeshi.fanli.tag.PageEntity;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.FileUtil;


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

@@ -35,14 +35,14 @@
import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.AdminUserService;

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

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

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

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

import com.yeshi.fanli.service.inter.money.extract.ExtractAuditRecordService;

import com.yeshi.fanli.service.inter.money.extract.ExtractCountService;

import com.yeshi.fanli.service.inter.money.extract.ExtractService;

import com.yeshi.fanli.service.inter.order.tb.TaoBaoOrderService;

import com.yeshi.fanli.service.inter.order.tb.TaoBaoWeiQuanOrderService;

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

import com.yeshi.fanli.service.inter.taobao.TaoBaoOrderService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoWeiQuanOrderService;

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

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

import com.yeshi.fanli.tag.PageEntity;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.RedisManager;


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

@@ -30,15 +30,15 @@
import com.yeshi.fanli.service.inter.count.HongBaoV2CountService;

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

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

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

import com.yeshi.fanli.service.inter.money.tb.TaoBaoWeiQuanDrawBackService;

import com.yeshi.fanli.service.inter.order.CommonOrderCountService;

import com.yeshi.fanli.service.inter.order.CommonOrderService;

import com.yeshi.fanli.service.inter.order.HongBaoOrderService;

import com.yeshi.fanli.service.inter.order.OrderProcessService;

import com.yeshi.fanli.service.inter.order.OrderService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoOrderService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoWeiQuanDrawBackService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoWeiQuanOrderService;

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

import com.yeshi.fanli.service.inter.order.tb.TaoBaoOrderService;

import com.yeshi.fanli.service.inter.order.tb.TaoBaoWeiQuanOrderService;

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

import com.yeshi.fanli.tag.PageEntity;

import com.yeshi.fanli.util.Constant;


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

@@ -24,7 +24,7 @@
import com.yeshi.fanli.service.AdminUserService;

import com.yeshi.fanli.service.inter.order.OrderProcessService;

import com.yeshi.fanli.service.inter.order.OrderService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoOrderService;

import com.yeshi.fanli.service.inter.order.tb.TaoBaoOrderService;

import com.yeshi.fanli.util.CMQManager;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.RedisManager;


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

@@ -30,16 +30,16 @@
import com.yeshi.fanli.entity.money.UserMoneyDetail;

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

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

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

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

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

import com.yeshi.fanli.service.inter.money.extract.BindingAccountService;

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

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

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

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

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

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

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

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

import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;

import com.yeshi.fanli.service.inter.user.tb.UserExtraTaoBaoInfoService;

import com.yeshi.fanli.tag.PageEntity;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;


 fanli/src/main/java/com/yeshi/fanli/controller/admin/order/TaoBaoOrderController.java

@@ -24,8 +24,8 @@
import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanOrder;

import com.yeshi.fanli.job.order.taobao.UpdateOrderJob;

import com.yeshi.fanli.job.order.taobao.UpdateTBRelationAndSpecialOrderJob;

import com.yeshi.fanli.service.inter.taobao.TaoBaoOrderService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoWeiQuanOrderService;

import com.yeshi.fanli.service.inter.order.tb.TaoBaoOrderService;

import com.yeshi.fanli.service.inter.order.tb.TaoBaoWeiQuanOrderService;

import com.yeshi.fanli.tag.PageEntity;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;


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

@@ -23,7 +23,7 @@
import com.yeshi.fanli.entity.push.PushGoodsGroup;

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

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

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

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

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

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

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


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

@@ -33,13 +33,13 @@
import com.yeshi.fanli.service.inter.goods.GoodsClassService;

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

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

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

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

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

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

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

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

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

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsActivityService;

import com.yeshi.fanli.service.inter.taobao.TaobaoMeterialService;

import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailV2Service;


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

@@ -23,7 +23,7 @@
import com.yeshi.fanli.entity.goods.CommonGoods;

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

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

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

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

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

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.factory.goods.GoodsDetailVOFactory;


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

@@ -27,7 +27,7 @@
import com.yeshi.fanli.service.inter.brand.BrandClassShopService;

import com.yeshi.fanli.service.inter.brand.TaoBaoShopHistoryService;

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

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

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoShopService;

import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsService;

import com.yeshi.fanli.util.Constant;


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

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

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

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

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

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsUpdateService;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.taobao.TaoBaoUtil;


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

@@ -282,7 +282,8 @@
            data.put("serviceProtocolLink", serviceProtocol);

            data.put("privacyProtocolLink", privacyProtocol);

            // 购物车跳转方式(包含jumpDetail与params)

            JSONObject source = JSONObject.fromObject(configService.get("taobao_cart_jump_detail"));

            JSONObject source = JSONObject.fromObject(configService.getByVersion("taobao_cart_jump_detail",

                    acceptData.getPlatform(), Integer.parseInt(acceptData.getVersion())));

            data.put("taoBaoCart", source);

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

        } catch (Exception e) {


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

@@ -26,7 +26,7 @@
import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;

import com.yeshi.fanli.service.inter.dynamic.DynamicInfoService;

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

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

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.taobao.DaTaoKeUtil;




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

@@ -23,7 +23,7 @@
import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;

import com.yeshi.fanli.log.LogHelper;

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

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

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;

import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailService;

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


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

@@ -43,12 +43,12 @@
import com.yeshi.fanli.service.inter.goods.TaoBaoCouponService;

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

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

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

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

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

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

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

import com.yeshi.fanli.service.inter.monitor.MonitorService;

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.RedisManager;

import com.yeshi.fanli.util.StringUtil;


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

@@ -27,7 +27,6 @@
import com.yeshi.fanli.log.LogHelper;

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

import com.yeshi.fanli.service.inter.goods.recommend.RecommendGoodsDeleteHistoryService;

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

import com.yeshi.fanli.service.inter.monitor.BusinessEmergent110Service;

import com.yeshi.fanli.service.inter.monitor.MonitorService;

import com.yeshi.fanli.service.inter.taobao.TLJBuyGoodsService;

@@ -35,9 +34,10 @@
import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;

import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinRecordService;

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

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

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

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

import com.yeshi.fanli.service.inter.user.integral.IntegralGetService;

import com.yeshi.fanli.service.inter.user.tb.UserExtraTaoBaoInfoService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.TaoBaoConstant;


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

@@ -21,7 +21,7 @@
import com.yeshi.fanli.log.LogHelper;

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

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

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

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsService;

import com.yeshi.fanli.util.dataoke.DaTaoKeApiUtil;

import com.yeshi.fanli.util.taobao.DaTaoKeUtil;


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

@@ -27,11 +27,11 @@
import com.yeshi.fanli.service.inter.config.ConfigService;

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

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

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

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

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

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

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

import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;

import com.yeshi.fanli.tag.PageEntity;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.RedisManager;

@@ -136,7 +136,6 @@
            pictureJson.put("params", picture.getParams());

            data.put("topBanner", pictureJson);

        }





        data.put("desc", configService.get("invite_desc"));



@@ -270,7 +269,6 @@
        }

    }



	
    /**

     * 激活邀请

     * 

@@ -285,7 +283,8 @@
    @RequestMapping(value = "activationInviteWX")

    public void activationInviteWX(AcceptData acceptData, Long uid, String  code, PrintWriter out) {

        try {

            userInfoExtraService.activationInviteWX(uid, code);

            userInfoExtraService.activationInviteWX(

                    Constant.getWXAccount(acceptData.getPlatform(), acceptData.getVersion()), uid, code);

            out.print(JsonUtil.loadTrueResult("邀请码激活成功"));

        } catch (UserInfoExtraException e) {

            out.print(JsonUtil.loadFalseResult(e.getMsg()));

@@ -294,7 +293,6 @@
            e.printStackTrace();

        }

    }



    

    /**

     * 获取邀请码


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

@@ -88,12 +88,13 @@
import com.yeshi.fanli.service.inter.homemodule.SpecialService;

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

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

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

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

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

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

import com.yeshi.fanli.service.inter.monitor.MonitorService;

import com.yeshi.fanli.service.inter.order.OrderService;

import com.yeshi.fanli.service.inter.order.ShareGoodsActivityOrderService;

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

import com.yeshi.fanli.service.inter.taobao.TLJBuyGoodsService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsUpdateService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoShopService;

@@ -109,7 +110,6 @@
import com.yeshi.fanli.service.inter.user.UserGoodsStorageService;

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

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

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

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.MoneyBigDecimalUtil;

import com.yeshi.fanli.util.RedisManager;


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

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

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

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

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

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

import com.yeshi.fanli.service.inter.special.S11Service;

import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;

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


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

@@ -38,9 +38,9 @@
import com.yeshi.fanli.service.inter.config.BusinessSystemService;

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

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

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

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

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

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoShopService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;

import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailService;


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

@@ -46,17 +46,17 @@
import com.yeshi.fanli.service.inter.goods.CommonGoodsService;

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

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

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

import com.yeshi.fanli.service.inter.monitor.BusinessEmergent110Service;

import com.yeshi.fanli.service.inter.monitor.MonitorService;

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

import com.yeshi.fanli.service.inter.tlj.ConfigTaoLiJinService;

import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinRecordService;

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

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

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

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

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

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

import com.yeshi.fanli.service.inter.user.tb.UserExtraTaoBaoInfoService;

import com.yeshi.fanli.util.AESUtil;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.MoneyBigDecimalUtil;


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

@@ -14,6 +14,7 @@
import org.yeshi.utils.encrypt.DESUtil;



import com.alipay.api.AlipayApiException;

import com.yeshi.fanli.dto.wx.WXAccountInfoDTO;

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

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

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

@@ -35,16 +36,16 @@
import com.yeshi.fanli.service.inter.config.BusinessSystemService;

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

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

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

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

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

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

import com.yeshi.fanli.service.inter.money.extract.BindingAccountService;

import com.yeshi.fanli.service.inter.money.extract.ExtractService;

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

import com.yeshi.fanli.service.inter.order.LostOrderService;

import com.yeshi.fanli.service.inter.order.OrderService;

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

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

import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;

import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinOriginService;

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

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

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

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

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

@@ -54,9 +55,9 @@
import com.yeshi.fanli.service.inter.user.UserInfoDeleteRecordService;

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

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

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

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

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

import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.GsonUtil;

import com.yeshi.fanli.util.RedisManager;

@@ -221,8 +222,8 @@
        tbUserInfo.setTbPic(tbPortrait);



        try {

            LoginResult result = userAccountService.login(request, first, system.getAppid(), code, phone, tbUserInfo,

                    wxinstall, loginType);

            LoginResult result = userAccountService.login(request, acceptData, first, system.getAppid(), code, phone,

                    tbUserInfo, wxinstall, loginType);

            if (result == null)

                LogHelper.error("login-result为空值");



@@ -387,7 +388,10 @@
        }

        UserInfo user = null;

        if (!StringUtil.isNullOrEmpty(code)) {

            WeiXinUser weiXinUser = WXLoginUtil.getWeiXinUserWithSavePortrait(code);

            WXAccountInfoDTO accountInfo = Constant.getWXAccount(acceptData.getPlatform(), acceptData.getVersion());



            WeiXinUser weiXinUser = WXLoginUtil.getWeiXinUserWithSavePortrait(code, accountInfo.getAppId(),

                    accountInfo.getAppSecret());

            if (weiXinUser == null) {

                out.print(JsonUtil.loadFalseResult(1, "获取微信用户信息失败"));

                return;

@@ -640,7 +644,7 @@
        }



        try {

            userAccountService.changeWXBind(uid, code);

            userAccountService.changeWXBind(acceptData, uid, code);

            UserInfo user = userInfoService.getUserByIdWithMybatis(uid);

            // 判断taoBaoUid是否已经封禁

            ForbiddenUserIdentifyCode ic = forbiddenUserIdentifyCodeService

@@ -941,6 +945,8 @@
        String[] ALIPAY_CODES = new String[] { "SYSTEM_ERROR", "PERMIT_CHECK_PERM_LIMITED", "PERM_AML_NOT_REALNAME_REV",

                "PERM_AML_NOT_REALNAME_REV", "PAYEE_USER_INFO_ERROR", "PAYEE_ACC_OCUPIED",

                "PERMIT_CHECK_PERM_IDENTITY_THEFT", "PERMIT_NON_BANK_LIMIT_PAYEE", "EXCEED_LIMIT_UNRN_DM_AMOUNT" };

        BindingAccount oldBindingAccount = bindingAccountService.getBindingAccountByUidAndType(uid,

                BindingAccount.TYPE_ALIPAY);

        try {

            BigDecimal balance = user.getMyHongBao();

            BindingAccount bindingAccount = bindingAccountService.changeAlipayBindingWithVerify(uid, name, account);

@@ -974,7 +980,11 @@
        } catch (AlipayAccountException e3) {

            // 账户无余额

            if (e3.getCode() == AlipayAccountException.CODE_NO_MONEY) {

                out.print(JsonUtil.loadFalseResult(5, "你的账户目前没有余额，无需绑定提现账号。"));

                if (oldBindingAccount != null) {

                    out.print(JsonUtil.loadFalseResult(5, "当前账户没有余额，无需修改，请有余额后修改"));

                } else {

                    out.print(JsonUtil.loadFalseResult(5, "当前账户没有余额，请有余额后绑定"));

                }

                return;

                // 提现次数限制

            } else if (e3.getCode() == AlipayAccountException.CODE_TIMES_LIMIT) {

@@ -1156,7 +1166,7 @@


            // 微信登录

            if (loginType == 2) {

                userInfo = userAccountService.loginWinXin(request, loginType, code, system.getAppid());

                userInfo = userAccountService.loginWinXin(request, acceptData, loginType, code, system.getAppid());

            }



            if (userInfo == null) {

@@ -1312,7 +1322,7 @@
        }



        try {

            userAccountService.bindWeiXin(uid, code);

            userAccountService.bindWeiXin(acceptData,uid, code);



            UserInfo user = userInfoService.getUserByIdWithMybatis(uid);

            // 判断taoBaoUid是否已经封禁


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

@@ -13,7 +13,7 @@
import com.yeshi.fanli.entity.accept.AcceptData;

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

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

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

import com.yeshi.fanli.service.inter.user.tb.UserExtraTaoBaoInfoService;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.TaoBaoConstant;

import com.yeshi.fanli.util.taobao.TaoBaoUtil;


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

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

import com.yeshi.fanli.dto.money.AccountDetails;

import com.yeshi.fanli.dto.order.OrderItem;

import com.yeshi.fanli.dto.wx.WXAccountInfoDTO;

import com.yeshi.fanli.entity.AppVersionInfo;

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

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

@@ -78,18 +79,17 @@
import com.yeshi.fanli.service.inter.config.ConfigService;

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

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

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

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

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

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

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

import com.yeshi.fanli.service.inter.money.extract.BindingAccountService;

import com.yeshi.fanli.service.inter.money.extract.ExtractRecordService;

import com.yeshi.fanli.service.inter.money.extract.ExtractService;

import com.yeshi.fanli.service.inter.order.HongBaoOrderService;

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

import com.yeshi.fanli.service.inter.order.LostOrderService;

import com.yeshi.fanli.service.inter.order.OrderService;

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinDetailService;

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

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

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

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

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

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

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

@@ -99,8 +99,9 @@
import com.yeshi.fanli.service.inter.user.UserInfoExtraService;

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

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

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

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

import com.yeshi.fanli.service.inter.user.invite.ThreeSaleExtraInfoSerivce;

import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;

import com.yeshi.fanli.util.AESUtil;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.GsonUtil;

@@ -293,7 +294,9 @@
            int loginType = form.getLoginType();

            // WeiXinUserParam wxParam = null;

            // 如果是微信登陆，那需要先获取到微信的unionid

            WeiXinUser weiXinUser = WXLoginUtil.getWeiXinUserWithSavePortrait(code);

            WXAccountInfoDTO account = Constant.getWXAccount(acceptData.getPlatform(), acceptData.getVersion());

            WeiXinUser weiXinUser = WXLoginUtil.getWeiXinUserWithSavePortrait(code, account.getAppId(),

                    account.getAppSecret());

            if (loginType == Constant.WEIXIN && StringUtil.isNullOrEmpty(form.getWxUnionId())) {

                // wxParam = WXinUtil.getWxParam(code);

                if (weiXinUser == null) {

@@ -388,7 +391,11 @@
                                                 * StringUtil.isNullOrEmpty(form

                                                 * .getWxOpenId())

                                                 */) {

                WeiXinUser xinUser = WXLoginUtil.getWeiXinUserWithSavePortrait(code);



                WXAccountInfoDTO account = Constant.getWXAccount(acceptData.getPlatform(), acceptData.getVersion());



                WeiXinUser xinUser = WXLoginUtil.getWeiXinUserWithSavePortrait(code, account.getAppId(),

                        account.getAppSecret());

                if (xinUser == null) {

                    out.print(JsonUtil.loadFalseResult("登录失败"));

                    return;

@@ -647,7 +654,9 @@
        }

        int loginType = form.getLoginType();

        if (loginType == Constant.WEIXIN) {

            WeiXinUser weiXinUser = WXLoginUtil.getWeiXinUserWithSavePortrait(code);

            WXAccountInfoDTO account = Constant.getWXAccount(acceptData.getPlatform(), acceptData.getVersion());

            WeiXinUser weiXinUser = WXLoginUtil.getWeiXinUserWithSavePortrait(code, account.getAppId(),

                    account.getAppSecret());



            if (weiXinUser == null) {

                out.print(JsonUtil.loadFalseResult("绑定失败，用户异常请重试！"));


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

@@ -30,11 +30,11 @@
import com.yeshi.fanli.entity.money.UserMoneyDetail.UserMoneyDetailTypeEnum;

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

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

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

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

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

import com.yeshi.fanli.service.inter.money.extract.ExtractService;

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

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

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

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

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.TimeUtil;

import com.yeshi.fanli.util.VersionUtil;


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

@@ -61,20 +61,20 @@
import com.yeshi.fanli.service.inter.goods.RecommendUserGoodsService;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

import com.yeshi.fanli.service.inter.user.invite.MsgInviteDetailService;

import com.yeshi.fanli.service.inter.user.msg.MsgAccountDetailService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.RedisManager;

import com.yeshi.fanli.util.StringUtil;


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

@@ -35,10 +35,10 @@
import com.yeshi.fanli.service.inter.order.CommonOrderService;

import com.yeshi.fanli.service.inter.order.LostOrderService;

import com.yeshi.fanli.service.inter.order.OrderService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoOrderService;

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

import com.yeshi.fanli.service.inter.order.tb.TaoBaoOrderService;

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

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

import com.yeshi.fanli.service.inter.user.tb.UserExtraTaoBaoInfoService;

import com.yeshi.fanli.util.CMQManager;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;


 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/h5/AppH5CouponController.java

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

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

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

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

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

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

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

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

import com.yeshi.fanli.util.factory.goods.GoodsDetailVOFactory;


 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/h5/AppH5TaoLiJinController.java

@@ -17,7 +17,7 @@
import com.yeshi.fanli.entity.taobao.ShareHotGoods;

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

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

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

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

import com.yeshi.fanli.service.inter.taobao.ShareHotGoodsService;

import com.yeshi.fanli.service.inter.taobao.TLJBuyGoodsService;

import com.yeshi.fanli.service.inter.tlj.ConfigTaoLiJinService;


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

@@ -30,7 +30,7 @@
import com.yeshi.fanli.service.inter.brand.TaoBaoShopHistoryService;

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

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

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

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsUpdateService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoShopService;

import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsService;


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

@@ -30,7 +30,7 @@
import com.yeshi.fanli.service.inter.goods.JDCommonTemplateContentService;

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

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

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

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

import com.yeshi.fanli.tag.PageEntity;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;


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

@@ -245,11 +245,17 @@
        JSONObject data = new JSONObject();



        if (url != null && url.contains("ifeeds.tmall.com/article.html?")) {

            if (VersionUtil.greaterThan_2_0(acceptData.getPlatform(), acceptData.getVersion()))

                data.put("baichuan", false);

            else

            data.put("baichuan", true);

            data.put("goodsDetail", false);

        } else if (url != null && (url.contains("s.click") || url.contains("taobao.com") || url.contains("tmall.com")

                || url.contains("m.tb.cn"))) {

            data.put("baichuan", true);// 采用阿里百川的方式加载webview

            if (VersionUtil.greaterThan_2_0(acceptData.getPlatform(), acceptData.getVersion()))

                data.put("baichuan", false);

            else

                data.put("baichuan", true);

            data.put("goodsDetail", true);// 需要拦截商品详情

        } else if (url != null && (url.contains("jd.com"))) {

            // 不能包含详情页


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

@@ -34,7 +34,7 @@
import com.yeshi.fanli.service.inter.config.BusinessSystemService;

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

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

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

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.RedisManager;

import com.yeshi.fanli.util.StringUtil;


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

@@ -25,7 +25,7 @@
import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;

import com.yeshi.fanli.service.inter.dynamic.DynamicInfoService;

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

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

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

import com.yeshi.fanli.util.Constant;



import net.sf.json.JSONObject;


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

@@ -28,10 +28,10 @@
import com.yeshi.fanli.service.inter.goods.GoodsClassService;

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

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

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

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

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

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

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsUpdateService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;


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

@@ -47,8 +47,8 @@
import com.yeshi.fanli.service.inter.goods.CollectionGoodsV2Service;

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

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

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

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

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

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

import com.yeshi.fanli.service.inter.taobao.TLJBuyGoodsService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsUpdateService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoShopService;

@@ -62,7 +62,7 @@
import com.yeshi.fanli.service.inter.user.UserGoodsStorageService;

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

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

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

import com.yeshi.fanli.service.inter.user.integral.IntegralGetService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.MoneyBigDecimalUtil;

import com.yeshi.fanli.util.RedisManager;


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

@@ -19,7 +19,7 @@
import com.yeshi.fanli.log.LogHelper;

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

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

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

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsService;

import com.yeshi.fanli.util.dataoke.DaTaoKeApiUtil;

import com.yeshi.fanli.util.factory.goods.GoodsDetailVOFactory;


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

@@ -44,17 +44,17 @@
import com.yeshi.fanli.log.LogHelper;

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

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

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

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

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

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

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

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

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

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

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

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

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

import com.yeshi.fanli.service.inter.user.integral.CodePublishRecordService;

import com.yeshi.fanli.service.inter.user.integral.IntegralDetailService;

import com.yeshi.fanli.service.inter.user.integral.IntegralExchangeRecordService;

import com.yeshi.fanli.service.inter.user.integral.IntegralExchangeService;

import com.yeshi.fanli.service.inter.user.integral.IntegralGetService;

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

import com.yeshi.fanli.service.inter.user.integral.IntegralTaskRankService;

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

import com.yeshi.fanli.service.inter.user.integral.IntegralTaskService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.TimeUtil;

@@ -234,7 +234,6 @@
                    taskClassVO.setLightUp(true);

                }



				
                int countFinished = 0;

                Long id = taskClassVO.getId();

                // 查询当日

@@ -251,8 +250,9 @@
                }

                

                /*

                 * // 完善信息完成后，列表中消失 if (uniqueKey == UniqueKeyEnum.accountMaintain && taskNum ==

                 * countFinished) { list.remove(i); i --; continue; }

                 * // 完善信息完成后，列表中消失 if (uniqueKey ==

                 * UniqueKeyEnum.accountMaintain && taskNum == countFinished) {

                 * list.remove(i); i --; continue; }

                 */

                

                progress = progress.replace("{已完成}", countFinished + "").replace("{总任务}", taskNum + "");

@@ -540,6 +540,7 @@
        }

        IntegralTaskRecord record = null;



        try {

        if (TaskUniqueKeyEnum.recommendSearch.name().equalsIgnoreCase(event)) {

            record = integralGetService.addRecommendSearch(uid);

        } else if (TaskUniqueKeyEnum.shareInvite.name().equalsIgnoreCase(event)) {

@@ -582,6 +583,9 @@
        } else {

            out.print(JsonUtil.loadFalseResult(""));

        }

        } catch (Exception e) {

            out.print(JsonUtil.loadFalseResult(""));

        }

    }



    /**


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

@@ -22,18 +22,17 @@
import com.yeshi.fanli.entity.bus.user.UserInfoExtra;

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

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

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

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

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

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

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

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

import com.yeshi.fanli.service.inter.user.invite.ThreeSaleExtraInfoSerivce;

import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;



import net.sf.json.JSONArray;

import net.sf.json.JSONObject;





@Controller

@RequestMapping("api/v2/invite")

@@ -60,11 +59,9 @@
    @Resource

    private ThreeSaleExtraInfoSerivce threeSaleExtraInfoSerivce;



	
	
	
    /**

     * 邀请码验证

     * 
     * @param out

     */

    @RequestMapping(value = "verifyCode")

@@ -81,15 +78,16 @@
        }

    }

    

	
    /**

     * 邀请码微信

     * 
     * @param out

     */

    @RequestMapping(value = "verifyWX")

    public void verifyWX(AcceptData acceptData, Long uid, String code, PrintWriter out) {

        try {

            UserInfo userInfo = userInfoExtraService.getInviterInfo(uid, code);

            UserInfo userInfo = userInfoExtraService.getInviterInfo(

                    Constant.getWXAccount(acceptData.getPlatform(), acceptData.getVersion()), uid, code);

            JSONObject data = new JSONObject();

            data.put("nickName", userInfo.getNickName());

            data.put("portrait", userInfo.getPortrait());

@@ -141,10 +139,9 @@
        out.print(JsonUtil.loadTrueResult(resultData));

    }

    

	
	
    /**

     * 组织数据

     * 
     * @param count

     * @param list

     * @param uid

@@ -232,7 +229,6 @@
        return result;

    }



	
    /**

     * 用户队员统计- IOS

     * 

@@ -296,6 +292,7 @@
    

    /**

     * 上级信息组织

     * 
     * @param acceptData

     * @param uid

     * @param threeSale

@@ -336,10 +333,9 @@
        return bossData;

    } 

    

	
	
    /**

     * 站内信提醒队员添加微信号

     * 
     * @param acceptData

     * @param uid

     * @param inviteId

@@ -386,12 +382,14 @@
            // 提示队长

            bossId = remindId;

            workerId = uid;

            content = "你的一级队员"+ userInfo.getNickName() +"，提醒你添加微信号，以便于和你取得联系和学习省钱技巧，赶快去添加吧；注：请升级到本软件最新版本在“我的-我的信息”中添加。";

            content = "你的一级队员" + userInfo.getNickName()

                    + "，提醒你添加微信号，以便于和你取得联系和学习省钱技巧，赶快去添加吧；注：请升级到本软件最新版本在“我的-我的信息”中添加。";

        } else {

            // 提示队员

            bossId = uid;

            workerId = remindId;

            content = "你的邀请人"+ userInfo.getNickName() +"，提醒你添加微信号，以便于和你取得联系帮助你更好的省钱，赶快去添加吧；注：请升级到本软件最新版本在“我的-我的信息”中添加。";

            content = "你的邀请人" + userInfo.getNickName()

                    + "，提醒你添加微信号，以便于和你取得联系帮助你更好的省钱，赶快去添加吧；注：请升级到本软件最新版本在“我的-我的信息”中添加。";

        }

        

        try {

@@ -399,8 +397,8 @@
            List<String> listAndroid = new ArrayList<String>();

            pushService.pushZNX(remindId, title, content, listIOS, listAndroid);

            

            userSystemMsgService.addUserSystemMsg(remindId, UserSystemMsgTypeEnum.common,

                    title, content, UserSystemMsg.TIME_TAG_COMMON, null);

            userSystemMsgService.addUserSystemMsg(remindId, UserSystemMsgTypeEnum.common, title, content,

                    UserSystemMsg.TIME_TAG_COMMON, null);

            

            ThreeSaleExtraInfo newInfo = new ThreeSaleExtraInfo();

            if (remindBoss) {


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

@@ -23,9 +23,9 @@
import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;

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

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

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

import com.yeshi.fanli.service.inter.jd.JDGoodsService;

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

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.factory.goods.GoodsDetailVOFactory;


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

@@ -21,8 +21,8 @@
import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;

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

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

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

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

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

import com.yeshi.fanli.service.inter.pdd.PDDGoodsService;

import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsService;

import com.yeshi.fanli.util.Constant;


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

@@ -36,11 +36,11 @@
import com.yeshi.fanli.service.inter.homemodule.DeviceSexService;

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

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

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

import com.yeshi.fanli.service.inter.jd.JDGoodsService;

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

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

import com.yeshi.fanli.service.inter.monitor.MonitorService;

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

import com.yeshi.fanli.service.inter.pdd.PDDGoodsService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsUpdateService;

import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailService;


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

@@ -41,15 +41,15 @@
import com.yeshi.fanli.service.inter.config.BusinessSystemService;

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

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

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

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

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

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

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoShopService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;

import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailService;

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

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

import com.yeshi.fanli.service.inter.user.integral.IntegralGetService;

import com.yeshi.fanli.tag.PageEntity;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;


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

@@ -49,17 +49,17 @@
import com.yeshi.fanli.service.inter.goods.CommonGoodsService;

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

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

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

import com.yeshi.fanli.service.inter.monitor.BusinessEmergent110Service;

import com.yeshi.fanli.service.inter.monitor.MonitorService;

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

import com.yeshi.fanli.service.inter.tlj.ConfigTaoLiJinService;

import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinRecordService;

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

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

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

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

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

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

import com.yeshi.fanli.service.inter.user.tb.UserExtraTaoBaoInfoService;

import com.yeshi.fanli.util.AESUtil;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.MoneyBigDecimalUtil;

@@ -370,8 +370,7 @@
        try {

            TaoBaoGoodsBrief goods = null;

            try {

                goods = TaoKeApiUtil.searchGoodsDetail(auctionId, new TaoKeAppInfo(TaoBaoConstant.TAOBAO_AUTH_APPKEY,

                        TaoBaoConstant.TAOBAO_AUTH_APPSECRET, TaoBaoConstant.TAOBAO_SPECIAL_PID_DEFAULT));

                goods = TaoKeApiUtil.searchGoodsDetail(auctionId);

            } catch (TaobaoGoodsDownException e2) {

                e2.printStackTrace();

            }

@@ -381,6 +380,11 @@
                return;

            }



            if (goods.getTkRate() == null || goods.getTkRate().compareTo(new BigDecimal(0)) <= 0) {

                //TaoKeApiUtil.specialConvertCoupon(auctionId, app);



            }



            // 计算推广红包

            String warningRate = configTaoLiJinService.getValueByKey("warning_value", new Date());

            LogHelper.error("推广红包比例:"+warningRate);


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

@@ -26,7 +26,7 @@
import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;

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

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

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

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

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

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;


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

@@ -46,10 +46,11 @@
import com.yeshi.fanli.service.inter.goods.ShareGoodsService;

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

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

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

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

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

import com.yeshi.fanli.service.inter.monitor.BusinessEmergent110Service;

import com.yeshi.fanli.service.inter.monitor.MonitorService;

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

import com.yeshi.fanli.service.inter.taobao.ShareHotGoodsService;

import com.yeshi.fanli.service.inter.taobao.TLJBuyGoodsService;

import com.yeshi.fanli.service.inter.tlj.ConfigTaoLiJinService;

@@ -57,11 +58,10 @@
import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinDetailService;

import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinOriginService;

import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinRecordService;

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

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

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

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

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

import com.yeshi.fanli.service.inter.user.tb.UserExtraTaoBaoInfoService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.TaoBaoConstant;


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

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

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

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

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

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

import com.yeshi.fanli.util.taobao.TaoBaoUtil;



import net.sf.json.JSONArray;


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

@@ -40,7 +40,7 @@
import com.yeshi.fanli.service.inter.goods.ShareGoodsService;

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

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

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

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;

import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinRecordService;

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


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

@@ -28,7 +28,7 @@
import com.yeshi.fanli.service.inter.config.CustomerContentService;

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

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

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

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

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

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.taobao.TaoBaoUtil;


 fanli/src/main/java/com/yeshi/fanli/controller/web/ShareHotGoodsController.java

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

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

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

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

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

import com.yeshi.fanli.service.inter.taobao.ShareHotGoodsService;

import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailService;

import com.yeshi.fanli.util.StringUtil;


 fanli/src/main/java/com/yeshi/fanli/controller/web/WebGoodsClassController.java

@@ -14,7 +14,7 @@
import com.yeshi.fanli.entity.accept.AcceptData;

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

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

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

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

import com.yeshi.fanli.util.GsonUtil;

import com.yeshi.fanli.util.Utils;

import com.yeshi.fanli.util.taobao.TaoBaoUtil;


 fanli/src/main/java/com/yeshi/fanli/controller/web/WebRecommendController.java

@@ -28,7 +28,7 @@
import com.yeshi.fanli.service.inter.goods.CollectionGoodsV2Service;

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

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

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

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.RedisManager;


 fanli/src/main/java/com/yeshi/fanli/controller/web/WebSearchController.java

@@ -31,8 +31,8 @@
import com.yeshi.fanli.service.inter.config.CustomerContentService;

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

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

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

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

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

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

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.taobao.TaoBaoUtil;


 fanli/src/main/java/com/yeshi/fanli/controller/xcx/XcxGoodsClassController.java

File was deleted

 fanli/src/main/java/com/yeshi/fanli/controller/xcx/XcxMiniControllerUtil.java

File was deleted

 fanli/src/main/java/com/yeshi/fanli/controller/xcx/XcxSearchController.java

File was deleted

 fanli/src/main/java/com/yeshi/fanli/controller/xcx/XcxSystemMiniController.java

File was deleted

 fanli/src/main/java/com/yeshi/fanli/controller/xcx/XcxUserInfoController.java

File was deleted

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

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

    UserInfo selectByPrimaryKey(Long id);
    
    UserInfo selectByPKey(Long id);
    /**
     * 查询有效的
     * 
     * @param id
     * @return
     */
    UserInfo selectAvailableByPrimaryKey(Long id);

    UserInfo selectByPrimaryKeyForUpdate(Long id);

@@ -54,7 +60,6 @@
    // 根据获WXUnionId有效用户
    UserInfo getEffectiveUserInfoByWXUnionId(@Param("unionId") String unionId);
    
	
    Long getMaxUid();

    /**
@@ -65,31 +70,36 @@
     */
    void connectUser(@Param("mainUid")Long mainUid,@Param("lessUid") Long lessUid);
    
	
    /**
     * 
     * @param start
     * @param count
     * @param key  查询条件
     * @param userType  用户类型
     * @param days      天数
     * @param startTime  注册时间 -小
     * @param endTime    注册时间 -大
     * @param orderMode  排序方式
     * @param key
     *            查询条件
     * @param userType
     *            用户类型
     * @param days
     *            天数
     * @param startTime
     *            注册时间 -小
     * @param endTime
     *            注册时间 -大
     * @param orderMode
     *            排序方式
     * @return
     */
    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("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);
    
    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("userRank") String userRank, @Param("days") Integer days, @Param("startTime") String startTime,
            @Param("endTime") String endTime);
    
    /**
     * 统计当前查询结果总金额
     * 
     * @param title
     * @param userType
     * @param days
@@ -102,14 +112,18 @@
    
    /**
     * 统计用户数量
     * @param isToday  统计今日
     * @param isMonth  统计当月  二则不可同时存在
     * 
     * @param isToday
     *            统计今日
     * @param isMonth
     *            统计当月 二则不可同时存在
     * @return
     */
    long countNewUser(@Param("isToday") Integer isToday, @Param("isMonth") Integer isMonth);
    
    /**
     * 根据等级统计用户数量
     * 
     * @param rank
     * @return
     */
@@ -117,14 +131,15 @@
    
    /**
     * 统计所有用户总金额  或  可提现金额
     * 
     * @param minMoney
     * @return
     */
    BigDecimal countAllMoney(@Param("minMoney") Double minMoney);
    
	
    /**
     * 超过 daysNum  天未登陆的用户
     * 
     * @param minMoney
     * @return
     */
@@ -132,53 +147,55 @@
    
    /**
     * 统计流失用户数量:（ num 天未使用登录并且无任何资金流动的账号数量）
     * @param num 180
     * 
     * @param num
     *            180
     * @return
     */
    long countLoseUser(@Param("num") int num);
    
	
    /**
     * 累计有购买用户数
     * 
     * @return
     */
    long countHasOrderUser();
    

    /**
     * 统计新增用户
     * 
     * @return
     */
    List<Map<String, Object>> countNewUserByDate(@Param("channel")String channel,@Param("type")Integer type, @Param("years") String years, 
            @Param("startTime")String startTime, @Param("endTime")String endTime);
	
    List<Map<String, Object>> countNewUserByDate(@Param("channel") String channel, @Param("type") Integer type,
            @Param("years") String years, @Param("startTime") String startTime, @Param("endTime") String endTime);
    
    /**
     * 统计新增用户当日产生订单用户数量
     * 
     * @return
     */
    List<Map<String, Object>> getTodayHasOrder(@Param("channel")String channel,@Param("type")Integer type, @Param("years") String years, 
            @Param("startTime")String startTime, @Param("endTime")String endTime);
	
    List<Map<String, Object>> getTodayHasOrder(@Param("channel") String channel, @Param("type") Integer type,
            @Param("years") String years, @Param("startTime") String startTime, @Param("endTime") String endTime);
    
    /**
     * 统计新增用户一周产生订单用户数量
     * 
     * @return
     */
    Map<String, Object> getWeekHasOrder(@Param("channel")String channel, @Param("startTime")String startTime, 
            @Param("endTime")String endTime, @Param("orderNum")Integer orderNum);
    
	
    /**
     * 根据电话号码、邀请码获取邀请用户
     * 
     * @param phone
     * @param inviteCode
     * @return
     */
    UserInfo getInfoByPhoneOrInviteCode(@Param("phone")String phone, @Param("inviteCode")String inviteCode);
    
	
    // 根据AppId与电话号码获取用户
    List<UserInfo> listByClosed(@Param("appId") String appId, @Param("phone") String phone);

    long countAvaiableUser();
}

 fanli/src/main/java/com/yeshi/fanli/dto/wx/WXAccountInfoDTO.java

New file
@@ -0,0 +1,53 @@
package com.yeshi.fanli.dto.wx;



public class WXAccountInfoDTO {

    // 公众号

    private String gzAppId;

    private String gzAppSecret;

    // APP

    private String appId;

    private String appSecret;



    public WXAccountInfoDTO(String gzAppId, String gzAppSecret, String appId, String appSecret) {

        this.gzAppId = gzAppId;

        this.gzAppSecret = gzAppSecret;

        this.appId = appId;

        this.appSecret = appSecret;

    }

	
    public WXAccountInfoDTO() {

    }



    public String getGzAppId() {

        return gzAppId;

    }



    public void setGzAppId(String gzAppId) {

        this.gzAppId = gzAppId;

    }



    public String getGzAppSecret() {

        return gzAppSecret;

    }



    public void setGzAppSecret(String gzAppSecret) {

        this.gzAppSecret = gzAppSecret;

    }



    public String getAppId() {

        return appId;

    }



    public void setAppId(String appId) {

        this.appId = appId;

    }



    public String getAppSecret() {

        return appSecret;

    }



    public void setAppSecret(String appSecret) {

        this.appSecret = appSecret;

    }



}


 fanli/src/main/java/com/yeshi/fanli/entity/bus/invite/SpreadUserImg.java

@@ -2,46 +2,37 @@


import java.util.Date;



import javax.persistence.Column;

import javax.persistence.Entity;

import javax.persistence.GeneratedValue;

import javax.persistence.GenerationType;

import javax.persistence.Id;

import javax.persistence.Table;

import javax.persistence.Transient;



import org.yeshi.utils.mybatis.Column;

import org.yeshi.utils.mybatis.Table;



import com.google.gson.annotations.Expose;



@Entity

@Table(name = "yeshi_ec_spread_user_img")

@org.yeshi.utils.mybatis.Table("yeshi_ec_spread_user_img")

@Table("yeshi_ec_spread_user_img")

public class SpreadUserImg {

    

    @Id

    @GeneratedValue(strategy = GenerationType.AUTO)

    @Column(name = "si_id")

    @org.yeshi.utils.mybatis.Column(name="si_id")

    @Expose

    private Long id;

    

    @org.yeshi.utils.mybatis.Column(name="si_uid")

    @Column(name = "si_uid")

    @Expose

    private Long uid;

    

    @org.yeshi.utils.mybatis.Column(name="si_type")

    @Column(name = "si_type")

    @Expose

    private Integer type;

    

    @org.yeshi.utils.mybatis.Column(name="si_url")

    @Expose

    @Column(name="si_url")

    @Expose

    private String url;

    

    @org.yeshi.utils.mybatis.Column(name="si_createtime")

    @Expose

    @Column(name="si_createtime")

    @Expose

    private Date createtime;

    

    @Transient


 fanli/src/main/java/com/yeshi/fanli/entity/bus/recommend/Honest.java

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


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



@Entity

@Table(name="yeshi_ec_honest")

public class Honest implements Serializable{

    


 fanli/src/main/java/com/yeshi/fanli/entity/bus/recommend/RecommendBanner.java

@@ -18,8 +18,6 @@


    @Column(name = "id")

    private Long id;

    // @ManyToOne(fetch = FetchType.EAGER)

    // @JoinColumn(name = "jumpid")

    @Column(name="jumpid")

    private JumpDetail jumpDetail;// 跳转详情

    @Column(name = "params")


 fanli/src/main/java/com/yeshi/fanli/entity/bus/user/AccountMessage.java

@@ -1,13 +1,7 @@
package com.yeshi.fanli.entity.bus.user;



import javax.persistence.Column;

import javax.persistence.Entity;

import javax.persistence.GeneratedValue;

import javax.persistence.GenerationType;

import javax.persistence.Id;

import javax.persistence.JoinColumn;

import javax.persistence.ManyToOne;

import javax.persistence.Table;

import org.yeshi.utils.mybatis.Column;

import org.yeshi.utils.mybatis.Table;



import com.google.gson.annotations.Expose;



@@ -17,41 +11,33 @@
 *

 * @date 2018年1月29日

 */

@Entity

@Table(name="yeshi_ec_account_message")

@org.yeshi.utils.mybatis.Table("yeshi_ec_account_message")

@Table("yeshi_ec_account_message")

public class AccountMessage {



    @org.yeshi.utils.mybatis.Column(name="id")

    @Id

    @GeneratedValue(strategy=GenerationType.AUTO)

    @Expose

    @Column(name="id")

    private Long id;

    

    @org.yeshi.utils.mybatis.Column(name="uid")

    @ManyToOne

    @JoinColumn(name="uid")

    @Column(name="uid")

    private UserInfo userInfo;

    

    @org.yeshi.utils.mybatis.Column(name="title")

    @Column(name="title")

    @Expose

    private String title;

    

    @org.yeshi.utils.mybatis.Column(name="content")

    @Column(name="content")

    @Expose

    private String content;

    

    @org.yeshi.utils.mybatis.Column(name="createTime")

    @Column(name="createTime")

    @Expose

    private Long createTime;

    

    @org.yeshi.utils.mybatis.Column(name="isOpen")

    @Column(name="isOpen")

    @Expose

    private Boolean isOpen;



    @org.yeshi.utils.mybatis.Column(name="system_msg_id")

    @Expose

    @Column(name="system_msg_id")

    @Expose

    private Long systemMsgId;

    

    public Long getId() {


 fanli/src/main/java/com/yeshi/fanli/entity/bus/user/BindingAccount.java

@@ -1,14 +1,8 @@
package com.yeshi.fanli.entity.bus.user;



import javax.persistence.Column;

import javax.persistence.Entity;

import javax.persistence.FetchType;

import javax.persistence.GeneratedValue;

import javax.persistence.GenerationType;

import javax.persistence.Id;

import javax.persistence.JoinColumn;

import javax.persistence.ManyToOne;

import javax.persistence.Table;



import org.yeshi.utils.mybatis.Column;

import org.yeshi.utils.mybatis.Table;



import com.google.gson.annotations.Expose;



@@ -18,34 +12,26 @@
 *

 * @date 2018年1月29日

 */

@Entity

@Table(name="yeshi_ec_binding_account")

@org.yeshi.utils.mybatis.Table("yeshi_ec_binding_account")

@Table("yeshi_ec_binding_account")

public class BindingAccount {

    

    public static final int TYPE_ALIPAY=1;

    

    public static final int TYPE_WXPAY=2;

    

    @Id

    @GeneratedValue(strategy=GenerationType.AUTO)

    @Column(name="`id`")

    @Expose

    @org.yeshi.utils.mybatis.Column(name="id")

    @Column(name="id")

    private Long id;

    

    @ManyToOne(fetch = FetchType.EAGER)

    @JoinColumn(name = "uid")

    @org.yeshi.utils.mybatis.Column(name="uid")

    @Column(name="uid")

    private UserInfo userInfo;

    @Expose

    @org.yeshi.utils.mybatis.Column(name="account")

    @Column(name="account")

    private String account;

    @Expose

    @org.yeshi.utils.mybatis.Column(name="type")

    @Column(name="type")

    private Integer type;  //1.支付宝  2.微信

    @Expose

    @org.yeshi.utils.mybatis.Column(name="name")

    @Column(name="name")

    private String name;



    public Long getId() {


 fanli/src/main/java/com/yeshi/fanli/entity/bus/user/HongBaoManage.java

@@ -1,11 +1,7 @@
package com.yeshi.fanli.entity.bus.user;



import javax.persistence.Column;

import javax.persistence.Entity;

import javax.persistence.GeneratedValue;

import javax.persistence.GenerationType;

import javax.persistence.Id;

import javax.persistence.Table;

import org.yeshi.utils.mybatis.Column;

import org.yeshi.utils.mybatis.Table;



/**

 * 红包相关参数设置

@@ -13,24 +9,15 @@
 *

 * @date 2018年1月29日

 */

@Entity

@Table(name="yeshi_ec_hongbao_manage")

@org.yeshi.utils.mybatis.Table("yeshi_ec_hongbao_manage")

@Table("yeshi_ec_hongbao_manage")

public class HongBaoManage {

	
    @Id

    @GeneratedValue(strategy = GenerationType.AUTO)

    @Column(name = "id")

    @org.yeshi.utils.mybatis.Column(name="id")

    private Long id;

    @Column(name="`key`")

    @org.yeshi.utils.mybatis.Column(name="key")

    @Column(name="key")

    private String key;

    @Column(name="`value`")

    @org.yeshi.utils.mybatis.Column(name="value")

    @Column(name="value")

    private String value;

    @Column(name="`remark`")

    @org.yeshi.utils.mybatis.Column(name="remark")

    @Column(name="remark")

    private String remark;

    

    public HongBaoManage() {


 fanli/src/main/java/com/yeshi/fanli/entity/bus/user/LostOrder.java

@@ -1,10 +1,5 @@
package com.yeshi.fanli.entity.bus.user;



import javax.persistence.GeneratedValue;

import javax.persistence.GenerationType;

import javax.persistence.Id;

import javax.persistence.JoinColumn;

import javax.persistence.ManyToOne;

import javax.persistence.Transient;



import org.yeshi.utils.mybatis.Column;

@@ -33,8 +28,6 @@
    

    public final static int TYPE_TAOBAO = 1;



    @Id

    @GeneratedValue(strategy = GenerationType.AUTO)

    @Expose

    @Column(name = "id")

    private Long id;

@@ -55,14 +48,10 @@
    private Long handleTime;



    @Column(name = "uid")

    @ManyToOne

    @JoinColumn(name = "uid")

    @Expose

    private UserInfo userInfo;



    @Column(name = "oid")

    @ManyToOne

    @JoinColumn(name = "oid")

    @Expose

    private Order order;

    @Column(name = "remake")

@@ -73,7 +62,6 @@
    private String judge;// 系统判定：如果用户在本系统购买并成功上传过订单，且上传的丢失订单后6位相同的话，那么系统判定为匹配



    @Column(name = "result_code")

    @javax.persistence.Column(name = "result_code")

    @Expose

    private Integer resultCode;// 第三方平台订单爬取结果

    @Column(name = "ip_info")


 fanli/src/main/java/com/yeshi/fanli/entity/bus/user/Order.java

@@ -4,13 +4,9 @@
import java.util.Date;



import javax.persistence.Column;

import javax.persistence.Entity;

import javax.persistence.FetchType;

import javax.persistence.GeneratedValue;

import javax.persistence.GenerationType;

import javax.persistence.Id;

import javax.persistence.JoinColumn;

import javax.persistence.ManyToOne;

import javax.persistence.Table;

import javax.persistence.UniqueConstraint;



@@ -22,7 +18,6 @@
 * @author Administrator

 *

 */

@Entity

@Table(name = "yeshi_ec_order", uniqueConstraints = @UniqueConstraint(columnNames = { "orderid", "order_type" }) )

@org.yeshi.utils.mybatis.Table("yeshi_ec_order")

public class Order {

@@ -68,8 +63,6 @@
    private Long createtime;// 创建时间 付款时间



    @org.yeshi.utils.mybatis.Column(name = "uid")

    @ManyToOne(fetch = FetchType.EAGER)

    @JoinColumn(name = "uid")

    @Expose

    private UserInfo userInfo;



@@ -116,11 +109,6 @@
     */

    @org.yeshi.utils.mybatis.Column(name = "version")

    private Integer version;



//    @OneToMany(fetch = FetchType.EAGER)

//    @JoinTable(name = "yeshi_ec_order_item", joinColumns = { @JoinColumn(name = "oid") }, inverseJoinColumns = {

//            @JoinColumn(name = "id") })

//    private List<OrderItem> orderItemList = new ArrayList<OrderItem>();



    public Order() {

        money = BigDecimal.valueOf(0);


 fanli/src/main/java/com/yeshi/fanli/entity/bus/user/ShamUser.java

@@ -11,7 +11,6 @@
import com.google.gson.annotations.Expose;



//假用户

@Entity

@Table(name = "yeshi_ec_sham_user")

@org.yeshi.utils.mybatis.Table("yeshi_ec_sham_user")

public class ShamUser {


 fanli/src/main/java/com/yeshi/fanli/entity/bus/user/ThreeSale.java

@@ -19,7 +19,6 @@
 *

 * @date 2018年1月29日

 */

@Entity

@Table(name = "yeshi_ec_threeSale")

@org.yeshi.utils.mybatis.Table("yeshi_ec_threeSale")

public class ThreeSale {

@@ -40,13 +39,11 @@
    public ThreeSale() {

    }



    @ManyToOne

    @JoinColumn(name = "boss_id")



    @Column(name = "boss_id")

    private UserInfo boss;// 邀请者



    @OneToOne

    @JoinColumn(name = "worker_id")



    @Column(name = "worker_id")

    private UserInfo worker; // 被邀请者




 fanli/src/main/java/com/yeshi/fanli/entity/bus/user/ThreeSaleExtraInfo.java

@@ -3,13 +3,9 @@
import java.util.Date;



import javax.persistence.Column;

import javax.persistence.Entity;

import javax.persistence.FetchType;

import javax.persistence.GeneratedValue;

import javax.persistence.GenerationType;

import javax.persistence.Id;

import javax.persistence.JoinColumn;

import javax.persistence.ManyToOne;

import javax.persistence.Table;



/**

@@ -17,7 +13,6 @@
 *

 * @date 2018年11月20日

 */

@Entity

@Table(name = "yeshi_ec_threesale_extra_info")

@org.yeshi.utils.mybatis.Table("yeshi_ec_threesale_extra_info")

public class ThreeSaleExtraInfo {

@@ -28,33 +23,27 @@
    @org.yeshi.utils.mybatis.Column(name = "tf_id")

    private Long id;

    

    @JoinColumn(name = "tf_boss_id")

    @ManyToOne(fetch = FetchType.EAGER)



    @org.yeshi.utils.mybatis.Column(name = "tf_boss_id")

    private UserInfo boss;//邀请者

    

    @JoinColumn(name = "tf_worker_id")

    @ManyToOne(fetch = FetchType.EAGER)



    @org.yeshi.utils.mybatis.Column(name = "tf_worker_id")

    private UserInfo worker; //被邀请者

    

    @JoinColumn(name = "tf_nickname")

    @org.yeshi.utils.mybatis.Column(name = "tf_nickname")

    private String nickname; // 备注名

    

    @JoinColumn(name = "tf_remind_boss")

    @org.yeshi.utils.mybatis.Column(name = "tf_remind_boss")

    private Integer remindBoss; // 提示boss绑定微信   1 已提醒

    

    @JoinColumn(name = "tf_remind_worker")

    @org.yeshi.utils.mybatis.Column(name = "tf_remind_worker")

    private Integer remindWorker; // 提示worker绑定微信  1 已提醒

    

    @JoinColumn(name = "tf_createtime")



    @org.yeshi.utils.mybatis.Column(name = "tf_createtime")

    private Date createTime; // 创建时间



    @JoinColumn(name = "tf_updatetime")

    @org.yeshi.utils.mybatis.Column(name = "tf_updatetime")

    private Date updateTime; // 更新时间




 fanli/src/main/java/com/yeshi/fanli/entity/bus/user/ThreeSaleRank.java

@@ -12,7 +12,6 @@
 *

 * @date 2018年1月29日

 */

@Entity

@Table(name="yeshi_ec_three_sale_rank")

public class ThreeSaleRank {

    


 fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserInfo.java

@@ -3,12 +3,11 @@
import java.math.BigDecimal;



import javax.persistence.Column;

import javax.persistence.Entity;

import javax.persistence.Id;

import javax.persistence.JoinColumn;

import javax.persistence.ManyToOne;

import javax.persistence.Table;

import javax.persistence.Transient;



import org.yeshi.utils.mybatis.Table;



import com.google.gson.annotations.Expose;

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

@@ -19,94 +18,78 @@
 * @author Administrator

 *

 */

@Entity

@Table(name = "`yeshi_ec_user`")

@org.yeshi.utils.mybatis.Table("yeshi_ec_user")

@Table("yeshi_ec_user")

public class UserInfo {

    public static int STATE_NORMAL = 0;// 正常状态

    public static int STATE_DELETE = 1;// 删除状态

    public static int STATE_FORBIDDEN = 2;// 封禁状态

    public static int STATE_DELETE_OUT_OF_DATE = 4;// 用户长期不活跃被删除



    @Id

    // @GeneratedValue(strategy = GenerationType.SEQUENCE)

    @Column(name = "id")

    @org.yeshi.utils.mybatis.Column(name = "id")

    @Expose

    private Long id;

    /**

     * 淘宝openId

     */

    @Expose

    @Column(name = "identifycode", length = 128)

    @org.yeshi.utils.mybatis.Column(name = "identifycode")

    @Column(name = "identifycode")

    private String openid;



    @Column(name = "login_type")

    @org.yeshi.utils.mybatis.Column(name = "login_type")

    @Expose

    private Integer loginType;// 1-淘宝



    @Column(name = "wx_open_id")

    @org.yeshi.utils.mybatis.Column(name = "wx_open_id")

    @Expose

    private String wxOpenId;



    @Column(name = "wx_union_id")

    @org.yeshi.utils.mybatis.Column(name = "wx_union_id")

    @Expose

    private String wxUnionId;



    @org.yeshi.utils.mybatis.Column(name = "nick_name")

    @Column(name = "nick_name", length = 128)

    @Column(name = "nick_name")

    @Expose

    private String nickName;// 昵称



    @org.yeshi.utils.mybatis.Column(name = "tbName")

    @Column(name = "tbName")

    @Expose

    private String tbName; // 淘宝昵称



    @org.yeshi.utils.mybatis.Column(name = "tbPic")

    @Column(name = "tbPic")

    private String tbPic;// 淘宝头像



    @org.yeshi.utils.mybatis.Column(name = "wxName")

    @Column(name = "wxName")

    @Expose

    private String wxName;



    @org.yeshi.utils.mybatis.Column(name = "wxPic")

    @Column(name = "wxPic")

    private String wxPic;



    @org.yeshi.utils.mybatis.Column(name = "portrait")

    @Column(name = "portrait", length = 512)

    @Column(name = "portrait")

    @Expose

    private String portrait;// 头像



    @org.yeshi.utils.mybatis.Column(name = "createtime")

    @Column(name = "createtime")

    @Expose

    private Long createtime;



    @org.yeshi.utils.mybatis.Column(name = "last_logintime")

    @Column(name = "last_logintime")

    @Expose

    private Long lastLoginTime;// 最近一次登录时间



    @org.yeshi.utils.mybatis.Column(name = "loginip")

    @Column(name = "loginip", length = 30)

    @Column(name = "loginip")

    @Expose

    private String lastLoginIp;// 最近一次登录IP



    @org.yeshi.utils.mybatis.Column(name = "tuiguang_code")

    @Column(name = "tuiguang_code", length = 30)

    @Column(name = "tuiguang_code")

    @Expose

    private String tuiGuangCode;// 推广码



    @org.yeshi.utils.mybatis.Column(name = "appid")

    @Column(name = "appid", length = 30)

    @Column(name = "appid")

    @Expose

    private String appId;//



    @org.yeshi.utils.mybatis.Column(name = "my_hongBao")

    @Column(name = "my_hongBao", length = 8)

    @Column(name = "my_hongBao")

    @Expose

    // @Type(type = "big_decimal")

    private BigDecimal myHongBao; // 我的红包

@@ -121,29 +104,24 @@
    @Expose

    private BigDecimal canOpenHongBao;



    @org.yeshi.utils.mybatis.Column(name = "pay_password")

    @Column(name = "pay_password")

    private String payPassword;



    @org.yeshi.utils.mybatis.Column(name = "sid")

    @ManyToOne

    @JoinColumn(name = "sid")

    @Column(name = "sid")

    private BusinessSystem system;



    @org.yeshi.utils.mybatis.Column(name = "rank")

    @Column(name = "rank")

    @Expose

    private Integer rank;// 0 普通 1 铜 2银 3 金



    @org.yeshi.utils.mybatis.Column(name = "phone")

    @Column(name = "phone", length = 16)

    @Column(name = "phone")

    @Expose

    private String phone; // 电话号码



    @org.yeshi.utils.mybatis.Column(name = "state")

    @Column(name = "state")

    private Integer state; // 用户的状态



    @org.yeshi.utils.mybatis.Column(name = "state_desc")

    @Column(name = "state_desc") // 用户状态简介

    @Column(name = "state_desc")

    private String stateDesc;



    @Transient


 fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserRankings.java

@@ -18,7 +18,6 @@
 *

 * @date 2018年7月27日

 */

@Entity

@Table(name = "yeshi_ec_rankings_record")

@org.yeshi.utils.mybatis.Table("yeshi_ec_rankings_record")

public class UserRankings {

@@ -30,43 +29,33 @@
    @org.yeshi.utils.mybatis.Column(name = "r_id")

    private Long id;



    @JoinColumn(name = "r_show_id")

    @org.yeshi.utils.mybatis.Column(name = "r_show_id")

    private String showId; // 显示id

    

    @JoinColumn(name = "r_nick_name")

    @org.yeshi.utils.mybatis.Column(name = "r_nick_name")

    private String nickName;// 名称



    @JoinColumn(name = "r_portrait")

    @org.yeshi.utils.mybatis.Column(name = "r_portrait")

    private String portrait;  //头像url

    

    @JoinColumn(name = "r_trade_reward")

    @org.yeshi.utils.mybatis.Column(name = "r_trade_reward")

    private BigDecimal tradeReward; // 自购奖励



    @JoinColumn(name = "r_share_reward")

    @org.yeshi.utils.mybatis.Column(name = "r_share_reward")

    private BigDecimal shareReward; // 分享奖励

    

    @JoinColumn(name = "r_trade_state")

    @org.yeshi.utils.mybatis.Column(name = "r_trade_state")

    private Integer tradeState; // 自购在线状态



    @JoinColumn(name = "r_share_state")

    @org.yeshi.utils.mybatis.Column(name = "r_share_state")

    private Integer shareState; // 分享在线状态



    @JoinColumn(name = "r_trade_time")

    @org.yeshi.utils.mybatis.Column(name = "r_trade_time")

    private Date tradeTime; // 自购榜 最后入榜时间



    @JoinColumn(name = "r_share_time")

    @org.yeshi.utils.mybatis.Column(name = "r_share_time")

    private Date shareTime; // 分享榜 最后入榜时间



    @JoinColumn(name = "r_createtime")

    @org.yeshi.utils.mybatis.Column(name = "r_createtime")

    private Date createtime; // 创建时间




 fanli/src/main/java/com/yeshi/fanli/entity/common/DataMonitor.java

@@ -17,7 +17,6 @@
 * @author Administrator

 *

 */

@Entity

@Table(name = "`yeshi_ec_monitor_data`")

@org.yeshi.utils.mybatis.Table("yeshi_ec_monitor_data")

public class DataMonitor {


 fanli/src/main/java/com/yeshi/fanli/entity/common/JumpDetailV2.java

@@ -18,7 +18,6 @@
 *

 * @date 2018年10月23日

 */

@Entity

@Table(name = "yeshi_ec_action_jumpdetail_v2")

@org.yeshi.utils.mybatis.Table("yeshi_ec_action_jumpdetail_v2")

public class JumpDetailV2 implements Serializable {


 fanli/src/main/java/com/yeshi/fanli/entity/push/DeviceTokenIOS.java

@@ -10,7 +10,6 @@
import org.yeshi.utils.mybatis.Column;

import org.yeshi.utils.mybatis.Table;



@Entity

@Table("yeshi_ec_uid_devicetoken_ios")

public class DeviceTokenIOS {




 fanli/src/main/java/com/yeshi/fanli/entity/push/PushQueueRecord.java

@@ -10,7 +10,6 @@
import javax.persistence.Table;





@Entity

@Table(name="yeshi_ec_push_queue")

@org.yeshi.utils.mybatis.Table("yeshi_ec_push_queue")

public class PushQueueRecord {


 fanli/src/main/java/com/yeshi/fanli/entity/system/BusinessSystem.java

@@ -16,7 +16,6 @@
 * @author Administrator

 *

 */

@Entity

@Table(name = "yeshi_ec_system")

@org.yeshi.utils.mybatis.Table("yeshi_ec_system")

public class BusinessSystem implements Serializable{


 fanli/src/main/java/com/yeshi/fanli/entity/taobao/TBPid.java

@@ -8,7 +8,6 @@


import org.yeshi.utils.mybatis.Column;



@Entity

@Table(name = "yeshi_ec_pid")

@org.yeshi.utils.mybatis.Table("yeshi_ec_pid")

public class TBPid {


 fanli/src/main/java/com/yeshi/fanli/entity/taobao/TaobaoMeterial.java

@@ -8,7 +8,6 @@
import javax.persistence.GeneratedValue;

import javax.persistence.GenerationType;

import javax.persistence.Id;

import javax.persistence.JoinColumn;

import javax.persistence.Table;



/**

@@ -18,7 +17,6 @@
 *

 * @date 2018年8月24日

 */

@Entity

@Table(name = "yeshi_ec_taobao_meterial")

@org.yeshi.utils.mybatis.Table("yeshi_ec_taobao_meterial")

public class TaobaoMeterial implements Serializable{

@@ -35,24 +33,19 @@
    @org.yeshi.utils.mybatis.Column(name = "tm_id")

    private Long id;



    @JoinColumn(name = "tm_class_name")

    @org.yeshi.utils.mybatis.Column(name = "tm_class_name")

    private String className;// 名称



    @JoinColumn(name = "tm_super_name")

    @org.yeshi.utils.mybatis.Column(name = "tm_super_name")

    private String superName; // 上级类目



    @JoinColumn(name = "tm_material_id")

    @org.yeshi.utils.mybatis.Column(name = "tm_material_id")

    private Integer materialId; // 通用物料id





    @JoinColumn(name = "tm_createtime")

    @org.yeshi.utils.mybatis.Column(name = "tm_createtime")

    private Date createtime; // 创建时间



    @JoinColumn(name = "tm_updatetime")

    @org.yeshi.utils.mybatis.Column(name = "tm_updatetime")

    private Date updatetime; // 更新时间（修改时间）




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

@@ -5,7 +5,7 @@
import org.springframework.scheduling.annotation.Scheduled;

import org.springframework.stereotype.Component;



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

import com.yeshi.fanli.service.inter.money.extract.ExtractRecordService;



@Component

public class DeleteRecordJob {


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

@@ -12,9 +12,9 @@
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.service.inter.integral.IntegralTaskClassService;

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

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

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

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

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.TimeUtil;




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

@@ -5,7 +5,7 @@
import org.springframework.scheduling.annotation.Scheduled;

import org.springframework.stereotype.Component;



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

import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;



@Component

public class ThreeSaleJob {


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

@@ -9,9 +9,9 @@
import org.springframework.stereotype.Component;



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

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

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

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

import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;

import com.yeshi.fanli.service.inter.user.invite.UserInviteMsgNotificationService;

import com.yeshi.fanli.util.Constant;



@Component


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

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

import com.yeshi.fanli.log.LogHelper;

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

import com.yeshi.fanli.service.inter.taobao.TaoBaoOrderService;

import com.yeshi.fanli.service.inter.order.tb.TaoBaoOrderService;

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

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;


 fanli/src/main/java/com/yeshi/fanli/job/order/jd/UpdateJDOrderJob.java

@@ -12,7 +12,7 @@
import com.yeshi.fanli.dto.jd.JDOrderResult;

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

import com.yeshi.fanli.exception.jd.JDOrderException;

import com.yeshi.fanli.service.inter.jd.JDOrderService;

import com.yeshi.fanli.service.inter.order.jd.JDOrderService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.RedisManager;

import com.yeshi.fanli.util.TimeUtil;


 fanli/src/main/java/com/yeshi/fanli/job/order/pdd/UpdatePDDOrderJob.java

@@ -12,7 +12,7 @@
import com.yeshi.fanli.dto.pdd.PDDOrderResult;

import com.yeshi.fanli.entity.pdd.PDDOrder;

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

import com.yeshi.fanli.service.inter.pdd.PDDOrderService;

import com.yeshi.fanli.service.inter.order.pdd.PDDOrderService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.RedisManager;

import com.yeshi.fanli.util.cmq.PDDOrderCMQManager;


 fanli/src/main/java/com/yeshi/fanli/job/order/taobao/UpdateCommonOrderJob.java

@@ -18,9 +18,9 @@
import com.yeshi.fanli.service.inter.order.LostOrderService;

import com.yeshi.fanli.service.inter.order.OrderProcessService;

import com.yeshi.fanli.service.inter.order.OrderService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoOrderService;

import com.yeshi.fanli.service.inter.order.tb.TaoBaoOrderService;

import com.yeshi.fanli.service.inter.order.tb.TaoBaoWeiQuanOrderService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoWeiQuanOrderService;

import com.yeshi.fanli.util.CMQManager;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.RedisManager;


 fanli/src/main/java/com/yeshi/fanli/job/order/taobao/UpdateOrderJob.java

@@ -28,9 +28,9 @@
import com.yeshi.fanli.service.inter.order.LostOrderService;

import com.yeshi.fanli.service.inter.order.OrderProcessService;

import com.yeshi.fanli.service.inter.order.OrderService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoOrderService;

import com.yeshi.fanli.service.inter.order.tb.TaoBaoOrderService;

import com.yeshi.fanli.service.inter.order.tb.TaoBaoWeiQuanOrderService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoWeiQuanOrderService;

import com.yeshi.fanli.util.CMQManager;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.RedisManager;


 fanli/src/main/java/com/yeshi/fanli/job/order/taobao/UpdateTBRelationAndSpecialOrderJob.java

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


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

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.taobao.TaoBaoOrderService;

import com.yeshi.fanli.service.inter.order.tb.TaoBaoOrderService;

import com.yeshi.fanli.util.CMQManager;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.RedisManager;


 fanli/src/main/java/com/yeshi/fanli/log/LogHelper.java

@@ -97,11 +97,11 @@
        e.printStackTrace();

        String date = TimeUtil.getGernalTime(System.currentTimeMillis(), "yyyy_MM_dd");

        String os = System.getProperty("os.name");

        String filePath = String.format("/usr/local/tomcat8/logs/error_detail_%s.txt", date);

        String filePath = String.format("/usr/local/tomcat8/logs/error_detail_%s.log", date);

        if (os.toLowerCase().startsWith("win")) {

            filePath = String.format("C:/logs/error_detail_%s.txt", date);

            filePath = String.format("C:/logs/error_detail_%s.log", date);

        } else

            filePath = String.format("/usr/local/tomcat8/logs/error_detail_%s.txt", date);

            filePath = String.format("/usr/local/tomcat8/logs/error_detail_%s.log", date);



        OutputStream out = null;



@@ -128,11 +128,11 @@
        e.printStackTrace();

        String date = TimeUtil.getGernalTime(System.currentTimeMillis(), "yyyy_MM_dd");

        String os = System.getProperty("os.name");

        String filePath = String.format("/usr/local/tomcat8/logs/error_detail_%s.txt", date);

        String filePath = String.format("/usr/local/tomcat8/logs/error_detail_%s.log", date);

        if (os.toLowerCase().startsWith("win")) {

            filePath = String.format("C:/logs/error_detail_%s.txt", date);

            filePath = String.format("C:/logs/error_detail_%s.log", date);

        } else

            filePath = String.format("/usr/local/tomcat8/logs/error_detail_%s.txt", date);

            filePath = String.format("/usr/local/tomcat8/logs/error_detail_%s.log", date);

        OutputStream out = null;

        try {

            out = new FileOutputStream(new File(filePath), true);


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

@@ -38,7 +38,8 @@
        <result column="wx_open_id" property="wxOpenId" jdbcType="VARCHAR" />

        <result column="wx_union_id" property="wxUnionId" jdbcType="VARCHAR" />

        <result column="nick_name" property="nickName" jdbcType="VARCHAR" />

        <result column="uiet_taobao_nick_name" property="tbName" jdbcType="VARCHAR" />

        <result column="uiet_taobao_nick_name" property="tbName"

            jdbcType="VARCHAR" />

        <result column="tbPic" property="tbPic" jdbcType="VARCHAR" />

        <result column="wxName" property="wxName" jdbcType="VARCHAR" />

        <result column="wxPic" property="wxPic" jdbcType="VARCHAR" />

@@ -64,32 +65,39 @@
        <result column="totalOrder" property="totalOrder"    jdbcType="BIGINT" />

        <result column="monthOrder" property="monthOrder"    jdbcType="BIGINT" />

        

        <result column="uiet_special_id" property="tbSpecialId"    jdbcType="VARCHAR" />

        <result column="uiet_relation_id" property="tbRelationId"    jdbcType="VARCHAR" />

        <result column="uiet_special_id" property="tbSpecialId"

            jdbcType="VARCHAR" />

        <result column="uiet_relation_id" property="tbRelationId"

            jdbcType="VARCHAR" />

        <result column="uiet_taobao_uid" property="taoBaoUid"    jdbcType="VARCHAR" />

        

        <result column="wxUnionIdInvalid" property="wxUnionIdInvalid"    jdbcType="VARCHAR" />

        <result column="taobaoUidInvalid" property="taobaoUidInvalid"    jdbcType="VARCHAR" />

        <result column="wxUnionIdInvalid" property="wxUnionIdInvalid"

            jdbcType="VARCHAR" />

        <result column="taobaoUidInvalid" property="taobaoUidInvalid"

            jdbcType="VARCHAR" />

        <result column="phoneInvalid" property="phoneInvalid"    jdbcType="VARCHAR" />

        <result column="alipayAccountInvalid" property="alipayAccountInvalid"    jdbcType="VARCHAR" />

        <result column="alipayAccountInvalid" property="alipayAccountInvalid"

            jdbcType="VARCHAR" />

        

        <result column="uie_gold_coin" property="goldCoin"    jdbcType="INTEGER" />

    </resultMap>

    

    <sql id="Base_Column_List">id,identifycode,login_type,wx_open_id,wx_union_id,nick_name,tbName,tbPic,wxName,wxPic,portrait,createtime,last_logintime,loginip,tuiguang_code,appid,my_hongBao,pay_password,sid,rank,phone,state,state_desc

    </sql>

    <!-- 不能查询缓存 -->

    <select id="selectByPrimaryKey" resultMap="BaseResultMap"

        parameterType="java.lang.Long">

        select

        <include refid="Base_Column_List" />

        from yeshi_ec_user where id = #{id,jdbcType=BIGINT} and `state`=0

    </select>

	
    <select id="selectByPKey" resultMap="BaseResultMap"

        parameterType="java.lang.Long">

        parameterType="java.lang.Long" flushCache="true" useCache="false">

        select

        <include refid="Base_Column_List" />

        from yeshi_ec_user where id = #{id,jdbcType=BIGINT} 

    </select>

	
        <!-- 不能查询缓存 -->

    <select id="selectAvailableByPrimaryKey" resultMap="BaseResultMap"

        parameterType="java.lang.Long" flushCache="true" useCache="false">

        select

        <include refid="Base_Column_List" />

        from yeshi_ec_user where id = #{id,jdbcType=BIGINT} and `state`=0

    </select>

    

    <select id="selectByPrimaryKeyForUpdate" resultMap="BaseResultMap"

@@ -250,14 +258,18 @@
    

    <!-- 根据AppId与电话号码获取用户 -->

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

        select <include refid="Base_Column_List" /> from yeshi_ec_user 
        select

        <include refid="Base_Column_List" />

        from yeshi_ec_user

        where phone=#{phone} AND state = 0 

        LIMIT 1 

    </select>

    

    <!-- 根据AppId与电话号码获取用户 -->

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

        select <include refid="Base_Column_List" /> from yeshi_ec_user 
        select

        <include refid="Base_Column_List" />

        from yeshi_ec_user

        where wx_union_id=#{unionId} AND state = 0 

        LIMIT 1 

    </select>

@@ -273,45 +285,71 @@
    <select id="query"  resultMap="BaseResultMapVO">

           SELECT *

           ,(SELECT COUNT(hb.hb_id) FROM `yeshi_ec_hongbao_v2` hb 

                   WHERE hb.hb_uid = u.id AND hb.hb_type = 1 )AS totalOrder <!-- 累计订单 -->

        WHERE

        hb.hb_uid = u.id AND hb.hb_type = 1 )AS totalOrder <!-- 累计订单 -->

           ,(SELECT COUNT(hb.hb_id) FROM `yeshi_ec_hongbao_v2` hb 

                   WHERE hb.hb_uid = u.id AND hb.hb_type = 1

                   AND DATE_FORMAT(hb.`hb_create_time`,'%Y%m') = DATE_FORMAT(CURDATE(),'%Y%m'))AS monthOrder <!-- 累计本月订单 -->

        WHERE hb.hb_uid

        = u.id AND hb.hb_type = 1

        AND DATE_FORMAT(hb.`hb_create_time`,'%Y%m') =

        DATE_FORMAT(CURDATE(),'%Y%m'))AS monthOrder <!-- 累计本月订单 -->

        ,(SELECT COUNT(tr.`id`) FROM `yeshi_ec_threesale` tr  <!-- 队员 -->

             WHERE  tr.`boss_id`=u.id AND tr.state = 1) AS totalPlayers 

           FROM yeshi_ec_user u 
               LEFT JOIN yeshi_ec_binding_account  b ON u.`id` = b.`uid`  
        FROM

        yeshi_ec_user u

        LEFT JOIN yeshi_ec_binding_account b ON u.`id` =

        b.`uid`

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

               LEFT JOIN yeshi_ec_user_rank rak ON rak.ur_id = ext.uie_rank_id

               LEFT JOIN yeshi_ec_user_info_extra_taobao tb ON  tb.`uiet_uid` = u.id

        LEFT

        JOIN yeshi_ec_user_info_extra_taobao tb ON tb.`uiet_uid` = u.id

        

        <if test="userState == 2">

               LEFT JOIN 

                (SELECT A.uid AS buid,MAX(A.f_wxUnionId) AS wxUnionIdInvalid ,MAX(A.f_taobaoUid) AS taobaoUidInvalid,MAX(A.f_phone) AS phoneInvalid,MAX(A.f_alipayAccount) AS alipayAccountInvalid FROM 
                    (SELECT u.`id`AS uid,b.account AS alipayAccount,b.name AS alipayAccountName,fu.* FROM yeshi_ec_user u 
                LEFT JOIN yeshi_ec_binding_account b ON b.`uid` = u.`id`

                LEFT JOIN yeshi_ec_user_info_extra_taobao tb ON  tb.`uiet_uid` = u.id

                LEFT JOIN (SELECT fc.fuc_effective,IF(fc.`fuc_type` = 'wxUnionId',fc.`fuc_identify_code`,NULL)AS f_wxUnionId,

                    IF(fc.`fuc_type` = 'taobaoUid',fc.`fuc_identify_code`,NULL)AS f_taobaoUid,

                    IF(fc.`fuc_type` = 'phone',fc.`fuc_identify_code`,NULL)AS f_phone,

                    IF(fc.`fuc_type` = 'alipayAccount',fc.`fuc_identify_code`,NULL)AS f_alipayAccount

                FROM yeshi_ec_forbidden_user_identify_code fc WHERE fc.fuc_effective = 1 )fu ON (fu.f_wxUnionId = u.`wx_union_id` OR fu.f_taobaoUid = tb.`uiet_taobao_uid` OR fu.f_phone = u.`phone` OR fu.f_alipayAccount = b.`account`)

            (SELECT A.uid AS buid,MAX(A.f_wxUnionId) AS

            wxUnionIdInvalid

            ,MAX(A.f_taobaoUid) AS

            taobaoUidInvalid,MAX(A.f_phone) AS

            phoneInvalid,MAX(A.f_alipayAccount) AS alipayAccountInvalid FROM

            (SELECT u.`id`AS uid,b.account AS alipayAccount,b.name AS

            alipayAccountName,fu.* FROM yeshi_ec_user u

            LEFT JOIN

            yeshi_ec_binding_account b ON b.`uid` = u.`id`

            LEFT JOIN

            yeshi_ec_user_info_extra_taobao tb ON tb.`uiet_uid` = u.id

            LEFT JOIN

            (SELECT fc.fuc_effective,IF(fc.`fuc_type` =

            'wxUnionId',fc.`fuc_identify_code`,NULL)AS f_wxUnionId,

            IF(fc.`fuc_type` = 'taobaoUid',fc.`fuc_identify_code`,NULL)AS

            f_taobaoUid,

            IF(fc.`fuc_type` = 'phone',fc.`fuc_identify_code`,NULL)AS

            f_phone,

            IF(fc.`fuc_type` =

            'alipayAccount',fc.`fuc_identify_code`,NULL)AS f_alipayAccount

            FROM

            yeshi_ec_forbidden_user_identify_code fc WHERE fc.fuc_effective

            = 1

            )fu ON (fu.f_wxUnionId = u.`wx_union_id` OR fu.f_taobaoUid =

            tb.`uiet_taobao_uid` OR fu.f_phone = u.`phone` OR fu.f_alipayAccount

            = b.`account`)

                WHERE u.`state` =2  

            )A GROUP BY A.uid) B ON u.id= B.buid 

           </if>

           

           where 1=1

               <if test="userState == 1">

                   AND u.`state` <![CDATA[<>]]> 2 <!--  正常用户 -->

            AND u.`state` <![CDATA[<>]]>

            2 <!-- 正常用户 -->

               </if>

               <if test="userState == 2">

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

               </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')

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

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

               </if>

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

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

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

               </if>

                  <if test="userRank != null">

                   AND rak.ur_name = #{userRank}

@@ -361,22 +399,28 @@
    

    <select id="queryCount" resultType="java.lang.Long">

           SELECT IFNULL(count(u.id),0) FROM yeshi_ec_user u 

               LEFT JOIN yeshi_ec_binding_account  b ON u.`id` = b.`uid`  
               LEFT JOIN yeshi_ec_user_info_extra  ext ON u.`id` = ext.uie_uid

               LEFT JOIN yeshi_ec_user_rank rak ON rak.ur_id = ext.uie_rank_id

        LEFT JOIN

        yeshi_ec_binding_account b ON u.`id` = b.`uid`

        LEFT JOIN

        yeshi_ec_user_info_extra ext ON u.`id` = ext.uie_uid

        LEFT JOIN

        yeshi_ec_user_rank rak ON rak.ur_id = ext.uie_rank_id

           where 1=1

           

                <if test="userState == 1">

                   AND u.`state` <![CDATA[<>]]> 2 <!--  正常用户 -->

            AND u.`state` <![CDATA[<>]]>

            2 <!-- 正常用户 -->

               </if>

               <if test="userState == 2">

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

               </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')

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

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

                </if>

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

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

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

                </if>

                   <if test="userRank != null">

                   AND rak.ur_name = #{userRank}

@@ -403,11 +447,16 @@
    

    <select id="querySumMoney" resultType="java.lang.Double">

           SELECT COALESCE(sum(u.my_hongBao),0) FROM yeshi_ec_user u 

               LEFT JOIN yeshi_ec_binding_account  b ON u.`id` = b.`uid`  
        LEFT JOIN

        yeshi_ec_binding_account b ON u.`id` = b.`uid`

           where <![CDATA[ 1>0 ]]>  

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

                   AND    (u.id LIKE '%${key}%' OR u.`phone` LIKE '%${key}%'  OR u.`wxName` LIKE '%${key}%'

                   OR u.`nick_name` LIKE '%${key}%'  OR u.`tbName` LIKE '%${key}%' OR b.`account` LIKE '%${key}%')

            AND (u.id LIKE '%${key}%' OR u.`phone` LIKE '%${key}%' OR

            u.`wxName`

            LIKE '%${key}%'

            OR u.`nick_name` LIKE '%${key}%' OR

            u.`tbName` LIKE '%${key}%' OR

            b.`account` LIKE '%${key}%')

                </if>

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

                   <![CDATA[ AND FROM_UNIXTIME(createtime/1000) >= '${startTime}' ]]>  

@@ -429,10 +478,13 @@
           SELECT COALESCE(count(id),0) FROM `yeshi_ec_user` 

           WHERE 1=1

                <if test="isToday != null and isToday == 1">

                AND TO_DAYS(FROM_UNIXTIME(createtime/1000)) = TO_DAYS(NOW())

            AND TO_DAYS(FROM_UNIXTIME(createtime/1000)) =

            TO_DAYS(NOW())

            </if>

            <if test="isMonth != null and isMonth == 1">

                AND DATE_FORMAT( FROM_UNIXTIME(createtime/1000), '%Y%m' ) = DATE_FORMAT(CURDATE() , '%Y%m' )

            AND DATE_FORMAT( FROM_UNIXTIME(createtime/1000), '%Y%m' )

            =

            DATE_FORMAT(CURDATE() , '%Y%m' )

            </if>

    </select>

    

@@ -452,18 +504,22 @@
    

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

        SELECT IFNULL(SUM(h.`money`),0),h.`uid` FROM `yeshi_ec_hongbao` h 

        WHERE  DATE_FORMAT(FROM_UNIXTIME(h.`createtime`/1000), '%Y-%m-%d' )= '2018-08-02'

        WHERE DATE_FORMAT(FROM_UNIXTIME(h.`createtime`/1000), '%Y-%m-%d' )=

        '2018-08-02'

        <![CDATA[AND h.state <>4]]> 

         AND ( h.`type` =5 OR  h.`type` =6 OR h.`type` =7 OR  h.`type` =20 OR h.`type` =21 OR h.`type` =22 )

        AND ( h.`type` =5 OR h.`type` =6 OR h.`type` =7 OR h.`type` =20 OR

        h.`type` =21 OR h.`type` =22 )

        GROUP BY h.`uid` 

        ORDER BY SUM(h.`money`) DESC

        ORDER BY SUM(h.`money`)

        DESC

         LIMIT ${start},${count}

    </select>

    

    <select id="longTimeNoLogin"  resultType="java.lang.Long">

    

        SELECT u.`id` FROM `yeshi_ec_user` u 

        WHERE  u.`id` IN <foreach item="item" collection="list" open="(" separator=","

        WHERE u.`id` IN

        <foreach item="item" collection="list" open="(" separator=","

            close=")">#{item}</foreach>

        AND <![CDATA[ (DATE_SUB(CURDATE(), INTERVAL ${daysNum} DAY) > DATE(FROM_UNIXTIME(u.`last_logintime`/1000))  

            OR (u.`last_logintime` IS NULL 

@@ -473,21 +529,29 @@
    

    <select id="countLoseUser" resultType="java.lang.Long">

        SELECT  COUNT(DISTINCT t.`id` ) FROM `yeshi_ec_user` t 

        LEFT JOIN `yeshi_ec_user_money_detail` d ON d.`umd_uid` = t.`id` 
        WHERE DATE_SUB(CURDATE(), INTERVAL ${num} DAY)<![CDATA[> ]]> DATE(FROM_UNIXTIME( t.`last_logintime`/1000)) 
               AND DATE_SUB(CURDATE(), INTERVAL ${num} DAY) <![CDATA[> ]]> DATE(d.`umd_createtime`)

        LEFT JOIN

        `yeshi_ec_user_money_detail` d ON d.`umd_uid` = t.`id`

        WHERE

        DATE_SUB(CURDATE(), INTERVAL ${num} DAY)<![CDATA[> ]]>

        DATE(FROM_UNIXTIME( t.`last_logintime`/1000))

        AND DATE_SUB(CURDATE(),

        INTERVAL ${num} DAY) <![CDATA[> ]]>

        DATE(d.`umd_createtime`)

    </select>

    

    <select id="countHasOrderUser" resultType="java.lang.Long">

        SELECT COUNT(DISTINCT h.`hb_uid`) FROM yeshi_ec_hongbao_v2 h 
        WHERE (h.`hb_type`=1 or  h.`hb_type`=2 or h.`hb_type`= 20)

        SELECT COUNT(DISTINCT

        h.`hb_uid`) FROM yeshi_ec_hongbao_v2 h

        WHERE (h.`hb_type`=1 or

        h.`hb_type`=2 or h.`hb_type`= 20)

    </select>

    

    

    <select id="countNewUserByDate" resultType="java.util.HashMap">

        SELECT COUNT(DISTINCT h.`id`) AS showValue,

            <if test="type == 1">

                 FROM_UNIXTIME(h.`createtime`/1000,'%Y-%m-%d') AS 'showDate'

            FROM_UNIXTIME(h.`createtime`/1000,'%Y-%m-%d') AS

            'showDate'

            </if>

            <if test="type == 2">

                 FROM_UNIXTIME(h.`createtime`/1000,'%m') AS 'showDate'

@@ -497,8 +561,11 @@
            </if>

        FROM yeshi_ec_user h 

            <if test="channel != null and  channel != 'all' ">

                left join (SELECT a.`lua_uid` AS uid FROM `yeshi_ec_log_user_active`  a 
                WHERE a.`lua_channel`='${channel}' GROUP BY a.`lua_uid`)a ON h.`id`=a.uid 
            left join (SELECT a.`lua_uid` AS uid FROM

            `yeshi_ec_log_user_active` a

            WHERE a.`lua_channel`='${channel}' GROUP

            BY a.`lua_uid`)a ON

            h.`id`=a.uid

            </if>

        WHERE 1=1

            <if test="channel != null and  channel != 'all' ">

@@ -508,7 +575,8 @@
                 AND FROM_UNIXTIME(h.`createtime`/1000,'%Y-%m-%d')<![CDATA[ >= ]]>'${startTime}'

            </if>

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

                 AND FROM_UNIXTIME(h.`createtime`/1000,'%Y-%m-%d') <![CDATA[ <= ]]> '${endTime}'

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

            '${endTime}'

            </if>

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

                 AND FROM_UNIXTIME(h.`createtime`/1000,'%Y') = '${years}'

@@ -528,7 +596,8 @@
    <select id="getTodayHasOrder" resultType="java.util.HashMap">

        SELECT COALESCE(COUNT(DISTINCT u.`id`),0) AS 'showValue', 

            <if test="type == 1">

                 FROM_UNIXTIME(u.`createtime`/1000,'%Y-%m-%d') AS 'showDate'

            FROM_UNIXTIME(u.`createtime`/1000,'%Y-%m-%d') AS

            'showDate'

            </if>

            <if test="type == 2">

                 FROM_UNIXTIME(u.`createtime`/1000,'%m') AS 'showDate'

@@ -539,22 +608,27 @@
        

        FROM  yeshi_ec_user u     

        <if test="channel != null and channel != 'all' ">

            LEFT JOIN  (SELECT a.`lua_uid` AS uid FROM `yeshi_ec_log_user_active`  a 
                WHERE a.`lua_channel`='${channel}' GROUP BY a.`lua_uid`) a ON u.`id`=a.uid

            LEFT JOIN (SELECT a.`lua_uid` AS uid FROM

            `yeshi_ec_log_user_active` a

            WHERE a.`lua_channel`='${channel}' GROUP

            BY a.`lua_uid`) a ON u.`id`=a.uid

        </if>

        LEFT JOIN `yeshi_ec_hongbao_v2` h ON h.`hb_uid`= u.`id`

        WHERE (h.`hb_type`=1 OR h.`hb_type`=20) 
        WHERE

        (h.`hb_type`=1 OR h.`hb_type`=20)

            <if test="channel != null and  channel != 'all' ">

                AND a.uid is not null

            </if>

            <!-- 当日下单 -->

            AND FROM_UNIXTIME(u.`createtime`/1000,'%Y-%m-%d') = DATE_FORMAT(h.hb_create_time,'%Y-%m-%d')

        AND FROM_UNIXTIME(u.`createtime`/1000,'%Y-%m-%d') =

        DATE_FORMAT(h.hb_create_time,'%Y-%m-%d')

            

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

                 AND FROM_UNIXTIME(u.`createtime`/1000,'%Y-%m-%d')<![CDATA[ >= ]]>'${startTime}'

            </if>

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

                 AND FROM_UNIXTIME(u.`createtime`/1000,'%Y-%m-%d') <![CDATA[ <= ]]> '${endTime}'

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

            '${endTime}'

            </if>

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

                 AND FROM_UNIXTIME(u.`createtime`/1000,'%Y') = '${years}'

@@ -574,32 +648,50 @@
    

    

    <select id="getWeekHasOrder" resultType="java.util.HashMap">

        SELECT COUNT(DISTINCT hb.uid) AS showValue,FROM_UNIXTIME(u.`createtime`/1000,'%Y-%m-%d') AS 'showDate'

        SELECT COUNT(DISTINCT hb.uid) AS

        showValue,FROM_UNIXTIME(u.`createtime`/1000,'%Y-%m-%d') AS 'showDate'

        FROM (SELECT COUNT(v2.`hb_id`) AS num,v2.hb_uid  AS uid

              FROM yeshi_ec_hongbao_v2 v2

        FROM

        yeshi_ec_hongbao_v2 v2

              WHERE   (v2.`hb_type`=1 OR v2.`hb_type`=20) 

                  AND DATE_FORMAT(v2.`hb_create_time`,'%Y-%m-%d') <![CDATA[ >= ]]>'${startTime}'

        AND

        DATE_FORMAT(v2.`hb_create_time`,'%Y-%m-%d') <![CDATA[ >= ]]>'${startTime}'

                 AND DATE_FORMAT(v2.`hb_create_time`,'%Y-%m-%d') <![CDATA[ <= ]]>'${endTime}'

              GROUP BY v2.hb_uid HAVING num >= ${orderNum})hb

        LEFT JOIN yeshi_ec_user u  ON u.id = hb.uid		
        LEFT JOIN yeshi_ec_user

        u ON u.id = hb.uid

        <if test="channel != null and channel != 'all' ">

            LEFT JOIN  (SELECT a.`lua_uid` AS uid FROM `yeshi_ec_log_user_active`  a 
                WHERE a.`lua_channel`='${channel}' GROUP BY a.`lua_uid`) a ON u.`id`=a.uid

            LEFT JOIN (SELECT a.`lua_uid` AS uid FROM

            `yeshi_ec_log_user_active` a

            WHERE a.`lua_channel`='${channel}' GROUP

            BY a.`lua_uid`) a ON u.`id`=a.uid

        </if>

        WHERE FROM_UNIXTIME(u.`createtime`/1000,'%Y-%m-%d') = '${startTime}'

            <if test="channel != null and  channel != 'all' ">

               AND a.uid is not null

            </if>

            GROUP BY FROM_UNIXTIME(u.`createtime`/1000,'%Y-%m-%d') 

        ORDER BY u.`createtime`

        ORDER BY

        u.`createtime`

    </select>

    

    <select id="getInfoByPhoneOrInviteCode" 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` IS NOT NULL  
              AND (u.`phone` =#{phone} 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` IS NOT NULL

        AND (u.`phone` =#{phone} OR

        uf.`uie_invite_code` = #{inviteCode})

        LIMIT 1

    </select>



	
    <select id="countAvaiableUser" resultType="java.lang.Long">

        SELECT count(*) FROM

        yeshi_ec_user u

        where u.state=0

    </select>



</mapper>


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

@@ -29,8 +29,8 @@
import com.yeshi.fanli.service.inter.brand.TaoBaoShopHistoryService;

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

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

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

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

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsUpdateService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoShopService;

import com.yeshi.fanli.util.Constant;


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

@@ -18,8 +18,8 @@
import com.yeshi.fanli.service.inter.brand.BrandClassShopService;

import com.yeshi.fanli.service.inter.brand.BrandInfoService;

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

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

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

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsUpdateService;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.taobao.TaoKeApiUtil;


 fanli/src/main/java/com/yeshi/fanli/service/impl/count/ExtractServiceCountImpl.java

@@ -8,7 +8,7 @@
import org.springframework.stereotype.Service;



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

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

import com.yeshi.fanli.service.inter.money.extract.ExtractCountService;





@Service


 fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/DynamicInfoServiceImpl.java

@@ -43,7 +43,7 @@
import com.yeshi.fanli.service.inter.dynamic.DynamicInfoService;

import com.yeshi.fanli.service.inter.dynamic.InviteMaterialService;

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

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

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsUpdateService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoShopService;

import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsService;


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

@@ -30,9 +30,9 @@
import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;

import com.yeshi.fanli.log.LogHelper;

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

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

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

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

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsUpdateService;

import com.yeshi.fanli.service.inter.taobao.TaobaoMeterialService;

import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailService;


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

@@ -44,15 +44,15 @@
import com.yeshi.fanli.service.inter.config.ConfigService;

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

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

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

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

import com.yeshi.fanli.service.inter.monitor.BusinessEmergent110Service;

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

import com.yeshi.fanli.service.inter.taobao.TLJBuyGoodsService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;

import com.yeshi.fanli.service.inter.taobao.UserTLJBuyHistoryService;

import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinRecordService;

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

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

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

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

import com.yeshi.fanli.util.AESUtil;

import com.yeshi.fanli.util.Constant;

@@ -246,7 +246,7 @@
            // throw new ShareGoodsException(4, "生成二维码失败");

            // }

            // 获取到用户的头像

            UserInfo user = userinfoMapper.selectByPrimaryKey(uid);

            UserInfo user = userinfoMapper.selectAvailableByPrimaryKey(uid);

            InputStream portrait = null;

            if (!StringUtil.isNullOrEmpty(user.getPortrait())) {

                try {


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

@@ -19,7 +19,7 @@
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;

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;

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

import com.yeshi.fanli.util.taobao.TaoBaoUtil;


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

@@ -19,8 +19,8 @@
import com.yeshi.fanli.entity.jd.JDGoods;

import com.yeshi.fanli.exception.jd.JDGoodsException;

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

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

import com.yeshi.fanli.service.inter.jd.JDGoodsService;

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

import com.yeshi.fanli.tag.PageEntity;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;

@@ -213,6 +213,8 @@
    public JDSearchResult getIndexJDGoods(int page) {

        JDSearchResult result = null;

        String way = configService.get("jd_api_search_key");

        // TODO 需要调整规则

        way = "0";

        if ("1".equals(way)) {

            JDFilter filterAPI = new JDFilter();

            filterAPI.setPageIndex(page);


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

@@ -22,9 +22,9 @@
import com.yeshi.fanli.entity.bus.lable.QualityFactory;

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

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

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

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

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

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsUpdateService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;

import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailService;


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

@@ -23,9 +23,9 @@
import com.yeshi.fanli.entity.taobao.TaoBaoSearchNav;

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

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

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

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

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

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoShopService;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.factory.goods.GoodsDetailVOFactory;


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

@@ -22,13 +22,13 @@
import com.yeshi.fanli.exception.money.UserMoneyDebtException;

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

import com.yeshi.fanli.log.LogHelper;

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

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

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

import com.yeshi.fanli.service.inter.taobao.TaoBaoOrderService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoWeiQuanDrawBackService;

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

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

import com.yeshi.fanli.service.inter.money.tb.TaoBaoWeiQuanDrawBackService;

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

import com.yeshi.fanli.service.inter.order.tb.TaoBaoOrderService;

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

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

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.factory.UserMoneyDetailFactory;




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

File was renamed from fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserMoneyDetailServiceImpl.java
@@ -1,4 +1,4 @@
package com.yeshi.fanli.service.impl.user;

package com.yeshi.fanli.service.impl.money;



import java.math.BigDecimal;

import java.util.ArrayList;

@@ -19,7 +19,7 @@
import com.yeshi.fanli.entity.money.UserMoneyDetail;

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

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

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

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

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.TimeUtil;

import com.yeshi.fanli.vo.money.UserMoneyDetailHistoryVO;


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

File was renamed from fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserMoneyExtraServiceImpl.java
@@ -1,4 +1,4 @@
package com.yeshi.fanli.service.impl.user;

package com.yeshi.fanli.service.impl.money;



import java.math.BigDecimal;

import java.util.Date;

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


import com.yeshi.fanli.dao.mybatis.user.UserMoneyExtraMapper;

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

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

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

import com.yeshi.fanli.util.MoneyBigDecimalUtil;



@Service


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

File was renamed from fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserMoneyServiceImpl.java
@@ -1,4 +1,4 @@
package com.yeshi.fanli.service.impl.user;

package com.yeshi.fanli.service.impl.money;



import java.math.BigDecimal;



@@ -13,7 +13,7 @@
import com.yeshi.fanli.dto.money.UserMoneyChangeDTO;

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

import com.yeshi.fanli.log.LogHelper;

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

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

import com.yeshi.fanli.util.cmq.UserMoneyChangeCMQManager;



@Service


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

File was renamed from fanli/src/main/java/com/yeshi/fanli/service/impl/user/BindingAccountServiceImpl.java
@@ -1,4 +1,4 @@
package com.yeshi.fanli.service.impl.user;

package com.yeshi.fanli.service.impl.money.extract;



import java.math.BigDecimal;

import java.util.Calendar;

@@ -34,10 +34,10 @@
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;

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

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

import com.yeshi.fanli.service.inter.money.extract.BindingAccountService;

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

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

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

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.factory.UserMoneyDetailFactory;

@@ -274,9 +274,13 @@
    @Override

    public boolean canVerifyAlipayAccount(Long uid) throws BindingAccountException {

        UserInfo userInfo = userInfoMapper.selectByPrimaryKeyForUpdate(uid);

        if (userInfo.getMyHongBao().compareTo(new BigDecimal("0")) <= 0)

            throw new BindingAccountException(1, "你的账户目前没有余额，无需绑定提现帐号。");



        if (userInfo.getMyHongBao().compareTo(new BigDecimal("0")) <= 0) {

            BindingAccount bindingAccount = bindingAccountMapper.selectByUidAndType(uid, BindingAccount.TYPE_ALIPAY);

            if (bindingAccount != null)

                throw new BindingAccountException(1, "当前账户没有余额，无需修改，请有余额后修改。");

            else

                throw new BindingAccountException(1, "当前账户没有余额，请有余额后绑定。");

        }

        AlipayAccountValidNormalHistory latest = alipayAccountValidNormalHistoryMapper.selectLatestByUid(uid);

        if (latest != null) {

            Calendar caLatest = Calendar.getInstance();


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

File was renamed from fanli/src/main/java/com/yeshi/fanli/service/impl/user/ExtractAuditRecordServiceImpl.java
@@ -1,4 +1,4 @@
package com.yeshi.fanli.service.impl.user;

package com.yeshi.fanli.service.impl.money.extract;



import java.util.List;

import java.util.Map;

@@ -11,7 +11,7 @@
import com.yeshi.fanli.dao.mybatis.ExtractAuditRecordMapper;

import com.yeshi.fanli.dto.money.ExtractOrderStatisticDTO;

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

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

import com.yeshi.fanli.service.inter.money.extract.ExtractAuditRecordService;

import com.yeshi.fanli.util.StringUtil;



@Service


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

File was renamed from fanli/src/main/java/com/yeshi/fanli/service/impl/user/ExtractRecordServiceImpl.java
@@ -1,4 +1,4 @@
package com.yeshi.fanli.service.impl.user;

package com.yeshi.fanli.service.impl.money.extract;



import java.util.List;



@@ -9,7 +9,7 @@
import com.yeshi.fanli.dao.mybatis.ExtractRecordMapper;

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

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

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

import com.yeshi.fanli.service.inter.money.extract.ExtractRecordService;



@Service

public class ExtractRecordServiceImpl implements ExtractRecordService {


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

File was renamed from fanli/src/main/java/com/yeshi/fanli/service/impl/user/ExtractServiceImpl.java
@@ -1,4 +1,4 @@
package com.yeshi.fanli.service.impl.user;

package com.yeshi.fanli.service.impl.money.extract;



import java.math.BigDecimal;

import java.util.ArrayList;

@@ -47,17 +47,17 @@
import com.yeshi.fanli.log.LogHelper;

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

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

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

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

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

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

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

import com.yeshi.fanli.service.inter.money.extract.ExtractRecordService;

import com.yeshi.fanli.service.inter.money.extract.ExtractService;

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

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

import com.yeshi.fanli.service.inter.order.OrderUserStatisticService;

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

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

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

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

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

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

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

import com.yeshi.fanli.util.CMQManager;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.GsonUtil;


 fanli/src/main/java/com/yeshi/fanli/service/impl/money/msg/MsgMoneyDetailServiceImpl.java

File was renamed from fanli/src/main/java/com/yeshi/fanli/service/impl/msg/MsgMoneyDetailServiceImpl.java
@@ -1,4 +1,4 @@
package com.yeshi.fanli.service.impl.msg;

package com.yeshi.fanli.service.impl.money.msg;



import java.util.Date;

import java.util.List;

@@ -11,7 +11,7 @@
import com.yeshi.fanli.entity.bus.msg.MsgMoneyDetail;

import com.yeshi.fanli.entity.bus.msg.MsgMoneyDetail.MsgTypeMoneyTypeEnum;

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

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

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

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

import com.yeshi.fanli.util.Constant;




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

File was renamed from fanli/src/main/java/com/yeshi/fanli/service/impl/msg/UserMoneyMsgNotificationServiceImpl.java
@@ -1,4 +1,4 @@
package com.yeshi.fanli.service.impl.msg;

package com.yeshi.fanli.service.impl.money.msg;



import java.math.BigDecimal;

import java.util.Date;

@@ -14,8 +14,8 @@
import com.yeshi.fanli.entity.config.push.PushMsgFactory;

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.money.msg.MsgMoneyDetailService;

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

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

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.factory.msg.MsgMoneyDetailFactory;


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

File was renamed from fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoWeiQuanDrawBackServiceImpl.java
@@ -1,4 +1,4 @@
package com.yeshi.fanli.service.impl.taobao;

package com.yeshi.fanli.service.impl.money.tb;



import java.math.BigDecimal;

import java.util.ArrayList;

@@ -35,10 +35,10 @@
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;

import com.yeshi.fanli.service.inter.taobao.TaoBaoWeiQuanDrawBackService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoWeiQuanOrderService;

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

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

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

import com.yeshi.fanli.service.inter.money.tb.TaoBaoWeiQuanDrawBackService;

import com.yeshi.fanli.service.inter.order.tb.TaoBaoWeiQuanOrderService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.MoneyBigDecimalUtil;

import com.yeshi.fanli.util.StringUtil;

@@ -241,7 +241,7 @@
            BigDecimal drawBackMoney = computeDrawBackMoney(settleMent, wqMoney, userGetMoney);



            // 计算资金是否充足

            UserInfo user = userInfoMapper.selectByPKey(uid);

            UserInfo user = userInfoMapper.selectByPrimaryKey(uid);

            if (user != null && user.getMyHongBao().compareTo(drawBackMoney) < 0)// 资金不足

            {

                // 添加债务

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


            // 新版通知

            userMoneyMsgNotificationService.fanliOrderWeiQuan(uid, orderId, Constant.SOURCE_TYPE_TAOBAO, drawBackMoney,

                    userInfoMapper.selectByPKey(uid).getMyHongBao());

                    userInfoMapper.selectByPrimaryKey(uid).getMyHongBao());

        }

    }



@@ -410,7 +410,7 @@
            for (TaoBaoWeiQuanDrawBack drawBack : newWeiQuanDrawBackList)

                taoBaoWeiQuanDrawBackMapper.insertSelective(drawBack);

            // 计算资金是否充足

            UserInfo user = userInfoMapper.selectByPKey(uid);

            UserInfo user = userInfoMapper.selectByPrimaryKey(uid);

            if (user != null && user.getMyHongBao().compareTo(drawBackMoney) < 0)// 资金不足

            {

                // 添加债务

@@ -451,7 +451,7 @@
            userMoneyService.subUserMoney(uid, drawBackMoney, userMoneyDetail);

            userMoneyMsgNotificationService.shareOrderWeiQuan(uid, orderId, Constant.SOURCE_TYPE_TAOBAO, drawBackMoney,



                    userInfoMapper.selectByPrimaryKey(uid).getMyHongBao());

                    userInfoMapper.selectAvailableByPrimaryKey(uid).getMyHongBao());

        }

    }



@@ -511,7 +511,7 @@
                    if (drawBackMoney != null && drawBackMoney.compareTo(new BigDecimal(0)) > 0) {



                        // 判断资金是否足够扣款

                        UserInfo user = userInfoMapper.selectByPKey(uid);

                        UserInfo user = userInfoMapper.selectByPrimaryKey(uid);

                        if (user != null && user.getMyHongBao().compareTo(drawBackMoney) < 0)// 资金不足

                        {

                            try {

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


                        // 新版通知

                        userMoneyMsgNotificationService.inviteOrderWeiQuan(uid, orderId, Constant.SOURCE_TYPE_TAOBAO,

                                drawBackMoney, userInfoMapper.selectByPrimaryKey(uid).getMyHongBao());

                                drawBackMoney, userInfoMapper.selectAvailableByPrimaryKey(uid).getMyHongBao());

                    }

                }

        }


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

@@ -10,13 +10,13 @@
import com.yeshi.fanli.dao.mybatis.msg.UserMsgUnReadNumMapper;

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

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

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

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

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

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

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

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

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

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

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

import com.yeshi.fanli.service.inter.user.invite.MsgInviteDetailService;

import com.yeshi.fanli.service.inter.user.msg.MsgAccountDetailService;



@Service

public class UserMsgReadStateServiceImpl implements UserMsgReadStateService {


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

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


    @Override

    public void syncSystemZNX(Long uid) {

        UserInfo user = userInfoMapper.selectByPrimaryKey(uid);

        UserInfo user = userInfoMapper.selectAvailableByPrimaryKey(uid);

        if (user == null)

            return;

        long createTime = user.getCreatetime();


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

@@ -46,9 +46,9 @@
import com.yeshi.fanli.service.inter.config.ConfigService;

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

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

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

import com.yeshi.fanli.service.inter.order.CommonOrderService;

import com.yeshi.fanli.service.inter.order.HongBaoOrderService;

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

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

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

import com.yeshi.fanli.util.Constant;


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

File was renamed from fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoV2ServiceImpl.java
@@ -1,4 +1,4 @@
package com.yeshi.fanli.service.impl.hongbao;

package com.yeshi.fanli.service.impl.order;



import java.math.BigDecimal;

import java.util.ArrayList;

@@ -39,17 +39,17 @@
import com.yeshi.fanli.exception.share.UserShareGoodsRecordException;

import com.yeshi.fanli.log.LogHelper;

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

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

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

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

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

import com.yeshi.fanli.service.inter.order.CommonOrderService;

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

import com.yeshi.fanli.service.inter.order.ShareGoodsActivityOrderService;

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

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

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

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

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

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

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

import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;

import com.yeshi.fanli.service.inter.user.tb.UserExtraTaoBaoInfoService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.MoneyBigDecimalUtil;

import com.yeshi.fanli.util.StringUtil;


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

@@ -17,11 +17,11 @@
import com.yeshi.fanli.entity.bus.user.LostOrder;

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

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

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

import com.yeshi.fanli.service.inter.order.HongBaoOrderService;

import com.yeshi.fanli.service.inter.order.LostOrderService;

import com.yeshi.fanli.service.inter.order.OrderService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoPunishOrderService;

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

import com.yeshi.fanli.service.inter.order.tb.TaoBaoPunishOrderService;

import com.yeshi.fanli.util.Utils;



@Service


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

@@ -49,20 +49,20 @@
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;

import com.yeshi.fanli.service.inter.jd.JDOrderService;

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

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

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

import com.yeshi.fanli.service.inter.money.tb.TaoBaoWeiQuanDrawBackService;

import com.yeshi.fanli.service.inter.order.CommonOrderService;

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

import com.yeshi.fanli.service.inter.order.LostOrderService;

import com.yeshi.fanli.service.inter.order.OrderProcessService;

import com.yeshi.fanli.service.inter.pdd.PDDOrderService;

import com.yeshi.fanli.service.inter.order.jd.JDOrderService;

import com.yeshi.fanli.service.inter.order.pdd.PDDOrderService;

import com.yeshi.fanli.service.inter.order.tb.TaoBaoOrderService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoBuyRelationMapService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoOrderService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoWeiQuanDrawBackService;

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

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

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

import com.yeshi.fanli.service.inter.user.tb.UserExtraTaoBaoInfoService;

import com.yeshi.fanli.util.CMQManager;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.MoneyBigDecimalUtil;

@@ -338,7 +338,7 @@
        // 查询最新的红包数据

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

        // 正常用户才能到账

        UserInfo mainUser = userInfoMapper.selectByPrimaryKey(hb1.getUserInfo().getId());

        UserInfo mainUser = userInfoMapper.selectAvailableByPrimaryKey(hb1.getUserInfo().getId());

        if (mainUser == null || mainUser.getState() != UserInfo.STATE_NORMAL) {

            return;

        }

@@ -462,7 +462,7 @@
            }



            // 站内信+推送

            UserInfo user = userInfoMapper.selectByPKey(uid);

            UserInfo user = userInfoMapper.selectByPrimaryKey(uid);



            // 新版通知

            userMoneyMsgNotificationService.fanliOrderReceived(uid, hongBaoOrder.getCommonOrder().getOrderNo(),

@@ -652,7 +652,7 @@
                if (hongBaoOrder != null && hongBaoOrder.getCommonOrder() != null) {

                    CommonOrder co = hongBaoOrder.getCommonOrder();

                    // 上级用户不是正常用户，订单均不能到账

                    UserInfo userInfo = userInfoMapper.selectByPrimaryKey(co.getUserInfo().getId());

                    UserInfo userInfo = userInfoMapper.selectAvailableByPrimaryKey(co.getUserInfo().getId());

                    if (userInfo == null || userInfo.getState() != UserInfo.STATE_NORMAL) {

                        hongBaoList.remove(i);

                        i--;

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


            // 新版通知

            userMoneyMsgNotificationService.inviteOrderReceived(uid, Constant.SOURCE_TYPE_TAOBAO, inviteOrders.size(),

                    inviteGoodsCount, invitemoney, userInfoMapper.selectByPKey(uid).getMyHongBao());

                    inviteGoodsCount, invitemoney, userInfoMapper.selectByPrimaryKey(uid).getMyHongBao());



            for (String orderId : drawBackOrders)

                taoBaoWeiQuanDrawBackService.doWeiQuanInvite(orderId);

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


            // 新版通知

            userMoneyMsgNotificationService.shareOrderReceived(uid, Constant.SOURCE_TYPE_TAOBAO, shareOrders.size(),

                    shareGoodsCount, sharemoney, userInfoMapper.selectByPrimaryKey(uid).getMyHongBao());

                    shareGoodsCount, sharemoney, userInfoMapper.selectAvailableByPrimaryKey(uid).getMyHongBao());



            for (String orderId : drawBackOrders)

                taoBaoWeiQuanDrawBackService.doWeiQuanShare(orderId);


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

@@ -48,19 +48,19 @@
import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;

import com.yeshi.fanli.log.LogHelper;

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

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

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

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

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

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

import com.yeshi.fanli.service.inter.order.CommonOrderService;

import com.yeshi.fanli.service.inter.order.HongBaoOrderService;

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

import com.yeshi.fanli.service.inter.order.OrderRepairHistoryService;

import com.yeshi.fanli.service.inter.order.OrderRepairService;

import com.yeshi.fanli.service.inter.order.ShareGoodsActivityOrderService;

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

import com.yeshi.fanli.service.inter.order.tb.TaoBaoOrderService;

import com.yeshi.fanli.service.inter.order.tb.TaoBaoWeiQuanOrderService;

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

import com.yeshi.fanli.service.inter.taobao.TaoBaoOrderService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoWeiQuanOrderService;

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

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

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

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

import com.yeshi.fanli.util.Constant;


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

@@ -11,9 +11,9 @@
import com.yeshi.fanli.entity.bus.user.HongBaoV2;

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

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

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

import com.yeshi.fanli.service.inter.order.HongBaoOrderService;

import com.yeshi.fanli.service.inter.order.OrderService;

import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;



@Service

public class OrderServiceImpl implements OrderService {


 fanli/src/main/java/com/yeshi/fanli/service/impl/order/config/HongBaoManageServiceImpl.java

File was renamed from fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoManageServiceImpl.java
@@ -1,4 +1,4 @@
package com.yeshi.fanli.service.impl.hongbao;

package com.yeshi.fanli.service.impl.order.config;



import java.math.BigDecimal;

import java.util.HashMap;

@@ -14,7 +14,7 @@
import com.yeshi.fanli.dao.mybatis.HongBaoManageMapper;

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

import com.yeshi.fanli.log.LogHelper;

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

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;



@Service

public class HongBaoManageServiceImpl implements HongBaoManageService {


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

File was renamed from fanli/src/main/java/com/yeshi/fanli/service/impl/jd/JDOrderServiceImpl.java
@@ -1,4 +1,4 @@
package com.yeshi.fanli.service.impl.jd;

package com.yeshi.fanli.service.impl.order.jd;



import java.util.Date;

import java.util.List;

@@ -13,7 +13,7 @@
import com.yeshi.fanli.entity.jd.JDOrder;

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

import com.yeshi.fanli.exception.jd.JDOrderException;

import com.yeshi.fanli.service.inter.jd.JDOrderService;

import com.yeshi.fanli.service.inter.order.jd.JDOrderService;



@Service

public class JDOrderServiceImpl implements JDOrderService {


 fanli/src/main/java/com/yeshi/fanli/service/impl/order/msg/MsgOrderDetailServiceImpl.java

File was renamed from fanli/src/main/java/com/yeshi/fanli/service/impl/msg/MsgOrderDetailServiceImpl.java
@@ -1,4 +1,4 @@
package com.yeshi.fanli.service.impl.msg;

package com.yeshi.fanli.service.impl.order.msg;



import java.util.Date;

import java.util.List;

@@ -11,8 +11,8 @@
import com.yeshi.fanli.entity.bus.msg.MsgOrderDetail;

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

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

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

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

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

import com.yeshi.fanli.util.Constant;



import redis.clients.jedis.Jedis;


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

File was renamed from fanli/src/main/java/com/yeshi/fanli/service/impl/msg/UserOrderMsgNotificationServiceImpl.java
@@ -1,4 +1,4 @@
package com.yeshi.fanli.service.impl.msg;

package com.yeshi.fanli.service.impl.order.msg;



import java.math.BigDecimal;

import java.util.Date;

@@ -12,8 +12,8 @@
import com.yeshi.fanli.entity.config.push.PushMsgFactory;

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.order.msg.MsgOrderDetailService;

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

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

import com.yeshi.fanli.util.factory.msg.MsgOrderDetailFactory;




 fanli/src/main/java/com/yeshi/fanli/service/impl/order/pdd/PDDOrderServiceImpl.java

File was renamed from fanli/src/main/java/com/yeshi/fanli/service/impl/pdd/PDDOrderServiceImpl.java
@@ -1,4 +1,4 @@
package com.yeshi.fanli.service.impl.pdd;

package com.yeshi.fanli.service.impl.order.pdd;



import java.util.ArrayList;

import java.util.Date;

@@ -11,7 +11,7 @@
import com.yeshi.fanli.dao.mybatis.pdd.PDDOrderMapper;

import com.yeshi.fanli.entity.pdd.PDDOrder;

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

import com.yeshi.fanli.service.inter.pdd.PDDOrderService;

import com.yeshi.fanli.service.inter.order.pdd.PDDOrderService;

import com.yeshi.fanli.util.StringUtil;



@Service


 fanli/src/main/java/com/yeshi/fanli/service/impl/order/tb/TaoBaoOrderServiceImpl.java

File was renamed from fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoOrderServiceImpl.java
@@ -1,4 +1,4 @@
package com.yeshi.fanli.service.impl.taobao;

package com.yeshi.fanli.service.impl.order.tb;



import java.util.ArrayList;

import java.util.Collections;

@@ -20,7 +20,7 @@
import com.yeshi.fanli.entity.taobao.TaoBaoOrder;

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

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.taobao.TaoBaoOrderService;

import com.yeshi.fanli.service.inter.order.tb.TaoBaoOrderService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.RedisManager;

import com.yeshi.fanli.util.StringUtil;


 fanli/src/main/java/com/yeshi/fanli/service/impl/order/tb/TaoBaoPunishOrderServiceImpl.java

File was renamed from fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoPunishOrderServiceImpl.java
@@ -1,4 +1,4 @@
package com.yeshi.fanli.service.impl.taobao;

package com.yeshi.fanli.service.impl.order.tb;



import java.util.Date;

import java.util.HashSet;

@@ -17,13 +17,13 @@
import com.yeshi.fanli.entity.order.CommonOrder;

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

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

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

import com.yeshi.fanli.service.inter.order.CommonOrderService;

import com.yeshi.fanli.service.inter.order.HongBaoOrderService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoPunishOrderService;

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

import com.yeshi.fanli.service.inter.order.tb.TaoBaoPunishOrderService;

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

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

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

import com.yeshi.fanli.service.inter.user.tb.UserExtraTaoBaoInfoService;

import com.yeshi.fanli.util.Constant;



@Service


 fanli/src/main/java/com/yeshi/fanli/service/impl/order/tb/TaoBaoWeiQuanOrderServiceImpl.java

File was renamed from fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoWeiQuanOrderServiceImpl.java
@@ -1,4 +1,4 @@
package com.yeshi.fanli.service.impl.taobao;

package com.yeshi.fanli.service.impl.order.tb;



import java.util.Date;

import java.util.List;

@@ -12,9 +12,9 @@
import com.yeshi.fanli.entity.bus.msg.MsgOrderDetail.MsgTypeOrderTypeEnum;

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

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

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

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

import com.yeshi.fanli.service.inter.taobao.TaoBaoWeiQuanOrderService;

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

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

import com.yeshi.fanli.service.inter.order.tb.TaoBaoWeiQuanOrderService;

import com.yeshi.fanli.util.Constant;



@Service


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

@@ -25,6 +25,7 @@
import com.yeshi.fanli.entity.taobao.dataoke.DaTaoKeDetailV2;

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

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

import com.yeshi.fanli.log.LogHelper;

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

import com.yeshi.fanli.service.inter.taobao.TLJBuyGoodsService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsUpdateService;

@@ -187,6 +188,9 @@
                    new Date(System.currentTimeMillis() + 1000 * 60 * 60 * 6), new Date(),

                    new Date(System.currentTimeMillis() + 1000 * 60 * 60 * 6), app);

        } catch (TaoLiJinCreateException e1) {

            LogHelper.test("商品ID:"+auctionId);

            LogHelper.test("淘礼金验证出错:"+e1.getMsg());

			
            if (e1.getCode() == TaoLiJinCreateException.CODE_TLJ_FORBIDDEN) {

                // 该商品不支持创建淘礼金红包

                deleteByGoodsId(auctionId);


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

@@ -19,7 +19,7 @@
import com.yeshi.fanli.entity.taobao.TaoBaoShop;

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

import com.yeshi.fanli.log.LogHelper;

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

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoShopService;

import com.yeshi.fanli.util.StringUtil;

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


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

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

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

import com.yeshi.fanli.log.LogHelper;

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

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

import com.yeshi.fanli.service.inter.tlj.ConfigTaoLiJinService;

import com.yeshi.fanli.service.inter.tlj.DeviceTaoLiJinRecordService;

@@ -37,7 +38,6 @@
import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinRecordService;

import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinReportService;

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

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

import com.yeshi.fanli.util.MoneyBigDecimalUtil;

import com.yeshi.fanli.util.StringUtil;




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

@@ -35,8 +35,9 @@
import com.yeshi.fanli.log.LogHelper;

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

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

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

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

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

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

import com.yeshi.fanli.service.inter.taobao.ShareHotGoodsService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoBuyRelationMapService;

import com.yeshi.fanli.service.inter.tlj.ConfigTaoLiJinService;

@@ -46,9 +47,8 @@
import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinRecordService;

import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinReportService;

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

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

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

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

import com.yeshi.fanli.service.inter.user.tb.UserExtraTaoBaoInfoService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.MoneyBigDecimalUtil;

import com.yeshi.fanli.util.RedisManager;


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

@@ -30,9 +30,6 @@
import com.yeshi.fanli.exception.user.UserInfoExtraException;

import com.yeshi.fanli.log.LogHelper;

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

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

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

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

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

import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinGiveRecordService;

import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinOriginService;

@@ -42,6 +39,9 @@
import com.yeshi.fanli.service.inter.user.UserSystemCouponGiveRecordService;

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

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

import com.yeshi.fanli.service.inter.user.integral.IntegralGetService;

import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;

import com.yeshi.fanli.service.inter.user.invite.UserInviteMsgNotificationService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.TokenUtil;


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

@@ -24,6 +24,8 @@
import com.yeshi.fanli.dao.mybatis.AccountMessageMapper;

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

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

import com.yeshi.fanli.dto.wx.WXAccountInfoDTO;

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

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

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

import com.yeshi.fanli.entity.bus.user.ForbiddenUserIdentifyCode.ForbiddenUserIdentifyCodeTypeEnum;

@@ -39,18 +41,18 @@
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;

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

import com.yeshi.fanli.service.inter.money.extract.BindingAccountService;

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

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

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

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

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

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

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

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

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

import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;

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

import com.yeshi.fanli.service.inter.user.tb.UserExtraTaoBaoInfoService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.FileUtil;

import com.yeshi.fanli.util.RedisManager;

@@ -112,15 +114,15 @@
    @Resource

    private JedisPool jedisPool;

    

	
    @Lazy

    @Resource

    private UserInfoModifyRecordService userInfoModifyRecordService;

    

    @Transactional

    @Override

    public LoginResult login(HttpServletRequest request, Boolean first, String appId, String code, String phone,

            UserInfo tbUserInfo, boolean wxinstall, int loginType) throws UserAccountException {

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

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

            throws UserAccountException {



        JSONObject logInfo = new JSONObject();

        logInfo.put("appId", appId);

@@ -182,7 +184,9 @@


            case 2:// 微信

                    // 通过Code换取信息

                weiXinUser = WXLoginUtil.getWeiXinUserWithSavePortrait(code);

                WXAccountInfoDTO wxAccount = Constant.getWXAccount(acceptData.getPlatform(), acceptData.getVersion());

                weiXinUser = WXLoginUtil.getWeiXinUserWithSavePortrait(code, wxAccount.getAppId(),

                        wxAccount.getAppSecret());

                if (weiXinUser == null)

                    throw new UserAccountException(1001, "无法获取到微信个人信息");

                LogHelper.test("微信授权用户信息：" + new Gson().toJson(weiXinUser));

@@ -363,7 +367,7 @@
            }



        } else {// 没有安装微信

            LoginResult result = loginNoInstallWX(appId, code, phone, tbUserInfo, loginType);

            LoginResult result = loginNoInstallWX(acceptData, appId, code, phone, tbUserInfo, loginType);

            if (result.getType() == LoginResult.TYPE_CREATE)

                session.setAttribute("LAST_LOGIN_USER", result.getUser());

            return result;

@@ -372,8 +376,8 @@


    @Transactional

    @Override

    public LoginResult loginNoInstallWX(String appId, String code, String phone, UserInfo tbUserInfo, int loginType)

            throws UserAccountException {

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

            UserInfo tbUserInfo, int loginType) throws UserAccountException {

        JSONObject logInfo = new JSONObject();

        logInfo.put("appId", appId);

        logInfo.put("code", code);

@@ -397,7 +401,9 @@
            break;

        case 2:// 微信

                // 通过Code换取信息

            weiXinUser = WXLoginUtil.getWeiXinUserWithSavePortrait(code);

            WXAccountInfoDTO wxAccount = Constant.getWXAccount(acceptData.getPlatform(), acceptData.getVersion());

            weiXinUser = WXLoginUtil.getWeiXinUserWithSavePortrait(code, wxAccount.getAppId(),

                    wxAccount.getAppSecret());

            if (weiXinUser == null)

                throw new UserAccountException(1001, "无法获取到微信个人信息");



@@ -713,7 +719,6 @@
            e.printStackTrace();

        }

        

		
        if (!StringUtil.isNullOrEmpty(user.getPhone())) 

            userInfoModifyRecordService.addModifyRecord(uid, ModifyTypeEnum.bindPhone, user.getPhone());

        

@@ -729,7 +734,7 @@


    @Override

    public void bindPhone(Long uid, String phone) throws UserAccountException {

        UserInfo user = userInfoMapper.selectByPrimaryKey(uid);

        UserInfo user = userInfoMapper.selectAvailableByPrimaryKey(uid);

        if (user == null)

            throw new UserAccountException(4, "用户不存在");



@@ -745,13 +750,12 @@
        userInfoMapper.updateByPrimaryKeySelective(update);

        userAccountMsgNotificationService.bindingSuccess(uid, MsgAccountDetailFactory.TYPE_PHONE);

        

		
        userInfoModifyRecordService.addModifyRecord(uid, ModifyTypeEnum.bindPhone, phone);

    }



    @Override

    public void unBindPhone(Long uid, String phone) throws UserAccountException {

        UserInfo user = userInfoMapper.selectByPrimaryKey(uid);

        UserInfo user = userInfoMapper.selectAvailableByPrimaryKey(uid);

        if (user == null)

            throw new UserAccountException(4, "用户不存在");



@@ -773,7 +777,7 @@
    @Override

    public void bindTaoBao(Long uid, String tbOpenId, String tbNickName, String tbPortrait)

            throws UserAccountException {

        UserInfo user = userInfoMapper.selectByPrimaryKey(uid);

        UserInfo user = userInfoMapper.selectAvailableByPrimaryKey(uid);

        if (user == null)

            throw new UserAccountException(4, "用户不存在");



@@ -803,7 +807,7 @@


    @Override

    public void unBindTaoBao(Long uid) throws UserAccountException {

        UserInfo user = userInfoMapper.selectByPrimaryKey(uid);

        UserInfo user = userInfoMapper.selectAvailableByPrimaryKey(uid);

        if (user == null)

            throw new UserAccountException(4, "用户不存在");

        if (StringUtil.isNullOrEmpty(user.getOpenid()))

@@ -830,11 +834,13 @@
    }



    @Override

    public void changeWXBind(Long uid, String code) throws UserAccountException {

        UserInfo user = userInfoMapper.selectByPrimaryKey(uid);

    public void changeWXBind(AcceptData acceptData, Long uid, String code) throws UserAccountException {

        UserInfo user = userInfoMapper.selectAvailableByPrimaryKey(uid);

        if (user == null)

            throw new UserAccountException(4, "用户不存在");

        WeiXinUser weiXinUser = WXLoginUtil.getWeiXinUserWithSavePortrait(code);

        WXAccountInfoDTO wxAccount = Constant.getWXAccount(acceptData.getPlatform(), acceptData.getVersion());

        WeiXinUser weiXinUser = WXLoginUtil.getWeiXinUserWithSavePortrait(code, wxAccount.getAppId(),

                wxAccount.getAppSecret());

        if (weiXinUser == null)

            throw new UserAccountException(10, "获取微信用户信息失败");

        if (weiXinUser.getUnionid().equalsIgnoreCase(user.getWxUnionId()))

@@ -842,7 +848,7 @@


        UserInfo newUser = getUserInfoByWXUnionId(user.getAppId(), weiXinUser.getUnionid());

        if (newUser != null)

            throw new UserAccountException(13, "亲，你要更换绑定的微信号已被其他账号绑定");

            throw new UserAccountException(13, "该微信号已被其他账号绑定");



        UserInfo updateUserInfo = new UserInfo(uid);

        updateUserInfo.setWxName(weiXinUser.getNickname());

@@ -870,7 +876,6 @@


        userAccountMsgNotificationService.changeBindingSuccess(uid, MsgAccountDetailFactory.TYPE_WX);

        

		
        userInfoModifyRecordService.addModifyRecord(uid, ModifyTypeEnum.bindWeiXin, weiXinUser.getUnionid());

    }



@@ -881,7 +886,7 @@
                TimeUtil.getGernalTime(System.currentTimeMillis(), "yyyyMMddHHmmss"));



        // 备份用户信息

        UserInfo user = userInfoMapper.selectByPrimaryKey(uid);

        UserInfo user = userInfoMapper.selectAvailableByPrimaryKey(uid);



        // TODO 备份资金明细



@@ -918,7 +923,7 @@
    public void clearUserPortrait(Long uid) {

        if (uid == null)

            return;

        UserInfo user = userInfoMapper.selectByPrimaryKey(uid);

        UserInfo user = userInfoMapper.selectAvailableByPrimaryKey(uid);

        String prefix = String.format("/portrait/wx/%s_", user.getWxUnionId());

        ObjectListing list = COSManager.getInstance().getObjectList(prefix, null, 30);

        if (list != null && list.getObjectSummaries() != null)

@@ -933,7 +938,7 @@
    public String repairPortrait(Long uid) {

        if (uid == null)

            return null;

        UserInfo user = userInfoMapper.selectByPrimaryKey(uid);

        UserInfo user = userInfoMapper.selectAvailableByPrimaryKey(uid);

        if (user == null)

            return null;

        String prefix = String.format("/portrait/wx/%s_", user.getWxUnionId());

@@ -1064,8 +1069,8 @@


    @Transactional

    @Override

    public UserInfo loginWinXin(HttpServletRequest request, int loginType, String code, String appId)

            throws UserAccountException {

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

            String appId) throws UserAccountException {

        // 日志信息

        JSONObject logInfo = new JSONObject();

        logInfo.put("appId", appId);

@@ -1074,7 +1079,9 @@
        LogHelper.lgoinInfo(logInfo.toString());



        // 通过Code换取信息

        WeiXinUser weiXinUser = WXLoginUtil.getWeiXinUserWithSavePortrait(code);

        WXAccountInfoDTO wxAccount = Constant.getWXAccount(acceptData.getPlatform(), acceptData.getVersion());

        WeiXinUser weiXinUser = WXLoginUtil.getWeiXinUserWithSavePortrait(code, wxAccount.getAppId(),

                wxAccount.getAppSecret());

        if (weiXinUser == null) {

            throw new UserAccountException(1, "微信帐号授权失败");

        }

@@ -1133,7 +1140,8 @@
                        e.printStackTrace();

                    }

                    

                    userInfoModifyRecordService.addModifyRecord(userInfo.getId(), ModifyTypeEnum.bindWeiXin, weiXinUser.getUnionid());

                    userInfoModifyRecordService.addModifyRecord(userInfo.getId(), ModifyTypeEnum.bindWeiXin,

                            weiXinUser.getUnionid());

                }

                return userInfo;

            }

@@ -1165,7 +1173,7 @@


    @Override

    public void bindPhoneNew(Long uid, String phone) throws UserAccountException {

        UserInfo user = userInfoMapper.selectByPrimaryKey(uid);

        UserInfo user = userInfoMapper.selectAvailableByPrimaryKey(uid);

        if (user == null) {

            throw new UserAccountException(1, "用户不存在");

        }

@@ -1205,13 +1213,14 @@
    }



    @Override

    public void bindWeiXin(Long uid, String code) throws UserAccountException {

        UserInfo user = userInfoMapper.selectByPrimaryKey(uid);

    public void bindWeiXin(AcceptData acceptData, Long uid, String code) throws UserAccountException {

        UserInfo user = userInfoMapper.selectAvailableByPrimaryKey(uid);

        if (user == null) {

            throw new UserAccountException(1, "用户不存在");

        }



        WeiXinUser weiXinUser = WXLoginUtil.getWeiXinUserWithSavePortrait(code);

        WXAccountInfoDTO wxAccount = Constant.getWXAccount(acceptData.getPlatform(), acceptData.getVersion());

        WeiXinUser weiXinUser = WXLoginUtil.getWeiXinUserWithSavePortrait(code, wxAccount.getAppId(),

                wxAccount.getAppSecret());

        if (weiXinUser == null) {

            throw new UserAccountException(2, "微信帐号授权失败");

        }

@@ -1272,7 +1281,6 @@
        userAccountBindingHistoryService.addUserAccountBindingHistory(history);



        userAccountMsgNotificationService.bindingSuccess(uid, MsgAccountDetailFactory.TYPE_WX);

		
        

        userInfoModifyRecordService.addModifyRecord(uid, ModifyTypeEnum.bindWeiXin, wxUnionId);

    }


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

@@ -30,7 +30,7 @@
import com.yeshi.fanli.exception.user.UserGoodsStorageException;

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

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

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

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

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

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

import com.yeshi.fanli.util.CommonGoodsUtil;


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

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


import com.yeshi.fanli.dao.mybatis.user.UserInfoExtraMapper;

import com.yeshi.fanli.dao.mybatis.user.UserRankRecordMapper;

import com.yeshi.fanli.dto.wx.WXAccountInfoDTO;

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

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

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

@@ -26,7 +27,6 @@
import com.yeshi.fanli.exception.user.UserInfoExtraException;

import com.yeshi.fanli.log.LogHelper;

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

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

import com.yeshi.fanli.service.inter.order.CommonOrderCountService;

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

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

@@ -34,6 +34,7 @@
import com.yeshi.fanli.service.inter.user.UserInfoService;

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

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

import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.account.UserUtil;

@@ -384,7 +385,7 @@
    

    

    @Override

    public void activationInviteWX(Long uid, String code) throws UserInfoExtraException{

    public void activationInviteWX(WXAccountInfoDTO wxAccount, Long uid, String code) throws UserInfoExtraException{

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

            throw new UserInfoExtraException(1, "激活信息不完整");

        }

@@ -405,7 +406,7 @@
        }

        

        // 获取微信信息

        WeiXinUser weiXinUser = WXLoginUtil.getWeiXinUserWithSavePortrait(code);

        WeiXinUser weiXinUser = WXLoginUtil.getWeiXinUserWithSavePortrait(code,wxAccount.getAppId(),wxAccount.getAppSecret());

        if (weiXinUser == null) {

            throw new UserInfoExtraException(1, "微信授权失败");

        }

@@ -608,7 +609,7 @@
    

    

    @Override

    public UserInfo getInviterInfo(Long uid, String code) throws UserInfoExtraException{

    public UserInfo getInviterInfo(WXAccountInfoDTO wxAccount,Long uid, String code) throws UserInfoExtraException{

        if (code == null) {

            throw new UserInfoExtraException(1, "code信息不完整");

        }

@@ -629,7 +630,7 @@
        }

        

        // 获取微信信息

        WeiXinUser weiXinUser = WXLoginUtil.getWeiXinUser(code);

        WeiXinUser weiXinUser = WXLoginUtil.getWeiXinUser(code,wxAccount.getAppId(),wxAccount.getAppSecret());

        if (weiXinUser == null) {

            throw new UserInfoExtraException(1, "微信授权失败");

        }


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

@@ -15,12 +15,12 @@
import com.yeshi.fanli.entity.bus.user.UserInfoModifyRecord;

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

import com.yeshi.fanli.log.LogHelper;

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

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

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

import com.yeshi.fanli.service.inter.money.extract.BindingAccountService;

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

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

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

import com.yeshi.fanli.service.inter.user.integral.IntegralGetService;

import com.yeshi.fanli.service.inter.user.tb.UserExtraTaoBaoInfoService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;




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

@@ -3,33 +3,21 @@
import java.io.File;

import java.io.IOException;

import java.io.InputStream;

import java.io.Serializable;

import java.math.BigDecimal;

import java.math.BigInteger;

import java.util.ArrayList;

import java.util.Calendar;

import java.util.Date;

import java.util.HashMap;

import java.util.List;

import java.util.Map;

import java.util.UUID;



import javax.annotation.Resource;



import org.hibernate.HibernateException;

import org.hibernate.Query;

import org.hibernate.SQLQuery;

import org.hibernate.Session;

import org.springframework.context.annotation.Lazy;

import org.springframework.core.task.TaskExecutor;

import org.springframework.orm.hibernate4.HibernateCallback;

import org.springframework.stereotype.Service;

import org.springframework.transaction.annotation.Propagation;

import org.springframework.transaction.annotation.Transactional;

import org.springframework.web.multipart.MultipartFile;

import org.yeshi.utils.FileUtil;

import org.yeshi.utils.HttpUtil;

import org.yeshi.utils.NumberUtil;

import org.yeshi.utils.tencentcloud.COSManager;



import com.google.gson.Gson;

@@ -39,9 +27,7 @@
import com.yeshi.fanli.dao.mybatis.UserInfoMapper;

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

import com.yeshi.fanli.dao.mybatis.share.ShareMapper;

import com.yeshi.fanli.dao.user.UserInfoDao;

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

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

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

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

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

@@ -52,21 +38,19 @@
import com.yeshi.fanli.log.LogHelper;

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

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

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

import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionAuthRecordService;

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

import com.yeshi.fanli.service.inter.money.extract.BindingAccountService;

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

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

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

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

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

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

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

import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;

import com.yeshi.fanli.service.inter.user.tb.TaoBaoUnionAuthRecordService;

import com.yeshi.fanli.service.inter.user.tb.UserExtraTaoBaoInfoService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.ThreadUtil;

import com.yeshi.fanli.util.TimeUtil;

import com.yeshi.fanli.util.Utils;

import com.yeshi.fanli.util.account.UserUtil;

import com.yeshi.fanli.util.wx.WXLoginUtil;

import com.yeshi.fanli.vo.user.UserInfoVO;

@@ -78,9 +62,6 @@


    @Resource(name = "taskExecutor")

    private TaskExecutor executor;



    @Resource

    private UserInfoDao userInfoDao;



    @Resource

    private UserInfoService userInfoService;

@@ -137,15 +118,12 @@
    @Resource

    private UserInfoModifyRecordService userInfoModifyRecordService;

    



    public UserInfo getUserByLoginTypeAndOpenId(int loginType, String openid, String appid) {

        List<UserInfo> list = null;

        if (loginType == 1) {

            list = userInfoDao.list("from UserInfo u where u.openid=? and u.appId = ? ",

                    new Serializable[] { openid, appid });

            list = userInfoMapper.listByAppIdAndTaoBaoOpenId(appid, openid);

        } else {

            list = userInfoDao.list("from UserInfo u where u.wxUnionId=? and u.appId = ? ",

                    new Serializable[] { openid, appid });

            list = userInfoMapper.listByAppIdAndWXUnionId(appid, openid);

        }



        if (list != null)

@@ -162,25 +140,6 @@
        }

        return null;

    }



    //

    // public UserInfo getUserByLoginTypeAndOpenIdByMybatis(int loginType,

    // String openid, String appid) {

    // List<UserInfo> list = null;

    // if (loginType == 1) {

    // list = userInfoDao.list("from UserInfo u where u.openid=? and u.appId = ?

    // ",

    // new Serializable[] { openid, appid });

    // } else {

    // list = userInfoDao.list("from UserInfo u where u.wxUnionId=? and u.appId

    // = ? ",

    // new Serializable[] { openid, appid });

    // }

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

    // return list.get(0);

    // }

    // return null;

    // }



    @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRES_NEW)

    public UserInfo addUser(UserInfo form, String appid) {

@@ -205,15 +164,15 @@


            LogHelper.userInfo("添加用户:" + form);

            if (form.getLoginType() == Constant.WEIXIN) {

                // final UserInfo temp = form;

                ThreadUtil.run(new Runnable() {

                    public void run() {

                        UserInfo temp = userInfoDao.find(UserInfo.class, form.getId());

                        UserInfo temp = userInfoMapper.selectByPrimaryKey(form.getId());

                        COSManager cosManager = COSManager.getInstance();

                        InputStream inputStream = HttpUtil.getAsInputStream(temp.getPortrait());

                        String uploadFile = cosManager.uploadFile(inputStream, UUID.randomUUID().toString()).getUrl();

                        temp.setPortrait(uploadFile);

                        userInfoDao.update(temp);

                        UserInfo updateTemp = new UserInfo(temp.getId());

                        updateTemp.setPortrait(uploadFile);

                        userInfoMapper.updateByPrimaryKeySelective(updateTemp);

                    }

                });

            }

@@ -229,26 +188,24 @@
    }



    public boolean createUser(UserInfo form, String appid) {

        Long id = (Long) userInfoDao.excute(new HibernateCallback<Long>() {

            public Long doInHibernate(Session session) throws HibernateException {

                SQLQuery query = session.createSQLQuery("SELECT IFNULL(MAX(id),100000) FROM yeshi_ec_user ");

                List list = query.list();



        long maxUid = userInfoMapper.getMaxUid();



                long dd = (long) (Math.random() * 100);

                if (dd == 0) {

                    dd = 1;

                }

                long bid = Long.parseLong(list.get(0) + "");

                return bid + dd;

            }

        });

        long bid = maxUid;

        long id = bid + dd;



        form.setId(id);

        form.setAppId(appid);

        userInfoDao.save(form);

        userInfoMapper.insertSelective(form);

        return true;

    }



    public UserInfo getUserById(long uid) {

        UserInfo user = userInfoDao.find(UserInfo.class, uid);

        UserInfo user = userInfoMapper.selectByPrimaryKey(uid);

        if (user.getState() != null && user.getState() != UserInfo.STATE_NORMAL)

            return null;

        if (user != null) {

@@ -260,211 +217,11 @@


    @Transactional

    public void update(UserInfo user) {

        userInfoDao.update(user);

        userInfoMapper.updateByPrimaryKeySelective(user);

    }



    public long getUserCount() {

        return userInfoDao.getCount("select count(*) from UserInfo");

    }



    public List<UserInfo> getUserList(int index, String key) {



        int start = index * Constant.PAGE_SIZE;



        if (NumberUtil.isNumeric(key)) {

            long l = Long.parseLong(key);

            return userInfoDao.list("from UserInfo u where u.id = ? or u.nickName like ? order by u.id desc", start,

                    Constant.PAGE_SIZE, new Serializable[] { l, "%" + key + "%" });

        }



        return userInfoDao.list("from UserInfo u where u.nickName like ? order by u.id desc ", start,

                Constant.PAGE_SIZE, new Serializable[] { "%" + key + "%" });



    }



    public int getUserCount(String key) {

        if (NumberUtil.isNumeric(key)) {

            long lk = Long.parseLong(key);

            return (int) userInfoDao.getCount("select count(u.id) from UserInfo u where u.id = ? or u.nickName like ? ",

                    new Serializable[] { lk, "%" + key + "%" });

        }

        Long lcount = userInfoDao.getCount("select count(u.id) from UserInfo u where u.nickName like ? ",

                new Serializable[] { "%" + key + "%" });

        return lcount.intValue();

    }



    @SuppressWarnings("unchecked")

    public Map<String, Integer> getnewUserByDate(final int days, Date date) {



        final Map<String, Integer> map = new HashMap<String, Integer>();

        long timestampms = date.getTime();

        final long timestamps = timestampms / 1000;

        List<String> list = TimeUtil.getEmupDate(days, timestampms);

        for (String dataStr : list) {

            map.put(dataStr, 0);

        }

        return (Map<String, Integer>) userInfoDao.excute(new HibernateCallback<Map<String, Integer>>() {



            public Map<String, Integer> doInHibernate(Session session) throws HibernateException {

                SQLQuery sqlQuery = session.createSQLQuery(

                        "SELECT DATE(FROM_UNIXTIME(createtime/1000)) c,COUNT(*) FROM yeshi_ec_user WHERE DATE_SUB(FROM_UNIXTIME(?), INTERVAL ? DAY) <= DATE(FROM_UNIXTIME(createtime/1000)) AND DATE(FROM_UNIXTIME(createtime/1000)) <= FROM_UNIXTIME(?) GROUP BY c");

                sqlQuery.setParameter(0, timestamps);

                sqlQuery.setParameter(1, days);

                sqlQuery.setParameter(2, timestamps);

                List<Object[]> list = sqlQuery.list();

                for (Object[] objArr : list) {

                    map.put(TimeUtil.getSimpleDate((Date) objArr[0]), ((BigInteger) objArr[1]).intValue());

                }

                return map;

            }

        });

    }



    @SuppressWarnings("unchecked")

    public Map<String, Integer> getnewUserByMonth(final int months, final Date endDate) {

        List<String> monthList = Utils.getDateMonthList(months, endDate);

        final Map<String, Integer> map = new HashMap<String, Integer>();

        for (String monthStr : monthList) {

            map.put(monthStr, 0);

        }

        return (Map<String, Integer>) userInfoDao.excute(new HibernateCallback<Map<String, Integer>>() {



            public Map<String, Integer> doInHibernate(Session session) throws HibernateException {

                Calendar calendar = Calendar.getInstance();

                calendar.setTime(endDate);

                calendar.set(Calendar.MONTH, calendar.get(Calendar.MONTH) + 1);

                calendar.set(Calendar.DAY_OF_MONTH, 1);

                long curTime = (calendar.getTime().getTime()) / 1000;

                SQLQuery sqlQuery = session.createSQLQuery(

                        "SELECT DATE_FORMAT(FROM_UNIXTIME(createtime/1000),'%Y-%m') months,COUNT(*) FROM yeshi_ec_user WHERE DATE(FROM_UNIXTIME(createtime/1000)) >= DATE_SUB(FROM_UNIXTIME(?),INTERVAL ? MONTH) AND DATE(FROM_UNIXTIME(createtime/1000)) < FROM_UNIXTIME(?) GROUP BY months");

                sqlQuery.setParameter(0, curTime);

                sqlQuery.setParameter(1, months);

                sqlQuery.setParameter(2, curTime);

                List<Object[]> list = sqlQuery.list();

                for (Object[] objArr : list) {

                    map.put((String) objArr[0], ((BigInteger) objArr[1]).intValue());

                }

                return map;

            }

        });

    }



    @SuppressWarnings("unchecked")

    public Map<String, Integer> getUserTotalByDate(final int days, Date date) {



        final Map<String, Integer> map = new HashMap<String, Integer>();

        long timestampms = date.getTime();

        final List<String> list = TimeUtil.getEmupDate(days, timestampms);

        for (String dataStr : list) {

            map.put(dataStr, 0);

        }

        return (Map<String, Integer>) userInfoDao.excute(new HibernateCallback<Map<String, Integer>>() {



            public Map<String, Integer> doInHibernate(Session session) throws HibernateException {

                StringBuffer sb = new StringBuffer();

                int ii = 0;

                for (String day : list) {

                    if (ii == 0) {

                        sb.append("SELECT '" + day + "' AS t,IFNULL(SUM(a.s),0) FROM yeshi_ec_user_day a WHERE a.c<= '"

                                + day + "' ");

                    } else {

                        sb.append("UNION ALL SELECT '" + day

                                + "' AS t,IFNULL(SUM(a.s),0) FROM yeshi_ec_user_day a WHERE a.c<= '" + day + "' ");

                    }

                    ii++;

                }



                SQLQuery sqlQuery = session.createSQLQuery(sb.toString());

                List<Object[]> list = sqlQuery.list();

                for (Object[] objArr : list) {

                    map.put(String.valueOf(objArr[0]), ((BigDecimal) objArr[1]).intValue());

                }

                return map;

            }

        });

    }



    @SuppressWarnings("unchecked")

    public Map<String, Integer> getUserTotalByMonth(int months, Date date) {

        final List<String> monthList = Utils.getDateMonthList(months, date);

        final Map<String, Integer> map = new HashMap<String, Integer>();

        for (String monthStr : monthList) {

            map.put(monthStr, 0);

        }

        return (Map<String, Integer>) userInfoDao.excute(new HibernateCallback<Map<String, Integer>>() {



            public Map<String, Integer> doInHibernate(Session session) throws HibernateException {



                StringBuffer sb = new StringBuffer();

                int ii = 0;

                for (String month : monthList) {

                    if (ii == 0) {

                        sb.append("SELECT '" + month

                                + "' AS t,IFNULL(SUM(a.s),0) FROM yeshi_ec_user_month a WHERE a.months<= '" + month

                                + "' ");

                    } else {

                        sb.append("UNION ALL SELECT '" + month

                                + "' AS t,IFNULL(SUM(a.s),0) FROM yeshi_ec_user_month a WHERE a.months<= '" + month

                                + "' ");

                    }

                    ii++;

                }



                SQLQuery sqlQuery = session.createSQLQuery(sb.toString());

                List<Object[]> list = sqlQuery.list();

                for (Object[] objArr : list) {

                    map.put((String) objArr[0], ((BigDecimal) objArr[1]).intValue());

                }

                return map;

            }

        });

    }



    public List<UserInfo> getUserListByUid(long uid) {

        List<UserInfo> list = userInfoDao.list("from UserInfo u where u.id = ? ", new Serializable[] { uid });

        return list;

    }



    public double getFreezeAssets(final double min) {

        return (Double) userInfoDao.excute(new HibernateCallback<Double>() {



            public Double doInHibernate(Session session) throws HibernateException {

                Query query = session.createSQLQuery(

                        "select IFNULL(sum(u.my_hongBao),0) from yeshi_ec_user u where u.my_hongBao < ? ");

                query.setParameter(0, min);

                Double result = Double.parseDouble(query.uniqueResult() + "");

                return result.doubleValue();

            }

        });

    }



    public double getCanAssets(final double min) {

        return (Double) userInfoDao.excute(new HibernateCallback<Double>() {



            public Double doInHibernate(Session session) throws HibernateException {

                Query query = session.createSQLQuery(

                        "select IFNULL(sum(u.my_hongBao),0) from yeshi_ec_user u where u.my_hongBao >= ? ");

                query.setParameter(0, min);

                Double result = Double.parseDouble(query.uniqueResult() + "");

                return result.doubleValue();

            }

        });

    }



    public long getRandomShamUser() {

        return (Long) userInfoDao.excute(new HibernateCallback<Long>() {



            public Long doInHibernate(Session session) throws HibernateException {

                SQLQuery sqlQuery = session

                        .createSQLQuery("SELECT id FROM yeshi_ec_user WHERE login_type=-1 ORDER BY RAND() LIMIT 1");

                List list = sqlQuery.list();

                if (list.size() > 0) {

                    long id = Long.parseLong(list.get(0) + "");

                    return id;

                }

                return (long) 0;

            }

        });

        return userInfoMapper.countAvaiableUser();

    }



    @Transactional

@@ -527,138 +284,25 @@
                user.setPortrait(user.getTbPic());

            }

        }

        userInfoDao.update(user);

        userInfoMapper.updateByPrimaryKeySelective(user);

    }



    @Transactional

    public void addMoney(UserInfo userInfo, BigDecimal money) {



        userInfoDao.excute(new HibernateCallback() {

            @Override

            public Object doInHibernate(Session session) throws HibernateException {

                Query query = session.createQuery("update UserInfo u set u.myHongBao = u.myHongBao + ? where u.id = ?");

                query.setParameter(0, money);

                query.setParameter(1, userInfo.getId());

                query.executeUpdate();

                return null;

            }

        });



    }



    @SuppressWarnings("unchecked")

    @Override

    public List<UserInfo> findFriends(long id, int type) {

        List<UserInfo> list;

        if (type == 1) {

            list = userInfoDao.list("select ts.worker from ThreeSale ts where ts.boss.id = ?",

                    new Serializable[] { id });

        } else {

            list = (List<UserInfo>) userInfoDao.excute(new HibernateCallback<List<UserInfo>>() {

                @Override

                public List<UserInfo> doInHibernate(Session session) throws HibernateException {

                    SQLQuery query = session.createSQLQuery(

                            "select uu.* from yeshi_ec_user uu left join (SELECT trw.`worker_id` as id FROM  yeshi_ec_threesale trw RIGHT JOIN "

                                    + "(SELECT tr.`worker_id` AS id FROM `yeshi_ec_threesale` tr LEFT JOIN `yeshi_ec_user` u  ON tr.`boss_id`=u.`id` WHERE tr.`boss_id`=?) nu ON nu.id = trw.`boss_id`"

                                    + "WHERE nu.id = trw.`boss_id`) u on uu.id=u.id where uu.id=u.id");

                    query.setParameter(0, id);

                    query.addEntity(UserInfo.class);

                    return query.list();

                }

            });

        }

        return list;

    }



    @Override

    public int findFriendsCount(long id, int type) {

        if (type == 1) {

            return (int) userInfoDao.getCount("select count(*) from ThreeSale ts where ts.boss.id = ? and ts.state=1",

                    new Serializable[] { id });

        } else {

            return (int) userInfoDao.getCountSQL(" from  yeshi_ec_threesale trw RIGHT JOIN "

                    + "(SELECT tr.`worker_id` AS id FROM `yeshi_ec_threesale` tr LEFT JOIN `yeshi_ec_user` u  ON tr.`boss_id`=u.`id` WHERE tr.`boss_id`=? and tr.state=1) nu ON nu.id = trw.`boss_id`"

                    + "WHERE nu.id = trw.`boss_id` and trw.state=1", new Serializable[] { id });

        }

        userInfoMapper.addHongBaoByUid(userInfo.getId(), money);

    }



    @Override

    public void updateLoginInfo(UserInfo user) {

        userInfoDao.excute(new HibernateCallback() {

            @Override

            public Object doInHibernate(Session session) throws HibernateException {

                SQLQuery query = session

                        .createSQLQuery("update yeshi_ec_user u set u.loginip=?,u.last_logintime=? where u.id = ?");

                query.setParameter(0, user.getLastLoginIp());

                query.setParameter(1, user.getLastLoginTime());

                query.setParameter(2, user.getId());

                return query.executeUpdate();

            }

        });

    }



    @Override

    public List<InviteUser> getFriendsList(final long id, int type, int page, int pageSize) {

        List<InviteUser> list = null;

        if (type == 1) {

            list = userInfoDao.getHibernateTemplate().execute(new HibernateCallback<List<InviteUser>>() {

                @Override

                public List<InviteUser> doInHibernate(Session session) throws HibernateException {

                    List list = session

                            .createSQLQuery(

                                    "SELECT u.id,u.`nick_name`,u.`portrait`,uu.state FROM (SELECT t.* FROM `yeshi_ec_threesale` t  "

                                            + "WHERE t.`boss_id`=? AND (t.expire = 0  OR  t.expire IS NULL) ORDER BY t.createTime DESC) uu LEFT JOIN yeshi_ec_user u ON u.`id`=uu.worker_id")

                            .setParameter(0, id).setFirstResult((page - 1) * pageSize).setMaxResults(pageSize).list();

                    return covertToInviteUserList(list);

                }

            });

        } else {

            list = userInfoDao.getHibernateTemplate().execute(new HibernateCallback<List<InviteUser>>() {

                @Override

                public List<InviteUser> doInHibernate(Session session) throws HibernateException {

                    List list = session

                            .createSQLQuery(

                                    "SELECT u.id,u.`nick_name`,u.`portrait`,uu.state FROM (SELECT tt.* FROM `yeshi_ec_threesale` t  LEFT JOIN yeshi_ec_threesale tt ON tt.`boss_id`=t.`worker_id` "

                                            + " WHERE t.`boss_id`=? AND tt.`id` IS NOT NULL AND (tt.expire = 0  OR  tt.expire IS NULL) ORDER BY tt.createTime DESC) uu LEFT JOIN yeshi_ec_user u ON u.`id`=uu.worker_id")

                            .setParameter(0, id).setFirstResult((page - 1) * pageSize).setMaxResults(pageSize).list();

                    return covertToInviteUserList(list);

                }

            });

        }

        return list;

    }



    private List<InviteUser> covertToInviteUserList(List list) {

        List<InviteUser> ilist = new ArrayList<>();

        if (list != null)

            for (int i = 0; i < list.size(); i++) {

                Object[] objs = (Object[]) list.get(i);

                InviteUser inviteUser = new InviteUser();

                UserInfo user = new UserInfo();

                user.setId(Long.parseLong(objs[0] + ""));

                user.setNickName(objs[1] + "");

                user.setPortrait(objs[2] + "");

                inviteUser.setUserInfo(user);

                inviteUser.setValid(Boolean.parseBoolean(objs[3] + ""));

                ilist.add(inviteUser);

            }

        return ilist;

        UserInfo update = new UserInfo(user.getId());

        update.setLastLoginIp(user.getLastLoginIp());

        update.setLastLoginTime(user.getLastLoginTime());

        userInfoMapper.updateByPrimaryKeySelective(update);

    }



    @Override

    public void cleanPassword(long id) {

        userInfoMapper.cleanPassword(id);

    }



    @Override

    public long getFriendsListCount(long id, int type) {

        if (type == 1)

            return userInfoDao.getCountSQL("SELECT COUNT(t.`id`) FROM `yeshi_ec_threesale` t  WHERE t.`boss_id`=  " + id

                    + " AND (t.expire = 0  OR  t.expire IS NULL)");

        else

            return userInfoDao.getCountSQL(

                    "SELECT COUNT(tt.id) FROM `yeshi_ec_threesale` t  LEFT JOIN yeshi_ec_threesale tt ON tt.`boss_id`=t.`worker_id`  WHERE t.`boss_id`="

                            + id + " AND tt.`id` IS NOT NULL AND (tt.expire = 0  OR  tt.expire IS NULL)");

    }



    @Override

@@ -668,7 +312,7 @@


    @Override

    public UserInfo getUserByIdWithMybatis(long uid) {

        UserInfo user = userInfoMapper.selectByPKey(uid);

        UserInfo user = userInfoMapper.selectByPrimaryKey(uid);

        return UserUtil.filterForClientUser(user);

    }



@@ -730,7 +374,6 @@
            userInfoVO.setLastLoginTime(null);

        }



		
         //显示用户微信 淘宝 老版本存在 

         String wxUnionId = userInfoVO.getWxUnionId(); 

         if (wxUnionId == null || wxUnionId.trim().length() == 0) {

@@ -741,7 +384,8 @@
         String taoBaoUid = userInfoVO.getTaoBaoUid(); 

         String tbSpecialId = userInfoVO.getTbSpecialId();

         String tbRelationId = userInfoVO.getTbRelationId();

         if (StringUtil.isNullOrEmpty(taoBaoUid) || StringUtil.isNullOrEmpty(tbSpecialId) || StringUtil.isNullOrEmpty(tbRelationId)) { 
        if (StringUtil.isNullOrEmpty(taoBaoUid) || StringUtil.isNullOrEmpty(tbSpecialId)

                || StringUtil.isNullOrEmpty(tbRelationId)) {

             userInfoVO.setTbName(null); 

             userInfoVO.setTaoBaoUid(null); 

         }

@@ -821,7 +465,7 @@


    @Override

    public UserInfo selectByPKey(Long id) {

        return userInfoMapper.selectByPKey(id);

        return userInfoMapper.selectByPrimaryKey(id);

    }



    @Override

@@ -891,7 +535,7 @@
            throw new UserInfoException(1, "请求参数为空");

        }



        UserInfo userInfo = userInfoMapper.selectByPKey(uid);

        UserInfo userInfo = userInfoMapper.selectByPrimaryKey(uid);

        if (userInfo == null) {

            throw new UserInfoException(1, "用户不存在");

        }

@@ -936,7 +580,7 @@


    @Override

    public BigDecimal getBalance(Long uid) {

        UserInfo user = userInfoMapper.selectByPKey(uid);

        UserInfo user = userInfoMapper.selectByPrimaryKey(uid);

        if (user != null)

            return user.getMyHongBao();

        return null;

@@ -945,7 +589,7 @@
    @Override

    public void uploadPortrait(MultipartFile file, Long uid) throws UserInfoException, IOException {



        UserInfo userInfo = userInfoMapper.selectByPKey(uid);

        UserInfo userInfo = userInfoMapper.selectByPrimaryKey(uid);

        if (userInfo == null) {

            throw new UserInfoException(1, "用户不存在");

        }

@@ -997,7 +641,7 @@


    @Override

    public void saveUserInfo(String nickName, Long uid) throws UserInfoException {

        UserInfo userInfo = userInfoMapper.selectByPKey(uid);

        UserInfo userInfo = userInfoMapper.selectByPrimaryKey(uid);

        if (userInfo == null) {

            throw new UserInfoException(1, "用户不存在");

        }


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

@@ -15,7 +15,7 @@
import com.yeshi.fanli.entity.bus.share.UserShareGoodsRecord.ShareSourceTypeEnum;

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

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

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

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

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

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.MoneyBigDecimalUtil;


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

@@ -42,12 +42,12 @@
import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;

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

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

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

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

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

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

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

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

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

import com.yeshi.fanli.service.inter.user.integral.IntegralGetService;

import com.yeshi.fanli.util.AESUtil;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.ImageUtil;

@@ -458,7 +458,7 @@
        }



        // 获取到用户的头像

        UserInfo user = userInfoMapper.selectByPrimaryKey(uid);

        UserInfo user = userInfoMapper.selectAvailableByPrimaryKey(uid);

        if (user == null) {

            throw new UserShareGoodsRecordException(1, "用户信息不存在");

        }

@@ -991,7 +991,7 @@
        }



        // 获取到用户的头像

        UserInfo user = userInfoMapper.selectByPrimaryKey(uid);

        UserInfo user = userInfoMapper.selectAvailableByPrimaryKey(uid);

        if (user == null) {

            throw new UserShareGoodsRecordException(1, "用户信息不存在");

        }


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

@@ -42,13 +42,13 @@
import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;

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

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

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

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

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

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

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

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

import com.yeshi.fanli.service.inter.order.CommonOrderCountService;

import com.yeshi.fanli.service.inter.order.CommonOrderService;

import com.yeshi.fanli.service.inter.order.HongBaoOrderService;

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

import com.yeshi.fanli.service.inter.order.OrderHongBaoMapService;

import com.yeshi.fanli.service.inter.order.OrderService;

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

@@ -56,10 +56,10 @@
import com.yeshi.fanli.service.inter.user.TokenRecordService;

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

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

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

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

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

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

import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.MoneyBigDecimalUtil;

import com.yeshi.fanli.util.RedisManager;


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

File was renamed from fanli/src/main/java/com/yeshi/fanli/service/impl/integral/CodePublishRecordServiceImpl.java
@@ -1,4 +1,4 @@
package com.yeshi.fanli.service.impl.integral;

package com.yeshi.fanli.service.impl.user.integral;



import java.util.Date;

import java.util.List;

@@ -9,8 +9,8 @@


import com.yeshi.fanli.dao.mybatis.integral.CodePublishRecordMapper;

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

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

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

import com.yeshi.fanli.service.inter.user.integral.CodePublishRecordService;

import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;

import com.yeshi.fanli.util.StringUtil;



@Service


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

File was renamed from fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralDetailServiceImpl.java
@@ -1,4 +1,4 @@
package com.yeshi.fanli.service.impl.integral;

package com.yeshi.fanli.service.impl.user.integral;



import java.math.BigDecimal;

import java.util.ArrayList;

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


import com.yeshi.fanli.dao.mybatis.integral.IntegralDetailMapper;

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

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

import com.yeshi.fanli.service.inter.user.integral.IntegralDetailService;

import com.yeshi.fanli.util.TimeUtil;

import com.yeshi.fanli.vo.integral.IntegralDetailVO;

import com.yeshi.fanli.vo.integral.IntegralMonthVO;


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

File was renamed from fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralExchangeRecordServiceImpl.java
@@ -1,4 +1,4 @@
package com.yeshi.fanli.service.impl.integral;

package com.yeshi.fanli.service.impl.user.integral;



import java.util.Date;

import java.util.List;

@@ -13,10 +13,10 @@
import com.yeshi.fanli.entity.integral.IntegralExchange.ExchangeTypeEnum;

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

import com.yeshi.fanli.log.LogHelper;

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

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

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

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

import com.yeshi.fanli.service.inter.user.integral.CodePublishRecordService;

import com.yeshi.fanli.service.inter.user.integral.IntegralExchangeRecordService;

import com.yeshi.fanli.service.inter.user.integral.IntegralExchangeService;

import com.yeshi.fanli.util.StringUtil;



@Service


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

File was renamed from fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralExchangeServiceImpl.java
@@ -1,4 +1,4 @@
package com.yeshi.fanli.service.impl.integral;

package com.yeshi.fanli.service.impl.user.integral;



import java.math.BigDecimal;

import java.util.Date;

@@ -24,18 +24,18 @@
import com.yeshi.fanli.exception.integral.IntegralExchangeException;

import com.yeshi.fanli.log.LogHelper;

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

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

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

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

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

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

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

import com.yeshi.fanli.service.inter.money.UserMoneyDetailService;

import com.yeshi.fanli.service.inter.msg.UserOtherMsgNotificationService;

import com.yeshi.fanli.service.inter.order.HongBaoV2Service;

import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinOriginService;

import com.yeshi.fanli.service.inter.user.UserInfoExtraService;

import com.yeshi.fanli.service.inter.user.UserInfoService;

import com.yeshi.fanli.service.inter.user.UserMoneyDetailService;

import com.yeshi.fanli.service.inter.user.UserSystemCouponService;

import com.yeshi.fanli.service.inter.user.integral.CodePublishRecordService;

import com.yeshi.fanli.service.inter.user.integral.IntegralDetailService;

import com.yeshi.fanli.service.inter.user.integral.IntegralExchangeRecordService;

import com.yeshi.fanli.service.inter.user.integral.IntegralExchangeService;

import com.yeshi.fanli.service.inter.user.invite.MsgInviteDetailService;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.factory.UserMoneyDetailFactory;

import com.yeshi.fanli.vo.integral.ExchangeTipVO;


 fanli/src/main/java/com/yeshi/fanli/service/impl/user/integral/IntegralGetServiceImpl.java

File was renamed from fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralGetServiceImpl.java
@@ -1,4 +1,4 @@
package com.yeshi.fanli.service.impl.integral;

package com.yeshi.fanli.service.impl.user.integral;



import java.util.Date;



@@ -20,11 +20,11 @@
import com.yeshi.fanli.exception.integral.IntegralGetException;

import com.yeshi.fanli.exception.integral.IntegralTaskRecordException;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.integral.IntegralGetService;

import com.yeshi.fanli.service.inter.integral.IntegralTaskRankService;

import com.yeshi.fanli.service.inter.integral.IntegralTaskRecordService;

import com.yeshi.fanli.service.inter.integral.IntegralTaskService;

import com.yeshi.fanli.service.inter.user.UserInfoExtraService;

import com.yeshi.fanli.service.inter.user.integral.IntegralGetService;

import com.yeshi.fanli.service.inter.user.integral.IntegralTaskRankService;

import com.yeshi.fanli.service.inter.user.integral.IntegralTaskRecordService;

import com.yeshi.fanli.service.inter.user.integral.IntegralTaskService;

import com.yeshi.fanli.util.RedisManager;

import com.yeshi.fanli.util.annotation.integral.IntegralGetFrequencyLimit;

import com.yeshi.fanli.util.annotation.integral.IntegralGetVersionLimit;


 fanli/src/main/java/com/yeshi/fanli/service/impl/user/integral/IntegralTaskClassServiceImpl.java

File was renamed from fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralTaskClassServiceImpl.java
@@ -1,4 +1,4 @@
package com.yeshi.fanli.service.impl.integral;

package com.yeshi.fanli.service.impl.user.integral;



import java.text.ParseException;

import java.text.SimpleDateFormat;

@@ -21,11 +21,11 @@
import com.yeshi.fanli.entity.integral.IntegralTaskClass.UniqueKeyEnum;

import com.yeshi.fanli.entity.integral.IntegralTaskRank;

import com.yeshi.fanli.entity.integral.IntegralTaskRecord;

import com.yeshi.fanli.service.inter.integral.IntegralTaskClassService;

import com.yeshi.fanli.service.inter.integral.IntegralTaskRankService;

import com.yeshi.fanli.service.inter.integral.IntegralTaskRecordService;

import com.yeshi.fanli.service.inter.integral.IntegralTaskService;

import com.yeshi.fanli.service.inter.user.UserInfoExtraService;

import com.yeshi.fanli.service.inter.user.integral.IntegralTaskClassService;

import com.yeshi.fanli.service.inter.user.integral.IntegralTaskRankService;

import com.yeshi.fanli.service.inter.user.integral.IntegralTaskRecordService;

import com.yeshi.fanli.service.inter.user.integral.IntegralTaskService;

import com.yeshi.fanli.vo.integral.DailySignVO;

import com.yeshi.fanli.vo.integral.IntegralTaskClassVO;

import com.yeshi.fanli.vo.integral.SignDateVO;


 fanli/src/main/java/com/yeshi/fanli/service/impl/user/integral/IntegralTaskRankServiceImpl.java

File was renamed from fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralTaskRankServiceImpl.java
@@ -1,4 +1,4 @@
package com.yeshi.fanli.service.impl.integral;

package com.yeshi.fanli.service.impl.user.integral;



import javax.annotation.Resource;



@@ -6,7 +6,7 @@


import com.yeshi.fanli.dao.mybatis.integral.IntegralTaskRankMapper;

import com.yeshi.fanli.entity.integral.IntegralTaskRank;

import com.yeshi.fanli.service.inter.integral.IntegralTaskRankService;

import com.yeshi.fanli.service.inter.user.integral.IntegralTaskRankService;



@Service

public class IntegralTaskRankServiceImpl implements IntegralTaskRankService {


 fanli/src/main/java/com/yeshi/fanli/service/impl/user/integral/IntegralTaskRecordServiceImpl.java

File was renamed from fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralTaskRecordServiceImpl.java
@@ -1,4 +1,4 @@
package com.yeshi.fanli.service.impl.integral;

package com.yeshi.fanli.service.impl.user.integral;



import java.text.ParseException;

import java.text.SimpleDateFormat;

@@ -28,12 +28,12 @@
import com.yeshi.fanli.exception.user.UserInfoExtraException;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.config.ConfigService;

import com.yeshi.fanli.service.inter.integral.IntegralDetailService;

import com.yeshi.fanli.service.inter.integral.IntegralTaskClassService;

import com.yeshi.fanli.service.inter.integral.IntegralTaskRecordService;

import com.yeshi.fanli.service.inter.integral.IntegralTaskService;

import com.yeshi.fanli.service.inter.msg.UserOtherMsgNotificationService;

import com.yeshi.fanli.service.inter.user.UserInfoExtraService;

import com.yeshi.fanli.service.inter.user.integral.IntegralDetailService;

import com.yeshi.fanli.service.inter.user.integral.IntegralTaskClassService;

import com.yeshi.fanli.service.inter.user.integral.IntegralTaskRecordService;

import com.yeshi.fanli.service.inter.user.integral.IntegralTaskService;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.TimeUtil;




 fanli/src/main/java/com/yeshi/fanli/service/impl/user/integral/IntegralTaskServiceImpl.java

File was renamed from fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralTaskServiceImpl.java
@@ -1,4 +1,4 @@
package com.yeshi.fanli.service.impl.integral;

package com.yeshi.fanli.service.impl.user.integral;



import java.util.List;



@@ -8,7 +8,7 @@


import com.yeshi.fanli.dao.mybatis.integral.IntegralTaskMapper;

import com.yeshi.fanli.entity.integral.IntegralTask;

import com.yeshi.fanli.service.inter.integral.IntegralTaskService;

import com.yeshi.fanli.service.inter.user.integral.IntegralTaskService;



@Service

public class IntegralTaskServiceImpl implements IntegralTaskService {


 fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/MsgInviteDetailServiceImpl.java

File was renamed from fanli/src/main/java/com/yeshi/fanli/service/impl/msg/MsgInviteDetailServiceImpl.java
@@ -1,4 +1,4 @@
package com.yeshi.fanli.service.impl.msg;

package com.yeshi.fanli.service.impl.user.invite;



import java.util.Date;

import java.util.List;

@@ -11,8 +11,8 @@
import com.yeshi.fanli.entity.bus.msg.MsgInviteDetail;

import com.yeshi.fanli.entity.bus.user.ThreeSale;

import com.yeshi.fanli.exception.msg.MsgInviteDetailException;

import com.yeshi.fanli.service.inter.msg.MsgInviteDetailService;

import com.yeshi.fanli.service.inter.msg.UserMsgReadStateService;

import com.yeshi.fanli.service.inter.user.invite.MsgInviteDetailService;

import com.yeshi.fanli.util.Constant;



@Service


 fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/ThreeSaleExtraInfoSerivceImpl.java

File was renamed from fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/ThreeSaleExtraInfoSerivceImpl.java
@@ -1,4 +1,4 @@
package com.yeshi.fanli.service.impl.hongbao;

package com.yeshi.fanli.service.impl.user.invite;



import javax.annotation.Resource;



@@ -6,7 +6,7 @@


import com.yeshi.fanli.dao.mybatis.ThreeSaleExtraInfoMapper;

import com.yeshi.fanli.entity.bus.user.ThreeSaleExtraInfo;

import com.yeshi.fanli.service.inter.hongbao.ThreeSaleExtraInfoSerivce;

import com.yeshi.fanli.service.inter.user.invite.ThreeSaleExtraInfoSerivce;



@Service

public class ThreeSaleExtraInfoSerivceImpl implements ThreeSaleExtraInfoSerivce {


 fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/ThreeSaleSerivceImpl.java

File was renamed from fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/ThreeSaleSerivceImpl.java
@@ -1,4 +1,4 @@
package com.yeshi.fanli.service.impl.hongbao;

package com.yeshi.fanli.service.impl.user.invite;



import java.text.SimpleDateFormat;

import java.util.ArrayList;

@@ -21,16 +21,16 @@
import com.yeshi.fanli.entity.bus.user.UserInfo;

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;

import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce;

import com.yeshi.fanli.service.inter.integral.IntegralGetService;

import com.yeshi.fanli.service.inter.msg.MsgInviteDetailService;

import com.yeshi.fanli.service.inter.msg.UserInviteMsgNotificationService;

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinOriginService;

import com.yeshi.fanli.service.inter.user.UserActiveLogService;

import com.yeshi.fanli.service.inter.user.UserInfoExtraService;

import com.yeshi.fanli.service.inter.user.UserInfoService;

import com.yeshi.fanli.service.inter.user.integral.IntegralGetService;

import com.yeshi.fanli.service.inter.user.invite.MsgInviteDetailService;

import com.yeshi.fanli.service.inter.user.invite.ThreeSaleExtraInfoSerivce;

import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;

import com.yeshi.fanli.service.inter.user.invite.UserInviteMsgNotificationService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.VersionUtil;


 fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/UserInviteMsgNotificationServiceImpl.java

File was renamed from fanli/src/main/java/com/yeshi/fanli/service/impl/msg/UserInviteMsgNotificationServiceImpl.java
@@ -1,4 +1,4 @@
package com.yeshi.fanli.service.impl.msg;

package com.yeshi.fanli.service.impl.user.invite;



import java.util.Date;



@@ -13,9 +13,9 @@
import com.yeshi.fanli.entity.config.push.PushMsgFactory;

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;

import com.yeshi.fanli.service.inter.user.invite.MsgInviteDetailService;

import com.yeshi.fanli.service.inter.user.invite.UserInviteMsgNotificationService;

import com.yeshi.fanli.util.factory.msg.MsgInviteDetailFactory;



@Service


 fanli/src/main/java/com/yeshi/fanli/service/impl/user/msg/MsgAccountDetailServiceImpl.java

File was renamed from fanli/src/main/java/com/yeshi/fanli/service/impl/msg/MsgAccountDetailServiceImpl.java
@@ -1,4 +1,4 @@
package com.yeshi.fanli.service.impl.msg;

package com.yeshi.fanli.service.impl.user.msg;



import java.util.Date;

import java.util.List;

@@ -10,8 +10,8 @@
import com.yeshi.fanli.dao.mybatis.msg.MsgAccountDetailMapper;

import com.yeshi.fanli.entity.bus.msg.MsgAccountDetail;

import com.yeshi.fanli.exception.msg.MsgAccountDetailException;

import com.yeshi.fanli.service.inter.msg.MsgAccountDetailService;

import com.yeshi.fanli.service.inter.msg.UserMsgReadStateService;

import com.yeshi.fanli.service.inter.user.msg.MsgAccountDetailService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;




 fanli/src/main/java/com/yeshi/fanli/service/impl/user/msg/UserAccountMsgNotificationServiceImpl.java

File was renamed from fanli/src/main/java/com/yeshi/fanli/service/impl/msg/UserAccountMsgNotificationServiceImpl.java
@@ -1,4 +1,4 @@
package com.yeshi.fanli.service.impl.msg;

package com.yeshi.fanli.service.impl.user.msg;



import javax.annotation.Resource;



@@ -6,8 +6,8 @@


import com.yeshi.fanli.entity.bus.msg.MsgAccountDetail;

import com.yeshi.fanli.exception.msg.MsgAccountDetailException;

import com.yeshi.fanli.service.inter.msg.MsgAccountDetailService;

import com.yeshi.fanli.service.inter.msg.UserAccountMsgNotificationService;

import com.yeshi.fanli.service.inter.user.msg.MsgAccountDetailService;

import com.yeshi.fanli.service.inter.user.msg.UserAccountMsgNotificationService;

import com.yeshi.fanli.util.factory.msg.MsgAccountDetailFactory;



@Service


 fanli/src/main/java/com/yeshi/fanli/service/impl/user/tb/TaoBaoUnionAuthRecordServiceImpl.java

File was renamed from fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoUnionAuthRecordServiceImpl.java
@@ -1,4 +1,4 @@
package com.yeshi.fanli.service.impl.taobao;

package com.yeshi.fanli.service.impl.user.tb;



import java.util.Date;



@@ -8,7 +8,7 @@


import com.yeshi.fanli.dao.mybatis.taobao.TaoBaoUnionAuthRecordMapper;

import com.yeshi.fanli.entity.taobao.TaoBaoUnionAuthRecord;

import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionAuthRecordService;

import com.yeshi.fanli.service.inter.user.tb.TaoBaoUnionAuthRecordService;



@Service

public class TaoBaoUnionAuthRecordServiceImpl implements TaoBaoUnionAuthRecordService {


 fanli/src/main/java/com/yeshi/fanli/service/impl/user/tb/UserExtraTaoBaoInfoServiceImpl.java

File was renamed from fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserExtraTaoBaoInfoServiceImpl.java
@@ -1,4 +1,4 @@
package com.yeshi.fanli.service.impl.user;

package com.yeshi.fanli.service.impl.user.tb;



import java.util.Date;

import java.util.List;

@@ -17,7 +17,7 @@
import com.yeshi.fanli.exception.user.UserExtraTaoBaoInfoException;

import com.yeshi.fanli.service.inter.user.ForbiddenUserIdentifyCodeService;

import com.yeshi.fanli.service.inter.user.UserAccountBindingHistoryService;

import com.yeshi.fanli.service.inter.user.UserExtraTaoBaoInfoService;

import com.yeshi.fanli.service.inter.user.tb.UserExtraTaoBaoInfoService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;




 fanli/src/main/java/com/yeshi/fanli/service/inter/money/UserMoneyDetailService.java

File was renamed from fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserMoneyDetailService.java
@@ -1,4 +1,4 @@
package com.yeshi.fanli.service.inter.user;

package com.yeshi.fanli.service.inter.money;



import java.math.BigDecimal;

import java.util.Date;


 fanli/src/main/java/com/yeshi/fanli/service/inter/money/UserMoneyExtraService.java

File was renamed from fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserMoneyExtraService.java
@@ -1,4 +1,4 @@
package com.yeshi.fanli.service.inter.user;

package com.yeshi.fanli.service.inter.money;



import java.math.BigDecimal;




 fanli/src/main/java/com/yeshi/fanli/service/inter/money/UserMoneyService.java

File was renamed from fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserMoneyService.java
@@ -1,4 +1,4 @@
package com.yeshi.fanli.service.inter.user;

package com.yeshi.fanli.service.inter.money;



import java.math.BigDecimal;




 fanli/src/main/java/com/yeshi/fanli/service/inter/money/extract/BindingAccountService.java

File was renamed from fanli/src/main/java/com/yeshi/fanli/service/inter/user/BindingAccountService.java
@@ -1,4 +1,4 @@
package com.yeshi.fanli.service.inter.user;

package com.yeshi.fanli.service.inter.money.extract;



import java.util.List;




 fanli/src/main/java/com/yeshi/fanli/service/inter/money/extract/ExtractAuditRecordService.java

File was renamed from fanli/src/main/java/com/yeshi/fanli/service/inter/user/ExtractAuditRecordService.java
@@ -1,4 +1,4 @@
package com.yeshi.fanli.service.inter.user;

package com.yeshi.fanli.service.inter.money.extract;



import java.util.List;

import java.util.Map;


 fanli/src/main/java/com/yeshi/fanli/service/inter/money/extract/ExtractCountService.java

File was renamed from fanli/src/main/java/com/yeshi/fanli/service/inter/count/ExtractCountService.java
@@ -1,4 +1,4 @@
package com.yeshi.fanli.service.inter.count;

package com.yeshi.fanli.service.inter.money.extract;



import java.math.BigDecimal;

import java.util.List;


 fanli/src/main/java/com/yeshi/fanli/service/inter/money/extract/ExtractRecordService.java

File was renamed from fanli/src/main/java/com/yeshi/fanli/service/inter/user/ExtractRecordService.java
@@ -1,4 +1,4 @@
package com.yeshi.fanli.service.inter.user;

package com.yeshi.fanli.service.inter.money.extract;



import com.yeshi.fanli.entity.bus.user.ExtractRecord;




 fanli/src/main/java/com/yeshi/fanli/service/inter/money/extract/ExtractService.java

File was renamed from fanli/src/main/java/com/yeshi/fanli/service/inter/user/ExtractService.java
@@ -1,4 +1,4 @@
package com.yeshi.fanli.service.inter.user;

package com.yeshi.fanli.service.inter.money.extract;



import java.math.BigDecimal;

import java.util.List;


 fanli/src/main/java/com/yeshi/fanli/service/inter/money/msg/MsgMoneyDetailService.java

File was renamed from fanli/src/main/java/com/yeshi/fanli/service/inter/msg/MsgMoneyDetailService.java
@@ -1,4 +1,4 @@
package com.yeshi.fanli.service.inter.msg;

package com.yeshi.fanli.service.inter.money.msg;



import java.util.List;




 fanli/src/main/java/com/yeshi/fanli/service/inter/money/msg/UserMoneyMsgNotificationService.java

File was renamed from fanli/src/main/java/com/yeshi/fanli/service/inter/msg/UserMoneyMsgNotificationService.java
@@ -1,4 +1,4 @@
package com.yeshi.fanli.service.inter.msg;

package com.yeshi.fanli.service.inter.money.msg;



import java.math.BigDecimal;




 fanli/src/main/java/com/yeshi/fanli/service/inter/money/tb/TaoBaoWeiQuanDrawBackService.java

File was renamed from fanli/src/main/java/com/yeshi/fanli/service/inter/taobao/TaoBaoWeiQuanDrawBackService.java
@@ -1,4 +1,4 @@
package com.yeshi.fanli.service.inter.taobao;

package com.yeshi.fanli.service.inter.money.tb;



import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanDrawBack;

import com.yeshi.fanli.exception.order.TaoBaoWeiQuanException;


 fanli/src/main/java/com/yeshi/fanli/service/inter/order/HongBaoV2Service.java

File was renamed from fanli/src/main/java/com/yeshi/fanli/service/inter/hongbao/HongBaoV2Service.java
@@ -1,4 +1,4 @@
package com.yeshi.fanli.service.inter.hongbao;

package com.yeshi.fanli.service.inter.order;



import java.math.BigDecimal;

import java.util.Date;


 fanli/src/main/java/com/yeshi/fanli/service/inter/order/config/HongBaoManageService.java

File was renamed from fanli/src/main/java/com/yeshi/fanli/service/inter/hongbao/HongBaoManageService.java
@@ -1,4 +1,4 @@
package com.yeshi.fanli.service.inter.hongbao;

package com.yeshi.fanli.service.inter.order.config;



import java.math.BigDecimal;

import java.util.List;


 fanli/src/main/java/com/yeshi/fanli/service/inter/order/jd/JDOrderService.java

File was renamed from fanli/src/main/java/com/yeshi/fanli/service/inter/jd/JDOrderService.java
@@ -1,4 +1,4 @@
package com.yeshi.fanli.service.inter.jd;

package com.yeshi.fanli.service.inter.order.jd;



import com.yeshi.fanli.entity.jd.JDOrder;

import com.yeshi.fanli.exception.jd.JDOrderException;


 fanli/src/main/java/com/yeshi/fanli/service/inter/order/msg/MsgOrderDetailService.java

File was renamed from fanli/src/main/java/com/yeshi/fanli/service/inter/msg/MsgOrderDetailService.java
@@ -1,4 +1,4 @@
package com.yeshi.fanli.service.inter.msg;

package com.yeshi.fanli.service.inter.order.msg;



import java.util.List;




 fanli/src/main/java/com/yeshi/fanli/service/inter/order/msg/UserOrderMsgNotificationService.java

File was renamed from fanli/src/main/java/com/yeshi/fanli/service/inter/msg/UserOrderMsgNotificationService.java
@@ -1,4 +1,4 @@
package com.yeshi.fanli.service.inter.msg;

package com.yeshi.fanli.service.inter.order.msg;



import java.math.BigDecimal;

import java.util.Date;


 fanli/src/main/java/com/yeshi/fanli/service/inter/order/pdd/PDDOrderService.java

File was renamed from fanli/src/main/java/com/yeshi/fanli/service/inter/pdd/PDDOrderService.java
@@ -1,4 +1,4 @@
package com.yeshi.fanli.service.inter.pdd;

package com.yeshi.fanli.service.inter.order.pdd;



import java.util.List;




 fanli/src/main/java/com/yeshi/fanli/service/inter/order/tb/TaoBaoOrderService.java

File was renamed from fanli/src/main/java/com/yeshi/fanli/service/inter/taobao/TaoBaoOrderService.java
@@ -1,4 +1,4 @@
package com.yeshi.fanli.service.inter.taobao;

package com.yeshi.fanli.service.inter.order.tb;



import java.util.List;




 fanli/src/main/java/com/yeshi/fanli/service/inter/order/tb/TaoBaoPunishOrderService.java

File was renamed from fanli/src/main/java/com/yeshi/fanli/service/inter/taobao/TaoBaoPunishOrderService.java
@@ -1,4 +1,4 @@
package com.yeshi.fanli.service.inter.taobao;

package com.yeshi.fanli.service.inter.order.tb;



import java.util.List;

import java.util.Set;


 fanli/src/main/java/com/yeshi/fanli/service/inter/order/tb/TaoBaoWeiQuanOrderService.java

File was renamed from fanli/src/main/java/com/yeshi/fanli/service/inter/taobao/TaoBaoWeiQuanOrderService.java
@@ -1,4 +1,4 @@
package com.yeshi.fanli.service.inter.taobao;

package com.yeshi.fanli.service.inter.order.tb;



import java.util.List;




 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserAccountService.java

@@ -3,6 +3,7 @@
import javax.servlet.http.HttpServletRequest;

import javax.servlet.http.HttpSession;



import com.yeshi.fanli.entity.accept.AcceptData;

import com.yeshi.fanli.entity.bus.user.LoginResult;

import com.yeshi.fanli.entity.bus.user.UserInfo;

import com.yeshi.fanli.exception.user.UserAccountException;

@@ -25,7 +26,7 @@
     * @return

     * @throws UserAccountException

     */

    public LoginResult login(HttpServletRequest request, Boolean first, String appId, String code, String phone,

    public LoginResult login(HttpServletRequest request,AcceptData acceptData,  Boolean first, String appId, String code, String phone,

            UserInfo tbUserInfo, boolean wxinstall, int loginType) throws UserAccountException;



    /**

@@ -39,7 +40,7 @@
     * @return

     * @throws UserAccountException

     */

    public LoginResult loginNoInstallWX(String appId, String code, String phone, UserInfo tbUserInfo, int loginType)

    public LoginResult loginNoInstallWX(AcceptData acceptData, String appId, String code, String phone, UserInfo tbUserInfo, int loginType)

            throws UserAccountException;



    /**

@@ -152,7 +153,7 @@
     * @param uid

     * @param code

     */

    public void changeWXBind(Long uid, String code) throws UserAccountException;

    public void changeWXBind(AcceptData acceptData,Long uid, String code) throws UserAccountException;



    /**

     * 清理用户头像

@@ -190,7 +191,7 @@
     * @return

     * @throws UserAccountException

     */

    public UserInfo loginWinXin(HttpServletRequest request,int loginType, String code, String appId)

    public UserInfo loginWinXin(HttpServletRequest request,AcceptData acceptData,int loginType, String code, String appId)

            throws UserAccountException;



    /**

@@ -207,7 +208,7 @@
     * @param code

     * @throws UserAccountException

     */

    public void bindWeiXin(Long uid, String code) throws UserAccountException;

    public void bindWeiXin(AcceptData acceptData,Long uid, String code) throws UserAccountException;



    /**

     * 账户封禁


 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserInfoExtraService.java

@@ -1,5 +1,6 @@
package com.yeshi.fanli.service.inter.user;



import com.yeshi.fanli.dto.wx.WXAccountInfoDTO;

import com.yeshi.fanli.entity.bus.user.UserInfo;

import com.yeshi.fanli.entity.bus.user.UserInfoExtra;

import com.yeshi.fanli.entity.bus.user.UserRank;

@@ -81,7 +82,7 @@
     * @param code

     * @throws UserInfoExtraException

     */

    public void activationInviteWX(Long uid, String code) throws UserInfoExtraException;

    public void activationInviteWX(WXAccountInfoDTO wxAccount,Long uid, String code) throws UserInfoExtraException;



    /**

     * 判断是否是新用户

@@ -119,6 +120,6 @@
     * @return

     * @throws UserInfoExtraException

     */

    public UserInfo getInviterInfo(Long uid, String code) throws UserInfoExtraException;

    public UserInfo getInviterInfo(WXAccountInfoDTO wxAccount,Long uid, String code) throws UserInfoExtraException;

    

}


 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserInfoService.java

@@ -56,39 +56,11 @@


    public long getUserCount();



    public List<UserInfo> getUserList(int index, String key);



    public int getUserCount(String key);



    public Map<String, Integer> getnewUserByDate(int days, Date date);



    public Map<String, Integer> getnewUserByMonth(int months, Date date);



    public Map<String, Integer> getUserTotalByDate(int days, Date date);



    public Map<String, Integer> getUserTotalByMonth(int months, Date date);



    public List<UserInfo> getUserListByUid(long uid);



    public double getFreezeAssets(double min);



    public double getCanAssets(double min);



    public long getRandomShamUser();



    public boolean inviteWXUserInfo(String code, UserInfo inviter);



    public void unBindUserInfo(UserInfo find, int type);



    public void addMoney(UserInfo userInfo, BigDecimal money);



    public List<UserInfo> findFriends(long id, int type);



    public List<InviteUser> getFriendsList(long id, int type, int page, int pageSize);



    public long getFriendsListCount(long id, int type);



    public int findFriendsCount(long id, int type);



    public boolean createUser(UserInfo form, String appid);




 fanli/src/main/java/com/yeshi/fanli/service/inter/user/integral/CodePublishRecordService.java

File was renamed from fanli/src/main/java/com/yeshi/fanli/service/inter/integral/CodePublishRecordService.java
@@ -1,4 +1,4 @@
package com.yeshi.fanli.service.inter.integral;

package com.yeshi.fanli.service.inter.user.integral;



import java.util.List;




 fanli/src/main/java/com/yeshi/fanli/service/inter/user/integral/IntegralDetailService.java

File was renamed from fanli/src/main/java/com/yeshi/fanli/service/inter/integral/IntegralDetailService.java
@@ -1,4 +1,4 @@
package com.yeshi.fanli.service.inter.integral;

package com.yeshi.fanli.service.inter.user.integral;



import java.util.Date;

import java.util.List;


 fanli/src/main/java/com/yeshi/fanli/service/inter/user/integral/IntegralExchangeRecordService.java

File was renamed from fanli/src/main/java/com/yeshi/fanli/service/inter/integral/IntegralExchangeRecordService.java
@@ -1,4 +1,4 @@
package com.yeshi.fanli.service.inter.integral;

package com.yeshi.fanli.service.inter.user.integral;



import java.util.List;




 fanli/src/main/java/com/yeshi/fanli/service/inter/user/integral/IntegralExchangeService.java

File was renamed from fanli/src/main/java/com/yeshi/fanli/service/inter/integral/IntegralExchangeService.java
@@ -1,4 +1,4 @@
package com.yeshi.fanli.service.inter.integral;

package com.yeshi.fanli.service.inter.user.integral;



import java.util.List;




 fanli/src/main/java/com/yeshi/fanli/service/inter/user/integral/IntegralGetService.java

File was renamed from fanli/src/main/java/com/yeshi/fanli/service/inter/integral/IntegralGetService.java
@@ -1,4 +1,4 @@
package com.yeshi.fanli.service.inter.integral;

package com.yeshi.fanli.service.inter.user.integral;



import com.yeshi.fanli.entity.integral.IntegralTaskRecord;

import com.yeshi.fanli.exception.integral.IntegralGetException;


 fanli/src/main/java/com/yeshi/fanli/service/inter/user/integral/IntegralTaskClassService.java

File was renamed from fanli/src/main/java/com/yeshi/fanli/service/inter/integral/IntegralTaskClassService.java
@@ -1,4 +1,4 @@
package com.yeshi.fanli.service.inter.integral;

package com.yeshi.fanli.service.inter.user.integral;



import java.text.ParseException;

import java.util.List;


 fanli/src/main/java/com/yeshi/fanli/service/inter/user/integral/IntegralTaskRankService.java

File was renamed from fanli/src/main/java/com/yeshi/fanli/service/inter/integral/IntegralTaskRankService.java
@@ -1,4 +1,4 @@
package com.yeshi.fanli.service.inter.integral;

package com.yeshi.fanli.service.inter.user.integral;



import com.yeshi.fanli.entity.integral.IntegralTaskRank;




 fanli/src/main/java/com/yeshi/fanli/service/inter/user/integral/IntegralTaskRecordService.java

File was renamed from fanli/src/main/java/com/yeshi/fanli/service/inter/integral/IntegralTaskRecordService.java
@@ -1,4 +1,4 @@
package com.yeshi.fanli.service.inter.integral;

package com.yeshi.fanli.service.inter.user.integral;



import java.util.Date;

import java.util.List;


 fanli/src/main/java/com/yeshi/fanli/service/inter/user/integral/IntegralTaskService.java

File was renamed from fanli/src/main/java/com/yeshi/fanli/service/inter/integral/IntegralTaskService.java
@@ -1,4 +1,4 @@
package com.yeshi.fanli.service.inter.integral;

package com.yeshi.fanli.service.inter.user.integral;



import java.util.List;




 fanli/src/main/java/com/yeshi/fanli/service/inter/user/invite/MsgInviteDetailService.java

File was renamed from fanli/src/main/java/com/yeshi/fanli/service/inter/msg/MsgInviteDetailService.java
@@ -1,4 +1,4 @@
package com.yeshi.fanli.service.inter.msg;

package com.yeshi.fanli.service.inter.user.invite;



import java.util.List;




 fanli/src/main/java/com/yeshi/fanli/service/inter/user/invite/ThreeSaleExtraInfoSerivce.java

File was renamed from fanli/src/main/java/com/yeshi/fanli/service/inter/hongbao/ThreeSaleExtraInfoSerivce.java
@@ -1,4 +1,4 @@
package com.yeshi.fanli.service.inter.hongbao;

package com.yeshi.fanli.service.inter.user.invite;



import com.yeshi.fanli.entity.bus.user.ThreeSaleExtraInfo;




 fanli/src/main/java/com/yeshi/fanli/service/inter/user/invite/ThreeSaleSerivce.java

File was renamed from fanli/src/main/java/com/yeshi/fanli/service/inter/hongbao/ThreeSaleSerivce.java
@@ -1,4 +1,4 @@
package com.yeshi.fanli.service.inter.hongbao;

package com.yeshi.fanli.service.inter.user.invite;



import java.util.List;




 fanli/src/main/java/com/yeshi/fanli/service/inter/user/invite/UserInviteMsgNotificationService.java

File was renamed from fanli/src/main/java/com/yeshi/fanli/service/inter/msg/UserInviteMsgNotificationService.java
@@ -1,4 +1,4 @@
package com.yeshi.fanli.service.inter.msg;

package com.yeshi.fanli.service.inter.user.invite;



import com.yeshi.fanli.dto.msg.MsgInviteContentDTO;

import com.yeshi.fanli.entity.bus.user.ThreeSale;


 fanli/src/main/java/com/yeshi/fanli/service/inter/user/msg/MsgAccountDetailService.java

File was renamed from fanli/src/main/java/com/yeshi/fanli/service/inter/msg/MsgAccountDetailService.java
@@ -1,4 +1,4 @@
package com.yeshi.fanli.service.inter.msg;

package com.yeshi.fanli.service.inter.user.msg;



import java.util.List;




 fanli/src/main/java/com/yeshi/fanli/service/inter/user/msg/UserAccountMsgNotificationService.java

File was renamed from fanli/src/main/java/com/yeshi/fanli/service/inter/msg/UserAccountMsgNotificationService.java
@@ -1,4 +1,4 @@
package com.yeshi.fanli.service.inter.msg;

package com.yeshi.fanli.service.inter.user.msg;



/**

 * 用户账户消息通知


 fanli/src/main/java/com/yeshi/fanli/service/inter/user/tb/TaoBaoUnionAuthRecordService.java

File was renamed from fanli/src/main/java/com/yeshi/fanli/service/inter/taobao/TaoBaoUnionAuthRecordService.java
@@ -1,4 +1,4 @@
package com.yeshi.fanli.service.inter.taobao;

package com.yeshi.fanli.service.inter.user.tb;



import com.yeshi.fanli.entity.taobao.TaoBaoUnionAuthRecord;




 fanli/src/main/java/com/yeshi/fanli/service/inter/user/tb/UserExtraTaoBaoInfoService.java

File was renamed from fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserExtraTaoBaoInfoService.java
@@ -1,4 +1,4 @@
package com.yeshi.fanli.service.inter.user;

package com.yeshi.fanli.service.inter.user.tb;



import com.yeshi.fanli.entity.bus.user.UserExtraTaoBaoInfo;

import com.yeshi.fanli.exception.user.UserExtraTaoBaoInfoException;


 fanli/src/main/java/com/yeshi/fanli/util/Constant.java

@@ -7,7 +7,7 @@


import org.yeshi.utils.annotation.MapUtil;



import com.yeshi.fanli.entity.accept.AcceptData;

import com.yeshi.fanli.dto.wx.WXAccountInfoDTO;

import com.yeshi.fanli.entity.config.AlipayConfig;

import com.yeshi.fanli.entity.config.ConstantConfig;

import com.yeshi.fanli.entity.config.SMSConfig;

@@ -264,8 +264,18 @@


    public static String getAppName(String platform, String version) {

        if (VersionUtil.greaterThan_2_0(platform, version))

            return Constant.systemCommonConfig.getProjectName();

            return Constant.systemCommonConfig.getProjectChineseName();

        else

            return "返利券";

    }



    public static WXAccountInfoDTO getWXAccount(String platform, String version) {

//        if (VersionUtil.greaterThan_2_0(platform, version)) {

//            return new WXAccountInfoDTO("wxa99686bb65a9f466", "57390718ddedaa1591f6876cdcf96f43", "wx879fb78463222cd5",

//                    "2ad8ec333a9f96b13c5c5c1c2b13cd67");

//        } else {

            return new WXAccountInfoDTO("wx43617e2ed82c5b28", "f8a65908fb4681bdd181de70f6ab9a3b", "wx5c0d167c6e3ad726",

                    "0c79d5869bb0f2d7c13e43f9a18f440d");

//        }

    }

}


 fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java

@@ -33,24 +33,24 @@
import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanOrder;

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;

import com.yeshi.fanli.service.inter.integral.IntegralGetService;

import com.yeshi.fanli.service.inter.integral.IntegralTaskRecordService;

import com.yeshi.fanli.service.inter.jd.JDOrderService;

import com.yeshi.fanli.service.inter.lable.BoutiqueAutoRuleService;

import com.yeshi.fanli.service.inter.lable.LabelService;

import com.yeshi.fanli.service.inter.money.UserMoneyDebtService;

import com.yeshi.fanli.service.inter.money.extract.ExtractService;

import com.yeshi.fanli.service.inter.order.CommonOrderService;

import com.yeshi.fanli.service.inter.order.HongBaoOrderService;

import com.yeshi.fanli.service.inter.order.HongBaoV2Service;

import com.yeshi.fanli.service.inter.order.OrderProcessService;

import com.yeshi.fanli.service.inter.pdd.PDDOrderService;

import com.yeshi.fanli.service.inter.order.jd.JDOrderService;

import com.yeshi.fanli.service.inter.order.pdd.PDDOrderService;

import com.yeshi.fanli.service.inter.order.tb.TaoBaoOrderService;

import com.yeshi.fanli.service.inter.push.IOSPushService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsUpdateService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoOrderService;

import com.yeshi.fanli.service.inter.user.ExtractService;

import com.yeshi.fanli.service.inter.user.UserInfoService;

import com.yeshi.fanli.service.inter.user.UserSystemCouponService;

import com.yeshi.fanli.service.inter.user.integral.IntegralGetService;

import com.yeshi.fanli.service.inter.user.integral.IntegralTaskRecordService;

import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;

import com.yeshi.fanli.util.cmq.HongBaoRecieveCMQManager;

import com.yeshi.fanli.util.cmq.JDOrderCMQManager;

import com.yeshi.fanli.util.cmq.PDDOrderCMQManager;


 fanli/src/main/java/com/yeshi/fanli/util/factory/HongBaoFactory.java

@@ -11,7 +11,7 @@
import com.yeshi.fanli.dto.HongBaoDTO;

import com.yeshi.fanli.entity.bus.user.Order;

import com.yeshi.fanli.entity.bus.user.UserInfo;

import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

import com.yeshi.fanli.util.Constant;



@Component


 fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java

@@ -57,7 +57,7 @@
import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.goods.TaoBaoLinkService;

import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

import com.yeshi.fanli.tag.PageEntity;

import com.yeshi.fanli.util.AESUtil;

import com.yeshi.fanli.util.Constant;


 fanli/src/main/java/com/yeshi/fanli/util/wx/WXLoginUtil.java

@@ -19,14 +19,9 @@
    public static String WEXIN_APPID = "wx43617e2ed82c5b28";

    public static String WEXIN_SECRET = "f8a65908fb4681bdd181de70f6ab9a3b";



    static String APPID = "wx5c0d167c6e3ad726";

    static String SECRET = "0c79d5869bb0f2d7c13e43f9a18f440d";



    static {

        WEXIN_APPID = Constant.systemCommonConfig.getWxGZAppId();

        WEXIN_SECRET = Constant.systemCommonConfig.getWxGZAppSecret();

        APPID = Constant.systemCommonConfig.getWxOpenAppId();

        SECRET = Constant.systemCommonConfig.getWxOpenAppSecret();

    }



    // 通过code获取access_token openId

@@ -34,8 +29,8 @@


    public static String weiXinUrl2 = "https://api.weixin.qq.com/sns/userinfo?access_token=%s&openid=%s&lang=zh_CN";



    public static WeiXinUserParam getWxParam(String code) {

        String wxUrl = String.format(weiXinUrl1, APPID, SECRET, code);

    public static WeiXinUserParam getWxParam(String code,String appId,String appSecret) {

        String wxUrl = String.format(weiXinUrl1, appId, appSecret, code);

        String result = HttpUtil.get(wxUrl);

        WeiXinUserParam weiXinUserParam = getWeiXinUserParam(result);

        return weiXinUserParam;

@@ -76,8 +71,8 @@
        return weiXinUser;

    }



    public static WeiXinUser getWeiXinUser(String code) {

        WeiXinUserParam param = getWxParam(code);

    public static WeiXinUser getWeiXinUser(String code,String appId,String appSecret) {

        WeiXinUserParam param = getWxParam(code,appId,appSecret);

        if (param == null) {

            return null;

        }

@@ -95,8 +90,8 @@
     * @param code

     * @return

     */

    public static WeiXinUser getWeiXinUserWithSavePortrait(String code) {

        WeiXinUser user = getWeiXinUser(code);

    public static WeiXinUser getWeiXinUserWithSavePortrait(String code,String appId,String appSecret) {

        WeiXinUser user = getWeiXinUser(code,appId,appSecret);

        if (user != null) {

            if (!StringUtil.isNullOrEmpty(user.getHeadimgurl())) {




 fanli/src/main/resource/app.properties

@@ -71,7 +71,7 @@
share_content=来自你的分享赚订单号：{0}的分享提成¥{1}元已经转入到你的余额中



service_title=售后订单扣款提示

service_content=订单号：{0}的订单淘宝已售后退款处理，其订单返利/分享提成¥{1}元，将从你的余额中扣出。因为任何订单出现退款或售后，商家均不会支付相应订单的广告费，所以板栗快省也无法提供返利，非常遗憾。温馨提示：恶意的提交售后申请，淘宝会对该用户做相应的处罚，购物信用将永远有记录；另一方面板栗快省也会做出相应处罚。

service_content=订单号：{0}的订单淘宝已售后退款处理，其订单返利/分享提成¥{1}元，将从你的余额中扣出。因为任何订单出现退款或售后，商家均不会支付相应订单的广告费，所以返利券也无法提供返利，非常遗憾。温馨提示：恶意的提交售后申请，淘宝会对该用户做相应的处罚，购物信用将永远有记录；另一方面返利券也会做出相应处罚。



extract_apply_title=你已成功提交提现申请

extract_apply_content=你已成功提交提现申请，我们会尽快审核，如账目明细无误，我们将在24小时内为您转账。


 fanli/src/main/resource/system_config.properties

@@ -3,7 +3,7 @@
#项目名称

project_name=fanli



project_chinese_name=板栗快省

project_chinese_name=返利券

#项目域名

project_host=flq.yeshitv.com

#公众号appid


 fanli/src/main/resource/wx_gz_config.properties

@@ -1,7 +1,7 @@
#微信公众号配置



#欢迎语

welcome_msg=你好啊，欢迎来到《板栗快省》官方公众号[爱心][爱心] \n 平时购物领券可是一种生活方式哦，券后价非常给力，下载《板栗快省》APP有返利哦，现在可以购物领券啦！[發][發]  \n [礼物]你可以回复，例如：衣服，可快速查询优惠券。\n [强]购物领券，绝对超给力 \n\n ↓↓下载APP不光能领券↓↓ \n ↓↓还有返利哦↓↓ \n <a href='http://sj.qq.com/myapp/detail.htm?apkName=com.yeshi.ec.rebate'> >>>戳此下载</a>

welcome_msg=你好啊，欢迎来到《返利券》官方公众号[爱心][爱心] \n 平时购物领券可是一种生活方式哦，券后价非常给力，下载《返利券》APP有返利哦，现在可以购物领券啦！[發][發]  \n [礼物]你可以回复，例如：衣服，可快速查询优惠券。\n [强]购物领券，绝对超给力 \n\n ↓↓下载APP不光能领券↓↓ \n ↓↓还有返利哦↓↓ \n <a href='http://sj.qq.com/myapp/detail.htm?apkName=com.yeshi.ec.rebate'> >>>戳此下载</a>

#app下载链接

app_download_link=http://sj.qq.com/myapp/detail.htm?apkName=com.yeshi.ec.rebate




 fanli/src/test/java/org/fanli/MyBatisProduce.java

@@ -4,8 +4,8 @@
import org.yeshi.utils.mybatis.ColumnParseUtil;

import org.yeshi.utils.mybatis.MyBatisMapperUtil;



import com.yeshi.fanli.entity.common.Config;

import com.yeshi.fanli.entity.jd.JDOrderItem;

import com.yeshi.fanli.entity.taobao.TaoBaoOrder;



//@Ignore

public class MyBatisProduce {

@@ -19,8 +19,8 @@


    @Test

    public void test1() {

        ColumnParseUtil.parseColumn(TaoBaoOrder.class,

                "D:\\workspace\\fanli\\fanli-server\\fanli\\src\\main\\java\\com\\yeshi\\fanli\\mapping\\taobao\\TaoBaoOrderMapper.xml");

        ColumnParseUtil.parseColumn(Config.class,

                "D:\\workspace\\fanli\\fanli-server\\fanli\\src\\main\\java\\com\\yeshi\\fanli\\mapping\\ConfigMapper.xml");

    }



}


 fanli/src/test/java/org/fanli/TaoKeTest.java

@@ -23,7 +23,6 @@
import com.yeshi.fanli.entity.taobao.TaoBaoLink;

import com.yeshi.fanli.entity.taobao.TaoBaoOrder;

import com.yeshi.fanli.entity.taobao.TaoKeAppInfo;

import com.yeshi.fanli.exception.taobao.TaoKeApiException;

import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.goods.ShareGoodsService;

@@ -48,16 +47,35 @@


    @Test

    public void test1() {


        try {

            TaoKeAppInfo app = new TaoKeAppInfo("27867727", "781fce83545edbed13af32dc3fa9fc3a",

                    "mm_124933865_865950258_109407350204");

            app.setAdzoneId("109407350204");

            TaoBaoGoodsBrief goods = TaoKeApiUtil.searchGoodsDetail(596441448615L, app);

            System.out.println(goods);

        } catch (TaobaoGoodsDownException e) {

            e.printStackTrace();

        }

    }



    @Test

    public void test2() {

        System.out.println(HttpUtil.getShortLink("http://h5.flq001.com"));

        System.out.println(HttpUtil.getShortLink("http://h5.flq002.com"));

        System.out.println(HttpUtil.getShortLink("http://h5.flq003.com"));

        System.out.println(HttpUtil.getShortLink("http://h5.flq004.com"));

        System.out.println(HttpUtil.getShortLink("http://h5.flq005.com"));



        TaoBaoGoodsBrief goods = null;

        try {

            goods = TaoKeApiUtil.searchGoodsDetail(601535036423L);



            // goods = TaoKeApiUtil.searchGoodsDetail(601535036423L, new

            // TaoKeAppInfo(TaoBaoConstant.TAOBAO_AUTH_APPKEY,

            // TaoBaoConstant.TAOBAO_AUTH_APPSECRET,

            // TaoBaoConstant.TAOBAO_SPECIAL_PID_DEFAULT));

        } catch (TaobaoGoodsDownException e2) {

            e2.printStackTrace();

        }

        System.out.println(goods);



        // goods = TaoKeApiUtil.searchGoodsDetail(auctionId);



    }



    @Test

@@ -72,7 +90,7 @@
            TaoKeApiUtil.createTaoLiJin(auctionId, "淘礼金", new BigDecimal(1), 1, new Date(),

                    new Date(System.currentTimeMillis() + 1000 * 60 * 60 * 12L), new Date(),

                    new Date(System.currentTimeMillis() + 1000 * 60 * 60 * 12L), app);

        } catch (TaoKeApiException e) {

        } catch (Exception e) {

            e.printStackTrace();

        }

    }