From 72f99531c8575c5621bb6067939b8b73807ab22f Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 15 五月 2019 14:51:38 +0800
Subject: [PATCH] 动态时间随机8分钟以内 + 分享优化
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java | 213 +++++++++++++++++++++++++++--------------------------
1 files changed, 108 insertions(+), 105 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java
index 78ef837..1de9e6a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java
@@ -60,34 +60,32 @@
@Resource
private CommonOrderGoodsMapper commonOrderGoodsMapper;
-
+
@Resource
private JumpDetailV2Service jumpDetailV2Service;
-
+
@Resource
private ConfigService configService;
-
+
@Resource
private UserSystemCouponService userSystemCouponService;
-
+
@Resource
private UserSystemCouponRecordService userSystemCouponRecordService;
-
+
@Resource
private SystemCouponService systemCouponService;
-
+
@Resource
private HongBaoV2Service hongBaoV2Service;
-
-
+
// 濂栧姳璁㈠崟鍥剧墖
- public final static String PIC_REWARD= "http://img.flqapp.com/resource/order/order_state_reward.png";
-
+ public final static String PIC_REWARD = "http://img.flqapp.com/resource/order/order_state_reward.png";
+
// 鍏嶅崟鐘舵�佸浘鐗�
public final static String PIC_FREE_ON = "http://img.flqapp.com/resource/order/order_state_freeing.png";
- public final static String PIC_FREE_FAIL = "http://img.flqapp.com/resource/order/order_state_free_fail.png";
- public final static String PIC_FREE_SUCCEED = "http://img.flqapp.com/resource/order/order_state_free_suc.png";
-
+ public final static String PIC_FREE_FAIL = "http://img.flqapp.com/resource/order/order_state_free_fail.png";
+ public final static String PIC_FREE_SUCCEED = "http://img.flqapp.com/resource/order/order_state_free_suc.png";
@Override
public int insert(CommonOrder record) {
@@ -160,8 +158,7 @@
return listOrder;
}
-
-
+
@Override
public Map<String, BigDecimal> countHistoryOrder(Long uid, Integer day) {
return commonOrderMapper.countHistoryOrder(uid, day);
@@ -192,14 +189,13 @@
public void listDataFactory(List<CommonOrderVO> listOrder, List<CommonOrderVO> listGoods, Long uid) {
List<String> listNo = new ArrayList<String>();
- for (CommonOrderVO commonOrderVO: listOrder) {
+ for (CommonOrderVO commonOrderVO : listOrder) {
listNo.add(commonOrderVO.getOrderNo());
}
-
+
// 宸茬粡浣跨敤鍒歌鍗�
List<UserSystemCouponRecord> couponRecordList = userSystemCouponRecordService.getRecordByOrderNoList(listNo);
-
-
+
/* 缁勫悎鍟嗗搧淇℃伅 */
for (CommonOrderVO commonOrder : listGoods) {
@@ -274,10 +270,10 @@
SimpleDateFormat format = new SimpleDateFormat("yyyy.MM.dd HH:mm");
SimpleDateFormat formatday = new SimpleDateFormat("yyyy.MM.dd");
-
+
// 鏄惁瀛樺湪濂栧姳鍒�
boolean hasRewardCoupon = userSystemCouponService.hasRewardCoupon(uid);
-
+
/* 缁勭粐璁㈠崟鐘舵�� 绛変俊鎭� */
for (CommonOrderVO order : listOrder) {
@@ -369,7 +365,7 @@
order.setOrderOrigin("2");
order.setHongBaoTypePic(CommonOrder.TYPE_SHARE);
signList.add(CommonOrder.TYPE_SHARE);
-
+
} else if (HongBaoV2.TYPE_YAOQING == hongBaoType || HongBaoV2.TYPE_YIJI == hongBaoType
|| HongBaoV2.TYPE_ERJI == hongBaoType || HongBaoV2.TYPE_SHARE_YIJI == hongBaoType
|| HongBaoV2.TYPE_SHARE_ERJI == hongBaoType) {
@@ -439,115 +435,116 @@
hongBaoMap.put("content", hongbaoInfo + " 楼" + hongBao.setScale(2, BigDecimal.ROUND_DOWN).toString());
hongBaoMap.put("fontColor", hongbaoInfoFontColor);
order.setHongBaoInfo(hongBaoMap);
-
+
// 闈炶嚜璐殑璁㈠崟 涓嶆樉绀鸿繑鍒┿�佸厤鍗曡鎯�
if (HongBaoV2.TYPE_ZIGOU != hongBaoType) {
// 璁㈠崟鏍囪瘑
order.setSignList(signList);
-
+
} else {
-
+
// 鏄惁鍏嶅崟鍟嗗搧
boolean freeOrder = false;
// 鏄惁濂栧姳鎴愬姛
boolean rewardSuccess = false;
-
+
// 濂栧姳璁㈠崟銆佸厤鍗� 浣跨敤璁板綍
if (couponRecordList != null && couponRecordList.size() > 0) {
-
- for (UserSystemCouponRecord couponRecord: couponRecordList) {
+
+ for (UserSystemCouponRecord couponRecord : couponRecordList) {
// 璁㈠崟鍙峰尮閰�
if (order.getOrderNo().equals(couponRecord.getOrderNo())) {
-
+
String systemCouponType = couponRecord.getCouponType();
Integer state = couponRecord.getState();
-
+
// 濂栧姳璁㈠崟: 涓旀垚鍔�
if (CouponTypeEnum.rebatePercentCoupon.name().equals(systemCouponType)
&& UserSystemCouponRecord.STATE_SUCCESS == state) {
rewardSuccess = true;
signList.add(PIC_REWARD); // 鍔犲叆濂栧姳鎴愬姛鍥剧墖
-
+
} else if (CouponTypeEnum.freeCoupon.name().equals(systemCouponType)
|| CouponTypeEnum.welfareFreeCoupon.name().equals(systemCouponType)) {
-
- if (UserSystemCouponRecord.STATE_FREE_ON == state) {
+
+ if (UserSystemCouponRecord.STATE_FREE_ON == state) {
// 鍏嶅崟涓�
- freeOrder = true;
- signList.add(PIC_FREE_ON);
+ freeOrder = true;
+ signList.add(PIC_FREE_ON);
} else if (UserSystemCouponRecord.STATE_SUCCESS == state) {
// 鍏嶅崟鎴愬姛
freeOrder = true;
signList.add(PIC_FREE_SUCCEED);
- } else if (UserSystemCouponRecord.STATE_FAIL_RULE == state || UserSystemCouponRecord.STATE_FAIL_DRAWBACK == state) {
+ } else if (UserSystemCouponRecord.STATE_FAIL_RULE == state
+ || UserSystemCouponRecord.STATE_FAIL_DRAWBACK == state) {
// 瑙勫垯涓嶅尮閰嶃�侀��娆�
freeOrder = true;
signList.add(PIC_FREE_FAIL);
- }
+ }
}
-
+
break;
}
}
}
-
+
// 璁㈠崟鏍囪瘑
order.setSignList(signList);
-
+
boolean rewardOrder = false;
-
- int type = 1; // 1 甯歌璺宠浆椤甸潰 2寮瑰嚭閫夐」锛堝鍔卞埜锛�
+
+ int type = 1; // 1 甯歌璺宠浆椤甸潰 2寮瑰嚭閫夐」锛堝鍔卞埜锛�
if (rewardSuccess) {
// 濂栧姳鎴愬姛
- rewardOrder = true;
- } else if(hasRewardCoupon && !freeOrder && HongBaoV2.TYPE_ZIGOU == hongBaoType &&
- HongBaoV2.STATE_YILINGQU == hongBaoState) {
+ rewardOrder = true;
+ } else if (hasRewardCoupon && !freeOrder && HongBaoV2.TYPE_ZIGOU == hongBaoType
+ && HongBaoV2.STATE_YILINGQU == hongBaoState) {
// 鏈夊彲鐢ㄧ殑濂栧姳鍒� 銆侀潪鍏嶅崟璁㈠崟 銆佷笖宸插埌璐︾殑 銆佽繑鍒╄鍗�
type = 2;
- rewardOrder = true;
+ rewardOrder = true;
}
-
- if (rewardOrder) {
+
+ if (rewardOrder) {
ClientTextStyleVO rewardStyleVO = new ClientTextStyleVO();
// 濂栧姳鍒歌繘搴﹁鎯�
rewardStyleVO.setContent("杩斿埄濂栧姳 >");
- rewardStyleVO.setColor( "#E5005C");
+ rewardStyleVO.setColor("#E5005C");
rewardStyleVO.setBottomColor("#FFDCEA");
-
- Map<String, Object> jumpLink = new HashMap<String,Object>();
+
+ Map<String, Object> jumpLink = new HashMap<String, Object>();
jumpLink.put("orderNo", order.getOrderNo());
-
- Map<String, Object> jump = new HashMap<String,Object>();
- jump.put("type", type);
- jump.put("params", jumpLink);
- jump.put("jumpDetail", jumpDetailV2Service.getByTypeCache("rewardCouponDetail"));
-
- Map<String, Object> rewardMap = new HashMap<String,Object>();
- rewardMap.put("text", rewardStyleVO);
- rewardMap.put("jump", jump);
-
+
+ Map<String, Object> jump = new HashMap<String, Object>();
+ jump.put("type", type);
+ jump.put("params", jumpLink);
+ jump.put("jumpDetail", jumpDetailV2Service.getByTypeCache("rewardCouponDetail"));
+
+ Map<String, Object> rewardMap = new HashMap<String, Object>();
+ rewardMap.put("text", rewardStyleVO);
+ rewardMap.put("jump", jump);
+
order.setRewardDetail(rewardMap);
}
-
- if (freeOrder) {
+
+ if (freeOrder) {
ClientTextStyleVO rewardStyleVO = new ClientTextStyleVO();
// 杩斿埄銆佸厤鍗曡鎯�
rewardStyleVO.setContent("鍏嶅崟璇︽儏 >");
- rewardStyleVO.setColor( "#E5005C");
+ rewardStyleVO.setColor("#E5005C");
rewardStyleVO.setBottomColor("#FFDCEA");
-
- Map<String, Object> jumpLink = new HashMap<String,Object>();
+
+ Map<String, Object> jumpLink = new HashMap<String, Object>();
jumpLink.put("orderNo", order.getOrderNo());
-
- Map<String, Object> jump = new HashMap<String,Object>();
+
+ Map<String, Object> jump = new HashMap<String, Object>();
jump.put("type", 1); // 椤甸潰璺宠浆
- jump.put("params", jumpLink);
- jump.put("jumpDetail", jumpDetailV2Service.getByTypeCache("freeCouponDetail"));
-
- Map<String, Object> rewardMap = new HashMap<String,Object>();
- rewardMap.put("text", rewardStyleVO);
- rewardMap.put("jump", jump);
-
+ jump.put("params", jumpLink);
+ jump.put("jumpDetail", jumpDetailV2Service.getByTypeCache("freeCouponDetail"));
+
+ Map<String, Object> rewardMap = new HashMap<String, Object>();
+ rewardMap.put("text", rewardStyleVO);
+ rewardMap.put("jump", jump);
+
order.setRewardDetail(rewardMap);
}
}
@@ -600,7 +597,7 @@
taoBaoGoods = TaoKeApiUtil.getSimpleGoodsInfo(taoBaoOrder.getAuctionId());
} catch (TaobaoGoodsDownException e) {
e.printStackTrace();
- taoBaoGoods=TaoBaoUtil.getSimpleGoodsBrief(taoBaoOrder.getAuctionId());
+ taoBaoGoods = TaoBaoUtil.getSimpleGoodsBrief(taoBaoOrder.getAuctionId());
}
if (taoBaoGoods != null) {
goods = CommonOrderGoodsFactory.create(taoBaoGoods);
@@ -798,25 +795,25 @@
// 宸插け鏁�
order.setHongBaoState(3);
}
-
+
List<HongBaoV2> listhb = hongBaoV2Service.listChildrenById(order.getHongbaoId());
if (listhb != null && listhb.size() > 0) {
if (listhb.size() == 1) {
UserInfo userInfo = listhb.get(0).getUserInfo();
if (userInfo != null) {
- order.setLevelOneId(userInfo.getId()+"");
+ order.setLevelOneId(userInfo.getId() + "");
order.setLevelOneMoney(listhb.get(0).getMoney() + "");
}
} else if (listhb.size() == 2) {
UserInfo userInfo = listhb.get(0).getUserInfo();
if (userInfo != null) {
- order.setLevelOneId(userInfo.getId()+"");
+ order.setLevelOneId(userInfo.getId() + "");
order.setLevelOneMoney(listhb.get(0).getMoney() + "");
}
-
+
UserInfo userInfo2 = listhb.get(1).getUserInfo();
if (userInfo2 != null) {
- order.setLevelTwoId(userInfo2.getId()+"");
+ order.setLevelTwoId(userInfo2.getId() + "");
order.setLevelTwoMoney(listhb.get(1).getMoney() + "");
}
}
@@ -835,7 +832,7 @@
}
@Override
- public CommonOrderVO getInfoByOrderNo(Long uid,String orderNo) throws CommonOrderException{
+ public CommonOrderVO getInfoByOrderNo(Long uid, String orderNo) throws CommonOrderException {
List<CommonOrderVO> list = getOrderByUid(1, uid, null, null, null, orderNo, null, null, null);
if (list == null || list.size() == 0) {
return null;
@@ -843,9 +840,10 @@
return list.get(0);
}
}
-
+
@Override
- public CommonOrderVO getCommonOrderByOrderNo(Long uid, String orderNo, Integer orderState) throws CommonOrderException {
+ public CommonOrderVO getCommonOrderByOrderNo(Long uid, String orderNo, Integer orderState)
+ throws CommonOrderException {
CommonOrderVO commonOrderVO = commonOrderMapper.getCommonOrderByOrderNo(uid, orderNo, orderState);
// 璁㈠崟淇℃伅涓虹┖
@@ -935,9 +933,10 @@
return commonOrderVO;
}
-
+
@Override
- public List<CommonOrderVO> getCouponHongbaoByOrderNo(Long uid, Integer hongBaoState, String orderNo) throws CommonOrderException {
+ public List<CommonOrderVO> getCouponHongbaoByOrderNo(Long uid, Integer hongBaoState, String orderNo)
+ throws CommonOrderException {
List<CommonOrderVO> listOrder = commonOrderMapper.getCouponHongbaoByOrderNo(uid, hongBaoState, orderNo);
@@ -960,38 +959,42 @@
return listOrder;
}
-
@Override
public JSONObject getRewardJumpInfo(String orderNo) {
-
+
JSONObject map = new JSONObject();
// 璁㈠崟鏍囪瘑
List<String> signList = new ArrayList<String>();
signList.add(CommonOrder.TYPE_FANLI);
signList.add(PIC_REWARD); // 鍔犲叆濂栧姳鎴愬姛鍥剧墖
map.put("signList", signList);
-
-
+
ClientTextStyleVO rewardStyleVO = new ClientTextStyleVO();
// 濂栧姳鍒歌繘搴﹁鎯�
rewardStyleVO.setContent("杩斿埄濂栧姳 >");
- rewardStyleVO.setColor( "#E5005C");
+ rewardStyleVO.setColor("#E5005C");
rewardStyleVO.setBottomColor("#FFDCEA");
-
- Map<String, Object> jumpLink = new HashMap<String,Object>();
+
+ Map<String, Object> jumpLink = new HashMap<String, Object>();
jumpLink.put("orderNo", orderNo);
-
- Map<String, Object> jump = new HashMap<String,Object>();
- jump.put("type", 1);
- jump.put("params", jumpLink);
- jump.put("jumpDetail", jumpDetailV2Service.getByTypeCache("rewardCouponDetail"));
-
- Map<String, Object> rewardMap = new HashMap<String,Object>();
- rewardMap.put("text", rewardStyleVO);
- rewardMap.put("jump", jump);
-
- map.put("rewardDetail", rewardMap);
-
+
+ Map<String, Object> jump = new HashMap<String, Object>();
+ jump.put("type", 1);
+ jump.put("params", jumpLink);
+ jump.put("jumpDetail", jumpDetailV2Service.getByTypeCache("rewardCouponDetail"));
+
+ Map<String, Object> rewardMap = new HashMap<String, Object>();
+ rewardMap.put("text", rewardStyleVO);
+ rewardMap.put("jump", jump);
+
+ map.put("rewardDetail", rewardMap);
+
return map;
}
+
+ @Override
+ public CommonOrder selectBySourceTypeAndTradeId(int sourceType, String tradeId) {
+
+ return commonOrderMapper.selectBySourceTypeAndTradeId(sourceType, tradeId);
+ }
}
--
Gitblit v1.8.0