资金明细添加京东，拼多多兼容

admin

2019-07-22 d2357693d74ec048ed19e483ea29f87d823cde5f

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java

@@ -684,7 +684,7 @@


   @Transactional

   @Override

   public void useOrderCoupon(Long uid, Long id, String orderNo) throws UserSystemCouponException, Exception {

   public void useOrderCoupon(Long uid, Long id, String orderNo, Integer goodsType) throws UserSystemCouponException, Exception {



      if (id == null) {

         throw new UserSystemCouponException(1, "券id不存在");

@@ -738,7 +738,7 @@
      // 条件: A:必须是返利订单 、B:必须已经处于已到账状态

      if (HongBaoV2.TYPE_ZIGOU == hongBaoType && HongBaoV2.STATE_YILINGQU == hongBaoState || hongBao != null) {



         Order order = orderService.findOrderByOrderIdAndType(orderNo, Order.ORDER_TYPE_TAOBAO);

         Order order = orderService.findOrderByOrderIdAndType(orderNo, goodsType);

         if (order == null)

            return;



@@ -760,19 +760,20 @@
         hongBaoV2.setUserInfo(new UserInfo(uid));

         hongBaoV2.setPreGetTime(new Date());

         hongBaoV2.setGetTime(new Date());

			
         hongBaoV2Service.insertSelective(hongBaoV2);



         // 2.插入关联

         orderHongBaoMapService.addOrderHongBaoMap(hongBaoV2, order);



         // 3.插入资金明细,用户余额

         UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createOrderReward(orderNo, money,

         // 3.插入资金明细,用户余额 // TODO

         UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createOrderReward(orderNo,goodsType, money,

               new UserInfo(uid));

         userMoneyDetailService.addUserMoneyDetail(userMoneyDetail);

         userInfoService.addMoney(new UserInfo(uid), money);



         // 插入资金通知

         userMoneyMsgNotificationService.orderReward(uid, orderNo, money,

         userMoneyMsgNotificationService.orderReward(uid, orderNo,goodsType, money,

               userInfoService.selectByPKey(uid).getMyHongBao());



         /* 用户券信息状态及记录处理 */

@@ -787,6 +788,7 @@
         // 插入使用券记录

         UserSystemCouponRecord couponRecord = new UserSystemCouponRecord();

         couponRecord.setState(UserSystemCouponRecord.STATE_SUCCESS);

         couponRecord.setGoodSource(goodsType);

         couponRecord.setOrderNo(orderNo);

         couponRecord.setUserSystemCoupon(userSystemCoupon);

         couponRecord.setCouponType(systemCoupon.getType().name());