|
|
@@ -1593,14 +1593,18 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
|
|
|
if (userDistributeShared == null) {
|
|
|
CouponDistributePopularize couponDistributePopularize = couponDistributePopularizeMapper.selectOne(Wrappers.lambdaQuery(CouponDistributePopularize.class).eq(CouponDistributePopularize::getExCode, couponExCode).last("limit 1"));
|
|
|
Optional.ofNullable(couponDistributePopularize).ifPresent(popularize -> {
|
|
|
- try {
|
|
|
- UserDistribute userDistribute = userDistributeMapper.selectById(popularize.getId());
|
|
|
+ try{
|
|
|
+ UserDistribute userDistribute = userDistributeMapper.selectById(popularize.getDistributeId());
|
|
|
if (userDistribute == null || !userDistribute.getDeleted()) {
|
|
|
return;
|
|
|
}
|
|
|
+ Long sharedId = userDistribute.getUserId();
|
|
|
+ if (sharedId.equals(userId)) {
|
|
|
+ return;
|
|
|
+ }
|
|
|
UserDistributeShared ud = new UserDistributeShared();
|
|
|
ud.setUserId(userId);
|
|
|
- ud.setSharedId(userDistribute.getUserId());
|
|
|
+ ud.setSharedId(sharedId);
|
|
|
ud.setRemark("优惠码");
|
|
|
userDistributeSharedMapper.insert(ud);
|
|
|
} catch (DuplicateKeyException e) {
|