From f6c74fb3b585d25fe45dea893335600853cd6476 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 24 一月 2019 09:33:12 +0800
Subject: [PATCH] 获取商品链接更改
---
fanli/src/main/java/com/yeshi/fanli/controller/client/UserOrderController.java | 68 ++++++++++++++++++++++++++--------
1 files changed, 52 insertions(+), 16 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/UserOrderController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/UserOrderController.java
index 0e67d3c..485598e 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/UserOrderController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/UserOrderController.java
@@ -9,23 +9,27 @@
import javax.annotation.Resource;
-import net.sf.json.JSONObject;
-
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.yeshi.utils.DateUtil;
import org.yeshi.utils.JsonUtil;
+import com.yeshi.fanli.entity.AppVersionInfo;
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.exception.order.CommonOrderException;
+import com.yeshi.fanli.service.inter.config.AppVersionService;
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.count.HongBaoV2CountService;
import com.yeshi.fanli.service.inter.order.CommonOrderService;
+import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.util.account.UserUtil;
import com.yeshi.fanli.vo.order.CommonOrderVO;
+import com.yeshi.fanli.vo.user.UserInfoExtraVO;
+
+import net.sf.json.JSONObject;
@Controller
@RequestMapping("api/v1/user/order")
@@ -33,9 +37,15 @@
@Resource
private ConfigService configService;
+
+ @Resource
+ private AppVersionService appVersionService;
@Resource
private UserInfoService userInfoService;
+
+ @Resource
+ private UserInfoExtraService userInfoExtraService;
@Resource
private CommonOrderService commonOrderService;
@@ -83,14 +93,17 @@
try {
if (slotTime != null) {
- SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
- endTime= sd.format(new Date());
- startTime = convertDate(slotTime, endTime);
+ SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd");
+ endTime= sd.format(new Date());
+ startTime = convertDate(slotTime, endTime);
}
} catch (Exception e) {
e.printStackTrace();
}
+ if (endTime != null && endTime.trim().length() > 0) {
+ endTime += " 23:59:59";
+ }
try {
long count = 0;
@@ -99,6 +112,7 @@
int totalInvite = 0;
long todayTotal = 0;
BigDecimal todayMoney = null;
+
// 鏌ヨ鍒楄〃
List<CommonOrderVO> list = commonOrderService.getOrderByUid(page, uid, state, type, orderState,
@@ -116,6 +130,7 @@
todayMoney = commonOrderService.countBonusOrderMoney(uid, type, dateType, startTime, endTime);
todayTotal = commonOrderService.countBonusOrderNumber(uid, type, dateType, startTime, endTime);
+
// 缁熻鏈夋晥鐨勮鍗曟暟閲� 銆� 澶辨晥璁㈠崟鏁伴噺 銆佺淮鏉冭鍗曟暟閲�
Map<String, BigDecimal> countOrder = commonOrderService.countByUidAndOrderState(uid, type,
@@ -193,6 +208,29 @@
}
UserInfo userInfo = UserUtil.filterForClientUser(user);
+
+ // 1.5.0 鐗堟湰涔嬪悗杩斿洖鏂扮殑绛夌骇
+ String version = acceptData.getVersion();
+ if (version != null && version.trim().length() > 0) {
+ int versionCode = Integer.parseInt(version);
+ String platform = acceptData.getPlatform();
+
+ AppVersionInfo versionInfo = appVersionService.getByPlatformAndVersion(platform, "1.5.0");
+ if (versionInfo != null) {
+ int versionCode150 = versionInfo.getVersionCode();
+ if (versionCode >= versionCode150) {
+ UserInfoExtraVO userInfoExtra = userInfoExtraService.getInfoExtraVOByUid(user.getId()); if (userInfoExtra != null && userInfoExtra.getUserRank() != null) {
+ String picture = userInfoExtra.getUserRank().getPicture();
+ String icon = userInfoExtra.getUserRank().getIcon();
+
+ userInfo.setRankIcon(icon);
+ userInfo.setRankNamePicture(picture);
+ }
+ }
+ }
+
+ }
+
JSONObject data = new JSONObject();
data.put("userInfo", userInfo);
@@ -313,7 +351,6 @@
Object totalmoney = shareMap.get("totalmoney");
if (totalmoney != null) {
sharemoney = (BigDecimal) totalmoney;
- sharemoney = sharemoney.setScale(2, BigDecimal.ROUND_DOWN);
}
}
@@ -327,17 +364,16 @@
Object totalmoney = inviteMap.get("totalmoney");
if (totalmoney != null) {
- sharemoney = (BigDecimal) totalmoney;
- inviteMoney = sharemoney.setScale(2, BigDecimal.ROUND_DOWN);
+ inviteMoney = (BigDecimal) totalmoney;
}
}
JSONObject data = new JSONObject();
data.put("shareCount", shareCount);
- data.put("sharemoney", sharemoney);
+ data.put("sharemoney", sharemoney.setScale(2, BigDecimal.ROUND_DOWN).toString());
data.put("inviteCount", inviteCount);
- data.put("inviteMoney", inviteMoney);
+ data.put("inviteMoney", inviteMoney.setScale(2, BigDecimal.ROUND_DOWN).toString());
data.put("showTiCheng", hongBaoV2CountService.getTotalTiChengCount(uid) > 0);
out.print(JsonUtil.loadTrueResult(data));
@@ -361,22 +397,22 @@
switch (slotTime) {
case 1: // 鏈�杩戜笁澶�
- startTime = DateUtil.reduceDay(3, endTime);
+ startTime = DateUtil.reduceDay(2, endTime);
break;
case 2: // 鏈�杩戜竷澶�
- startTime = DateUtil.reduceDay(7, endTime);
+ startTime = DateUtil.reduceDay(6, endTime);
break;
case 3: // 鏈�杩�15澶� 锛堝崐鏈堬級
- startTime = DateUtil.reduceDay(15, endTime);
+ startTime = DateUtil.reduceDay(14, endTime);
break;
case 4: // 鏈�杩戜笁鍗佸ぉ 锛堟湰鏈堬級
- startTime = DateUtil.reduceDay(30, endTime);
+ startTime = DateUtil.reduceDay(29, endTime);
break;
case 5: // 鏈�杩戜節鍗佸ぉ锛堣繎涓夋湀锛�
- startTime = DateUtil.reduceDay(3*30, endTime);
+ startTime = DateUtil.reduceDay(3*30-1, endTime);
break;
case 6: // 鏈�杩戜竴鐧惧叓鍗佸ぉ锛堣繎鍗婂勾锛�
- startTime = DateUtil.reduceDay(6*30, endTime);
+ startTime = DateUtil.reduceDay(6*30-1, endTime);
break;
default:
break;
--
Gitblit v1.8.0