小黄条

yujian

2019-12-10 c8041ec0544bf122e6819e6bf698997ccbf30aaf

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

@@ -1,6 +1,7 @@
package com.yeshi.fanli.controller.client.v1;



import java.io.PrintWriter;

import java.lang.reflect.Type;

import java.math.BigDecimal;

import java.util.ArrayList;

import java.util.Date;

@@ -18,6 +19,12 @@
import org.yeshi.utils.taobao.TbImgUtil;



import com.fasterxml.jackson.core.util.VersionUtil;

import com.google.gson.Gson;

import com.google.gson.GsonBuilder;

import com.google.gson.JsonElement;

import com.google.gson.JsonPrimitive;

import com.google.gson.JsonSerializationContext;

import com.google.gson.JsonSerializer;

import com.yeshi.fanli.controller.client.v2.ShareControllerV2;

import com.yeshi.fanli.dto.share.ShareGoodsRecordDTO;

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

@@ -506,15 +513,28 @@
         List<UserShareGoodsRecord> list = new ArrayList<UserShareGoodsRecord>();



         long count = userShareGoodsRecordService.countQueryByUid(uid, source);



         if (count > 0) {

            list = userShareGoodsRecordService.getMyShareGoodsRecords((page - 1) * pageSize, pageSize, uid, source);

         }



         GsonBuilder gsonBuilder = new GsonBuilder().excludeFieldsWithoutExposeAnnotation();

         gsonBuilder.registerTypeAdapter(BigDecimal.class, new JsonSerializer<BigDecimal>() {

            @Override

            public JsonElement serialize(BigDecimal value, Type theType, JsonSerializationContext context) {

               if (value == null) {

                  return new JsonPrimitive("");

               } else {

                  // 保留2位小数

                  value = value.setScale(2);

                  return new JsonPrimitive(value.toString());

               }

            }

         });

         Gson gson = gsonBuilder.create();

			
         data.put("count", count);

         data.put("result_list", list);

         data.put("result_list", gson.toJson(list));

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



      } catch (Exception e) {

         out.print(JsonUtil.loadFalseResult("加载失败"));

         e.printStackTrace();

@@ -1079,30 +1099,25 @@
                  data.put("clickUrl", ShareControllerV2.getERCodeContent(goods, taoBaoLink.getTaoToken()));



               data.put("token", TaoBaoUtil.filterTaoToken(taoBaoLink.getTaoToken()));

					
               String inviteCode=null;

               UserInfoExtra extra=   userInfoExtraService.getUserInfoExtra(uid);

               if(extra!=null)

                  inviteCode=extra.getInviteCode();



               String inviteCode  = userInfoExtraService.getInviteCodeByUid(uid);

               // 测试

               List<String> commentTexts = new ArrayList<>();

               String  commentTextStr=    configService.get("share_single_goods_comment_text");

               if(!StringUtil.isNullOrEmpty(commentTextStr))

               {

                  JSONArray arr=   JSONArray.fromObject(commentTextStr);

                  for(int i=0;i<arr.size();i++)

                  {

                     if(StringUtil.isNullOrEmpty(inviteCode))

                     {

                        if(arr.optString(i).contains("[邀请码]"))

                        {

               String commentTextStr = configService.get("share_single_goods_comment_text");

               if (!StringUtil.isNullOrEmpty(commentTextStr)) {

                  JSONArray arr = JSONArray.fromObject(commentTextStr);

                  for (int i = 0; i < arr.size(); i++) {

                     if (StringUtil.isNullOrEmpty(inviteCode)) {

                        if (arr.optString(i).contains("[邀请码]")) {

                           continue;

                        }

                     }

                     if(StringUtil.isNullOrEmpty(inviteCode))

                        commentTexts.add(arr.optString(i).replace("[下载链接]", Constant.YINGYONGBAO_LINK).replace("[淘口令]", data.optString("token")));

                     if (StringUtil.isNullOrEmpty(inviteCode))

                        commentTexts.add(arr.optString(i).replace("[下载链接]", Constant.YINGYONGBAO_LINK)

                              .replace("[淘口令]", data.optString("token")));

                     else

                        commentTexts.add(arr.optString(i).replace("[下载链接]", Constant.YINGYONGBAO_LINK).replace("[邀请码]", inviteCode).replace("[淘口令]", data.optString("token")));

                        commentTexts.add(arr.optString(i).replace("[下载链接]", Constant.YINGYONGBAO_LINK)

                              .replace("[邀请码]", inviteCode).replace("[淘口令]", data.optString("token")));

                  }

               }

               data.put("commentTexts", commentTexts);

@@ -1111,11 +1126,8 @@


         } else if (cid == 4) { // 邀请分享



            String inviteCode = null;

            UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);

            if (userInfoExtra != null && !StringUtil.isNullOrEmpty(userInfoExtra.getInviteCode())) {

               inviteCode = userInfoExtra.getInviteCode();

            } else {

            String inviteCode = userInfoExtraService.getInviteCodeByUid(uid);

            if (StringUtil.isNullOrEmpty(inviteCode)) {

               out.print(JsonUtil.loadFalseResult(9001, "邀请码未激活"));

               return;

            }