修改

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

@@ -378,7 +378,7 @@ public class ElectronicMembershipCardController {
                         customerManage.setPhoneNumber(mobilePhone);
                         customerManage.setAmt(customerManageInfo.getAmt().add(new BigDecimal(amt)));
                         customerManage.setLiters(customerManageInfo.getLiters().add(new BigDecimal(oilLiters)));
-                        if(discountPlanType !=null && discountPlanType.equals("1")){
+                        //if(discountPlanType !=null && discountPlanType.equals("1")){
                             List<Map> customerGradeInfo = customerGradeServices.getCustomerGradeList(params_1);  //直降
                             logger.info("该站直降等级信息："+ customerGradeInfo);
                             for (Map m: customerGradeInfo){
@@ -389,7 +389,7 @@ public class ElectronicMembershipCardController {
                                 }
                             }
                             logger.info("直降等级信息是否存入客户表："+ "直降ID："+ customerManage.getMemberGrade()+ "直降名称： "+customerManage.getGrade());
-                        }
+                        //}
                         customerManagerService.updateCustomerInfo(customerManage);
                     }else {
                         customerManage.setCustomerName(consumer);
@@ -400,7 +400,7 @@ public class ElectronicMembershipCardController {
                         customerManage.setMinaUserId(Integer.valueOf(consumerId));
                         customerManage.setUnionId(unionId);
                         customerManage.setRegtime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(registeDate));
-                        if(discountPlanType !=null && discountPlanType.equals("1")){
+                        //if(discountPlanType !=null && discountPlanType.equals("1")){
                             List<Map> customerGradeInfo = customerGradeServices.getCustomerGradeList(params_1);  //直降
                             logger.info("该站直降等级信息："+ customerGradeInfo);
                             if(customerGradeInfo !=null && customerGradeInfo.size() >0){
@@ -408,7 +408,7 @@ public class ElectronicMembershipCardController {
                                 customerManage.setMemberGrade(customerGradeInfo.get(0).get("id").toString());     //存入等级ID
                             }
                             logger.info("直降等级信息是否存入客户表："+ "直降ID："+ customerManage.getMemberGrade()+ "直降名称： "+customerManage.getGrade());
-                        }
+                        //}
                         //客户会员号
                         String memberId=groupId+stationId+System.nanoTime();
                         CustomerManage cm = new CustomerManage();

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

@@ -691,7 +691,7 @@ public class PayController {
             }
             logger.info("存在客户 更新时手机号参数: " + customerManage.getPhoneNumber());
 
-            if(discountPlanType !=null && discountPlanType.equals("1")){
+            //if(discountPlanType !=null && discountPlanType.equals("1")){
                 //直降时存入等级名称和等级ID
                 List<Map> customerGradeInfo = customerGradeServices.getCustomerGradeList(infoMap);  //直降
                 logger.info("该站直降等级信息："+ customerGradeInfo);
@@ -703,11 +703,11 @@ public class PayController {
                     }
                 }
                 logger.info("直降等级信息是否存入客户表："+ "直降ID："+ customerManage.getMemberGrade()+ "直降名称： "+customerManage.getGrade());
-            }
+            //}
             customerManagerService.updateCustomerInfo(customerManage);
             //payOrderService.updateCustomer(customerManage); //存在 更新
         }else{  //该客户不存在时插入
-            if(discountPlanType !=null && discountPlanType.equals("1")){
+            //if(discountPlanType !=null && discountPlanType.equals("1")){
                 //直降时存入等级名称和等级ID
                 List<Map> customerGradeInfo = customerGradeServices.getCustomerGradeList(infoMap);  //直降
                 logger.info("该站直降等级信息："+ customerGradeInfo);
@@ -716,7 +716,7 @@ public class PayController {
                     customerManage.setMemberGrade(customerGradeInfo.get(0).get("id").toString());     //存入等级ID
                 }
                 logger.info("直降等级信息是否存入客户表："+ "直降ID："+ customerManage.getMemberGrade()+ "直降名称： "+customerManage.getGrade());
-            }
+            //}
             customerManage.setAmt(BigDecimal.valueOf((Double) infoMap.get("amt")));    //存入金额
             if(infoMap.containsKey("orderType") && infoMap.get("orderType").equals("1")){
                 customerManage.setLiters(BigDecimal.valueOf((Double) infoMap.get("orderLiters")));    //存入升数