Merge remote-tracking branch 'origin/master'

admin

2019-01-29 a6b1160da8cbb78a664a6dd7496bee648c7c148c

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

@@ -21,14 +21,17 @@
import com.yeshi.fanli.entity.bus.share.UserShareGoodsGroup;

import com.yeshi.fanli.entity.bus.share.UserShareGoodsHistory;

import com.yeshi.fanli.entity.bus.share.UserShareGoodsRecord;

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

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

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

import com.yeshi.fanli.exception.ShareGoodsException;

import com.yeshi.fanli.exception.share.UserShareGoodsRecordException;

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.monitor.MonitorService;

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

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

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

import com.yeshi.fanli.util.AESUtil;

@@ -62,6 +65,12 @@
   @Resource

   private UserShareGoodsGroupService userShareGoodsGroupService;



   @Resource

   private CommonGoodsService commonGoodsService;



   @Resource

   private UserExtraTaoBaoInfoService userExtraTaoBaoInfoService;



   // 获取商品分享链接

   @RequestMapping(value = "getGoodsShareUrl")

   public void getGoodsShareUrl(AcceptData acceptData, long id, PrintWriter out) {

@@ -91,11 +100,16 @@
         return;

      }



      UserExtraTaoBaoInfo extraInfo = userExtraTaoBaoInfoService.getByUid(uid);

      try {

         TaoBaoLink taoBaoLink = shareGoodsService.getTaoBaoLinkForShare(uid, auctionId);

         String relationId = null;

         if (extraInfo != null && extraInfo.getRelationId() != null && extraInfo.getRelationValid() != null

               && extraInfo.getRelationValid() == true)

            relationId = extraInfo.getRelationId();

         TaoBaoLink taoBaoLink = shareGoodsService.getTaoBaoLinkForShare(uid, auctionId, relationId);



         JSONObject data = new JSONObject();

         String url = String.format("http://%s%s?uid=%s&id=%s", configService.getH5Host(),

         String url = String.format("http://%s%s?uid=%s&id=%s&appType=flq", configService.getH5Host(),

               Constant.systemCommonConfig.getShareGoodsPagePath(), AESUtil.encrypt(uid + "", Constant.UIDAESKEY),

               auctionId + "");