Commit d813d21bec544c951cec3f3eddc0b302984cc319
1 parent
3afaa064f7
Exists in
master
and in
6 other branches
update
Showing 2 changed files with 7 additions and 4 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
View file @
d813d21
| ... | ... | @@ -1142,7 +1142,7 @@ |
| 1142 | 1142 | bm.setEncoded(b.getEncoded()); |
| 1143 | 1143 | } |
| 1144 | 1144 | //预建档的要加上编码 |
| 1145 | - if(b.getYn()==0 && StringUtils.isEmpty(b.getEncoded())){ | |
| 1145 | + if(b.getYn()!=null && b.getYn()==0 && StringUtils.isEmpty(b.getEncoded())){ | |
| 1146 | 1146 | String encodedUtil = getEncodedUtil(); |
| 1147 | 1147 | bm.setEncoded(encodedUtil); |
| 1148 | 1148 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
View file @
d813d21
| ... | ... | @@ -1409,10 +1409,13 @@ |
| 1409 | 1409 | /** 处理优惠券查询 */ |
| 1410 | 1410 | if (StringUtils.isNotEmpty(coupon)) { |
| 1411 | 1411 | Map<String, Object> m = couponMapper.findUrl(coupon); |
| 1412 | - Object personId = m.get("user_id"); | |
| 1413 | - if (personId != null) { | |
| 1414 | - babyQuery.setPid(personId.toString()); | |
| 1412 | + if(!m.isEmpty()){ | |
| 1413 | + Object personId = m.get("user_id"); | |
| 1414 | + if (personId != null) { | |
| 1415 | + babyQuery.setPid(personId.toString()); | |
| 1416 | + } | |
| 1415 | 1417 | } |
| 1418 | + | |
| 1416 | 1419 | } |
| 1417 | 1420 | |
| 1418 | 1421 | //表示区域的 |