fix bug :1 order amount 2 coupon name show

@@ -54,7 +54,7 @@
     AND (#{currentTime} <![CDATA[ < ]]> `end_time` OR #{currentTime} <![CDATA[ < ]]> `receive_end_time`)
     and receive_start_time <![CDATA[ <= ]]> #{currentTime}
     AND `business_client` LIKE CONCAT('%',#{businessClient},'%')
-    ORDER BY coupon_type,use_limit_type,`use_limit_value` DESC
+    ORDER BY coupon_type,use_limit_type,`coupon_amount` DESC
     limit #{offset},#{limit}
   </select>
 
@@ -90,7 +90,7 @@
     AND (#{currentTime} <![CDATA[ < ]]> `end_time` OR #{currentTime} <![CDATA[ < ]]> `receive_end_time`)
     and receive_start_time <![CDATA[ <= ]]> #{currentTime}
     AND `business_client` LIKE CONCAT('%',#{businessClient},'%')
-    ORDER BY `use_limit_value` DESC
+    ORDER BY `coupon_amount` DESC
     limit #{offset},#{limit}
   </select>
 

@@ -167,11 +167,16 @@ public class CouponConvert {
                 && DateUtil.between(userCoupon.getEndTime() - DateUtil.getCurrentTimeSecond(), 0, THREE_DAY_SECOND);
     }
 
-
+    /**
+     * 展示原有的券名
+     * @param coupon
+     * @param userCoupon
+     * @return
+     */
     public static CouponSimpleBo do2CouponSimpleBo(Coupon coupon, UserCoupon userCoupon){
         CouponSimpleBo couponSimpleBo = new CouponSimpleBo();
         couponSimpleBo.setCouponId(coupon.getId());
-        String couponName = buildCouponNameByType(coupon);
+        String couponName = coupon.getCouponName();
         couponSimpleBo.setCouponName(couponName);
         couponSimpleBo.setCouponAmount(coupon.getCouponAmount());
         couponSimpleBo.setUseLimitType(coupon.getUseLimitType().intValue());
@@ -198,10 +203,16 @@ public class CouponConvert {
         return couponSimpleBo;
     }
 
+    /**
+     * 重命名券名
+     * @param coupon
+     * @return
+     */
     public static CouponSimpleBo do2CouponSimpleBo(Coupon coupon){
         CouponSimpleBo couponSimpleBo = new CouponSimpleBo();
         couponSimpleBo.setCouponId(coupon.getId());
-        couponSimpleBo.setCouponName(coupon.getCouponName());
+        String newName = buildCouponNameByType(coupon);
+        couponSimpleBo.setCouponName(newName);
         couponSimpleBo.setCouponAmount(coupon.getCouponAmount());
         couponSimpleBo.setUseLimitType(coupon.getUseLimitType().intValue());
         String useLimitValueStr;
@@ -210,8 +221,7 @@ public class CouponConvert {
         couponSimpleBo.setCouponToken(coupon.getCouponToken());
         Integer couponType;
         couponSimpleBo.setCouponType(couponType=coupon.getCouponType());
-        String couponDesc = buildCouponNameByType(coupon);
-        couponSimpleBo.setCouponDesc(couponDesc);
+
         couponSimpleBo.setStartTime(DateUtil.formatDate(coupon.getStartTime(), DateUtil.YYYY_MM_DD_DOT));
         couponSimpleBo.setEndTime(DateUtil.formatDate(coupon.getEndTime(), DateUtil.YYYY_MM_DD_DOT));
         return couponSimpleBo;