修改调整

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

@@ -111,6 +111,10 @@ public class CustomerGradeController {
                     }else if(customerGradeInfoList !=null && customerGradeInfoList.size() >1){
                         //存在多个等级时 查询出结果按优惠的油量升序排列取第一个即可
                         resultData = ResultData.success(customerGradeInfoList.get(0));
+                    }else{
+                        //直降表查询 升序取第一个
+                        List<Map> customerGradeList = customerGradeServices.getCustomerGradeList(params);
+                        resultData = ResultData.success(customerGradeList.get(0));
                     }
                 }else {
                     //此处重新赋值123的原因：station_pay表取值 1 2 3 4 分别代表 等级直降 满减 立减 直降； 而 在markert_plan 1 2 3代表 满减 立减 直降

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

@@ -678,13 +678,17 @@ public class PayController {
                                     //直降
                                     List<Map> customerGradeInfo = customerGradeServices.getCustomerGradeList(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())){
-                                            customerManage.setGrade(m.get("grade").toString());     //存入等级名称
-                                            customerManage.setMemberGrade(m.get("id").toString());     //存入等级ID
-                                            break;
-                                        }
+                                    if(customerGradeInfo !=null && customerGradeInfo.size() >0){
+                                        customerManage.setGrade(customerGradeInfo.get(0).get("grade").toString());     //存入等级名称
+                                        customerManage.setMemberGrade(customerGradeInfo.get(0).get("id").toString());     //存入等级ID
                                     }
+//                                    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;
+//                                        }
+//                                    }
                                     logger.info("直降等级信息是否存入客户表："+ "直降ID："+ customerManage.getMemberGrade()+ "直降名称： "+customerManage.getGrade());
                                 }
                                 customerManage.setAmt(BigDecimal.valueOf((Double) infoMap.get("amt")));    //存入金额

YijiaRestful/src/main/resources/mapper/CustomerGradeMapper.xml

@@ -70,6 +70,7 @@
         AND oil_name = #{oilName}
       </if>
     </where>
+      ORDER BY member_condit_end ASC
   </select>
 
     <!--查询客户等级直降信息-->