逻辑先后修改

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

@@ -662,36 +662,37 @@ public class PayController {
                             }
 /*/==========================================================================================================================================================//
                             //客户积分
-                            CustomerPoints customerPoints = new CustomerPoints();       //客户积分实体表
-                            CustomerPointsRecord customerPointsRecord = new CustomerPointsRecord();     //客户积分记录实体表
-                            if(infoMap.containsKey("unionId")){
-                                customerPoints.setUnionId(infoMap.get("unionId").toString());
-                                customerPointsRecord.setUnionId(infoMap.get("unionId").toString());
-                            }
-                            customerPoints.setCustomerName(infoMap.get("consumer").toString());
-                            customerPoints.setMobilePhone(infoMap.get("mobilePhone").toString());   //存入手机号
-
-                            customerPointsRecord.setCustomerName(infoMap.get("consumer").toString());       //客户名称
-                            customerPointsRecord.setRecordType("+");            // "+"表示增加积分
-                            customerPointsRecord.setStationId(Integer.valueOf(infoMap.get("stationId").toString()));
-                            customerPointsRecord.setCreateTime(new Date());
-
-                            if(infoMap.containsKey("userType") && infoMap.get("userType") !=null){
-                                switch (infoMap.get("userType").toString()){
-                                    case "1":
-                                        customerPoints.setBlogOpenId(infoMap.get("blogOpenid").toString());
-                                        break;
-                                    case "2":
-                                        customerPoints.setMinaOpenId(infoMap.get("minaOpenid").toString());
-                                        break;
-                                }
-                            }
                             IntegralRule integralRule  =new IntegralRule();
                             integralRule.setStationId(Integer.valueOf(infoMap.get("stationId").toString()));
                             integralRule.setOilName(infoMap.get("oilName").toString());
                             //获取该油站的积分规则
                             List<IntegralRule> rule = integralRuleService.getIntegralRule(integralRule);
                             if(rule !=null && rule.size() > 0){
+                                CustomerPoints customerPoints = new CustomerPoints();       //客户积分实体表
+                                CustomerPointsRecord customerPointsRecord = new CustomerPointsRecord();     //客户积分记录实体表
+                                if(infoMap.containsKey("unionId")){
+                                    customerPoints.setUnionId(infoMap.get("unionId").toString());
+                                    customerPointsRecord.setUnionId(infoMap.get("unionId").toString());
+                                }
+                                customerPoints.setCustomerName(infoMap.get("consumer").toString());
+                                customerPoints.setMobilePhone(infoMap.get("mobilePhone").toString());   //存入手机号
+
+                                customerPointsRecord.setCustomerName(infoMap.get("consumer").toString());       //客户名称
+                                customerPointsRecord.setRecordType("+");            // "+"表示增加积分
+                                customerPointsRecord.setStationId(Integer.valueOf(infoMap.get("stationId").toString()));
+                                customerPointsRecord.setCreateTime(new Date());
+
+                                if(infoMap.containsKey("userType") && infoMap.get("userType") !=null){
+                                    switch (infoMap.get("userType").toString()){
+                                        case "1":
+                                            customerPoints.setBlogOpenId(infoMap.get("blogOpenid").toString());
+                                            break;
+                                        case "2":
+                                            customerPoints.setMinaOpenId(infoMap.get("minaOpenid").toString());
+                                            break;
+                                    }
+                                }
+
                                 //获取该用户积分信息
                                 CustomerPoints customerPointsInfo = customerPointsService.getCustomerPointsInfo(customerPoints);
                                 if(customerPointsInfo !=null){