优化代码

java110-db/src/main/resources/mapper/fee/FeeDetailServiceDaoImplMapper.xml

@@ -206,7 +206,7 @@
         <if test="cashierName !=null and cashierName != ''">
             and t.cashier_name= #{cashierName}
         </if>
-        order by t.create_time desc
+        order by pf.payer_obj_id, pfc.fee_name, t.end_time desc
         <if test="page != -1 and page != null ">
             limit #{page}, #{row}
         </if>

java110-db/src/main/resources/mapper/fee/FeeServiceDaoImplMapper.xml

@@ -226,7 +226,7 @@
         <if test="deductFrom !=null and deductFrom != ''">
             and pfc.deduct_from = #{deductFrom}
         </if>
-        order by t.payer_obj_id,pfc.fee_name,t.end_time
+        order by t.payer_obj_id,pfc.fee_name,t.end_time desc
         <if test="page != -1 and page != null ">
             limit #{page}, #{row}
         </if>

service-fee/src/main/java/com/java110/fee/cmd/fee/QueryFeeDetailCmd.java

@@ -73,7 +73,7 @@ public class QueryFeeDetailCmd extends Cmd {
             for (FeeDetailDto feeDetail : feeDetailDtos) {
                 //获取状态
                 String state = feeDetail.getState();
-                if (!StringUtil.isEmpty(state) && (state.equals("1300") || state.equals("1100") || state.equals("1200"))) { //退费单、已退费、退费失败状态
+                if ("1300".equals(state) || "1100".equals(state) || "1200".equals(state)) { //退费单、已退费、退费失败状态
                     //获取周期
                     String cycles = feeDetail.getCycles();
                     if (!StringUtil.isEmpty(cycles) && cycles.contains("-")) {