From 190d6bc6aa7e4ca33c281bd9785339f3bddaf11e Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 08 五月 2021 12:43:37 +0800
Subject: [PATCH] bug修复

---
 fanli/src/main/java/com/yeshi/fanli/service/manger/goods/TaoBaoLinkManager.java |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/manger/goods/TaoBaoLinkManager.java b/fanli/src/main/java/com/yeshi/fanli/service/manger/goods/TaoBaoLinkManager.java
index 3049924..9a888e9 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/manger/goods/TaoBaoLinkManager.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/manger/goods/TaoBaoLinkManager.java
@@ -61,12 +61,13 @@
 
     /**
      * 鍙鍒�
+     *
      * @param auctionId
      * @param specialId
      * @param pid
      * @return
      */
-    public TaoBaoLink getTaoBaoLinkForRecieveCoupon(Long auctionId, String specialId, String pid) throws TaoBaoConvertLinkException{
+    public TaoBaoLink getTaoBaoLinkForRecieveCoupon(Long auctionId, String specialId, String pid) throws TaoBaoConvertLinkException {
         if (auctionId == null || auctionId <= 0) {
             throw new TaoBaoConvertLinkException(2, "鍟嗗搧ID涓嶈兘涓虹┖");
         }
@@ -74,7 +75,10 @@
         TaoKeAppInfo app = new TaoKeAppInfo();
         app.setAppKey(TaoBaoConstant.TAOBAO_AUTH_APPKEY);
         app.setAppSecret(TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
-        app.setPid(TaoBaoConstant.TAOBAO_SPECIAL_PID_DEFAULT);
+        if (pid == null)
+            app.setPid(TaoBaoConstant.TAOBAO_SPECIAL_PID_DEFAULT);
+        else
+            app.setPid(pid);
 
         TaoBaoLink taoBaoLink = new TaoBaoLink();
         taoBaoLink.setAuctionId(auctionId);
@@ -136,7 +140,7 @@
         if (uid == null || uid <= 0) {
             throw new TaoBaoConvertLinkException(1, "鐢ㄦ埛ID涓嶈兘涓虹┖");
         }
-        return getTaoBaoLinkForRecieveCoupon(auctionId,specialId,pid);
+        return getTaoBaoLinkForRecieveCoupon(auctionId, specialId, pid);
     }
 
 
@@ -206,7 +210,7 @@
                     return;
 
                 try {
-                    TaoBaoCouponCache cache = TaoBaoCouponCacheFactory.create(goods.getAuctionId(), goods.getCouponActivityId(), goods.getCouponAmount(), goods.getCouponStartFee(), new Date(TimeUtil.convertToTimeTemp(goods.getCouponEffectiveStartTime(), "yyyy-MM-dd")), new Date(TimeUtil.convertToTimeTemp(goods.getCouponEffectiveEndTime(), "yyyy-MM-dd")+1000*60*60*24L), pid, goods.getCouponLink());
+                    TaoBaoCouponCache cache = TaoBaoCouponCacheFactory.create(goods.getAuctionId(), goods.getCouponActivityId(), goods.getCouponAmount(), goods.getCouponStartFee(), new Date(TimeUtil.convertToTimeTemp(goods.getCouponEffectiveStartTime(), "yyyy-MM-dd")), new Date(TimeUtil.convertToTimeTemp(goods.getCouponEffectiveEndTime(), "yyyy-MM-dd") + 1000 * 60 * 60 * 24L), pid, goods.getCouponLink());
                     if (cache != null) {
                         taoBaoCouponCacheService.save(cache);
                     }
@@ -331,13 +335,13 @@
 
         if (!StringUtil.isNullOrEmpty(tbLink.getCouponLink())) {// 閫氳繃绔嬪嵆鎺ㄥ箍鏂瑰紡鑾峰彇娣樺彛浠ゆ垚鍔�
             String quanToken = convertLinkManager.createTaoBaoToken(uid, goods.getPictUrl(), goods.getTitle(),
-                    tbLink.getCouponLink(),false);
+                    tbLink.getCouponLink(), false);
             if (!StringUtil.isNullOrEmpty(quanToken)) {
                 tbLink.setTaoToken(quanToken);
             }
         } else if (!StringUtil.isNullOrEmpty(tbLink.getClickUrl())) {
             String quanToken = convertLinkManager.createTaoBaoToken(uid, goods.getPictUrl(), goods.getTitle(),
-                    tbLink.getClickUrl(),false);
+                    tbLink.getClickUrl(), false);
             if (!StringUtil.isNullOrEmpty(quanToken)) {
                 tbLink.setTaoToken(quanToken);
             }

--
Gitblit v1.8.0