Merge remote-tracking branch 'origin/master'

admin

2019-01-28 f7ed4e6bbe9be95d268481e66d70d90e70e07e12

 fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/ThreeSaleSerivceImpl.java

@@ -145,6 +145,10 @@
                  threeSale.setUpdateTime(java.lang.System.currentTimeMillis());

                  threeSale.setWorker(invitee);

                  threeSaleMapper.insertSelective(threeSale);

						
                  // 删除已失效关系

                  threeSaleMapper.deleteExpireRecord(inviter.getId(), invitee.getId());

						
                  userInviteMsgNotificationService.inviteScan(inviter.getId(), threeSale);

                  // threeSaleSerivce.bind(invitee, inviter);