修改

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

@@ -378,8 +378,9 @@ public class ElectronicMembershipCardController {
                         customerManage.setPhoneNumber(mobilePhone);
                         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.getCustomerGradeList(params_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())){
@@ -388,7 +389,7 @@ public class ElectronicMembershipCardController {
                                     break;
                                 }
                             }
-                            logger.info("直降等级信息是否存入客户表："+ "直降ID："+ customerManage.getMemberGrade()+ "直降名称： "+customerManage.getGrade());
+                            logger.info("存在客户时直降等级信息是否存入客户表："+ "直降ID："+ customerManage.getMemberGrade()+ "直降名称： "+customerManage.getGrade());
                         //}
                         customerManagerService.updateCustomerInfo(customerManage);
                     }else {
@@ -407,7 +408,7 @@ public class ElectronicMembershipCardController {
                                 customerManage.setGrade(customerGradeInfo.get(0).get("grade").toString());     //存入等级名称
                                 customerManage.setMemberGrade(customerGradeInfo.get(0).get("id").toString());     //存入等级ID
                             }
-                            logger.info("直降等级信息是否存入客户表："+ "直降ID："+ customerManage.getMemberGrade()+ "直降名称： "+customerManage.getGrade());
+                            logger.info("不存在客户时直降等级信息是否存入客户表："+ "直降ID："+ customerManage.getMemberGrade()+ "直降名称： "+customerManage.getGrade());
                         //}
                         //客户会员号
                         String memberId=groupId+stationId+System.nanoTime();

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

@@ -693,7 +693,7 @@ public class PayController {
 
             //if(discountPlanType !=null && discountPlanType.equals("1")){
                 //直降时存入等级名称和等级ID
-                List<Map> customerGradeInfo = customerGradeServices.getCustomerGradeList(infoMap);  //直降
+                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())){

YijiaRestful/src/main/java/com/platform/yijia/dao/CustomerGradeMapper.java

@@ -10,6 +10,9 @@ public interface CustomerGradeMapper {
     //查询直降
     List<Map> getCustomerGradeList(Map map);
 
+    //降序查询
+    List<Map> getCustomerGradeListOrderByDesc(Map map);
+
     //查询立减满减
     List<Map> getCustomerMarkertPlanList(Map map);
 

YijiaRestful/src/main/java/com/platform/yijia/service/CustomerGradeServices.java

@@ -12,6 +12,9 @@ public interface CustomerGradeServices {
     //查询直降方式
     List<Map> getCustomerGradeList(Map map);
 
+    //降序查询
+    List<Map> getCustomerGradeListOrderByDesc(Map map);
+
     //查询立减满减
     List<Map> getCustomerMarkertPlanList(Map<String, Object> map);
 

YijiaRestful/src/main/java/com/platform/yijia/service/impl/CustomerGradeServiceImpl.java

@@ -15,6 +15,11 @@ public class CustomerGradeServiceImpl implements CustomerGradeServices {
     @Resource
     private CustomerGradeMapper customerGradeMapper;
 
+    //降序查询
+    @Override
+    public List<Map> getCustomerGradeListOrderByDesc(Map map) {
+        return customerGradeMapper.getCustomerGradeListOrderByDesc(map);
+    }
 
     //查询直降
     @Override

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

@@ -78,9 +78,35 @@
         AND oil_name = #{oilName}
       </if>
     </where>
-      ORDER BY member_condit_end ASC
+      ORDER BY member_condit_start ASC
   </select>
 
+    <!-- 查询直降优惠方案 -->
+    <select id="getCustomerGradeListOrderByDesc"  resultType="map" parameterType="map">
+        SELECT
+        id                          AS id,
+        grade                       AS grade,
+        discount_way                AS discountWay,
+        gasoil_discount_litre       AS gasoilDiscountLitre,
+        member_condit               AS memberCondit,
+        station_id                  AS stationId,
+        member_condit_start         AS memberConditStart,
+        member_condit_end           AS memberConditEnd,
+        station_name                AS stationName,
+        oil_name                    AS oilName
+        FROM customer_grade_setting
+        <where>
+            <if test="stationId != null and stationId != ''">
+                station_id = #{stationId}
+            </if>
+            <if test="oilName != null and oilName != ''">
+                AND oil_name = #{oilName}
+            </if>
+        </where>
+        ORDER BY member_condit_start DESC
+    </select>
+
+
     <!--查询客户等级直降信息-->
     <select id="getCustomerGradeInfo" parameterType="map" resultType="map">
         SELECT