Merge branch 'ww-分享好友' into test
This commit is contained in:
@@ -258,6 +258,7 @@ public class TbShopShareRecordServiceImpl implements TbShopShareRecordService {
|
||||
record.setNum(newCoupon.getCouponNum());
|
||||
record.setOverNum(newCoupon.getCouponNum());
|
||||
record.setShopId(Integer.valueOf(tbShopUser.getShopId()));
|
||||
record.setCreateTime(new Date());
|
||||
record.setSourceActId(shopShare.getId());
|
||||
record.setUseStartTime(start);
|
||||
record.setUseEndTime(end);
|
||||
@@ -279,6 +280,7 @@ public class TbShopShareRecordServiceImpl implements TbShopShareRecordService {
|
||||
record.setSourceActId(shopShare.getId());
|
||||
record.setUseStartTime(start);
|
||||
record.setUseEndTime(end);
|
||||
record.setCreateTime(new Date());
|
||||
record.setSource("invited");
|
||||
actGiveRecords.add(record);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user