yujian
2019-03-12 f0fc7d2684ee50b885b7003bb06eb1663cfbaa7f
fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java
@@ -70,6 +70,7 @@
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;
@@ -166,6 +167,9 @@
   @Resource
   private UserExtraTaoBaoInfoService userExtraTaoBaoInfoService;
   @Resource
   private UserSystemCouponService userSystemCouponService;
   @Override
   public void processOrder(Map<String, List<TaoBaoOrder>> orders) {
@@ -482,7 +486,7 @@
         // 将自己添加到用户
         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));
@@ -497,7 +501,7 @@
            userMoneyDetailMapper.insert(userMoneyDetail);
         } catch (UserMoneyDetailException e1) {
            try {
               LogHelper.errorDetailInfo(e1);
               LogHelper.errorDetailInfo(e1,"订单号:"+hongBaoOrder.getCommonOrder().getOrderNo(),"");
            } catch (Exception e2) {
               e2.printStackTrace();
            }
@@ -507,6 +511,8 @@
         for (HongBaoV2 v2 : userHongBao.get(uid)) {
            accountDetailsHongBaoMapService.saveAccountDetailsHongBaoMap(v2.getId(), accountDetails.getId());
         }
         //增加用户资金
         userInfoMapper.addHongBaoByUid(uid, money);
         // 站内信+推送
         UserInfo user = userInfoMapper.selectByPrimaryKey(uid);
@@ -524,7 +530,12 @@
         // 新版通知
         userMoneyMsgNotificationService.fanliOrderReceived(uid, hongBaoOrder.getCommonOrder().getOrderNo(),
               userGoodsCount.get(uid), money, user.getMyHongBao());
      }
      // 通知免单到账
      try {
         userSystemCouponService.updateStateByArrivalAccount(hongBaoOrder.getCommonOrder().getOrderNo());
      } catch (Exception e) {
         e.printStackTrace();
      }
      // 维权扣款(2018-08-05后开始实行)