From 56e258fa6c23469ea825f6b11d458df9ba577e9f Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期五, 01 三月 2019 14:38:50 +0800
Subject: [PATCH] Merge branch 'div'
---
fanli/src/main/java/com/yeshi/fanli/controller/client/ShareController.java | 67 +++++++++++++++++++++------------
1 files changed, 43 insertions(+), 24 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/ShareController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/ShareController.java
index 762bea1..3346708 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/ShareController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/ShareController.java
@@ -9,9 +9,6 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
-import net.sf.json.JSONArray;
-import net.sf.json.JSONObject;
-
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
@@ -24,15 +21,18 @@
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.share.UserShareGoodsRecord.ShareSourceTypeEnum;
+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.UserInfoService;
import com.yeshi.fanli.service.inter.user.UserShareGoodsGroupService;
import com.yeshi.fanli.service.inter.user.UserShareGoodsRecordService;
import com.yeshi.fanli.util.AESUtil;
@@ -40,6 +40,9 @@
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.factory.MonitorFactory;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
+
+import net.sf.json.JSONArray;
+import net.sf.json.JSONObject;
@Controller(value = "ShareController1")
@RequestMapping("api/v1/share")
@@ -62,6 +65,15 @@
@Resource
private UserShareGoodsGroupService userShareGoodsGroupService;
+
+ @Resource
+ private CommonGoodsService commonGoodsService;
+
+ @Resource
+ private UserExtraTaoBaoInfoService userExtraTaoBaoInfoService;
+
+ @Resource
+ private UserInfoService userInfoService;
// 鑾峰彇鍟嗗搧鍒嗕韩閾炬帴
@RequestMapping(value = "getGoodsShareUrl")
@@ -87,16 +99,27 @@
return;
}
+ UserInfo user = userInfoService.getUserByIdWithMybatis(uid);
+ if (user != null && user.getState() != UserInfo.STATE_NORMAL) {
+ out.print(JsonUtil.loadFalseResult(Constant.CODE_FORBIDDEN_USER, Constant.FORBIDDEN_USER_REASON_DESC));
+ return;
+ }
+
if (auctionId == null || auctionId <= 0) {
out.print(JsonUtil.loadFalseResult(2, "鍟嗗搧ID涓嶈兘涓虹┖"));
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 + "");
@@ -125,12 +148,12 @@
shareText = text.replace("[鏍囬]", taoBaoLink.getGoods().getTitle())
.replace("[鍦ㄥ敭浠穄", "楼" + taoBaoLink.getGoods().getZkPrice())
.replace("[浼樻儬鍒搁噾棰漖",
- "楼"+BigDecimalUtil.getWithNoZera(taoBaoLink.getGoods().getCouponAmount()).toString())
+ "楼" + BigDecimalUtil.getWithNoZera(taoBaoLink.getGoods().getCouponAmount()).toString())
.replace("[鍒稿悗浠穄", "楼" + TaoBaoUtil.getAfterUseCouplePrice(taoBaoLink.getGoods()));
}
shareText = shareText.replace("[浠锋牸绫诲瀷]", shopType);
data.put("shareText", shareText);
- String descText = shareText.replace(taoBaoLink.getGoods().getTitle() + "\r\n", "");
+ String descText = shareText.replace(taoBaoLink.getGoods().getTitle(), "").trim();
if (descText.startsWith("\\r\\n"))
descText = descText.substring(0);
data.put("descText", descText);
@@ -161,7 +184,7 @@
history.setUser(new UserInfo(uid));
history.setPostPicture(taoBaoLink.getGoods().getPictUrl());
- data.put("shareMoney","楼"+ history.getHongbao().toString());
+ data.put("shareMoney", "楼" + history.getHongbao().toString());
out.print(JsonUtil.loadTrueResult(data));
@@ -171,11 +194,6 @@
@Override
public void run() {
shareGoodsService.addShareGoodsHistory(history);
- try {
- userShareGoodsRecordService.save(uid, ShareSourceTypeEnum.goodsDetail, null,taoBaoLink.getGoods());
- } catch (UserShareGoodsRecordException e) {
- e.printStackTrace();
- }
}
});
return;
@@ -188,7 +206,7 @@
}
}
-
+
/**
* 鍒嗕韩璁板綍缁熻鍒楄〃
*
@@ -291,14 +309,16 @@
}
}
-
-
/**
* 鍟嗗搧璇︽儏鍒嗕韩
+ *
* @param acceptData
- * @param uid 鐢ㄦ埛id
- * @param auctionId 鍟嗗搧id
- * @param type 鍥剧墖鍒嗕韩绫诲瀷 鍗曞浘single 澶氬浘many
+ * @param uid
+ * 鐢ㄦ埛id
+ * @param auctionId
+ * 鍟嗗搧id
+ * @param type
+ * 鍥剧墖鍒嗕韩绫诲瀷 鍗曞浘single 澶氬浘many
* @param out
*/
@RequestMapping(value = "sharedetail", method = RequestMethod.POST)
@@ -314,10 +334,10 @@
e.printStackTrace();
}
}
-
-
+
/**
* 鏇存柊鍒嗕韩璁板綍
+ *
* @param acceptData
* @param shareId
* @param out
@@ -327,7 +347,7 @@
if (shareId == null) {
out.print(JsonUtil.loadFalseResult("鍙傛暟涓嶆纭�"));
}
-
+
try {
userShareGoodsRecordService.updateShareRecord(shareId);
out.print(JsonUtil.loadTrueResult(""));
@@ -340,5 +360,4 @@
}
}
-
}
--
Gitblit v1.8.0