修改

YijiaRestful/src/main/java/com/platform/yijia/controller/AppUserInfoController.java

@@ -617,28 +617,36 @@ public class AppUserInfoController {
 //            }
 
             //如果该站开启标签功能
-            if(stationInfos.getLabelFlag() !=null && stationInfos.getLabelFlag().equals("1")){
-                //如果前端传来labelId，则表示一签一码；
-                if(StringUtils.isNotBlank(request.getLabelId()) && StringUtils.isNotBlank(request.getMobilePhone()) && request.getStationId() !=null){
-                    CustomerLabel customerLabel = new CustomerLabel();
-                    customerLabel.setStationId(request.getStationId());
-                    customerLabel.setPhone(request.getMobilePhone());
-                    //获取该标签用户信息
-                    CustomerLabel c = labelService.getCustomerLabel(customerLabel);
-                    if(c !=null){
-                        customerLabel.setLabelId(request.getLabelId());
-                        customerLabel.setUpdateBy(request.getCreateBy());
-                        customerLabel.setUpdateTime(new Date());
-                        labelService.updateCustomerLabel(customerLabel);
-                    }else {
-                        customerLabel.setCreateBy(request.getCreateBy());
-                        customerLabel.setCreateTime(new Date());
-                        customerLabel.setDelFlag("0");
-                        customerLabel.setLabelId(request.getLabelId());
-                        labelService.insertCustomerLabel(customerLabel);
-                    }
-                }
-            }
+//            if(stationInfos.getLabelFlag() !=null && stationInfos.getLabelFlag().equals("1")){
+//                //如果前端传来labelId，则表示一签一码；
+//                if(StringUtils.isNotBlank(request.getLabelId()) && StringUtils.isNotBlank(request.getMobilePhone()) && request.getStationId() !=null){
+//                    LabelRule labelRule = new LabelRule();
+//                    labelRule.setLabelId(Integer.valueOf(request.getLabelId()));
+//                    labelRule.setStationId(Integer.valueOf(request.getStationId()));
+//                    List<LabelRule> labelRuleList = labelService.getLabelRuleList(labelRule);
+//                    if(labelRuleList !=null && labelRuleList.size()>0){
+//                        CustomerLabel customerLabel = new CustomerLabel();
+//                        customerLabel.setStationId(request.getStationId());
+//                        customerLabel.setPhone(request.getMobilePhone());
+//                        if(labelRuleList.get(0).getIsAddLabel() !=null && labelRuleList.get(0).getIsAddLabel().equals("1")){
+//                            //获取该标签用户信息
+//                            CustomerLabel c = labelService.getCustomerLabel(customerLabel);
+//                            if(c !=null){
+//                                customerLabel.setLabelId(request.getLabelId());
+//                                customerLabel.setUpdateBy(request.getCreateBy());
+//                                customerLabel.setUpdateTime(new Date());
+//                                labelService.updateCustomerLabel(customerLabel);
+//                            }else {
+//                                customerLabel.setCreateBy(c.getCreateBy());
+//                                customerLabel.setCreateTime(new Date());
+//                                customerLabel.setDelFlag("0");
+//                                customerLabel.setLabelId(request.getLabelId());
+//                                labelService.insertCustomerLabel(customerLabel);
+//                            }
+//                        }
+//                    }
+//                }
+//            }
 
             //是否开起积分功能
             if(stationInfos.getIntegralRuleFlagGroup().equals("1")){