好省呗应用兼容

admin

2021-09-18 2e61c91e0e5cd76ed7174aa31e10b8522cd81fde

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

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

import com.yeshi.fanli.entity.SystemEnum;
import com.yeshi.fanli.entity.SystemPIDInfo;
import com.yeshi.fanli.exception.goods.ConvertLinkException;
import com.yeshi.fanli.service.manger.PIDManager;
import com.yeshi.fanli.service.manger.goods.ConvertLinkManager;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
@@ -79,12 +81,6 @@
    private TBPidService tbPidService;

    @Resource
    private TaoBaoUnionConfigService taoBaoUnionConfigService;

    @Resource
    private UserInfoExtraService userInfoExtraService;

    @Resource
    private FloatADService floatADService;

    @Resource
@@ -92,9 +88,6 @@

    @Resource
    private MsgDeviceReadStateService msgDeviceReadStateService;

    @Resource
    private UserTaoLiJinOriginService uerTaoLiJinOriginService;

    @Resource
    private UserActiveLogService userActiveLogService;
@@ -110,6 +103,9 @@

    @Resource
    private PIDManager pidManager;

    @Resource
    private ConvertLinkManager convertLinkManager;

    /**
     * s 首页配置信息
@@ -476,8 +472,17 @@
        String key = RedisKeyEnum.getRedisKey(RedisKeyEnum.elmeLink, uid + "");
        String elmeLink = redisManager.getCommonString(key);
        if (StringUtil.isNullOrEmpty(elmeLink)) {
            TaoKeOfficialActivityConvertResultDTO dto = TaoKeApiUtil.officialActivityConvert(
                    elmePid.split("_")[3], "1571715733668", userInfoExtra.getRelationId());
            TaoKeOfficialActivityConvertResultDTO dto = null;
            try {
                dto = convertLinkManager.taobaoOfficialActivityConvert(uid, elmePid, "1571715733668", userInfoExtra.getRelationId(), false);
            } catch (ConvertLinkException e) {
                e.printStackTrace();
                if (StringUtil.isNullOrEmpty(callback))
                    out.print(JsonUtil.loadFalseResult(e.getMessage()));
                else
                    out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult(e.getMessage())));
                return;
            }
            if (dto != null)
                elmeLink = dto.getShort_click_url();
            if (!StringUtil.isNullOrEmpty(elmeLink)) {
@@ -533,12 +538,19 @@
        JSONObject data = new JSONObject();
        TaoKeOfficialActivityConvertResultDTO dto = null;
        if (StringUtil.isNullOrEmpty(elmeResult)) {
            try {
            if (share) {
                dto = TaoKeApiUtil.officialActivityConvert(relationPid.split("_")[3],
                        activityId, userInfoExtra.getRelationId());
                    dto = convertLinkManager.taobaoOfficialActivityConvert(uid, relationPid, activityId, userInfoExtra.getRelationId(), true);
            } else {
                dto = TaoKeApiUtil.officialActivityConvert(elmePid.split("_")[3], activityId,
                        userInfoExtra.getRelationId());
                    dto = convertLinkManager.taobaoOfficialActivityConvert(uid, elmePid, activityId,
                            userInfoExtra.getRelationId(), false);
                }
            } catch (ConvertLinkException e) {
                if (StringUtil.isNullOrEmpty(callback))
                    out.print(JsonUtil.loadFalseResult(e.getMessage()));
                else
                    out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult(e.getMessage())));
                return;
            }

            if (dto != null) {
@@ -610,12 +622,18 @@
        JSONObject data = new JSONObject();
        TaoKeOfficialActivityConvertResultDTO dto = null;
        if (StringUtil.isNullOrEmpty(elmeResult)) {

            try {
            if (share) {
                dto = TaoKeApiUtil.officialActivityConvert(relationPid.split("_")[3],
                        activityId, userInfoExtra.getRelationId());
                    dto = convertLinkManager.taobaoOfficialActivityConvert(uid, relationPid,
                            activityId, userInfoExtra.getRelationId(), true);
            } else {
                dto = TaoKeApiUtil.officialActivityConvert(TaoBaoConstant.TAOBAO_KOUBEI_PID.split("_")[3], activityId,
                        userInfoExtra.getRelationId());
                    dto = convertLinkManager.taobaoOfficialActivityConvert(uid, TaoBaoConstant.TAOBAO_KOUBEI_PID,
                            activityId, userInfoExtra.getRelationId(), false);
                }
            } catch (ConvertLinkException e) {
                out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult(e.getCode(), e.getMessage())));
                return;
            }

            if (dto != null) {