From 4aff1edc20bf550f20c6e1db23321b6c36a78e79 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 12 十二月 2018 10:31:27 +0800
Subject: [PATCH] 动态修改
---
fanli/src/main/java/com/yeshi/fanli/controller/client/ShareController.java | 38 ++++++++++++++++++++++++++++----------
1 files changed, 28 insertions(+), 10 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 4f69a9a..0a3b97f 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
@@ -15,6 +15,7 @@
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
+import org.yeshi.utils.BigDecimalUtil;
import org.yeshi.utils.HttpUtil;
import org.yeshi.utils.JsonUtil;
import org.yeshi.utils.taobao.TbImgUtil;
@@ -23,9 +24,11 @@
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.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.ShareGoodsService;
import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
@@ -53,10 +56,10 @@
@Resource
private MonitorService monitorService;
-
+
@Resource
private UserShareGoodsRecordService userShareGoodsRecordService;
-
+
@Resource
private UserShareGoodsGroupService userShareGoodsGroupService;
@@ -121,6 +124,8 @@
String text = configService.get("goods_share_text_coupon");
shareText = text.replace("[鏍囬]", taoBaoLink.getGoods().getTitle())
.replace("[鍦ㄥ敭浠穄", "楼" + taoBaoLink.getGoods().getZkPrice())
+ .replace("[浼樻儬鍒搁噾棰漖",
+ "楼"+BigDecimalUtil.getWithNoZera(taoBaoLink.getGoods().getCouponAmount()).toString())
.replace("[鍒稿悗浠穄", "楼" + TaoBaoUtil.getAfterUseCouplePrice(taoBaoLink.getGoods()));
}
shareText = shareText.replace("[浠锋牸绫诲瀷]", shopType);
@@ -138,7 +143,7 @@
data.put("notifyDesc", configService.get("goods_share_notify"));
// 娣诲姞鍒嗕韩璁板綍
- BigDecimal rate = new BigDecimal(hongBaoManageService.get("hongbao_goods_proportion"));
+ BigDecimal rate = hongBaoManageService.getShareRate();
UserShareGoodsHistory history = new UserShareGoodsHistory();
history.setTkCode(taoBaoLink.getTaoToken());
history.setLink(taoBaoLink.getClickUrl());
@@ -156,6 +161,8 @@
history.setUser(new UserInfo(uid));
history.setPostPicture(taoBaoLink.getGoods().getPictUrl());
+ data.put("shareMoney", history.getHongbao().toString());
+
out.print(JsonUtil.loadTrueResult(data));
// 寮傛鎿嶄綔
@@ -164,6 +171,11 @@
@Override
public void run() {
shareGoodsService.addShareGoodsHistory(history);
+ try {
+ userShareGoodsRecordService.save(uid, ShareSourceTypeEnum.goodsDetail, taoBaoLink.getGoods());
+ } catch (UserShareGoodsRecordException e) {
+ e.printStackTrace();
+ }
}
});
return;
@@ -176,11 +188,13 @@
}
}
-
+
/**
* 鍒嗕韩璁板綍缁熻鍒楄〃
+ *
* @param acceptData
- * @param page 鍒濆1
+ * @param page
+ * 鍒濆1
* @param uid
* @param source
* @param out
@@ -196,6 +210,10 @@
out.print(JsonUtil.loadFalseResult("鐢ㄦ埛鏈櫥褰�"));
}
+ if ("all".equals(source)) {
+ source = null;// 鏌ヨ鍏ㄩ儴
+ }
+
try {
int pageSize = Constant.PAGE_SIZE;
@@ -203,7 +221,7 @@
List<UserShareGoodsRecord> list = new ArrayList<UserShareGoodsRecord>();
long count = userShareGoodsRecordService.countQueryByUid(uid, source);
-
+
if (count > 0) {
list = userShareGoodsRecordService.getMyShareGoodsRecords((page - 1) * pageSize, pageSize, uid, source);
}
@@ -218,9 +236,9 @@
}
}
-
/**
* 鑾峰彇鍒嗕韩鍟嗗搧
+ *
* @param acceptData
* @param recordId
* @param out
@@ -240,9 +258,10 @@
e.printStackTrace();
}
}
-
+
/**
* 鑾峰彇鍒嗕韩鍟嗗搧鍗曚釜缁熻淇℃伅
+ *
* @param acceptData
* @param groupId
* @param out
@@ -262,7 +281,7 @@
userShareGoodsGroup.setUpdateTime(null);
userShareGoodsGroup.setRecordId(null);
}
-
+
JSONObject data = new JSONObject();
data.put("goodsData", userShareGoodsGroup);
out.print(JsonUtil.loadTrueResult(data));
@@ -271,6 +290,5 @@
e.printStackTrace();
}
}
-
}
--
Gitblit v1.8.0