车型

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

@@ -308,6 +308,7 @@ public class UserCouponBiz extends BaseBiz<UserCouponMapper, UserCoupon> {
             userCoupon.setCrtTime(Instant.now().toEpochMilli());
             userCoupon.setStartTime(couponVo.getValidStartTime());
             userCoupon.setExpireTime(couponVo.getValidEndTime());
+            userCoupon.setTickerNo(Snowflake.build()+"");
             userCoupons.add(userCoupon);
         }
         return mapper.inserBatch(userCoupons);
@@ -328,6 +329,7 @@ public class UserCouponBiz extends BaseBiz<UserCouponMapper, UserCoupon> {
             userCoupon.setExpireTime(couponVo.getValidEndTime());
             userCoupon.setCrtTime(Instant.now().toEpochMilli());
             userCoupon.setUserId(phoneAndAppUserLoginMap.get(userCounponData.get(i)[0]));
+            userCoupon.setTickerNo(Snowflake.build()+"");
             userCoupons.add(userCoupon);
         }
 
@@ -359,4 +361,8 @@ public class UserCouponBiz extends BaseBiz<UserCouponMapper, UserCoupon> {
         criteria.andIn("userId",userIds);
         mapper.deleteByExample(example);
     }
+
+    public void updateUserCouponStatusById(Integer id) {
+        mapper.updateUserCouponStatusById(id);
+    }
 }
\ No newline at end of file

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/mapper/UserCouponMapper.java

@@ -34,4 +34,6 @@ public interface UserCouponMapper extends Mapper<UserCoupon> , InsertListMapper<
     List<UserCouponDTO> findUserCoupons(UserCouponFindDTO userCouponFindDTO);
 
     int inserBatch(@Param("userCoupons") List<UserCoupon> userCoupons);
+
+    void updateUserCouponStatusById(@Param("id") Integer id);
 }
\ No newline at end of file

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/rest/admin/UserCouponAdminController.java

 package com.xxfc.platform.activity.rest.admin;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.util.excel.ExcelImport;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
@@ -78,4 +76,11 @@ public class UserCouponAdminController {
         }
         return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(null);
     }
+
+    @DeleteMapping("/{id}")
+    public ObjectRestResponse<Void> deleteUserConuponById(@PathVariable("id") Integer id) {
+          userCouponBiz.updateUserCouponStatusById(id);
+          return  ObjectRestResponse.succ();
+    }
+
 }

xx-activity/xx-activity-server/src/main/resources/mapper/UserCouponMapper.xml

@@ -109,4 +109,8 @@
            (#{userCoupon.userId},#{userCoupon.couponId},#{userCoupon.startTime},#{userCoupon.expireTime},#{userCoupon.crtTime} )
        </foreach>
     </insert>
+
+    <update id="updateUserCouponStatusById">
+        update `user_coupon` set `is_del`=1 where  `id`=#{id}
+    </update>
 </mapper>
\ No newline at end of file

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleModelController.java

@@ -296,6 +296,7 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
      */
     @ApiOperation("优质车型")
     @GetMapping(value = "/goodList")
+    @IgnoreUserToken
     public List<GoodDataVO> goodList(@RequestParam("page") Integer page, @RequestParam("limit") Integer limit) {
         return baseBiz.goodList(page, limit);
     }