优化查询排序

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

@@ -85,6 +85,7 @@ public class ElectronicMembershipCardController {
 
                 customerCardSetting.setStationId(stationId);
                 customerCardSetting.setCardOilsType(cardOilsType);
+                customerCardSetting.setOrderBy("DESC");
                 //获取用户要充值电子卡的优惠规则信息
                 List<CustomerCardSetting> cardRechargeSettingList = electronicMembershipCardService.getCardRechargeSettingList(customerCardSetting);
                 if(cardRechargeSettingList !=null && cardRechargeSettingList.size() ==1){
@@ -478,6 +479,7 @@ public class ElectronicMembershipCardController {
             CustomerCardSetting customerCardSetting = new CustomerCardSetting();
             customerCardSetting.setStationId(stationId);
             customerCardSetting.setCardOilsType(cardOilsType);
+            customerCardSetting.setOrderBy("ASC");  //优惠规则升序排序
             List<CustomerCardSetting> cardRechargeSettingList = electronicMembershipCardService.getCardRechargeSettingList(customerCardSetting);
             resultData = ResultData.success(cardRechargeSettingList);
         }else {

YijiaRestful/src/main/java/com/platform/yijia/pojo/CustomerCardSetting.java

@@ -19,5 +19,6 @@ public class CustomerCardSetting {
     private Integer stationId;          //油站ID
     private String stationName;          //油站名称
     private Date createTime;
+    private String orderBy;         //查询结果排序方式
     private List<CustomerCardSettingDetail> customerCardSettingDetailList;
 }

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

@@ -83,7 +83,10 @@
                AND T1.card_oils_type = #{cardOilsType}
             </if>
         </where>
-        ORDER BY discount_amt_term DESC
+        <if test="orderBy !=null and orderBy !=''">
+            ORDER BY discount_amt_term ${orderBy}
+        </if>
+
     </select>
 
     <!--查询客户充值的订单信息-->