Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
@@ -122,8 +122,7 @@ public class TbShopCouponServiceImpl implements TbShopCouponService {
|
||||
|
||||
@Override
|
||||
public Result find(CouponDto param) {
|
||||
if (param.getOrderId() != null) {
|
||||
|
||||
if (param.getOrderId() != null && param.getOrderId() > 0) {
|
||||
TbShopUser tbShopUser = shopUserMapper.selectByUserIdAndShopId(param.getUserId().toString(), param.getShopId().toString());
|
||||
List<TbUserCouponVo> tbUserCouponVos = inRecordMapper.queryByVipIdAndShopId(Arrays.asList(Integer.valueOf(tbShopUser.getId())), param.getShopId());
|
||||
if (CollectionUtil.isNotEmpty(tbUserCouponVos)) {
|
||||
|
||||
Reference in New Issue
Block a user