java/PlayPai.git

			@@ -1,4 +1,5 @@
			package com.dsh.activity.controller;

			import java.util.Date;

			import com.alibaba.fastjson.JSON;
			@@ -87,7 +88,6 @@
			private StoreClient stoClient;



			@Resource
			private RegionClient regionClient;

			@@ -107,8 +107,8 @@
			*/
			@ResponseBody
			@PostMapping("/coupon/queryCouponByUser/{userId}")
			public List<Integer> queryCouponByUser(@PathVariable("userId") Integer userId){

			public List<Long> queryCouponByUser(@PathVariable("userId") Integer userId) {
			List<Long> ids = new ArrayList<>();
			System.err.println("到达了赠送优惠价");
			List<Coupon> list = couponService.list(new QueryWrapper<Coupon>().eq("distributionMethod", 2)
			.le("startTime", new Date()).ge("endTime", new Date()).eq("auditStatus", 2)
			@@ -137,8 +137,9 @@
			userCoupon.setStatus(1);
			userCoupon.setInsertTime(new Date());
			ucService.save(userCoupon);
			ids.add(userCoupon.getId());
			}
			return null;
			return ids;
			}

			@ResponseBody
			@@ -168,6 +169,7 @@

			/**
			* 根据id获取优惠券信息
			*
			* @param id
			* @return
			*/
			@@ -186,6 +188,7 @@

			@Autowired
			private UserCouponService userCouponService;

			@ResponseBody
			@PostMapping("/coupon/queryCouponByUid")
			public List<Coupon> queryCouponByUid(@RequestBody Integer uid){
			@@ -215,6 +218,7 @@

			/**
			* 我的券包列表
			*
			* @param req
			* @return
			*/
			@@ -303,6 +307,7 @@

			@Autowired
			private OperatorClient operatorClient;

			@ResponseBody
			@PostMapping("/base/coupon/queryCouponListSearch")
			public List<Map<String,Object>> getCouponListOfSearch(@RequestBody CouponListOfSearch ofSearch){
			@@ -428,6 +433,7 @@
			}
			return mapList;
			}

			@ResponseBody
			@PostMapping("/base/coupon/couponExamineListSearch")
			public List<Map<String,Object>> getCouponExamineListOfSearch(@RequestBody CouponExamineListSearch ofSearch){
			@@ -557,7 +563,6 @@
			}
			return couponInfo;
			}



			@ResponseBody
			@@ -780,7 +785,6 @@
			Page<Object> objectPage = new Page<>(ofSearch.getOffset(), ofSearch.getLimit());
			return couponService.listRecord(objectPage,ofSearch.getId(),ofSearch.getIds(),ofSearch.getType());
			}



			@PostMapping("/base/coupon/updateType")