|
|
@@ -354,8 +354,9 @@ public class PayOrderController {
|
|
|
customerLabel.setPhone(payOrderRequest.getCustomerPhone());
|
|
|
customerLabel.setStationId(payOrderRequest.getStationId());
|
|
|
//扫码进标签优惠：一码一签
|
|
|
- if(payOrderRequest.getLabelId() !=null){
|
|
|
+ if(StringUtils.isNoneBlank(payOrderRequest.getLabelId()) && !payOrderRequest.getPersonnelId().equals("undefined")){
|
|
|
//如果前端传来labelId,则表示一码一签；
|
|
|
+ logger.info("labelId", payOrderRequest.getLabelId());
|
|
|
params.put("labelId", payOrderRequest.getLabelId());
|
|
|
payOrderResultInfo = this.calculateLabelDiscount(params);
|
|
|
//是否强制将该扫码用户拉入此标签：0、否；1、是；
|
JK