Merge remote-tracking branch 'origin/dev' into jrz_dev

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/biz/UserCouponBiz.java

@@ -378,16 +378,17 @@ public class UserCouponBiz extends BaseBiz<UserCouponMapper, UserCoupon> {
         UserCoupon userCoupon;
         List<UserCoupon> userCoupons = new ArrayList<>();
         for (int i=0;i<userCouponSendDTO.getCouponNum();i++){
-            userCoupon = new UserCoupon();
+            /*userCoupon = new UserCoupon();
             userCoupon.setCouponId(userCouponSendDTO.getCouponId());
             userCoupon.setUserId(appUserLogin.getId());
             userCoupon.setCrtTime(Instant.now().toEpochMilli());
             userCoupon.setStartTime(couponVo.getValidStartTime());
             userCoupon.setExpireTime(couponVo.getValidEndTime());
             userCoupon.setTickerNo(Snowflake.build()+"");
-            userCoupons.add(userCoupon);
+            userCoupons.add(userCoupon);*/
+            userLedCoupon(appUserLogin.getId(),userCouponSendDTO.getCouponId());
         }
-        return mapper.inserBatch(userCoupons);
+        return 1;
     }
 
     public long importUserCoupon(Integer couponId,List<String[]> userCounponData) {

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleMapper.xml

@@ -588,7 +588,7 @@
             <if test=" yearMonthAndParam !=null and yearNo4Where != null and yearNo4Where == true">
                 hasVehicle desc,
             </if>
-            distance asc
+            distance asc, model_id asc
         </if>
     </select>