Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify

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

@@ -78,4 +78,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-app/xx-app-server/src/main/java/com/xxfc/platform/app/rest/AppHomeController.java

@@ -9,6 +9,7 @@ import com.xxfc.platform.app.biz.CofigBiz;
 import com.xxfc.platform.app.entity.Cofig;
 import com.xxfc.platform.campsite.feign.CampsiteFeign;
 import com.xxfc.platform.tour.feign.TourFeign;
+import com.xxfc.platform.vehicle.entity.VehicleModel;
 import com.xxfc.platform.vehicle.feign.VehicleFeign;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

xx-campsite/xx-campsite-server/src/main/java/com/xxfc/platform/campsite/rest/CampsiteShopController.java

 package com.xxfc.platform.campsite.rest;
 
-import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.github.wxiaoqi.security.common.vo.GoodDataVO;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
-import com.sun.org.apache.regexp.internal.RE;
 import com.xxfc.platform.campsite.biz.CampsiteShopBiz;
 import com.xxfc.platform.campsite.entity.CampsiteShop;
 import com.xxfc.platform.campsite.vo.CampsiteShopDetailVo;
@@ -13,11 +11,12 @@ import com.xxfc.platform.campsite.vo.CampsiteShopPageVo;
 import com.xxfc.platform.campsite.vo.CampsiteShopVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * @author libin

xx-tour/xx-tour-api/src/main/java/com/xxfc/platform/tour/dto/TourGoodDTO.java

@@ -108,6 +108,8 @@ public class TourGoodDTO {
 	//商品标签
 	@ApiModelProperty(value = "商品标签")
 	List<GoodTagDTO> tagDTOS;
-	
+
+	@ApiModelProperty(value = "海报背景")
+	private String posterBackground;
 
 }

xx-tour/xx-tour-api/src/main/java/com/xxfc/platform/tour/entity/TourGood.java

@@ -130,6 +130,9 @@ public class TourGood implements Serializable {
 	@Column(name = "is_del")
 	@ApiModelProperty(value = "是否删除，0否，1是")
 	private Integer isDel;
-	
+
+	@Column(name = "poster_background")
+	@ApiModelProperty(value = "海报背景")
+	private String posterBackground;
 
 }

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/entity/VehicleModel.java

@@ -152,4 +152,8 @@ public class VehicleModel implements Serializable {
 	@Column(name = "cover_pic")
 	@ApiModelProperty(value = "封面图")
 	private  String coverPic;
+
+	@Column(name = "poster_background")
+	@ApiModelProperty(value = "海报背景")
+	private String posterBackground;
 }

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/feign/VehicleFeign.java

@@ -85,7 +85,7 @@ public interface VehicleFeign {
      * @param limit
      * @return 返回
      */
-    @GetMapping(value = "/vehicleModel/goodList")
+    @GetMapping("/vehicleModel/goodList")
     List<GoodDataVO> goodList(@RequestParam(value = "page") Integer page, @RequestParam("limit") Integer limit);
 
     /**

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

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
 import com.github.wxiaoqi.security.admin.feign.rest.UserRestInterface;
+import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
 import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
 import com.github.wxiaoqi.security.auth.client.config.UserAuthConfig;
 import com.github.wxiaoqi.security.common.exception.BaseException;
@@ -32,6 +33,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 
@@ -289,7 +291,8 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
      */
     @ApiOperation("优质车型")
     @GetMapping(value = "/goodList")
-    public List<GoodDataVO> goodList(@RequestParam("page") Integer page, @RequestParam("limit") Integer limit) {
+    @IgnoreUserToken
+    public List<GoodDataVO> goodList(@RequestParam(value = "page") Integer page, @RequestParam(value = "limit") Integer limit) {
         return baseBiz.goodList(page, limit);
     }