From 651f2856e9ae10aacbfb8327d967aacbb6d58333 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 12 四月 2023 18:13:58 +0800
Subject: [PATCH] 大淘客API修复/唯品会订单爬取策略修改

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ShareControllerV2.java |  284 ++++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 260 insertions(+), 24 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ShareControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ShareControllerV2.java
index 7707486..8bbff8a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ShareControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ShareControllerV2.java
@@ -22,6 +22,12 @@
 import com.yeshi.fanli.service.manger.goods.TaoBaoLinkManager;
 import com.yeshi.fanli.util.*;
 import com.yeshi.fanli.util.StringUtil;
+import com.yeshi.fanli.util.goods.douyin.CSJCPSApiUtil;
+import com.yeshi.fanli.util.goods.douyin.DYUtil;
+import com.yeshi.fanli.util.goods.douyin.vo.DYConvertResult;
+import com.yeshi.fanli.util.goods.douyin.vo.DYGoodsDetail;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -93,6 +99,9 @@
 @Controller
 @RequestMapping("api/v2/share")
 public class ShareControllerV2 {
+
+    Logger logger = LoggerFactory.getLogger(ShareControllerV2.class);
+
     @Resource
     private ShareGoodsService shareGoodsService;
 
@@ -227,7 +236,7 @@
 
         // 娣樺疂
         if (goodsType == null || goodsType == Constant.SOURCE_TYPE_TAOBAO) {
-            createTaoBaoShare(acceptData, uid, Long.parseLong(goodsId), totalNum, source, needGoods, request, out);
+            createTaoBaoShare(acceptData, uid, goodsId, totalNum, source, needGoods, request, out);
             return;
         }
 
@@ -252,6 +261,12 @@
         // 鑻忓畞
         if (goodsType == Constant.SOURCE_TYPE_SUNING) {
             createSuningShare(acceptData, uid, goodsId, source, needGoods, out);
+            return;
+        }
+
+        // 鎶栭煶
+        if (goodsType == Constant.SOURCE_TYPE_DY) {
+            createDYShare(acceptData, uid,Long.parseLong( goodsId), source, needGoods, out);
             return;
         }
 
@@ -306,7 +321,7 @@
      * @param request
      * @param out
      */
-    public void createTaoBaoShare(AcceptData acceptData, Long uid, Long goodsId, Integer totalNum, String source,
+    public void createTaoBaoShare(AcceptData acceptData, Long uid, String goodsId, Integer totalNum, String source,
                                   Boolean needGoods, HttpServletRequest request, PrintWriter out) {
         if (needGoods == null)
             needGoods = false;
@@ -353,7 +368,7 @@
      * @param request
      * @param out
      */
-    public void createTaoLijin(Long uid, Long auctionId, int totalNum, String relationId, AcceptData acceptData, HttpServletRequest request,
+    public void createTaoLijin(Long uid, String auctionId, int totalNum, String relationId, AcceptData acceptData, HttpServletRequest request,
                                PrintWriter out) {
         try {
             TaoBaoGoodsBrief goods = null;
@@ -524,7 +539,7 @@
         }
     }
 
-    public void createCommonTaoBaoShare(String platform, String version, Long goodsId, String inviteCode, Long uid,
+    public void createCommonTaoBaoShare(String platform, String version, String goodsId, String inviteCode, Long uid,
                                         boolean needGoods, String relationId, AcceptData acceptData, PrintWriter out) {
 
         SystemEnum system = SystemInfoUtil.getSystem(acceptData);
@@ -769,9 +784,18 @@
         }
         String materialId = "https://item.jd.com/" + goodsId + ".html";
         String pid = pidManager.getPidCache(acceptData.getSystem(), Constant.SOURCE_TYPE_JD, SystemPIDInfo.PidType.share);
-        String jumpLink = JDApiUtil.convertLinkWithSubUnionId(materialId, couponUrl, null, pid, uid + "");
+        String jumpLink = null;
+        try {
+            jumpLink = JDApiUtil.convertLinkWithSubUnionId(materialId, couponUrl, null, pid, uid + "");
+        } catch (Exception e) {
+            logger.warn(String.format("浜笢杞摼鍑洪敊锛歮aterialId-%s  couponUrl-%s", materialId, couponUrl), e);
+        }
         if (StringUtil.isNullOrEmpty(jumpLink)) {
-            jumpLink = JDApiUtil.convertLinkWithSubUnionId(materialId, null, null, pid, uid + "");
+            try {
+                jumpLink = JDApiUtil.convertLinkWithSubUnionId(materialId, null, null, pid, uid + "");
+            } catch (Exception e) {
+                logger.warn(String.format("浜笢杞摼鍑洪敊锛歮aterialId-%s  couponUrl-%s", materialId, couponUrl), e);
+            }
         }
 
         ShareInfoVO shareInfo = new ShareInfoVO();
@@ -818,7 +842,7 @@
         BigDecimal shareMoney = JDUtil.getGoodsFanLiMoney(jdGoods, shareRate);
         shareInfo.setShareMoney("楼" + shareMoney.toString());
         try {
-            ShareGoodsRecordDTO shareRecord = userShareGoodsRecordService.addRecordGoodsDetail(uid, goodsId,
+            ShareGoodsRecordDTO shareRecord = userShareGoodsRecordService.addRecordGoodsDetail(uid, goodsId + "",
                     Constant.SOURCE_TYPE_JD, false);
             shareInfo.setShareId(shareRecord.getRedisKey());
         } catch (Exception e) {
@@ -894,7 +918,7 @@
                 history.setTkCode(null);
                 history.setLink(null);
                 history.setQuanLink(null);
-                history.setGoodsId(goodsId);
+                history.setGoodsId(goodsId + "");
                 history.setPostPicture(goods.getPicUrl());
                 history.setShareImg(jumpLinkNew);
 
@@ -1008,7 +1032,7 @@
         shareInfo.setShareMoney("楼" + shareMoney.toString());
 
         try {
-            ShareGoodsRecordDTO shareRecord = userShareGoodsRecordService.addRecordGoodsDetail(uid, goodsId,
+            ShareGoodsRecordDTO shareRecord = userShareGoodsRecordService.addRecordGoodsDetail(uid, goodsId + "",
                     Constant.SOURCE_TYPE_PDD, false);
             shareInfo.setShareId(shareRecord.getRedisKey());
         } catch (Exception e) {
@@ -1083,7 +1107,7 @@
                 history.setTkCode(null);
                 history.setLink(null);
                 history.setQuanLink(null);
-                history.setGoodsId(goodsId);
+                history.setGoodsId(goodsId + "");
                 history.setPostPicture(goods.getGoodsImageUrl());
                 history.setShareImg(jumpLink);
                 List<String> imgList = null;
@@ -1163,7 +1187,7 @@
         shareInfo.setShareMoney("楼" + shareMoney.toString());
 
         try {
-            ShareGoodsRecordDTO shareRecord = userShareGoodsRecordService.addRecordGoodsDetail(uid, goodsId,
+            ShareGoodsRecordDTO shareRecord = userShareGoodsRecordService.addRecordGoodsDetail(uid, goodsId + "",
                     Constant.SOURCE_TYPE_VIP, false);
             shareInfo.setShareId(shareRecord.getRedisKey());
         } catch (Exception e) {
@@ -1212,7 +1236,7 @@
                 history.setTkCode(null);
                 history.setLink(null);
                 history.setQuanLink(null);
-                history.setGoodsId(goodsId);
+                history.setGoodsId(goodsId + "");
                 history.setPostPicture(goods.getGoodsThumbUrl());
                 history.setShareImg(jumpLink.getUrl());
                 List<String> imgList = goods.getGoodsDetailPictures();
@@ -1307,7 +1331,7 @@
 
         try {
             ShareGoodsRecordDTO shareRecord = userShareGoodsRecordService.addRecordGoodsDetail(uid,
-                    Long.parseLong(sts[1]), Constant.SOURCE_TYPE_SUNING, false);
+                    Long.parseLong(sts[1]) + "", Constant.SOURCE_TYPE_SUNING, false);
             shareInfo.setShareId(shareRecord.getRedisKey());
         } catch (Exception e) {
             try {
@@ -1393,7 +1417,7 @@
                 history.setTkCode(null);
                 history.setLink(null);
                 history.setQuanLink(null);
-                history.setGoodsId(Long.parseLong(sts[1]));
+                history.setGoodsId(Long.parseLong(sts[1]) + "");
                 if (goods.getCommodityInfo().getPictureUrl() != null
                         && goods.getCommodityInfo().getPictureUrl().size() > 0)
                     history.setPostPicture(goods.getCommodityInfo().getPictureUrl().get(0).getPicUrl());
@@ -1403,6 +1427,161 @@
                 if (pictureList != null) {
                     for (SuningGoodsImg gi : pictureList)
                         imgList.add(gi.getPicUrl());
+                }
+                history.setPictures(JsonUtil.getGson().toJson(imgList));
+                shareGoodsService.addShareGoodsHistory(history);
+            }
+        });
+    }
+
+
+    /**
+     * 鎶栭煶鍒嗕韩
+     *
+     * @param acceptData
+     * @param uid
+     * @param goodsId
+     * @param source
+     * @param needGoods
+     * @param out        void 杩斿洖绫诲瀷
+     * @throws
+     * @Title: createSuningShare
+     * @Description:
+     */
+    public void createDYShare(AcceptData acceptData, Long uid, Long goodsId, String source, boolean needGoods,
+                              PrintWriter out) {
+        DYGoodsDetail goods = CSJCPSApiUtil.goodsDetail(goodsId);
+        if (goods == null) {
+            out.print(JsonUtil.loadFalseResult(1, "璇ュ晢鍝佸凡涓嬫灦"));
+            return;
+        }
+
+        SystemEnum system = SystemInfoUtil.getSystem(acceptData);
+
+
+        DYConvertResult convertResult = CSJCPSApiUtil.goodsConvert(goods.getDetail_url(), DYUtil.createShareExtraInfo(uid), "");
+
+        ShareInfoVO shareInfo = new ShareInfoVO();
+        shareInfo.setClickUrl(convertResult.getQrCode());
+        shareInfo.setWxErCode(convertResult.getQrCode());
+        shareInfo.setCommentTexts(new ArrayList<>());
+        shareInfo.setRule(configService.getValue(ConfigKeyEnum.shareRuleLinkDY.getKey(), system));
+        shareInfo.setPictUrl(goods.getCover());
+        if (needGoods) {
+            shareInfo
+                    .setGoodsInfo(GoodsDetailVOFactory.convertDYGoods(goods,
+                            new GoodsMoneyConfigParamsDTO(hongBaoManageService.getFanLiRate(acceptData.getSystem()),
+                                    hongBaoManageService.getShareRate(acceptData.getSystem()), Constant.MAX_REWARD_RATE,
+                                    hongBaoManageService.getFanLiRate(UserLevelEnum.superVIP, acceptData.getSystem()))));
+        }
+
+        String template = shareGoodsTextTemplateService.getTextTemplateBySuNing(uid);
+        String shareText =  shareGoodsTextTemplateService.createCommonShareTextDY(template, goods, convertResult.getDeeplink());
+        shareInfo.setShareText(shareText);
+
+        String descText = shareText.replace(goods.getTitle(), "").trim();
+        if (descText.startsWith("\\r\\n")) {
+            descText = descText.substring(0);
+        }
+        shareInfo.setDescText(descText);
+
+        //
+        String imgs = configService.getByVersion(ConfigKeyEnum.goodsShareNotifyImgs.getKey(), acceptData.getPlatform(),
+                Integer.parseInt(acceptData.getVersion()), system);
+        JSONArray array = JSONArray.fromObject(imgs);
+
+        shareInfo.setNotifyPicture(array.size() > 1 ? array.optString(1) : array.optString(0));
+
+        // 2.0.7鐗堟湰鍚庣殑鎻愮ず鍥剧墖
+        imgs = configService.getValue(ConfigKeyEnum.goodsShareNotifyImgs207.getKey(), system);
+        array = JSONArray.fromObject(imgs);
+        shareInfo.setNotifyPictureNew(array.size() > 1 ? array.optString(1) : array.optString(0));
+
+        shareInfo.setNotifyDesc(configService.getValue(ConfigKeyEnum.goodsShareNotifyDY.getKey(), system));
+
+        // 娣诲姞鍒嗕韩璁板綍
+        BigDecimal shareRate = hongBaoManageService.getShareRate(acceptData.getSystem());
+        BigDecimal shareMoney = DYUtil.getGoodsFanLiMoney(goods, shareRate);
+        shareInfo.setShareMoney("楼" + shareMoney.toString());
+
+        try {
+            ShareGoodsRecordDTO shareRecord = userShareGoodsRecordService.addRecordGoodsDetail(uid,
+                    goodsId + "", Constant.SOURCE_TYPE_DY, false);
+            shareInfo.setShareId(shareRecord.getRedisKey());
+        } catch (Exception e) {
+            try {
+                LogHelper.errorDetailInfo(e);
+            } catch (Exception e1) {
+                e1.printStackTrace();
+            }
+        }
+
+        String inviteCode = userInfoExtraService.getInviteCodeByUid(uid);
+
+
+        String commentText = "";
+        String recommendText = "";
+        String qtemplate = configService.getValue(ConfigKeyEnum.quickShareGoodsText.getKey(), system);
+        recommendText = qtemplate.replace("[鍟嗗搧鏍囬]", goods.getTitle());
+
+        recommendText = recommendText.replace("鎺ㄨ崘鐞嗙敱:[鎺ㄨ崘璇璢", "");
+
+
+        String quickCommentText = configService.getValue(ConfigKeyEnum.quickShareDYCommentText.getKey(), system);
+
+        commentText = quickCommentText.replace("[鍘熶环]", BigDecimalUtil.getWithNoZera(DYUtil.getPrice(goods.getPrice())).toString());
+        //commentText = commentText.replace("[閾炬帴]", jumpLink);
+        commentText = commentText.replace("[鍙d护]", convertResult.getPassword());
+
+
+        String salesCountMidea = "";
+        Integer count = goods.getSales();
+        if (count < 10000) {
+            salesCountMidea = count + "";
+        } else {
+            double sales = count;
+            salesCountMidea = String.format("%.1f", sales / 10000);
+            salesCountMidea = salesCountMidea + "涓�";
+        }
+        if (StringUtil.isNullOrEmpty(salesCountMidea) || salesCountMidea.equals("0")) {
+            recommendText = recommendText.replace("閿�閲�:[閿�閲廬", "");
+        } else {
+            recommendText = recommendText.replace("[閿�閲廬", salesCountMidea.replace("涓�", "w"));
+        }
+
+        commentText = commentText.replace("棰嗗埜鎶㈣喘", "鎶㈣喘").replace("銆愬埜鍚庝环銆慬鍒稿悗浠穄鍏�", "");
+        recommendText = recommendText.replace("浼樻儬鍒�:[鍒搁潰棰漖鍏�", "");
+
+        shareInfo.setRecommendText(deleteBlankLine(recommendText));
+        shareInfo.setCommentText(deleteBlankLine(commentText));
+
+        // 璁剧疆璇勮鏂囨湰閫夐」
+        shareInfo.setCommentTextChoiceList(getCommentChoiceList(null, shareInfo.getCommentText(), inviteCode,
+                DYUtil.getGoodsFanLiMoney(goods, hongBaoManageService.getFanLiRate(UserLevelEnum.superVIP, acceptData.getSystem()))));
+
+        out.print(JsonUtil.loadTrueResult(
+                JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder()).create().toJson(shareInfo)));
+
+        // 寮傛鎿嶄綔
+        com.yeshi.fanli.util.ThreadUtil.run(new Runnable() {
+            @Override
+            public void run() {
+                // 寮傛鎿嶄綔 娣诲姞鍒嗕韩璁板綍
+                UserShareGoodsHistory history = new UserShareGoodsHistory();
+                history.setUser(new UserInfo(uid));
+                history.setHongbao(shareMoney);
+                history.setCreateTime(new Date());
+                history.setGoodsType(Constant.SOURCE_TYPE_DY);
+                history.setTkCode(null);
+                history.setLink(null);
+                history.setQuanLink(null);
+                history.setGoodsId(goodsId + "");
+                history.setPostPicture(goods.getCover());
+                history.setShareImg(convertResult.getQrCode());
+                List<String> imgList = new ArrayList<>();
+                if (goods.getImgs() != null) {
+                    for (String gi : goods.getImgs())
+                        imgList.add(gi);
                 }
                 history.setPictures(JsonUtil.getGson().toJson(imgList));
                 shareGoodsService.addShareGoodsHistory(history);
@@ -1434,7 +1613,7 @@
         }
 
         if (goodsType == Constant.SOURCE_TYPE_TAOBAO) {
-            createTaoBaoViewText(acceptData.getSystem(), goodsType, uid, template, Long.parseLong(goodsId), tljId, hasCoupon, out);
+            createTaoBaoViewText(acceptData.getSystem(), goodsType, uid, template, goodsId, tljId, hasCoupon, out);
             return;
         }
 
@@ -1457,6 +1636,11 @@
             createSuNingViewText(acceptData.getSystem(), goodsType, uid, template, goodsId, hasCoupon, out);
             return;
         }
+
+        if (goodsType == Constant.SOURCE_TYPE_DY) {
+            createDYViewText(acceptData.getSystem(), goodsType, uid, template, goodsId, hasCoupon, out);
+            return;
+        }
     }
 
     /**
@@ -1470,7 +1654,7 @@
      * @param hasCoupon
      * @param out
      */
-    private void createTaoBaoViewText(SystemEnum system, Integer goodsType, Long uid, String template, Long goodsId, Long tljId,
+    private void createTaoBaoViewText(SystemEnum system, Integer goodsType, Long uid, String template, String goodsId, Long tljId,
                                       Boolean hasCoupon, PrintWriter out) {
         TaoBaoGoodsBrief goods = taoBaoGoodsCacheUtil.getCommonTaoBaoGoodsInfo(goodsId);
         if (goods == null)
@@ -1559,8 +1743,13 @@
             couponUrl = couponInfo.getLink();
         }
         String materialId = "https://item.jd.com/" + goodsId + ".html";
-        String shortLink = JDApiUtil.convertLinkWithSubUnionId(materialId, couponUrl, null, pidManager.getPidCache(system, Constant.SOURCE_TYPE_JD, SystemPIDInfo.PidType.share),
-                uid + "");
+        String shortLink = null;
+        try {
+            shortLink = JDApiUtil.convertLinkWithSubUnionId(materialId, couponUrl, null, pidManager.getPidCache(system, Constant.SOURCE_TYPE_JD, SystemPIDInfo.PidType.share),
+                    uid + "");
+        } catch (Exception e) {
+            logger.warn(String.format("浜笢杞摼鍑洪敊锛歮aterialId-%s  couponUrl-%s", materialId, couponUrl), e);
+        }
 
         String content = shareGoodsTextTemplateService.createContentJD(template, goods, shortLink, hasCoupon);
         JSONObject data = new JSONObject();
@@ -1693,6 +1882,40 @@
         out.print(JsonUtil.loadTrueResult(data));
     }
 
+
+    private void createDYViewText(SystemEnum system, Integer goodsType, Long uid, String template, String goodsId, Boolean hasCoupon,
+                                      PrintWriter out) {
+
+        DYGoodsDetail goods = CSJCPSApiUtil.goodsDetail(Long.parseLong(goodsId));
+        if (goods == null) {
+            out.print(JsonUtil.loadFalseResult(4, "鍟嗗搧宸蹭笅鏋�"));
+            return;
+        }
+
+        if (StringUtil.isNullOrEmpty(template)) {
+            template = getShareTemplate(goodsType, uid, hasCoupon, null);
+        }
+
+        // 鏍¢獙鍒告ā鏉挎槸鍚︽纭�
+        try {
+            shareGoodsTextTemplateService.verifyRightDY(template);
+        } catch (ShareGoodsTextTemplateException e) {
+            out.print(JsonUtil.loadFalseResult(5, e.getMsg()));
+            return;
+        }
+
+        DYConvertResult convertResult = CSJCPSApiUtil.goodsConvert(goods.getDetail_url(),DYUtil.createShareExtraInfo(uid),"");
+
+
+        // 鐢熸垚鏅�氬垎浜唴瀹�
+        String content = shareGoodsTextTemplateService.createCommonShareTextDY(template, goods, convertResult.getPassword());
+
+        JSONObject data = new JSONObject();
+        data.put("content", content);
+        out.print(JsonUtil.loadTrueResult(data));
+    }
+
+
     /**
      * 鑾峰彇鍒嗕韩妯℃澘
      *
@@ -1713,6 +1936,8 @@
             template = shareGoodsTextTemplateService.getTextTemplateByVIP(uid);
         } else if (goodsType == Constant.SOURCE_TYPE_SUNING) {
             template = shareGoodsTextTemplateService.getTextTemplateBySuNing(uid);
+        }else if (goodsType == Constant.SOURCE_TYPE_DY) {
+            template = shareGoodsTextTemplateService.getTextTemplateByDY(uid);
         }
         return template;
     }
@@ -1767,6 +1992,8 @@
             out.print(JsonUtil.loadTrueResult(configService.getValue(ConfigKeyEnum.shareGoodsTemplateRulesVIP.getKey(), system)));
         } else if (goodsType == Constant.SOURCE_TYPE_SUNING) {
             out.print(JsonUtil.loadTrueResult(configService.getValue(ConfigKeyEnum.shareGoodsTemplateRulesSuNing.getKey(), system)));
+        }else if (goodsType == Constant.SOURCE_TYPE_DY) {
+            out.print(JsonUtil.loadTrueResult(configService.getValue(ConfigKeyEnum.shareGoodsTemplateRulesDY.getKey(), system)));
         }
     }
 
@@ -1798,6 +2025,8 @@
                 shareGoodsTextTemplateService.saveTemplateVIP(uid, template);
             } else if (goodsType == Constant.SOURCE_TYPE_SUNING) {
                 shareGoodsTextTemplateService.saveTemplateSuNing(uid, template);
+            } else if (goodsType == Constant.SOURCE_TYPE_DY) {
+                shareGoodsTextTemplateService.saveTemplateDY(uid, template);
             }
         } catch (ShareGoodsTextTemplateException e) {
             out.print(JsonUtil.loadFalseResult(5, e.getMsg()));
@@ -1832,6 +2061,8 @@
             shareGoodsTextTemplateService.resetCommonTemplateVIP(uid);
         } else if (goodsType == Constant.SOURCE_TYPE_SUNING) {
             shareGoodsTextTemplateService.resetCommonTemplateSuNing(uid);
+        }else if (goodsType == Constant.SOURCE_TYPE_DY) {
+            shareGoodsTextTemplateService.resetCommonTemplateDY(uid);
         }
 
         if (goodsId != null) {
@@ -1874,7 +2105,7 @@
 
         // API缃戠粶鎺ュ彛楠岃瘉鏄惁鍦ㄥ敭
         List<TaoBaoGoodsBrief> listTaoKeGoods = null;
-        List<Long> listGid = new ArrayList<Long>();
+        List<String> listGid = new ArrayList<>();
         for (UserShareGoodsGroup goodsGroup : list) {
             CommonGoods commonGoods = goodsGroup.getCommonGoods();
             Integer goodsType = commonGoods.getGoodsType();
@@ -1913,10 +2144,10 @@
             if (listTaoKeGoods != null && listTaoKeGoods.size() > 0 && goodsType != null
                     && goodsType == Constant.SOURCE_TYPE_TAOBAO) {
                 int state = 1; // 榛樿鍋滃敭
-                Long goodsId = commonGoods.getGoodsId();
+                String goodsId = commonGoods.getGoodsId();
                 for (TaoBaoGoodsBrief taoKeGoods : listTaoKeGoods) {
-                    Long auctionId = taoKeGoods.getAuctionId();
-                    if (goodsId == auctionId || goodsId.equals(auctionId)) {
+                    String auctionId = taoKeGoods.getAuctionId();
+                    if (TaoBaoUtil.isEqual(goodsId, auctionId)) {
                         state = 0; // 鍦ㄥ敭
                         break;
                     }
@@ -1974,10 +2205,10 @@
         paramsDTO.setBaseFanliRate(hongBaoManageService.getBaseFanliRate(acceptData.getSystem()));
 
         if (goodsType == Constant.SOURCE_TYPE_TAOBAO) {
-            TaoBaoGoodsBrief goods = taoBaoGoodsCacheUtil.getCommonTaoBaoGoodsInfo(Long.parseLong(goodsId));
+            TaoBaoGoodsBrief goods = taoBaoGoodsCacheUtil.getCommonTaoBaoGoodsInfo(goodsId);
             if (goods == null) {
                 try {
-                    goods = redisManager.getTaoBaoGoodsBrief(Long.parseLong(goodsId));
+                    goods = redisManager.getTaoBaoGoodsBrief(goodsId);
                 } catch (TaobaoGoodsDownException e) {
                     goods = null;
                 }
@@ -2006,6 +2237,11 @@
             if (goods != null) {
                 goodsDetail = GoodsDetailVOFactory.convertSuningGoods(goods, paramsDTO);
             }
+        }else if (goodsType == Constant.SOURCE_TYPE_DY) {
+            DYGoodsDetail goods = CSJCPSApiUtil.goodsDetail(Long.parseLong(goodsId));
+            if (goods != null) {
+                goodsDetail = GoodsDetailVOFactory.convertDYGoods(goods, paramsDTO);
+            }
         }
 
         if (goodsDetail == null) {

--
Gitblit v1.8.0