From efba42a325e1cf71c1d0f7a6ac46a0141c23443a Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期二, 12 三月 2019 16:25:11 +0800 Subject: [PATCH] 增加序列化 --- fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java | 76 +++++++++++++++++--------------------- 1 files changed, 34 insertions(+), 42 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java index bb0e8e5..8aa3f25 100644 --- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java +++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java @@ -17,7 +17,6 @@ import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; -import com.yeshi.fanli.dao.mybatis.AccountDetailsMapper; import com.yeshi.fanli.dao.mybatis.AccountMessageMapper; import com.yeshi.fanli.dao.mybatis.HongBaoManageMapper; import com.yeshi.fanli.dao.mybatis.HongBaoV2Mapper; @@ -32,7 +31,6 @@ import com.yeshi.fanli.dao.mybatis.order.OrderMapper; import com.yeshi.fanli.dao.mybatis.share.PidUserMapper; import com.yeshi.fanli.dao.mybatis.taobao.TaoBaoWeiQuanOrderMapper; -import com.yeshi.fanli.entity.bus.user.AccountDetails; import com.yeshi.fanli.entity.bus.user.HongBao; import com.yeshi.fanli.entity.bus.user.HongBaoV2; import com.yeshi.fanli.entity.bus.user.Order; @@ -70,11 +68,11 @@ import com.yeshi.fanli.service.inter.taobao.TaoBaoWeiQuanDrawBackService; import com.yeshi.fanli.service.inter.user.UserExtraTaoBaoInfoService; import com.yeshi.fanli.service.inter.user.UserNotificationService; +import com.yeshi.fanli.service.inter.user.UserSystemCouponService; import com.yeshi.fanli.util.CMQManager; import com.yeshi.fanli.util.RedisManager; import com.yeshi.fanli.util.StringUtil; import com.yeshi.fanli.util.TimeUtil; -import com.yeshi.fanli.util.factory.AccountDetailsFactory; import com.yeshi.fanli.util.factory.UserMoneyDetailFactory; @Service @@ -109,9 +107,6 @@ @Resource private HongBaoManageMapper hongBaoManageMapper; - - @Resource - private AccountDetailsMapper accountDetailsMapper; @Resource private AccountMessageMapper accountMessageMapper; @@ -166,6 +161,9 @@ @Resource private UserExtraTaoBaoInfoService userExtraTaoBaoInfoService; + + @Resource + private UserSystemCouponService userSystemCouponService; @Override public void processOrder(Map<String, List<TaoBaoOrder>> orders) { @@ -287,7 +285,16 @@ Iterator<String> its = orders.keySet().iterator(); while (its.hasNext()) { String orderId = its.next(); - processShareGoodsOrderNew(orderId, orders.get(orderId)); + try { + processShareGoodsOrderNew(orderId, orders.get(orderId)); + } catch (Exception e) { + try { + LogHelper.errorDetailInfo(e, "processShareGoodsOrderNew鍑洪敊", "璁㈠崟鍙�:" + orderId); + } catch (Exception e1) { + e1.printStackTrace(); + } + } + } } } @@ -473,31 +480,27 @@ // 灏嗚嚜宸辨坊鍔犲埌鐢ㄦ埛 Long uid = its.next(); BigDecimal money = userMoney.get(uid); - userInfoMapper.addHongBaoByUid(uid, money); - - AccountDetails accountDetails = AccountDetailsFactory.create("+" + money, AccountDetailsFactory.FANLI, null, - null, new UserInfo(uid)); - accountDetailsMapper.insertSelective(accountDetails); - + UserMoneyDetail userMoneyDetail = null; // 鎻掑叆鏂扮増璧勯噾鏄庣粏 try { - UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createFanLi(uid, - hongBaoOrder.getCommonOrder().getOrderNo(), hongBaoOrder.getCommonOrder().getSourceType(), null, - money); - userMoneyDetail.setId(accountDetails.getId()); - userMoneyDetailMapper.insert(userMoneyDetail); + userMoneyDetail = UserMoneyDetailFactory.createFanLi(uid, hongBaoOrder.getCommonOrder().getOrderNo(), + hongBaoOrder.getCommonOrder().getSourceType(), null, money); + } catch (UserMoneyDetailException e1) { try { - LogHelper.errorDetailInfo(e1); + LogHelper.errorDetailInfo(e1, "璁㈠崟鍙�:" + hongBaoOrder.getCommonOrder().getOrderNo(), ""); } catch (Exception e2) { e2.printStackTrace(); } } + userMoneyDetailMapper.insert(userMoneyDetail); // 娣诲姞璧勯噾鏄庣粏涓庣孩鍖呯殑鏄犲皠鍏崇郴 for (HongBaoV2 v2 : userHongBao.get(uid)) { - accountDetailsHongBaoMapService.saveAccountDetailsHongBaoMap(v2.getId(), accountDetails.getId()); + accountDetailsHongBaoMapService.saveAccountDetailsHongBaoMap(v2.getId(), userMoneyDetail.getId()); } + // 澧炲姞鐢ㄦ埛璧勯噾 + userInfoMapper.addHongBaoByUid(uid, money); // 绔欏唴淇�+鎺ㄩ�� UserInfo user = userInfoMapper.selectByPrimaryKey(uid); @@ -515,7 +518,12 @@ // 鏂扮増閫氱煡 userMoneyMsgNotificationService.fanliOrderReceived(uid, hongBaoOrder.getCommonOrder().getOrderNo(), userGoodsCount.get(uid), money, user.getMyHongBao()); - + } + // 閫氱煡鍏嶅崟鍒拌处 + try { + userSystemCouponService.updateStateByArrivalAccount(hongBaoOrder.getCommonOrder().getOrderNo()); + } catch (Exception e) { + e.printStackTrace(); } // 缁存潈鎵f锛�2018-08-05鍚庡紑濮嬪疄琛岋級 @@ -694,10 +702,6 @@ // 閭�璇疯禋鍒拌处 if (invitemoney.compareTo(new BigDecimal(0)) > 0) { userInfoMapper.addHongBaoByUid(uid, invitemoney); - // 娣诲姞璁板綍 - AccountDetails accountDetails = AccountDetailsFactory.create("+" + invitemoney, - AccountDetailsFactory.TICHENG, null, null, new UserInfo(uid)); - accountDetailsMapper.insertSelective(accountDetails); // 娣诲姞鏂扮増璇︽儏璁板綍 try { @@ -718,8 +722,9 @@ UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createInvite(uid, (int) validCount, (int) weiQuanCount, (int) invalidCount, invitemoney, new Date()); - userMoneyDetail.setId(accountDetails.getId()); userMoneyDetailMapper.insert(userMoneyDetail); + // 娣诲姞鍒扮孩鍖呰繑鍒╄褰曢泦鍚� + accountDetailsHongBaoMapService.saveAccountDetailsHongBaoMap(hbIdList, userMoneyDetail.getId()); } catch (UserMoneyDetailException e) { try { LogHelper.errorDetailInfo(e); @@ -727,11 +732,6 @@ e1.printStackTrace(); } } - - // 璁板綍杩斿埄绾㈠寘涓庤祫閲戣鎯呯殑瀵瑰簲鍏崇郴 - - // 娣诲姞鍒扮孩鍖呰繑鍒╄褰曢泦鍚� - accountDetailsHongBaoMapService.saveAccountDetailsHongBaoMap(hbIdList, accountDetails.getId()); // 鍙戦�佹帹閫� try { @@ -798,11 +798,6 @@ if (sharemoney.compareTo(new BigDecimal(0)) > 0) { userInfoMapper.addHongBaoByUid(uid, sharemoney); - // 娣诲姞璁板綍 - AccountDetails accountDetails = AccountDetailsFactory.create("+" + sharemoney, - AccountDetailsFactory.SHARE_GOODS, null, null, new UserInfo(uid)); - accountDetailsMapper.insertSelective(accountDetails); - // 娣诲姞鏂扮増璇︽儏璁板綍 try { // 璁$畻鏈湀鐨勬湁鏁堣鍗曪紝澶辨晥璁㈠崟锛岀淮鏉冭鍗� @@ -823,8 +818,9 @@ UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createShare(uid, (int) validCount, (int) weiQuanCount, (int) invalidCount, sharemoney, new Date()); - userMoneyDetail.setId(accountDetails.getId()); userMoneyDetailMapper.insert(userMoneyDetail); + // 娣诲姞鍒扮孩鍖呰繑鍒╄褰曢泦鍚� + accountDetailsHongBaoMapService.saveAccountDetailsHongBaoMap(hbIdList, userMoneyDetail.getId()); } catch (UserMoneyDetailException e) { try { LogHelper.errorDetailInfo(e); @@ -832,10 +828,6 @@ e1.printStackTrace(); } } - // 璁板綍杩斿埄绾㈠寘涓庤祫閲戣鎯呯殑瀵瑰簲鍏崇郴 - - // 娣诲姞鍒扮孩鍖呰繑鍒╄褰曢泦鍚� - accountDetailsHongBaoMapService.saveAccountDetailsHongBaoMap(hbIdList, accountDetails.getId()); // 鍙戦�佹帹閫� try { @@ -953,7 +945,7 @@ hongBaoV2Service.addHongBao(commonOrderList, HongBaoV2.TYPE_ZIGOU); } catch (CommonOrderException e) { try { - LogHelper.errorDetailInfo(e, null, "璁㈠崟鍙�:" + orderId); + LogHelper.errorDetailInfo(e, "addTaoBaoOrder鎴朼ddHongBao鍑洪敊", "璁㈠崟鍙�:" + orderId); } catch (Exception e1) { e1.printStackTrace(); } -- Gitblit v1.8.0