Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-09-10 65460a2dc7c69d8c0e031ec4c89e25d47e5173f2

 fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoWeiQuanDrawBackServiceImpl.java

@@ -30,16 +30,15 @@
import com.yeshi.fanli.entity.taobao.TaoBaoOrder;

import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanDrawBack;

import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanOrder;

import com.yeshi.fanli.exception.TaoBaoWeiQuanException;

import com.yeshi.fanli.exception.money.UserMoneyDebtException;

import com.yeshi.fanli.exception.money.UserMoneyDetailException;

import com.yeshi.fanli.exception.order.TaoBaoWeiQuanException;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.money.UserMoneyDebtService;

import com.yeshi.fanli.service.inter.msg.UserMoneyMsgNotificationService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoWeiQuanDrawBackService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoWeiQuanOrderService;

import com.yeshi.fanli.service.inter.user.UserMoneyService;

import com.yeshi.fanli.service.inter.user.UserNotificationService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.MoneyBigDecimalUtil;

import com.yeshi.fanli.util.StringUtil;

@@ -62,9 +61,6 @@


   @Resource

   private UserMoneyDetailMapper userMoneyDetailMapper;



   @Resource

   private UserNotificationService userNotificationService;



   @Resource

   private CommonOrderMapper commonOrderMapper;

@@ -287,10 +283,8 @@
         userMoneyService.subUserMoney(uid, drawBackMoney, userMoneyDetail);



         // 新版通知

         userMoneyMsgNotificationService.fanliOrderWeiQuan(uid, orderId, drawBackMoney,

         userMoneyMsgNotificationService.fanliOrderWeiQuan(uid, orderId, Constant.SOURCE_TYPE_TAOBAO, drawBackMoney,

               userInfoMapper.selectByPKey(uid).getMyHongBao());



         userNotificationService.weiQuanFanli(uid, orderId, drawBackMoney);

      }

   }



@@ -455,7 +449,8 @@
            }

         }

         userMoneyService.subUserMoney(uid, drawBackMoney, userMoneyDetail);

         userMoneyMsgNotificationService.shareOrderWeiQuan(uid, orderId, drawBackMoney,

         userMoneyMsgNotificationService.shareOrderWeiQuan(uid, orderId, Constant.SOURCE_TYPE_TAOBAO, drawBackMoney,



               userInfoMapper.selectByPrimaryKey(uid).getMyHongBao());

      }

   }

@@ -543,8 +538,8 @@
                  userMoneyService.subUserMoney(uid, drawBackMoney, userMoneyDetail);



                  // 新版通知

                  userMoneyMsgNotificationService.inviteOrderWeiQuan(uid, orderId, drawBackMoney,

                        userInfoMapper.selectByPrimaryKey(uid).getMyHongBao());

                  userMoneyMsgNotificationService.inviteOrderWeiQuan(uid, orderId, Constant.SOURCE_TYPE_TAOBAO,

                        drawBackMoney, userInfoMapper.selectByPrimaryKey(uid).getMyHongBao());

               }

            }

      }