|
@@ -237,7 +237,7 @@ public class PayOrderController {
|
|
|
customerLabel.setStationId(payOrderRequest.getStationId());
|
|
|
//获取该用户是否在标签组内
|
|
|
CustomerLabel customerLabelInfo = labelService.getCustomerLabel(customerLabel);
|
|
|
- if(payOrderRequest.getLabelFlag().equals("1") && customerLabelInfo !=null){
|
|
|
+ if(payOrderRequest.getLabelFlag() !=null && payOrderRequest.getLabelFlag().equals("1") && customerLabelInfo !=null){
|
|
|
//表示此用户为标签用户,计算标签用户优惠
|
|
|
payOrderResultInfo = this.calculateLabelDiscount(params);
|
|
|
}else {
|