|
|
|
@@ -76,16 +76,16 @@ public class WxDeviceScreenAdController extends BaseController { |
|
|
|
Object target = null; |
|
|
|
if (s.getType().equals(EnumScreenAdType.COUPON.getCode())) |
|
|
|
target = wxCouponChannelService.findDetailVo(s.getTargetId()); |
|
|
|
if (s.getType().equals(EnumScreenAdType.COUPON.getCode())) |
|
|
|
else if (s.getType().equals(EnumScreenAdType.CAMPAIGN.getCode())) |
|
|
|
target = wxCampaignService.getById(s.getTargetId()); |
|
|
|
s.setTarget(target); |
|
|
|
}); |
|
|
|
return new ResultData(); |
|
|
|
return new ResultData(page); |
|
|
|
} |
|
|
|
|
|
|
|
@ApiOperation("心跳") |
|
|
|
@PostMapping("heartbeat") |
|
|
|
public Result heartbeat(@RequestParam String deviceId,@RequestBody String version) { |
|
|
|
public Result heartbeat(@RequestParam String deviceId,@ModelAttribute String version) { |
|
|
|
WxDevice wxDevice = findDevice(deviceId); |
|
|
|
if (wxDevice == null) |
|
|
|
return new ResultData(ErrorCode.DEVICE_NOT_FOUND); |
|
|
|
|