caojiahao/dev_caojiahao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop

Browse Source
This commit is contained in:
Chopper 2022-02-16 17:42:18 +08:00
commit 9fe633d228
4 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
buyer-api/src/main/resources/application.yml
View File

@ -137,6 +137,7 @@ ignored:
- /buyer/passport/connect/** - /buyer/passport/connect/**
- /buyer/members/** - /buyer/members/**
- /buyer/passport/member/** - /buyer/passport/member/**
- /buyer/passport/member/refresh/**
- /buyer/promotion/pintuan/** - /buyer/promotion/pintuan/**
- /buyer/promotion/seckill/** - /buyer/promotion/seckill/**
- /buyer/promotion/pointsGoods/** - /buyer/promotion/pointsGoods/**

2
config/application.yml
View File

@ -125,6 +125,7 @@ ignored:
- /weixin/** - /weixin/**
- /source/** - /source/**
- /store/passport/login/** - /store/passport/login/**
- /store/passport/login/refresh/**
- /common/common/slider/** - /common/common/slider/**
- /common/common/sms/** - /common/common/sms/**
- /buyer/payment/cashier/** - /buyer/payment/cashier/**
@ -135,6 +136,7 @@ ignored:
- /buyer/passport/connect/** - /buyer/passport/connect/**
- /buyer/members/** - /buyer/members/**
- /buyer/passport/member/** - /buyer/passport/member/**
- /buyer/passport/member/refresh/**
- /buyer/promotion/pintuan/** - /buyer/promotion/pintuan/**
- /buyer/promotion/seckill/** - /buyer/promotion/seckill/**
- /buyer/promotion/pointsGoods/** - /buyer/promotion/pointsGoods/**

2
framework/src/main/java/cn/lili/modules/promotion/entity/dto/search/FullDiscountSearchParams.java
View File

@ -34,7 +34,7 @@ public class FullDiscountSearchParams extends BasePromotionsSearchParams impleme
public <T> QueryWrapper<T> queryWrapper() { public <T> QueryWrapper<T> queryWrapper() {
QueryWrapper<T> queryWrapper = super.queryWrapper(); QueryWrapper<T> queryWrapper = super.queryWrapper();
if (CharSequenceUtil.isNotEmpty(promotionName)) { if (CharSequenceUtil.isNotEmpty(promotionName)) {
queryWrapper.like("title", promotionName); queryWrapper.like("promotion_name", promotionName);
} }
if (couponFlag != null) { if (couponFlag != null) {
queryWrapper.eq("coupon_flag", couponFlag); queryWrapper.eq("coupon_flag", couponFlag);

1
seller-api/src/main/resources/application.yml
View File

@ -120,6 +120,7 @@ ignored:
- /weixin/** - /weixin/**
- /source/** - /source/**
- /store/passport/login/** - /store/passport/login/**
- /store/passport/login/refresh/**
- /druid/** - /druid/**
- /swagger-ui.html - /swagger-ui.html
- /doc.html - /doc.html