修改

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

@@ -376,18 +376,17 @@ public class ElectronicMembershipCardController {
                         customerManage.setAmt(customerManageInfo.getAmt().add(new BigDecimal(amt)));
                         customerManage.setLiters(customerManageInfo.getLiters().add(new BigDecimal(oilLiters)));
                         logger.info("存在客户 更新时手机号参数: " + customerManage.getPhoneNumber());
-                        //if(discountPlanType !=null && discountPlanType.equals("1")){
-                            List<Map> customerGradeInfo = customerGradeServices.getCustomerGradeListOrderByDesc(params_1);  //直降
-                            logger.info("该站直降等级信息："+ customerGradeInfo);
-                            for (Map m: customerGradeInfo){
-                                if(Double.valueOf(customerManage.getAmt().toString()) >= Double.valueOf(m.get("memberConditStart").toString()) && Double.valueOf(customerManage.getAmt().toString()) < Double.valueOf(m.get("memberConditEnd").toString())){
-                                    customerManage.setGrade(m.get("grade").toString());     //存入等级名称
-                                    customerManage.setMemberGrade(m.get("id").toString());     //存入等级ID
-                                    break;
-                                }
+                        List<Map> customerGradeInfo = customerGradeServices.getCustomerGradeListOrderByDesc(params_1);  //直降
+                        logger.info("该站直降等级信息："+ customerGradeInfo);
+                        for (Map m: customerGradeInfo){
+                            //&& Double.valueOf(customerManage.getAmt().toString()) < Double.valueOf(m.get("memberConditEnd").toString())
+                            if(Double.valueOf(customerManage.getAmt().toString()) >= Double.valueOf(m.get("memberConditStart").toString())){
+                                customerManage.setGrade(m.get("grade").toString());     //存入等级名称
+                                customerManage.setMemberGrade(m.get("id").toString());     //存入等级ID
+                                break;
                             }
-                            logger.info("存在客户时直降等级信息是否存入客户表："+ "直降ID："+ customerManage.getMemberGrade()+ "直降名称： "+customerManage.getGrade());
-                        //}
+                        }
+                        logger.info("存在客户时直降等级信息是否存入客户表："+ "直降ID："+ customerManage.getMemberGrade()+ "直降名称： "+customerManage.getGrade());
                         customerManagerService.updateCustomerInfo(customerManage);
                     }else {
                         customerManage.setCustomerName(consumer);
@@ -398,15 +397,13 @@ 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")){
-                            List<Map> customerGradeInfo = customerGradeServices.getCustomerGradeList(params_1);  //直降
-                            logger.info("该站直降等级信息："+ customerGradeInfo);
-                            if(customerGradeInfo !=null && customerGradeInfo.size() >0){
-                                customerManage.setGrade(customerGradeInfo.get(0).get("grade").toString());     //存入等级名称
-                                customerManage.setMemberGrade(customerGradeInfo.get(0).get("id").toString());     //存入等级ID
-                            }
-                            logger.info("不存在客户时直降等级信息是否存入客户表："+ "直降ID："+ customerManage.getMemberGrade()+ "直降名称： "+customerManage.getGrade());
-                        //}
+                        List<Map> customerGradeInfo = customerGradeServices.getCustomerGradeList(params_1);  //直降
+                        logger.info("该站直降等级信息："+ customerGradeInfo);
+                        if(customerGradeInfo !=null && customerGradeInfo.size() >0){
+                            customerManage.setGrade(customerGradeInfo.get(0).get("grade").toString());     //存入等级名称
+                            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

@@ -696,7 +696,8 @@ public class PayController {
                 List<Map> customerGradeInfo = customerGradeServices.getCustomerGradeListOrderByDesc(infoMap);  //直降
                 logger.info("该站直降等级信息："+ customerGradeInfo);
                 for (Map m: customerGradeInfo){
-                    if(Double.valueOf(customerManage.getAmt().toString()) >= Double.valueOf(m.get("memberConditStart").toString()) && Double.valueOf(customerManage.getAmt().toString()) < Double.valueOf(m.get("memberConditEnd").toString())){
+                    // && Double.valueOf(customerManage.getAmt().toString()) < Double.valueOf(m.get("memberConditEnd").toString())
+                    if(Double.valueOf(customerManage.getAmt().toString()) >= Double.valueOf(m.get("memberConditStart").toString())){
                         customerManage.setGrade(m.get("grade").toString());     //存入等级名称
                         customerManage.setMemberGrade(m.get("id").toString());     //存入等级ID
                         break;