From 6b1a7a75b06eafb0bbf7f20d950384a3fde4c8ef Mon Sep 17 00:00:00 2001 From: yujian <yujian@123.com> Date: 星期三, 10 七月 2019 17:27:33 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ShareController.java | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ShareController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ShareController.java index 6624399..5590389 100644 --- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ShareController.java +++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ShareController.java @@ -251,7 +251,7 @@ data.put("shareMoney", "楼" + shareMoney.toString()); try { - ShareGoodsRecordDTO shareRecord = userShareGoodsRecordService.addRecordGoodsDetail(uid, auctionId); + ShareGoodsRecordDTO shareRecord = userShareGoodsRecordService.addRecordGoodsDetail(uid, auctionId, Constant.SOURCE_TYPE_TAOBAO); data.put("shareId", shareRecord.getRedisKey()); } catch (Exception e) { try { @@ -316,7 +316,6 @@ TaoBaoGoodsBrief goods = taoBaoLink.getGoods(); - // 璁$畻鎺ㄥ箍绾㈠寘 String warningRate = configTaoLiJinService.getValueByKey("warning_value"); BigDecimal spreadMoney = TaoLiJinUtil.getSpreadMoney(warningRate, goods); @@ -328,7 +327,7 @@ } JSONObject data = new JSONObject(); - data.put("spreadMoney", "娣樼ぜ閲� 楼" + spreadMoney.toString()); + data.put("spreadMoney", " 楼" + spreadMoney.toString()); String taoLiJinLink = null; Long tljId = null; @@ -416,7 +415,7 @@ data.put("shareMoney", "楼" + shareMoney.toString()); try { - ShareGoodsRecordDTO shareRecord = userShareGoodsRecordService.addRecordGoodsDetail(uid, auctionId); + ShareGoodsRecordDTO shareRecord = userShareGoodsRecordService.addRecordGoodsDetail(uid, auctionId, Constant.SOURCE_TYPE_TAOBAO); data.put("shareId", shareRecord.getRedisKey()); } catch (Exception e) { try { @@ -586,7 +585,7 @@ @RequestMapping(value = "sharedetail", method = RequestMethod.POST) public void shareDetail(AcceptData acceptData, Long uid, Long auctionId, String type, PrintWriter out) { try { - userShareGoodsRecordService.saveSingleShareRecord(uid, auctionId); + userShareGoodsRecordService.saveSingleShareRecord(uid, auctionId, Constant.SOURCE_TYPE_TAOBAO); out.print(JsonUtil.loadTrueResult("鍒嗕韩鎴愬姛")); } catch (UserShareGoodsRecordException e) { out.print(JsonUtil.loadFalseResult(e.getMsg())); -- Gitblit v1.8.0